diff --git a/Cargo.lock b/Cargo.lock
index 621f9131..6a76c872 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,7 +24,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytes",
  "futures-core",
  "futures-sink",
@@ -45,7 +45,7 @@ dependencies = [
  "actix-rt",
  "actix-service",
  "actix-utils",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytes",
  "bytestring",
  "derive_more 2.1.1",
@@ -160,7 +160,7 @@ dependencies = [
  "serde_json",
  "serde_urlencoded",
  "smallvec",
- "socket2 0.6.4",
+ "socket2 0.6.5",
  "time",
  "tracing",
  "url",
@@ -348,7 +348,7 @@ dependencies = [
  "persistence",
  "priority-queue",
  "prost-types",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rayon",
  "regex",
  "repo_metadata",
@@ -367,7 +367,7 @@ dependencies = [
  "strum_macros 0.27.2",
  "syntax_tree",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "typed-path 0.10.0",
  "unicode-width 0.1.14",
@@ -435,7 +435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
 dependencies = [
  "alsa-sys",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "libc",
 ]
@@ -457,7 +457,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cc",
  "jni 0.22.4",
  "libc",
@@ -466,7 +466,7 @@ dependencies = [
  "ndk-context",
  "ndk-sys",
  "num_enum",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -542,9 +542,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
 [[package]]
 name = "app-installation-detection"
@@ -1103,7 +1103,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -1165,7 +1165,7 @@ dependencies = [
  "enumflags2",
  "futures-channel",
  "futures-util",
- "rand 0.9.4",
+ "rand 0.9.5",
  "serde",
  "serde_repr",
  "url",
@@ -1207,7 +1207,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.9",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -1267,7 +1267,7 @@ checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "futures-lite 2.6.1",
  "pin-project-lite",
  "slab",
@@ -1350,7 +1350,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -1390,7 +1390,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -1401,13 +1401,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
-version = "0.1.89"
+version = "0.1.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -1464,7 +1464,7 @@ dependencies = [
  "attribute-derive-macro",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -1480,7 +1480,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "quote-use",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -1504,7 +1504,7 @@ dependencies = [
  "num-traits",
  "pastey 0.1.1",
  "rayon",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "v_frame",
  "y4m",
 ]
@@ -1534,9 +1534,9 @@ dependencies = [
 
 [[package]]
 name = "aws-config"
-version = "1.8.18"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33f815b73a3899c03b380d543532e5865f230dce9678d108dc10732a8682275"
+checksum = "701418aa459dac33e50a0f8e818e5662a16bc018a6ac7423659b70f3799d67a8"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1554,11 +1554,11 @@ dependencies = [
  "aws-types",
  "base64-simd",
  "bytes",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "hex",
  "http 1.4.2",
  "p256",
- "rand 0.8.6",
+ "rand 0.8.7",
  "sha1",
  "sha2 0.10.9",
  "time",
@@ -1571,9 +1571,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.14"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f20799b373a1be121fe3005fba0c2090af9411573878f224df44b42727fcaf7"
+checksum = "e93964ffdaf57857f544be3666a5f57570bb699e934700f11b49708f61bb556e"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -1583,9 +1583,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.17.1"
+version = "1.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad"
+checksum = "00bdb5da18dac48ca2cc7cd4a98e533e8635a58e2361d13a1a4ee3888e0d72f1"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -1593,9 +1593,9 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.42.0"
+version = "0.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444"
+checksum = "43103168cc76fe62678a375e722fc9cb3a0146159ac5828bc4f0dfd755c2224c"
 dependencies = [
  "cc",
  "cmake",
@@ -1606,9 +1606,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.7.5"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9b9de216a988dd54b754a82a7660cfe14cee4f6782ae4524470972fa0ccb39"
+checksum = "a6b50a43f3ccdf331521c6d6c68b7cc9668b6e09d439ebda9569df5722324d76"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -1621,9 +1621,9 @@ dependencies = [
  "aws-types",
  "bytes",
  "bytes-utils",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "percent-encoding",
  "pin-project-lite",
  "tracing",
@@ -1632,9 +1632,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-bedrockruntime"
-version = "1.135.0"
+version = "1.137.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e74b780f2f36912bae71b4f4f8ed9a0a88832b4681a1add3caf5ca25dbc8ab2d"
+checksum = "4d264d7d6412325fc6c77449f98363920da408fb426ce2d8b9b7c95324497c2c"
 dependencies = [
  "arc-swap",
  "aws-credential-types",
@@ -1647,10 +1647,11 @@ dependencies = [
  "aws-smithy-observability",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
+ "aws-smithy-schema",
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 0.2.12",
  "http 1.4.2",
  "http-body-util",
@@ -1660,9 +1661,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-signin"
-version = "1.14.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3295648005395c0611b1e4705f8cad062aa2a71789806d9d9717020b744a869f"
+checksum = "4cb1aef0872a7ab9e035a8c14d9ee1c3bd7f86f741b3620df8e8ecfe7b0d14dd"
 dependencies = [
  "arc-swap",
  "aws-credential-types",
@@ -1673,10 +1674,11 @@ dependencies = [
  "aws-smithy-observability",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
+ "aws-smithy-schema",
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 0.2.12",
  "http 1.4.2",
  "regex-lite",
@@ -1685,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.102.0"
+version = "1.104.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c82b3ac19f1431854f7ace3a7531674633e286bfdde21976893bfee36fd493b"
+checksum = "b53416d16c278234845392e38d93bd4481d2f09daa0f005a2277f0aa91f59c22"
 dependencies = [
  "arc-swap",
  "aws-credential-types",
@@ -1698,10 +1700,11 @@ dependencies = [
  "aws-smithy-observability",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
+ "aws-smithy-schema",
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 0.2.12",
  "http 1.4.2",
  "regex-lite",
@@ -1710,9 +1713,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.104.0"
+version = "1.106.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321000d2b4c5519ee573f73167f612efd7329322d9b26969ad1979f0427f1913"
+checksum = "cc9b706c3305ed0285d5b1b696c747aa34950f830fb03e3e6c76890f99b9f188"
 dependencies = [
  "arc-swap",
  "aws-credential-types",
@@ -1723,10 +1726,11 @@ dependencies = [
  "aws-smithy-observability",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
+ "aws-smithy-schema",
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 0.2.12",
  "http 1.4.2",
  "regex-lite",
@@ -1735,9 +1739,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.107.0"
+version = "1.109.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d0d328ba962af23ecfa3c9f23b98d3d35e325fa218d7f13d17a6bf522f8a560"
+checksum = "32d214cdfa5bbe17f117e76a7643fadf32a5234fb597322ef8b1fb4b2f17dbbd"
 dependencies = [
  "arc-swap",
  "aws-credential-types",
@@ -1749,10 +1753,11 @@ dependencies = [
  "aws-smithy-query",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
+ "aws-smithy-schema",
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 0.2.12",
  "http 1.4.2",
  "regex-lite",
@@ -1761,9 +1766,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.4.5"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae38512beae0ffee7010fc24e7a8a123c53efdfef42a61e80fda4882418dc71"
+checksum = "723c2234ad7511ceef63eab016b7ba6ff7c55590fefb96fa8467af014a07309f"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -1784,9 +1789,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.2.14"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffcaf626bdda484571968400c326a244598634dc75fd451325a54ad1a59acfc"
+checksum = "f02e407fb3b54891734224b9ffac8a71fdd35f542500fa1af95754a6b2beb316"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -1795,9 +1800,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.21"
+version = "0.61.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78d8391e65fcea47c586a22e1a41f173b38615b112b2c6b7a44e80cec3e6b706"
+checksum = "5a9381123ab62d20c13082b151f30f962a3b112b727345394536dfa39a482944"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -1806,9 +1811,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.63.6"
+version = "0.64.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba1ab2dc1c2c3749ead27180d333c42f11be8b0e934058fb4b2258ee8dbe5231"
+checksum = "37843d9add67c3aff5856f409c6dc315d3cdff60f9c0cb5b670dab1e9920306d"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -1818,7 +1823,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "percent-encoding",
  "pin-project-lite",
@@ -1828,9 +1833,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http-client"
-version = "1.1.13"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3ef8931ad1c98aa6a55b4256f847f3116090819844e0dd41ea682cac5dd2d3"
+checksum = "635d23afda0a6ab48d666c4d447c4873e8d1e83518a2be2093122397e50b838e"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -1852,9 +1857,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-json"
-version = "0.62.7"
+version = "0.63.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "701a947f4797e52a911e114a898667c746c39feea467bbd1abd7b3721f702ffa"
+checksum = "3dc65a121adb4b33729919fcfa14fa36fb33c1555a8f06bb0e2188dbfdc1d9ef"
 dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-schema",
@@ -1863,28 +1868,31 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-observability"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06c2315d173edbf1920da8ba3a7189695827002e4c0fc961973ab1c54abca9c"
+checksum = "8e86338c869539a581bf161247762a6e87f92c5c075060057b5ed6d06632ed0c"
 dependencies = [
  "aws-smithy-runtime-api",
 ]
 
 [[package]]
 name = "aws-smithy-query"
-version = "0.60.15"
+version = "0.62.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a56d79744fb3edb5d722ef79d86081e121d3b9422cb209eb03aea6aa4f21ebd"
+checksum = "512346c7212ab7436df2d77a16d976a468ae44a418835511d2a69269810aaf62"
 dependencies = [
+ "aws-smithy-runtime-api",
+ "aws-smithy-schema",
  "aws-smithy-types",
+ "aws-smithy-xml",
  "urlencoding",
 ]
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.11.3"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e6f5caf6fea86f8c2206541ab5857cfcda9013426cdbe8fa0098b9e2d32182"
+checksum = "bea94a9ff8464016338c851e24b472d7131c388c88898a502e781815b2ee6045"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -1894,11 +1902,11 @@ dependencies = [
  "aws-smithy-schema",
  "aws-smithy-types",
  "bytes",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "http 0.2.12",
  "http 1.4.2",
  "http-body 0.4.6",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "pin-project-lite",
  "pin-utils",
@@ -1908,9 +1916,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.12.3"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9db177daa6ba8afb9ee1aefcf548c907abcf52065e394ee11a92780057fe0e8c"
+checksum = "22ed1ebe6e0a95ea84570225f5a8208dec4b8f77e61a9b0d6f51773fcb4612f0"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api-macros",
@@ -1926,20 +1934,20 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime-api-macros"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d7396fd9500589e62e460e987ecb671bad374934e55ec3b5f498cc7a8a8a7b7"
+checksum = "221eaa237ddf1ca79b60d1372aad77e47f9c0ea5b3ce5099da8c61d027dc77b3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "aws-smithy-schema"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7442cb268338f0eb8278140a107c046756aa01093d8ef5e99628d34ae09c94f5"
+checksum = "7d56e0a4e53127a632224e43633b0fe045fa9e1e3cfc68b9830f1115e103f910"
 dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -1948,9 +1956,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.5.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b42fcf341259d85ca10fac9a2f6448a8ec691c6955a18e45bc3b71a85fab85"
+checksum = "d6dc683efb34b9e755675b37fedbe0103141e5b6df7bdc9eb6967756a8c167d8"
 dependencies = [
  "base64-simd",
  "bytes",
@@ -1959,7 +1967,7 @@ dependencies = [
  "http 0.2.12",
  "http 1.4.2",
  "http-body 0.4.6",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "itoa",
  "num-integer",
@@ -1974,18 +1982,21 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.60.15"
+version = "0.62.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce02add1aa3677d022f8adf81dcbe3046a95f17a1b1e8979c145cd21d3d22b3"
+checksum = "ce84f71c72fee2cbbadde6e7d082f5fb466e3a84733855295fa7aafd1b31b7d8"
 dependencies = [
+ "aws-smithy-runtime-api",
+ "aws-smithy-schema",
+ "aws-smithy-types",
  "xmlparser",
 ]
 
 [[package]]
 name = "aws-types"
-version = "1.3.16"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16bf10b03a3c01e6b3b7d47cd964e873ffe9e7d4e80fad16bd4c077cb068531"
+checksum = "eec1cd5469f328c782dc3e33d4153cf118a54e33cbb3356d60d16f89883e1f94"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
@@ -2007,7 +2018,7 @@ dependencies = [
  "form_urlencoded",
  "futures-util",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "hyper",
  "hyper-util",
@@ -2038,7 +2049,7 @@ dependencies = [
  "bytes",
  "futures-core",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "mime",
  "pin-project-lite",
@@ -2059,7 +2070,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "mime",
  "pin-project-lite",
@@ -2146,7 +2157,7 @@ version = "0.69.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -2159,7 +2170,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex 1.3.0",
- "syn 2.0.118",
+ "syn 2.0.119",
  "which",
 ]
 
@@ -2169,7 +2180,7 @@ version = "0.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cexpr",
  "clang-sys",
  "itertools 0.13.0",
@@ -2180,7 +2191,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex 1.3.0",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -2253,9 +2264,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
 dependencies = [
  "serde_core",
 ]
@@ -2266,7 +2277,7 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b64e60c28b6d25ad92e8b367801ff9aa12b41d05fc8798055d296bace4a60cc"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "serde",
 ]
 
@@ -2386,7 +2397,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -2397,26 +2408,26 @@ checksum = "dc0b364ead1874514c8c2855ab558056ebfeb775653e7ae45ff72f28f8f3166c"
 
 [[package]]
 name = "borsh"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145"
+checksum = "a88b7ea17d208c4193f2c1e6de3c35fe71f98c96982d5ced308bdcc749ff6e1f"
 dependencies = [
  "borsh-derive",
  "bytes",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae8fb4fb5740e4b2c4884ff95f5f32f5e8479db1e8fd8eb49ddbe09eb09bb7c"
+checksum = "d8f347189c62a579b8cd5f80714efa178f52e461dc2e6d701d264f5ff22e566c"
 dependencies = [
  "once_cell",
  "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -2448,9 +2459,9 @@ dependencies = [
 
 [[package]]
 name = "bstr"
-version = "1.12.3"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79"
+checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -2529,7 +2540,7 @@ checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -2540,22 +2551,22 @@ checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
 
 [[package]]
 name = "bytemuck"
-version = "1.25.0"
+version = "1.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
+checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.10.2"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
+checksum = "f65693059b6b9c588b9f62fed1cedbf0a8b805631457ea162d68f0de186f3de5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -2572,9 +2583,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "bytes"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
 dependencies = [
  "serde",
 ]
@@ -2623,7 +2634,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "log",
  "polling",
  "rustix 0.38.44",
@@ -2663,11 +2674,11 @@ dependencies = [
  "num_cpus",
  "objc2-foundation 0.3.2",
  "objc2-metal 0.3.2",
- "rand 0.9.4",
+ "rand 0.9.5",
  "rand_distr",
  "rayon",
  "safetensors 0.7.0",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "yoke 0.8.3",
  "zip 7.2.0",
 ]
@@ -2692,7 +2703,7 @@ dependencies = [
  "objc2-foundation 0.3.2",
  "objc2-metal 0.3.2",
  "once_cell",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tracing",
 ]
 
@@ -2711,7 +2722,7 @@ dependencies = [
  "rayon",
  "safetensors 0.7.0",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -2737,7 +2748,7 @@ dependencies = [
  "candle-nn",
  "fancy-regex 0.17.0",
  "num-traits",
- "rand 0.9.4",
+ "rand 0.9.5",
  "rayon",
  "serde",
  "serde_json",
@@ -2782,9 +2793,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.65"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
+checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -2838,9 +2849,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "cfg_aliases"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
 
 [[package]]
 name = "chacha20"
@@ -2853,6 +2864,17 @@ dependencies = [
  "cpufeatures 0.2.17",
 ]
 
+[[package]]
+name = "chacha20"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "chacha20poly1305"
 version = "0.10.1"
@@ -2860,7 +2882,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
  "aead",
- "chacha20",
+ "chacha20 0.9.1",
  "cipher",
  "poly1305",
  "zeroize",
@@ -2945,9 +2967,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.6.1"
+version = "4.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
+checksum = "d91e0c145792ef73a6ad36d27c75ac09f1832222a3c209689d90f534685ee5b7"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2955,9 +2977,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.6.0"
+version = "4.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
+checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2976,14 +2998,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.6.1"
+version = "4.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
+checksum = "d012d2b9d65aca7f18f4d9878a045bc17899bba951561ba5ec3c2ba1eed9a061"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -3086,7 +3108,7 @@ dependencies = [
  "serde",
  "session-sharing-protocol",
  "settings_value",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "uuid",
  "warp_server_auth",
 ]
@@ -3139,7 +3161,7 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block",
  "cocoa-foundation 0.2.1",
  "core-foundation 0.10.1",
@@ -3169,7 +3191,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block",
  "core-foundation 0.10.1",
  "core-graphics-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3215,7 +3237,7 @@ dependencies = [
  "nom 7.1.3",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -3271,7 +3293,7 @@ dependencies = [
  "libc",
  "log",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "win32job",
  "windows 0.62.2",
 ]
@@ -3295,7 +3317,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "command",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
 ]
 
 [[package]]
@@ -3338,7 +3360,7 @@ dependencies = [
  "ashpd",
  "async-trait",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "clap",
  "command",
  "computer_use",
@@ -3370,7 +3392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -3499,7 +3521,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.1",
  "core-graphics-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "foreign-types 0.5.0",
@@ -3511,7 +3533,7 @@ name = "core-graphics"
 version = "0.25.0"
 source = "git+https://github.com/servo/core-foundation-rs?rev=6f844cf1a1a18e25b70fcdf1bcdc458555bd2eff#6f844cf1a1a18e25b70fcdf1bcdc458555bd2eff"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.1",
  "core-graphics-types 0.2.0 (git+https://github.com/servo/core-foundation-rs?rev=6f844cf1a1a18e25b70fcdf1bcdc458555bd2eff)",
  "foreign-types 0.5.0",
@@ -3535,7 +3557,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.1",
  "libc",
 ]
@@ -3573,7 +3595,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "objc2-audio-toolbox",
  "objc2-core-audio",
@@ -3586,7 +3608,7 @@ name = "cosmic-text"
 version = "0.12.0"
 source = "git+https://github.com/warpdotdev/cosmic-text.git?rev=15198beba692162201c0ea8b15222cf5643ea068#15198beba692162201c0ea8b15222cf5643ea068"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "fontdb",
  "log",
  "rangemap",
@@ -3761,18 +3783,18 @@ checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.15"
+version = "0.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+checksum = "5181e0de7b61eb03a81e347d6dd8797bae9da5146707b51077e2d71a54ec0ceb"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -3780,18 +3802,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.18"
+version = "0.9.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+checksum = "2d6914041f254d6e9176c01941b21115dcfb7089e55135a35411081bd106ef3f"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
 
 [[package]]
 name = "crossterm"
@@ -3799,7 +3821,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "crossterm_winapi",
  "derive_more 2.1.1",
  "document-features",
@@ -3987,7 +4009,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4001,9 +4023,9 @@ dependencies = [
 
 [[package]]
 name = "cynic"
-version = "3.13.2"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e722e1560ed4e4260cf35ac5fafc422aa7682c919db5a14209e4afad4446c2"
+checksum = "6260314e64d59ff1a962d465573ac6775fbf4624aa67613e220eb61f4a3d9a5c"
 dependencies = [
  "cynic-proc-macros",
  "ref-cast",
@@ -4014,9 +4036,9 @@ dependencies = [
 
 [[package]]
 name = "cynic-codegen"
-version = "3.13.2"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde92ad70b36e9794eab14cbe915ae33e0ee8013844b7dcacad686830e107a5f"
+checksum = "04e68e191fc65c3b8a5b467368ef8e3d5f610ef770df664d5cca51de573c3010"
 dependencies = [
  "cynic-parser",
  "darling 0.20.11",
@@ -4026,15 +4048,15 @@ dependencies = [
  "quote",
  "rkyv 0.8.17",
  "strsim 0.10.0",
- "syn 2.0.118",
+ "syn 2.0.119",
  "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "cynic-parser"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4dfae2e0e25c72720197bde791ef9b840562ed6418eab6d8505f1d8fed27e86"
+checksum = "7793e157a59a0bd2142a5723860aeaef3aa459feae1467b597351e5f58251904"
 dependencies = [
  "indexmap 2.14.0",
  "lalrpop-util",
@@ -4043,14 +4065,14 @@ dependencies = [
 
 [[package]]
 name = "cynic-proc-macros"
-version = "3.13.2"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64118c37832e4ff3e2b8ffaf2f3a08d1b646fa049e90ff54826abac01005ae11"
+checksum = "8ca74b7363c9c675b6539aaf151c695cac83d3e7abc80dfbfbfdbfef27e4ec20"
 dependencies = [
  "cynic-codegen",
  "darling 0.20.11",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4103,7 +4125,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4117,7 +4139,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4130,7 +4152,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4141,7 +4163,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core 0.20.11",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4152,7 +4174,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4163,7 +4185,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
 dependencies = [
  "darling_core 0.23.0",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4240,9 +4262,9 @@ checksum = "ac6b926516df9c60bfa16e107b21086399f8285a44ca9711344b9e553c5146e2"
 
 [[package]]
 name = "defmt"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f"
+checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
 dependencies = [
  "bitflags 1.3.2",
  "defmt-macros",
@@ -4250,15 +4272,14 @@ dependencies = [
 
 [[package]]
 name = "defmt-macros"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b"
+checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
 dependencies = [
  "defmt-parser",
- "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4267,7 +4288,7 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
 dependencies = [
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -4289,9 +4310,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fd89660b2dc699704064e59e9dba0147b903e85319429e131620d022be411b"
+checksum = "a69dedd701da44b0536442edf09c81a64b0ab97a7a4a5e3d1971f00027cbc63d"
 dependencies = [
  "pem-rfc7468 1.0.0",
  "zeroize",
@@ -4336,7 +4357,7 @@ checksum = "d08b3a0bcc0d079199cd476b2cae8435016ec11d1c0986c6901c5ac223041534"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4347,7 +4368,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4368,7 +4389,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4378,7 +4399,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4391,7 +4412,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4413,7 +4434,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.118",
+ "syn 2.0.119",
  "unicode-xid",
 ]
 
@@ -4435,9 +4456,9 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.3.10"
+version = "2.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29fe29a87fb84c631ffb3ba21798c4b1f3a964701ba78f0dce4bf8668562ec88"
+checksum = "e54d1f576cd3a3460f212a4615fd12ce1b6303c095b79a44449ffbe627753dc1"
 dependencies = [
  "chrono",
  "diesel_derives",
@@ -4457,7 +4478,7 @@ dependencies = [
  "dsl_auto_type",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4477,7 +4498,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe2444076b48641147115697648dc743c2c00b61adade0f01ce67133c7babe8c"
 dependencies = [
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4601,7 +4622,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -4615,7 +4636,7 @@ checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4681,7 +4702,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4790,7 +4811,7 @@ dependencies = [
  "cc",
  "memchr",
  "rustc_version",
- "toml 1.1.2+spec-1.1.0",
+ "toml 1.1.3+spec-1.1.0",
  "vswhom",
  "winreg",
 ]
@@ -4846,7 +4867,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4866,7 +4887,7 @@ checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4887,7 +4908,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -4920,7 +4941,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -5008,14 +5029,16 @@ dependencies = [
 
 [[package]]
 name = "exr"
-version = "1.74.0"
+version = "1.74.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4300e043a56aa2cb633c01af81ca8f699a321879a7854d3896a0ba89056363be"
+checksum = "711fe42c9964295e01ee3fba3f9fe0e1d24b98886950d68efe81b1c76e21adf3"
 dependencies = [
  "bit_field",
  "half",
  "lebe",
  "miniz_oxide",
+ "num-complex",
+ "pulp 0.22.3",
  "rayon-core",
  "smallvec",
  "zune-inflate",
@@ -5076,9 +5099,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "fax"
@@ -5120,7 +5143,7 @@ dependencies = [
  "prost",
  "prost-reflect",
  "prost-types",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -5239,7 +5262,7 @@ dependencies = [
  "cudarc 0.19.8",
  "half",
  "num-traits",
- "rand 0.9.4",
+ "rand 0.9.5",
  "rand_distr",
 ]
 
@@ -5295,7 +5318,7 @@ name = "font-kit"
 version = "0.12.0"
 source = "git+https://github.com/warpdotdev/font-kit.git?rev=a04b225ecb639bb850f21d05212cfdc7465000f3#a04b225ecb639bb850f21d05212cfdc7465000f3"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "byteorder",
  "core-foundation 0.10.1",
  "core-graphics 0.25.0",
@@ -5382,7 +5405,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -5502,9 +5525,9 @@ dependencies = [
 
 [[package]]
 name = "futures"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
+checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -5517,9 +5540,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
+checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -5527,15 +5550,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
+checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -5544,9 +5567,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
+checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a"
 
 [[package]]
 name = "futures-lite"
@@ -5569,7 +5592,7 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
 dependencies = [
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "futures-core",
  "futures-io",
  "parking",
@@ -5578,26 +5601,26 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
+checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
+checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307"
 
 [[package]]
 name = "futures-task"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
 
 [[package]]
 name = "futures-test-sink"
@@ -5620,9 +5643,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -5685,7 +5708,7 @@ dependencies = [
  "base64 0.22.1",
  "bimap",
  "bincode",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bitflags-serde-legacy",
  "block",
  "blocking",
@@ -5696,7 +5719,7 @@ dependencies = [
  "bytes",
  "cc",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "channel_versions",
  "chrono",
  "clap",
@@ -5831,10 +5854,6 @@ dependencies = [
  "objc2-foundation 0.3.2",
  "onboarding",
  "once_cell",
- "opentelemetry",
- "opentelemetry-http",
- "opentelemetry-otlp",
- "opentelemetry_sdk",
  "ordered-float 3.9.2",
  "os_info",
  "palette 0.6.1",
@@ -5850,7 +5869,7 @@ dependencies = [
  "prost-build",
  "prost-types",
  "qrcode",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rangemap",
  "rayon",
  "regex",
@@ -5860,7 +5879,7 @@ dependencies = [
  "reqwest 0.13.4",
  "rmcp",
  "rquickjs",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "rustls",
  "schemars",
  "security-framework-sys",
@@ -5900,16 +5919,15 @@ dependencies = [
  "sysinfo",
  "tabwriter",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "thousands",
  "tikv-jemallocator",
  "tokio",
  "tokio-util",
  "toml 0.8.23",
- "toml_edit 0.25.12+spec-1.1.0",
+ "toml_edit 0.25.13+spec-1.1.0",
  "tracing",
  "tracing-futures",
- "tracing-opentelemetry",
  "tracing-subscriber",
  "typed-path 0.10.0",
  "ui_components",
@@ -5958,7 +5976,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "chrono",
  "clap",
  "clap_complete",
@@ -6010,7 +6028,7 @@ dependencies = [
  "shellexpand",
  "smol_str",
  "string-offset",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "typed-path 0.10.0",
  "warp-command-signatures",
 ]
@@ -6047,7 +6065,7 @@ dependencies = [
  "objc2-foundation 0.3.2",
  "parking_lot",
  "pin-project",
- "rand 0.8.6",
+ "rand 0.8.7",
  "regex",
  "reqwest 0.13.4",
  "schemars",
@@ -6065,7 +6083,7 @@ dependencies = [
  "strum_macros 0.27.2",
  "sysinfo",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "tracing",
  "url",
@@ -6107,17 +6125,17 @@ dependencies = [
  "ordered-float 3.9.2",
  "parking_lot",
  "pathfinder_color",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rangemap",
  "rayon",
  "regex-automata",
  "regex-syntax",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "serde",
  "serde_yaml 0.8.26",
  "string-offset",
  "sum_tree",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "unicode-width 0.1.14",
  "urlocator",
  "vec1",
@@ -6147,7 +6165,7 @@ dependencies = [
  "remote_server",
  "repo_metadata",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "watcher",
 ]
 
@@ -6172,7 +6190,7 @@ dependencies = [
  "persistence",
  "reqwest 0.13.4",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "websocket",
  "ws_stream_wasm",
 ]
@@ -6198,7 +6216,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -6209,7 +6227,7 @@ dependencies = [
  "cfg-if",
  "rquickjs",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "uuid",
 ]
 
@@ -6251,11 +6269,11 @@ dependencies = [
  "getrandom 0.3.4",
  "hpke",
  "log",
- "rand 0.9.4",
+ "rand 0.9.5",
  "serde",
  "serde_json",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tink-core",
  "tink-hybrid",
  "tink-proto",
@@ -6322,14 +6340,14 @@ dependencies = [
  "oauth2",
  "parking_lot",
  "pathfinder_geometry",
- "rand 0.8.6",
+ "rand 0.8.7",
  "reqwest 0.13.4",
  "schemars",
  "serde",
  "serde_json",
  "session-sharing-protocol",
  "settings_value",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "url",
  "uuid",
  "warp_server_auth",
@@ -6341,7 +6359,7 @@ name = "galaxy_terminal"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bitflags-serde-legacy",
  "cfg-if",
  "channel_versions",
@@ -6362,7 +6380,7 @@ dependencies = [
  "smol_str",
  "static_assertions",
  "string-offset",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "typed-path 0.10.0",
  "unicode-segmentation",
  "unicode-width 0.1.14",
@@ -6391,11 +6409,11 @@ dependencies = [
  "mime_guess",
  "pathdiff",
  "pin-project",
- "rand 0.8.6",
+ "rand 0.8.7",
  "regex",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "typed-path 0.10.0",
  "windows 0.62.2",
 ]
@@ -6427,7 +6445,7 @@ dependencies = [
  "bytemuck",
  "cc",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "chrono",
  "cocoa 0.26.0",
  "command",
@@ -6481,14 +6499,14 @@ dependencies = [
  "parking_lot",
  "pathfinder_color",
  "pathfinder_geometry",
- "rand 0.8.6",
+ "rand 0.8.7",
  "resvg",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "serde",
  "sum_tree",
  "takecell",
  "tauri-winrt-notification",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tini",
  "url",
  "urlencoding",
@@ -6524,7 +6542,7 @@ dependencies = [
  "bounded-vec-deque",
  "bytes",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "chrono",
  "command",
  "concat-idents",
@@ -6559,13 +6577,13 @@ dependencies = [
  "parking_lot",
  "pathfinder_color",
  "pathfinder_geometry",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rangemap",
  "ratatui",
  "raw-window-handle 0.6.2",
  "resvg",
  "rstar",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "rustc-hash 2.1.3",
  "schemars",
  "serde",
@@ -6579,7 +6597,7 @@ dependencies = [
  "strum_macros 0.27.2",
  "sum_tree",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "titlecase",
  "tokio",
  "tracing",
@@ -6602,7 +6620,7 @@ dependencies = [
  "objc2 0.6.4",
  "objc2-foundation 0.3.2",
  "ouroboros",
- "rand 0.8.6",
+ "rand 0.8.7",
  "ring",
  "secret-service",
  "security-framework 2.11.1",
@@ -6610,8 +6628,8 @@ dependencies = [
  "serde_json",
  "sha2 0.10.9",
  "tempfile",
- "thiserror 2.0.18",
- "toml_edit 0.25.12+spec-1.1.0",
+ "thiserror 2.0.19",
+ "toml_edit 0.25.13+spec-1.1.0",
  "windows 0.62.2",
  "windows-registry 0.2.0",
  "windows-result 0.2.0",
@@ -6883,7 +6901,7 @@ checksum = "13a1bcfb855c1f340d5913ab542e36f25a1c56f57de79022928297632435dec2"
 dependencies = [
  "attribute-derive",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -6930,8 +6948,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "r-efi 6.0.0",
+ "rand_core 0.10.1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -6942,7 +6963,7 @@ checksum = "6cf442baaabe4213ce7d1239afc26c039180b6456da2cededa316ae2c8a77a77"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -6997,7 +7018,7 @@ version = "0.20.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b88256088d75a56f8ecfa070513a775dd9107f6530ef14919dac831af9cfe2b"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "libgit2-sys",
  "log",
@@ -7017,9 +7038,9 @@ dependencies = [
 
 [[package]]
 name = "glob"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b"
 
 [[package]]
 name = "global-hotkey"
@@ -7032,7 +7053,7 @@ dependencies = [
  "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "once_cell",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "windows-sys 0.59.0",
  "x11rb",
  "xkeysym",
@@ -7040,9 +7061,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.18"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
+checksum = "e47d37d2ae4464254884b60ab7071be2b876a9c35b696bd018ddcc76847309cd"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -7167,7 +7188,7 @@ dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -7212,7 +7233,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "log",
  "presser",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "windows 0.62.2",
 ]
 
@@ -7222,7 +7243,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "gpu-descriptor-types",
  "hashbrown 0.15.5",
 ]
@@ -7233,7 +7254,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -7294,9 +7315,9 @@ dependencies = [
 
 [[package]]
 name = "grep-matcher"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36d7b71093325ab22d780b40d7df3066ae4aebb518ba719d38c697a8228a8023"
+checksum = "f9417543f4870fc8f1c8e1af870afae2431007626d9e703fce6471c468d33847"
 dependencies = [
  "memchr",
 ]
@@ -7331,9 +7352,9 @@ dependencies = [
 
 [[package]]
 name = "grep-searcher"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac63295322dc48ebb20a25348147905d816318888e64f531bfc2a2bc0577dc34"
+checksum = "72348823a0eafc4bc2e9051064f28b5b42cc100b571b3a35d67918d711efcbc6"
 dependencies = [
  "bstr",
  "encoding_rs",
@@ -7384,7 +7405,7 @@ dependencies = [
  "cfg-if",
  "crunchy",
  "num-traits",
- "rand 0.9.4",
+ "rand 0.9.5",
  "rand_distr",
  "zerocopy",
 ]
@@ -7517,11 +7538,11 @@ dependencies = [
  "log",
  "native-tls",
  "num_cpus",
- "rand 0.9.4",
+ "rand 0.9.5",
  "reqwest 0.12.28",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "ureq 2.12.1",
  "windows-sys 0.60.2",
@@ -7614,12 +7635,9 @@ dependencies = [
 
 [[package]]
 name = "html-escape"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
-dependencies = [
- "utf8-width",
-]
+checksum = "46c1ff2d1cbf39efe5af0900ced8a069b5e61557a17544eb0c4a50239937389e"
 
 [[package]]
 name = "html5ever"
@@ -7672,9 +7690,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
 dependencies = [
  "bytes",
  "http 1.4.2",
@@ -7682,14 +7700,14 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2"
 dependencies = [
  "bytes",
  "futures-core",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "pin-project-lite",
 ]
 
@@ -7766,9 +7784,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
+checksum = "d22053281f852e11534f5198498373cbb59295120a20771d90f7ed1897490a72"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -7776,7 +7794,7 @@ dependencies = [
  "futures-core",
  "h2",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "httparse",
  "httpdate",
  "itoa",
@@ -7829,13 +7847,13 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "hyper",
  "ipnet",
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.4",
+ "socket2 0.6.5",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -7978,9 +7996,9 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.27"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe112b004901c62c2faa11f4f75e9864e0cc5af8da71c9115d184a3aa888749f"
+checksum = "7f8a7b8211e695a1d0cd91cace480d4d0bd57667ab10277cc412c5f7f4884f83"
 dependencies = [
  "crossbeam-deque",
  "globset",
@@ -8048,9 +8066,9 @@ checksum = "89194689a993ab15268672e99e7b0e19da2da3268ac682e8f02d29d4d1434cd7"
 
 [[package]]
 name = "impl-more"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35a84fd5aa25fae5c0f4a33d9cac2ca017fc622cbd089be2229993514990f870"
+checksum = "134d2c4324d61664107020b79019cf6a6aec153f0b79bc9619ee9e794a5fb021"
 
 [[package]]
 name = "indexmap"
@@ -8108,20 +8126,20 @@ dependencies = [
 
 [[package]]
 name = "inotify"
-version = "0.11.2"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533e68a5842e734946fe159fb03fc9bbbb254f590dd0d8ad321ae5ff7beca2c1"
+checksum = "153be1941a183ec9ccd095ddbe17a8b8d435ef6c76e9e02451b933c3999af2c8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "inotify-sys",
  "libc",
 ]
 
 [[package]]
 name = "inotify-sys"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea94e891b3606826e9c998be69ddca42247dad8ad50b1649a5cb7e1c9ae06fd"
+checksum = "c033f80b2c113cdf91ab7a33faa9cbc014726dcad99880c8609af2a370edf37d"
 dependencies = [
  "libc",
 ]
@@ -8160,7 +8178,7 @@ dependencies = [
  "ort",
  "parking_lot",
  "prost",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "serde",
  "smol_str",
  "tokenizers",
@@ -8172,7 +8190,7 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6654738b8024300cf062d04a1c13c10c8e2cea598ec1c47dc9b6641159429756"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "crossterm",
  "dyn-clone",
  "fuzzy-matcher",
@@ -8190,7 +8208,7 @@ dependencies = [
  "indoc",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -8233,9 +8251,9 @@ dependencies = [
  "nix 0.26.4",
  "parking_lot",
  "pathfinder_geometry",
- "rand 0.8.6",
+ "rand 0.8.7",
  "regex",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "serde",
  "serde_json",
  "settings",
@@ -8259,7 +8277,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -8318,9 +8336,9 @@ dependencies = [
  "itertools 0.14.0",
  "log",
  "parking_lot",
- "rand 0.8.6",
+ "rand 0.8.7",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "uuid",
 ]
 
@@ -8337,7 +8355,7 @@ dependencies = [
  "markdown_parser",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -8550,11 +8568,12 @@ dependencies = [
 
 [[package]]
 name = "jiff"
-version = "0.2.31"
+version = "0.2.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccfe6121cbe750cf81efa362d85c0bde7ea298ec43092d3a193baca59cdbd634"
+checksum = "e184d09547b80eb7e20d141ba2fb1fbac843ca53f4cf1b31210adc4c1adc6e16"
 dependencies = [
  "defmt",
+ "jiff-core",
  "jiff-static",
  "jiff-tzdb-platform",
  "log",
@@ -8565,21 +8584,31 @@ dependencies = [
 ]
 
 [[package]]
-name = "jiff-static"
-version = "0.2.31"
+name = "jiff-core"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e165e897f662d428f3cd3828a919dbe067c2d42bb1031eede74ef9d27ecdedd2"
+checksum = "7feca88439efe53da3754500c1851dedf3cb36c524dd5cf8225cc0794de95d09"
 dependencies = [
+ "defmt",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "323da076b7a6faf914dc677cb05a4b907742ff7375c8322c9e7f5061e5e0e9de"
+dependencies = [
+ "jiff-core",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "jiff-tzdb"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6142247df1a93c2b3587402a19710be3e6e942f1581a1702e76408f2c21d6590"
+checksum = "142bd39932ad231f10513df9ab62661fead8719872150b7ad02a2df79f4e141e"
 
 [[package]]
 name = "jiff-tzdb-platform"
@@ -8618,7 +8647,7 @@ dependencies = [
  "jni-sys 0.4.1",
  "log",
  "simd_cesu8",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "walkdir",
  "windows-link 0.2.1",
 ]
@@ -8633,7 +8662,7 @@ dependencies = [
  "quote",
  "rustc_version",
  "simd_cesu8",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -8661,16 +8690,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "jobserver"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+checksum = "1c00acbd29eabad4a2392fa0e921c874934dbbf4194312ad20f04a0ed67a3cb3"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "libc",
 ]
 
@@ -8734,7 +8763,7 @@ checksum = "bde5057d6143cc94e861d90f591b9303d6716c6b9602309150bd068853c10899"
 dependencies = [
  "hashbrown 0.16.1",
  "portable-atomic",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -8743,7 +8772,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "serde",
  "unicode-segmentation",
 ]
@@ -8772,7 +8801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d9f1da1000eb32cea537203e5ea121eb06e66c5e5f3420a1e9f11a57676f55b"
 dependencies = [
  "palette 0.6.1",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rand_chacha 0.3.1",
 ]
 
@@ -8792,7 +8821,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
 ]
 
@@ -8837,7 +8866,7 @@ dependencies = [
  "galaxy_editor",
  "galaxy_util",
  "lazy_static",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "serde",
  "serde_yaml 0.8.26",
 ]
@@ -8878,9 +8907,9 @@ checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25"
 
 [[package]]
 name = "libc"
-version = "0.2.186"
+version = "0.2.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -8936,7 +8965,7 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "plain",
  "redox_syscall 0.9.0",
@@ -8971,7 +9000,7 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f50e8f47623268b5407192d26876c4d7f89d686ca130fdc53bced4814cd29f8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -9030,12 +9059,12 @@ dependencies = [
  "chrono",
  "command",
  "libc",
- "rand 0.8.6",
+ "rand 0.8.7",
  "reqwest 0.13.4",
  "serde",
  "serde_json",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "uuid",
 ]
 
@@ -9122,7 +9151,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -9154,9 +9183,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.18.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9"
+checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6"
 dependencies = [
  "hashbrown 0.17.1",
 ]
@@ -9365,7 +9394,7 @@ dependencies = [
  "markup5ever_rcdom",
  "nom 7.1.3",
  "serde_yaml 0.8.26",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -9399,7 +9428,7 @@ checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -9419,9 +9448,9 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
+checksum = "3f607c237553f086e7043417a51df26b2eb899d3caff94e6a67592ff992fedc7"
 dependencies = [
  "autocfg",
  "rawpointer",
@@ -9460,7 +9489,7 @@ dependencies = [
  "serde_json",
  "simple_logger",
  "sse-stream",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "tracing",
  "url",
@@ -9479,9 +9508,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.8.2"
+version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
 [[package]]
 name = "memmap"
@@ -9553,7 +9582,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block",
  "core-graphics-types 0.1.3",
  "foreign-types 0.5.0",
@@ -9605,7 +9634,7 @@ version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c4d14bcca0fd3ed165a03000480aaa364c6860c34e900cb2dafdf3b95340e77"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "debugid",
  "num-derive",
  "num-traits",
@@ -9620,7 +9649,7 @@ version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abcd9c8a1e6e1e9d56ce3627851f39a17ea83e17c96bc510f29d7e43d78a7d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "byteorder",
  "cfg-if",
  "crash-context",
@@ -9700,9 +9729,9 @@ checksum = "c505b3e17ed6b70a7ed2e67fbb2c560ee327353556120d6e72f5232b6880d536"
 
 [[package]]
 name = "mio"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
+checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
 dependencies = [
  "libc",
  "log",
@@ -9733,7 +9762,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -9747,13 +9776,13 @@ dependencies = [
  "colored",
  "futures-core",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "hyper",
  "hyper-util",
  "log",
  "pin-project-lite",
- "rand 0.9.4",
+ "rand 0.9.5",
  "regex",
  "serde_json",
  "serde_urlencoded",
@@ -9780,7 +9809,7 @@ checksum = "e4db6d5580af57bf992f59068d4ea26fd518574ff48d7639b255a36f9de6e7e9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -9816,7 +9845,7 @@ checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -9833,9 +9862,9 @@ checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
 dependencies = [
  "arrayvec",
  "bit-set 0.9.1",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "codespan-reporting",
  "half",
  "hashbrown 0.16.1",
@@ -9847,7 +9876,7 @@ dependencies = [
  "once_cell",
  "rustc-hash 1.1.0",
  "spirv",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "unicode-ident",
 ]
 
@@ -9945,7 +9974,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "jni-sys 0.3.1",
  "log",
  "ndk-sys",
@@ -9993,7 +10022,7 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "cfg_aliases 0.1.1",
  "libc",
@@ -10005,9 +10034,9 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "libc",
  "memoffset 0.9.1",
 ]
@@ -10018,9 +10047,9 @@ version = "0.31.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "libc",
 ]
 
@@ -10085,7 +10114,7 @@ name = "notify"
 version = "8.0.0"
 source = "git+https://github.com/warpdotdev/notify?rev=91b719849bc04ef251bcb2cc61076b099204e970#91b719849bc04ef251bcb2cc61076b099204e970"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -10163,9 +10192,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c863e9ab5e7bf9c99ba75e1050f1e4d624ae87ed3532d6238ffbdc7b585dbbe6"
+checksum = "c89e69e7e0f03bea5ef08013795c25018e101932225a656383bd384495ecc367"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -10201,7 +10230,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -10215,11 +10244,10 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
@@ -10274,7 +10302,7 @@ dependencies = [
  "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -10302,7 +10330,7 @@ dependencies = [
  "chrono",
  "getrandom 0.2.17",
  "http 1.4.2",
- "rand 0.8.6",
+ "rand 0.8.7",
  "serde",
  "serde_json",
  "serde_path_to_error",
@@ -10361,7 +10389,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "libc",
  "objc2 0.5.2",
@@ -10377,7 +10405,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -10391,7 +10419,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "objc2 0.6.4",
  "objc2-core-audio",
@@ -10406,7 +10434,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "478ae33fcac9df0a18db8302387c666b8ef08a3e2d62b510ca4fc278a384b6c0"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
@@ -10427,7 +10455,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location 0.2.2",
@@ -10440,7 +10468,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-foundation 0.3.2",
 ]
@@ -10475,7 +10503,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
 ]
 
@@ -10485,7 +10513,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -10507,7 +10535,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "libc",
@@ -10520,7 +10548,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "libc",
@@ -10580,7 +10608,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -10598,7 +10626,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "dispatch",
  "libc",
@@ -10611,7 +10639,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "libc",
  "objc2 0.6.4",
@@ -10634,7 +10662,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-core-foundation",
 ]
@@ -10657,7 +10685,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -10669,7 +10697,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "dispatch2",
  "objc2 0.6.4",
@@ -10683,7 +10711,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
@@ -10696,7 +10724,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -10719,7 +10747,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-cloud-kit 0.2.2",
@@ -10740,7 +10768,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "objc2 0.6.4",
  "objc2-cloud-kit 0.3.2",
@@ -10772,7 +10800,7 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-core-location 0.2.2",
@@ -10822,7 +10850,7 @@ dependencies = [
  "log",
  "pathfinder_color",
  "pathfinder_geometry",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "serde",
  "serde_json",
  "strum 0.27.2",
@@ -10855,7 +10883,7 @@ version = "6.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0cc3cbf698f9438986c11a880c90a6d04b9de27575afd28bbf45b154b6c709e2"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "libc",
  "once_cell",
  "onig_sys",
@@ -10885,9 +10913,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "open"
-version = "5.3.6"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d3b65c44123a56e0133d2cd06ce4361bd3ca99d41198b2f25e3c3db9b8b4a"
+checksum = "a0b3d059e795d52b8a72fef45658620edd4d9c359b338564aa14391ffa511ed5"
 dependencies = [
  "is-wsl",
  "libc",
@@ -10920,7 +10948,7 @@ version = "0.10.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -10936,7 +10964,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -10957,76 +10985,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "opentelemetry"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0142c63252a9e054e68a4c61a5778f7b14f576274d593f8ce883d191a099682"
-dependencies = [
- "futures-core",
- "futures-sink",
- "js-sys",
- "pin-project-lite",
- "thiserror 2.0.18",
- "tracing",
-]
-
-[[package]]
-name = "opentelemetry-http"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5683015d09e2df236ef005b17f6f196f0d5f6313c4fa43a7b6a53b52776e4331"
-dependencies = [
- "async-trait",
- "bytes",
- "http 1.4.2",
- "opentelemetry",
-]
-
-[[package]]
-name = "opentelemetry-otlp"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9966929966d17620d7c316c643ba62631826e10021409357772d5eea84f62c35"
-dependencies = [
- "flate2",
- "http 1.4.2",
- "opentelemetry",
- "opentelemetry-http",
- "opentelemetry-proto",
- "opentelemetry_sdk",
- "prost",
- "thiserror 2.0.18",
- "zstd",
-]
-
-[[package]]
-name = "opentelemetry-proto"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d658ba1faf63f7b9c492cfbe6e0ec365440a16132d3270c1065f7b33f1b638"
-dependencies = [
- "opentelemetry",
- "opentelemetry_sdk",
- "prost",
-]
-
-[[package]]
-name = "opentelemetry_sdk"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b59f80e1ac4d5ff7a2db8fb6c80badb7f0f3f858211fba08dd9aaec750894f9"
-dependencies = [
- "futures-channel",
- "futures-executor",
- "futures-util",
- "opentelemetry",
- "percent-encoding",
- "portable-atomic",
- "rand 0.9.4",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -11050,7 +11008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
- "rand 0.8.6",
+ "rand 0.8.7",
  "serde",
 ]
 
@@ -11159,7 +11117,7 @@ dependencies = [
  "proc-macro2",
  "proc-macro2-diagnostics",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -11242,7 +11200,7 @@ dependencies = [
  "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -11382,9 +11340,9 @@ dependencies = [
 
 [[package]]
 name = "pest"
-version = "2.8.6"
+version = "2.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
+checksum = "7df728be843c7070fab6ab7c328c4e9e9d78e23bf749c0669c86ee7ebfa050a2"
 dependencies = [
  "memchr",
  "ucd-trie",
@@ -11392,9 +11350,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.8.6"
+version = "2.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f486f1ea21e6c10ed15d5a7c77165d0ee443402f0780849d1768e7d9d6fe77"
+checksum = "9e2dd6fc3b26b3462ee188aac870f5a41d398f1cd5e2408d16531bd71c9591fd"
 dependencies = [
  "pest",
  "pest_generator",
@@ -11402,25 +11360,24 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.8.6"
+version = "2.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8040c4647b13b210a963c1ed407c1ff4fdfa01c31d6d2a098218702e6664f94f"
+checksum = "6a7a9205cfb6f596a9e8b689c0a15f9ceb7a1aafae7aaf788150ac65b29975b6"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.8.6"
+version = "2.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89815c69d36021a140146f26659a81d6c2afa33d216d736dd4be5381a7362220"
+checksum = "85abd351c0de1e8384fc791a0737111a350394937e92b956b743dac12429f57c"
 dependencies = [
  "pest",
- "sha2 0.10.9",
 ]
 
 [[package]]
@@ -11472,7 +11429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
- "rand 0.8.6",
+ "rand 0.8.7",
 ]
 
 [[package]]
@@ -11485,7 +11442,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -11520,7 +11477,7 @@ checksum = "c96395f0a926bc13b1c17622aaddda1ecb55d49c8f1bf9777e4d877800a43f8b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -11553,7 +11510,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
 dependencies = [
  "atomic-waker",
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "futures-io",
 ]
 
@@ -11581,13 +11538,13 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "plist"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092791278e026273c1b65bbdcfbba3a300f2994c896bd01ab01da613c29c46f1"
+checksum = "7da1d65da6dd5d1e44199ac0f58712d241c0f439f80adea8924d832384087f85"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.14.0",
- "quick-xml",
+ "quick-xml 0.41.0",
  "serde",
  "time",
 ]
@@ -11626,7 +11583,7 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -11681,9 +11638,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49"
+checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3"
 
 [[package]]
 name = "portable-atomic-util"
@@ -11729,7 +11686,7 @@ dependencies = [
  "spin",
  "symbolic-demangle",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -11799,7 +11756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -11807,7 +11764,7 @@ name = "prevent_sleep"
 version = "0.0.0"
 dependencies = [
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "futures",
  "itertools 0.14.0",
  "log",
@@ -11863,7 +11820,7 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
- "toml_edit 0.25.12+spec-1.1.0",
+ "toml_edit 0.25.13+spec-1.1.0",
 ]
 
 [[package]]
@@ -11890,28 +11847,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-error-attr2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "proc-macro-error2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
-dependencies = [
- "proc-macro-error-attr2",
- "proc-macro2",
- "quote",
- "syn 2.0.118",
-]
-
 [[package]]
 name = "proc-macro-utils"
 version = "0.8.0"
@@ -11925,9 +11860,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.106"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
 dependencies = [
  "unicode-ident",
 ]
@@ -11940,7 +11875,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "version_check",
  "yansi",
 ]
@@ -11965,7 +11900,7 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "hex",
 ]
 
@@ -11985,7 +11920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4488a4a36b9a4ba6b9334a32a39971f77c1436ec82c38707bce707699cc3bbcb"
 dependencies = [
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -12013,7 +11948,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.118",
+ "syn 2.0.119",
  "tempfile",
 ]
 
@@ -12027,14 +11962,14 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "prost-reflect"
-version = "0.16.4"
+version = "0.16.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "590aa145fee8f7a26b5a6055365e7c5e89a5c1caae9869de76ec0ee73181a2f9"
+checksum = "01b80ea363c31af2de2b92e3c07ed1156628f7838c4afb4df75ee78a37fedbd1"
 dependencies = [
  "prost",
  "prost-reflect-derive",
@@ -12043,9 +11978,9 @@ dependencies = [
 
 [[package]]
 name = "prost-reflect-build"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8214ae2c30bbac390db0134d08300e770ef89b6d4e5abf855e8d300eded87e28"
+checksum = "95a9e8261adf6617d5dc2a5a9e75cce5ab9d546a007f6f870f809a1ad25386b6"
 dependencies = [
  "prost-build",
  "prost-reflect",
@@ -12053,13 +11988,13 @@ dependencies = [
 
 [[package]]
 name = "prost-reflect-derive"
-version = "0.16.0"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b6d90e29fa6c0d13c2c19ba5e4b3fb0efbf5975d27bcf4e260b7b15455bcabe"
+checksum = "30320eb03b43b7dfcaf9b361f808a4f1adad1e718ad219df1d7e4283e34e73f5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -12124,9 +12059,9 @@ dependencies = [
 
 [[package]]
 name = "psl"
-version = "2.1.216"
+version = "2.1.220"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9826c2fe4dade07e9da1af2e18427257877bc8bc27aa810f6fbb52d907a480cc"
+checksum = "de177021aa731f88221b3ae411cb89d70f66e51487c26ef9c9f65fc7250c22e8"
 dependencies = [
  "psl-types",
 ]
@@ -12174,7 +12109,7 @@ checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -12216,9 +12151,9 @@ checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740"
 
 [[package]]
 name = "pxfm"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c5ccf5294c6ccd63a74f1565028353830a9c2f5eb0c682c355c471726a6e3f"
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
 
 [[package]]
 name = "qrcode"
@@ -12241,6 +12176,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quinn"
 version = "0.11.11"
@@ -12248,14 +12192,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c1a41e437b6bbd489372cd4971de128e85c855f56c57f283d20ff016cf7c0a8"
 dependencies = [
  "bytes",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.3",
  "rustls",
- "socket2 0.6.4",
- "thiserror 2.0.18",
+ "socket2 0.6.5",
+ "thiserror 2.0.19",
  "tokio",
  "tracing",
  "web-time",
@@ -12263,21 +12207,22 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.15"
+version = "0.11.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e"
+checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
 dependencies = [
  "aws-lc-rs",
  "bytes",
- "getrandom 0.3.4",
+ "getrandom 0.4.3",
  "lru-slab",
- "rand 0.9.4",
+ "rand 0.10.2",
+ "rand_pcg",
  "ring",
  "rustc-hash 2.1.3",
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tinyvec",
  "tracing",
  "web-time",
@@ -12285,23 +12230,23 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
 dependencies = [
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "libc",
  "once_cell",
- "socket2 0.6.4",
+ "socket2 0.6.5",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.46"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
 dependencies = [
  "proc-macro2",
 ]
@@ -12314,7 +12259,7 @@ checksum = "a7b5abe3fe82fdeeb93f44d66a7b444dedf2e4827defb0a8e69c437b2de2ef94"
 dependencies = [
  "quote",
  "quote-use-macros",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -12326,7 +12271,7 @@ dependencies = [
  "derive-where",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -12358,9 +12303,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -12370,14 +12315,25 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
+checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.5",
 ]
 
+[[package]]
+name = "rand"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
+dependencies = [
+ "chacha20 0.10.1",
+ "getrandom 0.4.3",
+ "rand_core 0.10.1",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -12417,6 +12373,12 @@ dependencies = [
  "getrandom 0.3.4",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
+
 [[package]]
 name = "rand_distr"
 version = "0.5.1"
@@ -12424,7 +12386,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8615d50dcf34fa31f7ab52692afec947c4dd0ab803cc87cb3b0b4570ff7463"
 dependencies = [
  "num-traits",
- "rand 0.9.4",
+ "rand 0.9.5",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
+dependencies = [
+ "rand_core 0.10.1",
 ]
 
 [[package]]
@@ -12470,17 +12441,17 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cbb175c433c8e28a809d1f5773a2ae96e68c0ce40db865cbab1020bf33ae479c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "compact_str",
  "critical-section",
  "hashbrown 0.17.1",
  "itertools 0.14.0",
  "kasuari",
- "lru 0.18.0",
+ "lru 0.18.1",
  "palette 0.7.6",
  "serde",
  "strum 0.28.0",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "unicode-segmentation",
  "unicode-truncate",
  "unicode-width 0.2.2",
@@ -12535,7 +12506,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66e3d19bcc9130ca376277d93b60767ff121ace3be06f5f95f81dd68956407d1"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "hashbrown 0.17.1",
  "indoc",
  "instability",
@@ -12576,10 +12547,10 @@ dependencies = [
  "num-traits",
  "paste",
  "profiling",
- "rand 0.9.4",
+ "rand 0.9.5",
  "rand_chacha 0.9.0",
  "simd_helpers",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "v_frame",
  "wasm-bindgen",
 ]
@@ -12605,7 +12576,7 @@ version = "11.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -12709,7 +12680,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -12718,7 +12689,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -12740,27 +12711,27 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
  "getrandom 0.2.17",
  "libredox",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+checksum = "216e8f773d7923bcba9ceb86a86c93cabb3903a11872fc3f138c49630e50b96d"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.25"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+checksum = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -12780,9 +12751,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.4"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -12792,9 +12763,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.14"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
+checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -12841,7 +12812,7 @@ dependencies = [
  "prost-build",
  "repo_metadata",
  "serde",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "tokio-util",
  "uuid",
@@ -12897,7 +12868,7 @@ dependencies = [
  "strum 0.27.2",
  "strum_macros 0.27.2",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "virtual-fs",
  "walkdir",
  "watcher",
@@ -12916,7 +12887,7 @@ dependencies = [
  "futures-util",
  "h2",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "hyper",
  "hyper-rustls",
@@ -12960,7 +12931,7 @@ dependencies = [
  "futures-util",
  "h2",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "hyper",
  "hyper-rustls",
@@ -13098,7 +13069,7 @@ checksum = "c0ed1a78a1b19d184b0daa629dd9a024573173ec7d485b287cb369fb3607cc1c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -13122,7 +13093,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sse-stream",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -13140,7 +13111,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -13192,7 +13163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c51c9ae4df8a7fba42103df5c621fa3c37eccf3a3c650879e90fc48b11cc192c"
 dependencies = [
  "hashbrown 0.16.1",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -13231,12 +13202,12 @@ dependencies = [
 
 [[package]]
 name = "rust-embed"
-version = "8.11.0"
+version = "8.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27"
+checksum = "e9e7760e252aaba7b09f4be00e36476cf585bdb68a53552ac954cdf504ab4bc9"
 dependencies = [
- "rust-embed-impl 8.11.0",
- "rust-embed-utils 8.11.0",
+ "rust-embed-impl 8.12.0",
+ "rust-embed-utils 8.12.0",
  "walkdir",
 ]
 
@@ -13249,20 +13220,21 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rust-embed-utils 7.8.1",
- "syn 2.0.118",
+ "syn 2.0.119",
  "walkdir",
 ]
 
 [[package]]
 name = "rust-embed-impl"
-version = "8.11.0"
+version = "8.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa"
+checksum = "3bcfc4d6f53af43755f7a723e4b6b8794fcce052a178dd8c6c1dadc5f5343097"
 dependencies = [
+ "mime_guess",
  "proc-macro2",
  "quote",
- "rust-embed-utils 8.11.0",
- "syn 2.0.118",
+ "rust-embed-utils 8.12.0",
+ "syn 2.0.119",
  "walkdir",
 ]
 
@@ -13279,12 +13251,12 @@ dependencies = [
 
 [[package]]
 name = "rust-embed-utils"
-version = "8.11.0"
+version = "8.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
+checksum = "42ffa149f6aa81b58a5b3011d01a857c4ed12c7a732d2c51947a4c7c692185f0"
 dependencies = [
  "globset",
- "sha2 0.10.9",
+ "sha2 0.11.0",
  "walkdir",
 ]
 
@@ -13308,7 +13280,7 @@ dependencies = [
  "borsh",
  "bytes",
  "num-traits",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rkyv 0.7.46",
  "serde",
  "serde_json",
@@ -13317,9 +13289,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d"
+checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb"
 
 [[package]]
 name = "rustc-hash"
@@ -13362,7 +13334,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
@@ -13375,7 +13347,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "errno",
  "libc",
  "linux-raw-sys 0.12.1",
@@ -13384,9 +13356,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.41"
+version = "0.23.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f"
+checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -13482,9 +13454,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
 
 [[package]]
 name = "rustybuzz"
@@ -13492,7 +13464,7 @@ version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "core_maths",
  "log",
@@ -13592,7 +13564,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -13624,7 +13596,7 @@ checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -13685,7 +13657,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
@@ -13698,7 +13670,7 @@ version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
@@ -13717,9 +13689,9 @@ dependencies = [
 
 [[package]]
 name = "self_cell"
-version = "1.2.2"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
+checksum = "2ab42ca02749e120097e328d91d415325bdf43b1c72c4c8badf37375fe40a813"
 
 [[package]]
 name = "semver"
@@ -13739,7 +13711,7 @@ version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb25f439f97d26fea01d717fa626167ceffcd981addaa670001e70505b72acbb"
 dependencies = [
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "httpdate",
  "reqwest 0.13.4",
  "rustls",
@@ -13810,7 +13782,7 @@ version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ac170a5bba8bec6e3339c90432569d89641fa7a3d3e4f44987d24f0762e6adf"
 dependencies = [
- "rand 0.9.4",
+ "rand 0.9.5",
  "sentry-types",
  "serde",
  "serde_json",
@@ -13833,7 +13805,7 @@ version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "235865e639f1d72414fa5d35374e105c292e2ee3a2f90919d961bbb486626ee6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "log",
  "sentry-core",
 ]
@@ -13854,7 +13826,7 @@ version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27701acc51e68db5281802b709010395bfcbcb128b1d0a4e5873680d3b47ff0c"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "sentry-backtrace",
  "sentry-core",
  "tracing-core",
@@ -13869,10 +13841,10 @@ checksum = "56780cb5597d676bf22e6c11d1f062eb4def46390ea3bfb047bcbcf7dfd19bdb"
 dependencies = [
  "debugid",
  "hex",
- "rand 0.9.4",
+ "rand 0.9.5",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "time",
  "url",
  "uuid",
@@ -13886,9 +13858,9 @@ checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
 
 [[package]]
 name = "serde"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
 dependencies = [
  "serde_core",
  "serde_derive",
@@ -13928,22 +13900,22 @@ dependencies = [
 
 [[package]]
 name = "serde_core"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.228"
+version = "1.0.229"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -13954,14 +13926,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
 dependencies = [
  "itoa",
  "memchr",
@@ -14002,13 +13974,13 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -14066,7 +14038,7 @@ dependencies = [
  "darling 0.20.11",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -14182,7 +14154,7 @@ dependencies = [
  "convert_case 0.7.1",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -14198,9 +14170,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8"
 dependencies = [
  "cfg-if",
  "cpufeatures 0.2.17",
@@ -14308,15 +14280,15 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214"
+checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
 
 [[package]]
 name = "simd_cesu8"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520"
 dependencies = [
  "rustc_version",
  "simdutf8",
@@ -14355,7 +14327,7 @@ dependencies = [
  "galaxyui_core",
  "instant",
  "log",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
 ]
 
@@ -14439,7 +14411,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -14448,7 +14420,7 @@ version = "0.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "calloop",
  "calloop-wayland-source",
  "cursor-icon",
@@ -14488,9 +14460,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -14509,9 +14481,9 @@ dependencies = [
 
 [[package]]
 name = "spin"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591"
+checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3"
 dependencies = [
  "lock_api",
 ]
@@ -14531,7 +14503,7 @@ version = "0.4.0+sdk-1.4.341.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
 ]
 
 [[package]]
@@ -14570,13 +14542,13 @@ dependencies = [
 
 [[package]]
 name = "sse-stream"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3962b63f038885f15bce2c6e02c0e7925c072f1ac86bb60fd44c5c6b762fb72"
+checksum = "c123f296ade4ec4b8b0f6162116e6629f5146922ca5ab40ca9d3c2e73ab4761e"
 dependencies = [
  "bytes",
  "futures-util",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "pin-project-lite",
 ]
@@ -14684,7 +14656,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -14696,7 +14668,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -14711,7 +14683,7 @@ version = "0.1.0"
 dependencies = [
  "arrayvec",
  "log",
- "rand 0.8.6",
+ "rand 0.8.7",
  "sum_tree",
 ]
 
@@ -14772,9 +14744,20 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.118"
+version = "2.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14798,7 +14781,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -14837,7 +14820,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "walkdir",
  "yaml-rust",
 ]
@@ -14857,7 +14840,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01198a2debb237c62b6826ec7081082d951f46dbb64b0e8c7649a452230d1dfc"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "byteorder",
  "enum-as-inner",
  "libc",
@@ -14886,7 +14869,7 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "core-foundation 0.9.4",
  "system-configuration-sys",
 ]
@@ -14962,7 +14945,7 @@ dependencies = [
  "tantivy-stacker",
  "tantivy-tokenizer-api",
  "tempfile",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "time",
  "typetag",
  "uuid",
@@ -15087,7 +15070,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade"
 dependencies = [
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "windows 0.61.3",
  "windows-version",
 ]
@@ -15104,7 +15087,7 @@ version = "3.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
- "fastrand 2.4.1",
+ "fastrand 2.5.0",
  "getrandom 0.4.3",
  "once_cell",
  "rustix 1.1.4",
@@ -15137,7 +15120,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9048a889effe34a5cddee0af7f53285198b16dca3be510858d38dfdb3e62a04e"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "parking_lot",
  "rustix 1.1.4",
  "signal-hook",
@@ -15179,7 +15162,7 @@ checksum = "4676b37242ccbd1aabf56edb093a4827dc49086c0ffd764a5705899e0f35f8f7"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "fancy-regex 0.11.0",
  "filedescriptor",
  "finl_unicode",
@@ -15224,11 +15207,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.18"
+version = "2.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
+checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
 dependencies = [
- "thiserror-impl 2.0.18",
+ "thiserror-impl 2.0.19",
 ]
 
 [[package]]
@@ -15239,18 +15222,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.18"
+version = "2.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
+checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -15261,9 +15244,9 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
 
 [[package]]
 name = "thread_local"
-version = "1.1.9"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070"
 dependencies = [
  "cfg-if",
 ]
@@ -15313,9 +15296,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.53"
+version = "0.3.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50"
+checksum = "3e1d5e639ff6bab73cb6885cc7e7b1de96c3f32c68ec55f3952614bec1092244"
 dependencies = [
  "deranged",
  "libc",
@@ -15335,9 +15318,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
 
 [[package]]
 name = "time-macros"
-version = "0.2.31"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
 dependencies = [
  "num-conv",
  "time-core",
@@ -15375,7 +15358,7 @@ dependencies = [
  "digest 0.10.7",
  "hkdf",
  "lazy_static",
- "rand 0.8.6",
+ "rand 0.8.7",
  "serde",
  "serde_json",
  "sha-1",
@@ -15520,9 +15503,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3"
+checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -15569,7 +15552,7 @@ dependencies = [
  "monostate",
  "onig",
  "paste",
- "rand 0.9.4",
+ "rand 0.9.5",
  "rayon",
  "rayon-cond",
  "regex",
@@ -15577,7 +15560,7 @@ dependencies = [
  "serde",
  "serde_json",
  "spm_precompiled",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "unicode-normalization-alignments",
  "unicode-segmentation",
  "unicode_categories",
@@ -15585,9 +15568,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.52.3"
+version = "1.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
+checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
 dependencies = [
  "bytes",
  "libc",
@@ -15595,20 +15578,20 @@ dependencies = [
  "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.4",
+ "socket2 0.6.5",
  "tokio-macros",
  "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
+checksum = "6328af13490e73a9b4694030fafd93f8c8c6a9dede33e821c3fc63eddf8042ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -15633,9 +15616,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.18"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70"
+checksum = "a3d06f0b082ba57c26b79407372e57cf2a1e28124f78e9479fe80322cf53420b"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -15644,14 +15627,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098"
+checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
+ "libc",
  "pin-project-lite",
  "tokio",
 ]
@@ -15692,9 +15676,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "1.1.2+spec-1.1.0"
+version = "1.1.3+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
+checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c"
 dependencies = [
  "indexmap 2.14.0",
  "serde_core",
@@ -15702,7 +15686,7 @@ dependencies = [
  "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
  "toml_writer",
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]
 
 [[package]]
@@ -15768,15 +15752,15 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.25.12+spec-1.1.0"
+version = "0.25.13+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b"
 dependencies = [
  "indexmap 2.14.0",
  "toml_datetime 1.1.1+spec-1.1.0",
  "toml_parser",
  "toml_writer",
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]
 
 [[package]]
@@ -15785,7 +15769,7 @@ version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow 1.0.3",
+ "winnow 1.0.4",
 ]
 
 [[package]]
@@ -15796,9 +15780,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "toml_writer"
-version = "1.1.1+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
 
 [[package]]
 name = "tower"
@@ -15823,12 +15807,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
 dependencies = [
  "async-compression",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytes",
  "futures-core",
  "futures-util",
  "http 1.4.2",
- "http-body 1.0.1",
+ "http-body 1.1.0",
  "http-body-util",
  "http-range-header",
  "httpdate",
@@ -15877,7 +15861,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -15913,20 +15897,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-opentelemetry"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adbc64cba7137545b8044cb1fe9814f7aacf3c6b5f9b45be8bb5db538befdb26"
-dependencies = [
- "js-sys",
- "opentelemetry",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
- "web-time",
-]
-
 [[package]]
 name = "tracing-subscriber"
 version = "0.3.23"
@@ -16010,7 +15980,7 @@ dependencies = [
  "http 1.4.2",
  "httparse",
  "log",
- "rand 0.8.6",
+ "rand 0.8.7",
  "rustls",
  "rustls-pki-types",
  "sha1",
@@ -16020,9 +15990,9 @@ dependencies = [
 
 [[package]]
 name = "twox-hash"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
+checksum = "8464ec13c3691491391d9fce00f6416c9a48e46972f72d7865688be2080192c9"
 
 [[package]]
 name = "typed-arena"
@@ -16056,9 +16026,9 @@ checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
 name = "typetag"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5a897b12c6c1151ad0b138b8db50252dc301f93bc3b027db05eec82aeed298c"
+checksum = "c90e86058a30d42a1a928dfb4b49bb33c98c3a2b4909492e6b0881cd94798ec2"
 dependencies = [
  "erased-serde",
  "inventory",
@@ -16069,13 +16039,13 @@ dependencies = [
 
 [[package]]
 name = "typetag-impl"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf808357c6ed7e13ba0f3277ec8d8f21b2d501274895104263985330c726c1c5"
+checksum = "f153acc4e99a5f2a5aefa09fb078be54e26271b2813f6041200b224c098d8328"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 3.0.3",
 ]
 
 [[package]]
@@ -16163,7 +16133,7 @@ dependencies = [
  "galaxyui_core",
  "pathfinder_color",
  "pathfinder_geometry",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
  "rustls",
 ]
 
@@ -16356,7 +16326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0"
 dependencies = [
  "base64 0.22.1",
- "der 0.8.0",
+ "der 0.8.1",
  "log",
  "native-tls",
  "percent-encoding",
@@ -16366,7 +16336,7 @@ dependencies = [
  "ureq-proto",
  "utf8-zero",
  "webpki-root-certs",
- "webpki-roots 1.0.8",
+ "webpki-roots 1.0.9",
 ]
 
 [[package]]
@@ -16448,9 +16418,9 @@ checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
 
 [[package]]
 name = "utf8-width"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1292c0d970b54115d14f2492fe0170adf21d68a1de108eebc51c1df4f346a091"
+checksum = "159a7cadce548703edd50d24069bc294c5415ecab0a480e0cd1ca06d112dc94a"
 
 [[package]]
 name = "utf8-zero"
@@ -16477,9 +16447,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.23.4"
+version = "1.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
+checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239"
 dependencies = [
  "atomic",
  "getrandom 0.4.3",
@@ -16532,13 +16502,13 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "variant_count"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1935e10c6f04d22688d07c0790f2fc0e1b1c5c2c55bc0cc87ed67656e587dd8"
+checksum = "17c13b28baa922722e35ded153b394d0247b4942b4ad54f85713a7de672cdf0e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -16616,7 +16586,7 @@ dependencies = [
  "log",
  "parking_lot",
  "rubato",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
 ]
 
 [[package]]
@@ -16756,7 +16726,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "galaxyui_core",
- "rust-embed 8.11.0",
+ "rust-embed 8.12.0",
 ]
 
 [[package]]
@@ -16792,7 +16762,7 @@ dependencies = [
  "galaxy_core",
  "galaxy_server_client",
  "prost",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tracing",
  "tracing-futures",
  "warp_multi_agent_api",
@@ -16844,7 +16814,7 @@ dependencies = [
  "parking_lot",
  "serde",
  "serde_json",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "uuid",
 ]
 
@@ -16934,7 +16904,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "wasm-bindgen-shared",
 ]
 
@@ -17005,7 +16975,7 @@ version = "0.31.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
@@ -17017,7 +16987,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "cursor-icon",
  "wayland-backend",
 ]
@@ -17039,7 +17009,7 @@ version = "0.32.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -17051,7 +17021,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -17064,7 +17034,7 @@ version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -17078,7 +17048,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c324a910fd86ebdc364a3e61ec1f11737d3b1d6c273c0239ee8ff4bc0d24b4a"
 dependencies = [
  "proc-macro2",
- "quick-xml",
+ "quick-xml 0.39.4",
  "quote",
 ]
 
@@ -17128,9 +17098,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-root-certs"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267"
+checksum = "b96554aa2acc8ccdb7e1c9a58a7a68dd5d13bccc69cd124cb09406db612a1c9b"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -17141,14 +17111,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.8",
+ "webpki-roots 1.0.9",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf85cb06032201fa7c6f829d7db5a7e5aa45bcc0655327713065f6f0576731bf"
+checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -17177,7 +17147,7 @@ dependencies = [
  "pin-project",
  "rustls",
  "rustls-platform-verifier 0.6.2",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tokio",
  "tokio-rustls",
  "url",
@@ -17279,10 +17249,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
 dependencies = [
  "arrayvec",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "document-features",
  "hashbrown 0.16.1",
  "js-sys",
@@ -17310,9 +17280,9 @@ dependencies = [
  "arrayvec",
  "bit-set 0.9.1",
  "bit-vec 0.9.1",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "document-features",
  "hashbrown 0.16.1",
  "indexmap 2.14.0",
@@ -17325,7 +17295,7 @@ dependencies = [
  "raw-window-handle 0.6.2",
  "rustc-hash 1.1.0",
  "smallvec",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "wgpu-core-deps-apple",
  "wgpu-core-deps-emscripten",
  "wgpu-core-deps-wasm",
@@ -17381,11 +17351,11 @@ dependencies = [
  "arrayvec",
  "ash",
  "bit-set 0.9.1",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.6.2",
  "bytemuck",
  "cfg-if",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "glow",
  "glutin_wgl_sys",
  "gpu-allocator",
@@ -17414,7 +17384,7 @@ dependencies = [
  "raw-window-metal",
  "renderdoc-sys",
  "smallvec",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "wasm-bindgen",
  "wayland-sys",
  "web-sys",
@@ -17441,7 +17411,7 @@ version = "29.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "bytemuck",
  "js-sys",
  "log",
@@ -17622,7 +17592,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -17633,7 +17603,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -18011,11 +17981,11 @@ dependencies = [
  "ahash 0.8.12",
  "android-activity",
  "atomic-waker",
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "block2 0.5.1",
  "bytemuck",
  "calloop",
- "cfg_aliases 0.2.1",
+ "cfg_aliases 0.2.2",
  "concurrent-queue",
  "core-foundation 0.9.4",
  "core-graphics 0.23.2",
@@ -18075,9 +18045,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
 dependencies = [
  "memchr",
 ]
@@ -18117,7 +18087,7 @@ dependencies = [
  "log",
  "os_pipe",
  "rustix 1.1.4",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "tree_magic_mini",
  "wayland-backend",
  "wayland-client",
@@ -18154,7 +18124,7 @@ dependencies = [
  "pharos",
  "rustc_version",
  "send_wrapper",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -18239,7 +18209,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5"
 dependencies = [
- "bitflags 2.13.0",
+ "bitflags 2.13.1",
  "dlib",
  "log",
  "once_cell",
@@ -18358,7 +18328,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "synstructure",
 ]
 
@@ -18370,15 +18340,15 @@ checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "synstructure",
 ]
 
 [[package]]
 name = "zbus"
-version = "5.16.0"
+version = "5.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee682d202a77e4a9f3b2c2bdf48a7b28af5c08c34ddf66f98c93e5e39464285"
+checksum = "fe18fb60dc696039e738717b76eaea21e7a4489bbb1885020b43c94236d7e98a"
 dependencies = [
  "async-broadcast",
  "async-executor",
@@ -18403,7 +18373,7 @@ dependencies = [
  "uds_windows",
  "uuid",
  "windows-sys 0.61.2",
- "winnow 1.0.3",
+ "winnow 1.0.4",
  "zbus_macros",
  "zbus_names",
  "zvariant",
@@ -18411,14 +18381,14 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "5.16.0"
+version = "5.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adf1bd45a81a103745b1757754762a26e8cd01e4532e4d6c8ec431624b80d1d6"
+checksum = "fe96480bed92df2b442a1a30df364e12d08eed03aeb061f2b8dc6afb2be91119"
 dependencies = [
  "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "zbus_names",
  "zvariant",
  "zvariant_utils",
@@ -18426,12 +18396,12 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "4.3.2"
+version = "4.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7074f3e50b894eac91750142016d30d0a89be8e67dbfd9704fb875825760e52d"
+checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"
 dependencies = [
  "serde",
- "winnow 1.0.3",
+ "winnow 1.0.4",
  "zvariant",
 ]
 
@@ -18443,22 +18413,22 @@ checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697"
 
 [[package]]
 name = "zerocopy"
-version = "0.8.52"
+version = "0.8.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
+checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.52"
+version = "0.8.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
+checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -18478,7 +18448,7 @@ checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "synstructure",
 ]
 
@@ -18499,7 +18469,7 @@ checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -18532,7 +18502,7 @@ checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
 ]
 
 [[package]]
@@ -18557,7 +18527,7 @@ dependencies = [
  "memchr",
  "pbkdf2",
  "sha1",
- "thiserror 2.0.18",
+ "thiserror 2.0.19",
  "time",
  "xz2",
  "zeroize",
@@ -18579,9 +18549,9 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
 
 [[package]]
 name = "zopfli"
@@ -18649,41 +18619,41 @@ dependencies = [
 
 [[package]]
 name = "zvariant"
-version = "5.12.0"
+version = "5.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a192a0bde63360d77a7523c833d4b4ce6070a927e2c53246e4c540b1a3e27be0"
+checksum = "bee2a0bcd2a907786a456fff45aaaaf54c9ba5f50b71ae9ec1a4edd200c94911"
 dependencies = [
  "endi",
  "enumflags2",
  "serde",
  "url",
- "winnow 1.0.3",
+ "winnow 1.0.4",
  "zvariant_derive",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_derive"
-version = "5.12.0"
+version = "5.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc6cde9c01c511074be97f7ccb6c19d0da89e3f8662e812e999dcfd4638737"
+checksum = "38a708216a18780796770bfe3f4739c7c83a3e8f789b755534bbbc06e4e23e12"
 dependencies = [
  "proc-macro-crate 3.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.118",
+ "syn 2.0.119",
  "zvariant_utils",
 ]
 
 [[package]]
 name = "zvariant_utils"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8535915cfa75547e559d8c68e8139909a4aeee076831e4ef7fc59d8172c4d6"
+checksum = "90cb9383f9b45290407a1258b202d3f8f01db719eb60b4e4055c6375af4fc7c7"
 dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.118",
- "winnow 1.0.3",
+ "syn 2.0.119",
+ "winnow 1.0.4",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 7ca2d4d7..89efca8b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -217,15 +217,6 @@ notify-debouncer-full = { git = "https://github.com/warpdotdev/notify", rev = "9
 nom = "7.1.1"
 num-traits = "0.2"
 oauth2 = { version = "5.0.0", default-features = false }
-opentelemetry = { version = "0.32.0", default-features = false, features = ["trace"] }
-opentelemetry-http = "0.32.0"
-opentelemetry-otlp = { version = "0.32.0", default-features = false, features = [
-  "gzip-http",
-  "http-proto",
-  "trace",
-  "zstd-http",
-] }
-opentelemetry_sdk = { version = "0.32.1", default-features = false, features = ["trace"] }
 openh264 = "0.8"
 static_assertions = "1.1.0"
 url = "2.5.4"
@@ -306,7 +297,6 @@ tower = "0.5.2"
 tower-http = "0.6.6"
 tracing = "0.1.40"
 tracing-futures = "0.2.5"
-tracing-opentelemetry = { version = "0.33.0", default-features = false }
 tracing-subscriber = { version = "0.3.22", default-features = false, features = [
   "registry",
   "std",
@@ -453,7 +443,7 @@ split-debuginfo = "unpacked"
 
 [profile.dev.package]
 # Improve the performance of core terminal logic.
-warp_terminal.opt-level = 3
+galaxy_terminal.opt-level = 3
 # Minimize the runtime overhead of CPU profiling at the cost of a small
 # increase in compile time for this crate.
 backtrace.opt-level = 3
diff --git a/app/Cargo.toml b/app/Cargo.toml
index 5b51af1d..6a6d8409 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -321,13 +321,8 @@ http_server.workspace = true
 hyper.workspace = true
 libsqlite3-sys = { version = "0.33.0", features = ["bundled"] }
 mio = { version = "1.1.1", features = ["os-poll", "os-ext"] }
-opentelemetry.workspace = true
-opentelemetry-http.workspace = true
-opentelemetry-otlp.workspace = true
-opentelemetry_sdk.workspace = true
 tokio.workspace = true
 tokio-util.workspace = true
-tracing-opentelemetry.workspace = true
 tracing-subscriber.workspace = true
 
 # AWS SDK (loading credentials for BYO LLM)
diff --git a/app/src/ai/bedrock/request_translator.rs b/app/src/ai/bedrock/request_translator.rs
index 41523027..9f176e88 100644
--- a/app/src/ai/bedrock/request_translator.rs
+++ b/app/src/ai/bedrock/request_translator.rs
@@ -1718,6 +1718,69 @@ fn extract_tool_result_content(result: &api::request::input::ToolCallResult) ->
                     None => ("User did not answer.".to_string(), true),
                 }
             }
+            api::request::input::tool_call_result::Result::CreateDocuments(create_result) => {
+                match &create_result.result {
+                    Some(api::create_documents_result::Result::Success(success)) => {
+                        let docs_info: Vec<String> = success
+                            .created_documents
+                            .iter()
+                            .map(|doc| {
+                                format!(
+                                    "Created document (id: {}):\n{}",
+                                    doc.document_id, doc.content
+                                )
+                            })
+                            .collect();
+                        (docs_info.join("\n\n"), false)
+                    }
+                    Some(api::create_documents_result::Result::Error(error)) => {
+                        (format!("Error creating documents: {}", error.message), true)
+                    }
+                    None => ("Create documents cancelled.".to_string(), true),
+                }
+            }
+            api::request::input::tool_call_result::Result::EditDocuments(edit_result) => {
+                match &edit_result.result {
+                    Some(api::edit_documents_result::Result::Success(success)) => {
+                        let docs_info: Vec<String> = success
+                            .updated_documents
+                            .iter()
+                            .map(|doc| {
+                                format!(
+                                    "Updated document (id: {}):\n{}",
+                                    doc.document_id, doc.content
+                                )
+                            })
+                            .collect();
+                        (docs_info.join("\n\n"), false)
+                    }
+                    Some(api::edit_documents_result::Result::Error(error)) => {
+                        (format!("Error editing documents: {}", error.message), true)
+                    }
+                    None => ("Edit documents cancelled.".to_string(), true),
+                }
+            }
+            api::request::input::tool_call_result::Result::ReadDocuments(read_result) => {
+                match &read_result.result {
+                    Some(api::read_documents_result::Result::Success(success)) => {
+                        let docs_info: Vec<String> = success
+                            .documents
+                            .iter()
+                            .map(|doc| {
+                                format!(
+                                    "Document (id: {}):\n{}",
+                                    doc.document_id, doc.content
+                                )
+                            })
+                            .collect();
+                        (docs_info.join("\n\n"), false)
+                    }
+                    Some(api::read_documents_result::Result::Error(error)) => {
+                        (format!("Error reading documents: {}", error.message), true)
+                    }
+                    None => ("Read documents cancelled.".to_string(), true),
+                }
+            }
             _ => ("Tool completed successfully.".to_string(), false),
         }
     } else {
diff --git a/app/src/ai/blocklist/action_model/execute/notebooks.rs b/app/src/ai/blocklist/action_model/execute/notebooks.rs
index 39b2d165..03b005c6 100644
--- a/app/src/ai/blocklist/action_model/execute/notebooks.rs
+++ b/app/src/ai/blocklist/action_model/execute/notebooks.rs
@@ -13,7 +13,7 @@ use crate::ai::agent::{
     DocumentContext, EditDocumentsRequest, EditDocumentsResult, ReadDocumentsRequest,
     ReadDocumentsResult,
 };
-use crate::ai::document::ai_document_model::AIDocumentVersion;
+use crate::ai::document::ai_document_model::{AIDocumentId, AIDocumentVersion};
 use crate::cloud_object::model::persistence::CloudModel;
 use crate::notebooks::CloudNotebookModel;
 use crate::server::cloud_objects::update_manager::UpdateManager;
@@ -59,10 +59,11 @@ impl NotebookExecutor {
 
         for document in documents {
             let client_id = ClientId::new();
+            let document_id = AIDocumentId::new();
             let model = CloudNotebookModel {
                 title: document.title.clone(),
                 data: document.content.clone(),
-                ai_document_id: None,
+                ai_document_id: Some(document_id),
                 conversation_id: None,
             };
 
@@ -79,7 +80,7 @@ impl NotebookExecutor {
             });
 
             created.push(DocumentContext {
-                document_id: crate::ai::document::ai_document_model::AIDocumentId::new(),
+                document_id,
                 document_version: AIDocumentVersion::default(),
                 content: document.content.clone(),
                 line_ranges: vec![],
@@ -112,10 +113,15 @@ impl NotebookExecutor {
         let mut documents = Vec::new();
 
         for id in document_ids {
-            // Try to find the notebook by treating the ID as a SyncId string
+            // Look up the notebook by its ai_document_id field, falling back to SyncId matching
             let notebook = cloud_model
                 .get_all_active_notebooks()
-                .find(|nb| nb.id.uid() == id.to_string());
+                .find(|nb| nb.model().ai_document_id.as_ref() == Some(id))
+                .or_else(|| {
+                    cloud_model
+                        .get_all_active_notebooks()
+                        .find(|nb| nb.id.uid() == id.to_string())
+                });
 
             if let Some(notebook) = notebook {
                 documents.push(DocumentContext {
@@ -149,9 +155,15 @@ impl NotebookExecutor {
 
         for diff in diffs {
             let cloud_model = CloudModel::as_ref(ctx);
+            // Look up the notebook by its ai_document_id field, falling back to SyncId matching
             let notebook_data = cloud_model
                 .get_all_active_notebooks()
-                .find(|nb| nb.id.uid() == diff.document_id.to_string())
+                .find(|nb| nb.model().ai_document_id.as_ref() == Some(&diff.document_id))
+                .or_else(|| {
+                    cloud_model
+                        .get_all_active_notebooks()
+                        .find(|nb| nb.id.uid() == diff.document_id.to_string())
+                })
                 .map(|nb| (nb.id, nb.model().data.clone()));
 
             let Some((notebook_id, current_data)) = notebook_data else {
diff --git a/app/src/ai/blocklist/inline_action/create_environment_modal.rs b/app/src/ai/blocklist/inline_action/create_environment_modal.rs
index cde87e37..38bba35c 100644
--- a/app/src/ai/blocklist/inline_action/create_environment_modal.rs
+++ b/app/src/ai/blocklist/inline_action/create_environment_modal.rs
@@ -1,11 +1,5 @@
-use warpui::elements::{ChildView, Element, Empty};
-use warpui::{AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle};
-
-use crate::settings_view::handoff_environment_creation_modal::{
-    HandoffEnvironmentCreationModal, HandoffEnvironmentCreationModalEvent,
-};
-use crate::view_components::DismissibleToast;
-use crate::workspace::ToastStack;
+use warpui::elements::{Element, Empty};
+use warpui::{AppContext, Entity, TypedActionView, View, ViewContext};
 
 #[derive(Debug, Clone)]
 pub enum CreateEnvironmentModalEvent {
@@ -15,38 +9,11 @@ pub enum CreateEnvironmentModalEvent {
 
 pub struct CreateEnvironmentModal {
     visible: bool,
-    handoff_modal: ViewHandle<HandoffEnvironmentCreationModal>,
 }
 
 impl CreateEnvironmentModal {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        let handoff_modal =
-            ctx.add_typed_action_view(HandoffEnvironmentCreationModal::new_for_orchestration);
-        ctx.subscribe_to_view(&handoff_modal, |me, _, event, ctx| match event {
-            HandoffEnvironmentCreationModalEvent::Created { env_id } => {
-                me.visible = false;
-                ctx.emit(CreateEnvironmentModalEvent::Created {
-                    environment_id: env_id.uid(),
-                });
-                ctx.notify();
-            }
-            HandoffEnvironmentCreationModalEvent::Cancelled => {
-                me.cancel(ctx);
-            }
-            HandoffEnvironmentCreationModalEvent::CreationFailed { error_message } => {
-                me.visible = false;
-                me.show_error_toast(
-                    format!("Failed to create environment: {error_message}"),
-                    ctx,
-                );
-                ctx.notify();
-            }
-        });
-
-        Self {
-            visible: false,
-            handoff_modal,
-        }
+    pub fn new(_ctx: &mut ViewContext<Self>) -> Self {
+        Self { visible: false }
     }
 
     pub fn is_visible(&self) -> bool {
@@ -55,10 +22,7 @@ impl CreateEnvironmentModal {
 
     pub fn show(&mut self, ctx: &mut ViewContext<Self>) {
         self.visible = true;
-        self.handoff_modal.update(ctx, |modal, ctx| {
-            modal.show(ctx);
-        });
-        ctx.focus(&self.handoff_modal);
+        ctx.emit(CreateEnvironmentModalEvent::Cancelled);
         ctx.notify();
     }
 
@@ -66,18 +30,6 @@ impl CreateEnvironmentModal {
         self.visible = false;
         ctx.notify();
     }
-
-    fn cancel(&mut self, ctx: &mut ViewContext<Self>) {
-        self.hide(ctx);
-        ctx.emit(CreateEnvironmentModalEvent::Cancelled);
-    }
-
-    fn show_error_toast(&self, message: String, ctx: &mut ViewContext<Self>) {
-        let window_id = ctx.window_id();
-        ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
-            toast_stack.add_ephemeral_toast(DismissibleToast::error(message), window_id, ctx);
-        });
-    }
 }
 
 impl Entity for CreateEnvironmentModal {
@@ -96,11 +48,7 @@ impl View for CreateEnvironmentModal {
     }
 
     fn render(&self, _app: &AppContext) -> Box<dyn Element> {
-        if !self.visible {
-            return Empty::new().finish();
-        }
-
-        ChildView::new(&self.handoff_modal).finish()
+        Empty::new().finish()
     }
 }
 
diff --git a/app/src/ai/blocklist/inline_action/requested_command.rs b/app/src/ai/blocklist/inline_action/requested_command.rs
index 26f4063b..0ddc2db0 100644
--- a/app/src/ai/blocklist/inline_action/requested_command.rs
+++ b/app/src/ai/blocklist/inline_action/requested_command.rs
@@ -1476,9 +1476,8 @@ impl View for RequestedCommandView {
         let is_input_pinned_to_top =
             *InputModeSettings::as_ref(app).input_mode.value() == InputMode::PinnedToTop;
 
-        // When expanded details are rendered using a regular block, having a non-zero horizontal
-        // margin while toggled expanded will cause the body to look wider than the header.
-        // The expanded details should also appear connected to the header, so we remove bottom margin in this case.
+        // Tracks whether the expanded command has a terminal output block directly below it.
+        // Used to remove the bottom margin for visual continuity with the terminal block.
         let is_rendered_above_expanded_command_block = {
             let terminal_model = self.terminal_model.lock();
 
@@ -1517,7 +1516,6 @@ impl View for RequestedCommandView {
         let header_element = self.render_header(
             !should_render_editor
                 && !should_render_mcp_content
-                && !is_rendered_above_expanded_command_block
                 && !has_citations_footer,
             app,
         );
@@ -1613,12 +1611,9 @@ impl View for RequestedCommandView {
             theme.surface_2()
         };
 
-        // If the requested command state is completed and input isn't pinned to the top, we're
-        // going to have a regular block directly below this one with the output of the executed
-        // command. Since we can't control the top padding of the AI block that comes _after_ the
-        // subsequent regular block, we'll simply need to eliminate the bottom margin on this block
-        // and have the next AI block take care of the vertical spacing. Moreover, having a non-zero
-        // bottom margin while expanded will cause the body to look disconnected from the header.
+        // If the requested command is expanded above a terminal block or
+        // the next exchange flows directly after, remove bottom margin for
+        // visual continuity.
         let should_remove_bottom_margin = is_rendered_above_expanded_command_block
             || ((self.action_type.is_requested_command() || self.action_type.is_mcp_tool())
                 && is_last_output_message_in_output
@@ -1645,28 +1640,20 @@ impl View for RequestedCommandView {
                 && !is_input_pinned_to_top);
 
         let container = Container::new(content.finish())
-            .with_margin_left(if is_rendered_above_expanded_command_block {
-                0.
-            } else if action_status.is_some_and(|status| status.is_blocked()) {
-                CONTENT_HORIZONTAL_PADDING
-            } else {
-                CONTENT_HORIZONTAL_PADDING + icon_size(app) + 16.
-            })
-            .with_margin_right(if is_rendered_above_expanded_command_block {
-                0.
-            } else {
-                CONTENT_HORIZONTAL_PADDING
-            })
+            .with_margin_left(
+                if action_status.is_some_and(|status| status.is_blocked()) {
+                    CONTENT_HORIZONTAL_PADDING
+                } else {
+                    CONTENT_HORIZONTAL_PADDING + icon_size(app) + 16.
+                },
+            )
+            .with_margin_right(CONTENT_HORIZONTAL_PADDING)
             .with_margin_bottom(if should_remove_bottom_margin {
                 0.
             } else {
                 CONTENT_ITEM_VERTICAL_MARGIN
             })
-            .with_corner_radius(if is_rendered_above_expanded_command_block {
-                CornerRadius::with_top(Radius::Pixels(8.))
-            } else {
-                CornerRadius::with_all(Radius::Pixels(8.))
-            })
+            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
             .with_border(Border::all(1.).with_border_fill(border_color))
             .finish();
 
diff --git a/app/src/ai/blocklist/prompt/prompt_alert.rs b/app/src/ai/blocklist/prompt/prompt_alert.rs
index 56291550..68370329 100644
--- a/app/src/ai/blocklist/prompt/prompt_alert.rs
+++ b/app/src/ai/blocklist/prompt/prompt_alert.rs
@@ -392,7 +392,7 @@ impl View for PromptAlertView {
             text_fragments.push(FormattedTextFragment::plain_text("  "));
             text_fragments.push(FormattedTextFragment::hyperlink_action(
                 "Add credits",
-                WorkspaceAction::ShowSettingsPage(SettingsSection::BillingAndUsage),
+                WorkspaceAction::ShowSettingsPage(SettingsSection::About),
             ));
         } else {
             self.action_hyperlink(&state, &mut text_fragments, app);
diff --git a/app/src/app_state.rs b/app/src/app_state.rs
index 1bcc06ce..e3cb96ce 100644
--- a/app/src/app_state.rs
+++ b/app/src/app_state.rs
@@ -15,7 +15,6 @@ use crate::code::editor_management::CodeSource;
 use crate::drive::OpenGalaxyDriveObjectSettings;
 use crate::root_view::quake_mode_window_id;
 use crate::server::ids::SyncId;
-use crate::settings_view::environments_page::EnvironmentsPage;
 use crate::settings_view::SettingsSection;
 use crate::tab::SelectedTabColor;
 use crate::terminal::ShellLaunchData;
@@ -282,9 +281,7 @@ pub enum EnvVarCollectionPaneSnapshot {
 }
 
 #[derive(Clone, Debug, PartialEq)]
-pub struct EnvironmentManagementPaneSnapshot {
-    pub mode: EnvironmentsPage,
-}
+pub struct EnvironmentManagementPaneSnapshot;
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum SettingsPaneSnapshot {
diff --git a/app/src/notebooks/editor/model.rs b/app/src/notebooks/editor/model.rs
index a7517b28..cf4fcf52 100644
--- a/app/src/notebooks/editor/model.rs
+++ b/app/src/notebooks/editor/model.rs
@@ -1804,8 +1804,10 @@ impl NotebooksEditorModel {
         diffs: Vec<ai::diff_validation::DiffDelta>,
         ctx: &mut ModelContext<Self>,
     ) {
-        // Get current markdown content
-        let current_markdown = self.markdown(ctx);
+        // Get current markdown content using the unescaped form so that line
+        // ranges computed by fuzzy_match_diffs (which operates on
+        // markdown_unescaped output) align correctly.
+        let current_markdown = self.markdown_unescaped(ctx);
 
         let lines: Vec<&str> = current_markdown.lines().collect();
         let mut result_lines = Vec::new();
diff --git a/app/src/pane_group/mod.rs b/app/src/pane_group/mod.rs
index 08a4a547..09d7eebc 100644
--- a/app/src/pane_group/mod.rs
+++ b/app/src/pane_group/mod.rs
@@ -8047,15 +8047,7 @@ impl View for PaneGroup {
                         .environment_setup_mode_selector_handle()
                         .cloned()
                 })
-                .or_else(|| {
-                    self.downcast_pane_by_id::<EnvironmentManagementPane>(pane_id)
-                        .and_then(|emp| {
-                            emp.environments_page_view(app)
-                                .as_ref(app)
-                                .environment_setup_mode_selector_handle()
-                                .cloned()
-                        })
-                });
+                .or_else(|| None);
             if let Some(handle) = selector_handle {
                 stack.add_child(ChildView::new(&handle).finish());
             }
@@ -8074,18 +8066,7 @@ impl View for PaneGroup {
             }
         }
         // Render agent-assisted environment modal at tab level when open.
-        if let Some(pane_id) = self.pane_with_open_agent_assisted_environment_modal {
-            if let Some(handle) = self
-                .downcast_pane_by_id::<EnvironmentManagementPane>(pane_id)
-                .and_then(|emp| {
-                    emp.environments_page_view(app)
-                        .as_ref(app)
-                        .agent_assisted_environment_modal_handle(app)
-                        .cloned()
-                })
-            {
-                stack.add_child(ChildView::new(&handle).finish());
-            }
+        if let Some(_pane_id) = self.pane_with_open_agent_assisted_environment_modal {
         }
 
         stack.finish()
diff --git a/app/src/pane_group/pane/environment_management_pane.rs b/app/src/pane_group/pane/environment_management_pane.rs
index 4be39eed..dc8f73bd 100644
--- a/app/src/pane_group/pane/environment_management_pane.rs
+++ b/app/src/pane_group/pane/environment_management_pane.rs
@@ -2,48 +2,26 @@ use galaxyui::{AppContext, ModelHandle, ViewContext, ViewHandle};
 
 use super::view::PaneView;
 use super::{
-    DetachType, PaneConfiguration, PaneContent, PaneEvent, PaneGroup, PaneId, ShareableLink,
+    DetachType, PaneConfiguration, PaneContent, PaneGroup, PaneId, ShareableLink,
     ShareableLinkError,
 };
-use crate::ai::ambient_agents::github_auth_url::GithubAuthRedirectTarget;
 use crate::app_state::{EnvironmentManagementPaneSnapshot, LeafContents};
 use crate::pane_group::focus_state::PaneFocusHandle;
-use crate::settings_view::environments_page::{EnvironmentsPage, EnvironmentsPageView};
-use crate::settings_view::settings_page::{PaneEventWrapper, SettingsPageEvent};
+use crate::settings_view::{SettingsView, SettingsViewEvent};
 
 pub struct EnvironmentManagementPane {
-    view: ViewHandle<PaneView<EnvironmentsPageView>>,
+    view: ViewHandle<PaneView<SettingsView>>,
     pane_configuration: ModelHandle<PaneConfiguration>,
 }
 
 impl EnvironmentManagementPane {
     pub fn new(ctx: &mut ViewContext<PaneGroup>) -> Self {
-        // Create the EnvironmentsPageView
-        let environments_page_view = ctx.add_typed_action_view(|ctx| {
-            let mut view = EnvironmentsPageView::new(ctx);
-            view.set_github_auth_redirect_target(GithubAuthRedirectTarget::FocusCloudMode, ctx);
-            view
-        });
+        let settings_view = ctx.add_typed_action_view(|ctx| SettingsView::new(None, ctx));
+        let pane_configuration = settings_view.as_ref(ctx).pane_configuration();
 
-        Self::from_view(environments_page_view, ctx)
-    }
-
-    pub fn from_view(
-        environments_page_view: ViewHandle<EnvironmentsPageView>,
-        ctx: &mut AppContext,
-    ) -> Self {
-        let pane_configuration = environments_page_view.as_ref(ctx).pane_configuration();
-        let window_id = environments_page_view.window_id(ctx);
-
-        let view = ctx.add_typed_action_view(window_id, |ctx| {
+        let view = ctx.add_typed_action_view(|ctx| {
             let pane_id = PaneId::from_environment_management_pane_ctx(ctx);
-            PaneView::new(
-                pane_id,
-                environments_page_view,
-                (),
-                pane_configuration.clone(),
-                ctx,
-            )
+            PaneView::new(pane_id, settings_view, (), pane_configuration.clone(), ctx)
         });
 
         Self {
@@ -51,18 +29,6 @@ impl EnvironmentManagementPane {
             pane_configuration,
         }
     }
-
-    pub fn environments_page_view(&self, ctx: &AppContext) -> ViewHandle<EnvironmentsPageView> {
-        self.view.as_ref(ctx).child(ctx)
-    }
-
-    /// Returns the current mode of the environment management pane.
-    pub fn current_mode(&self, ctx: &AppContext) -> EnvironmentsPage {
-        self.environments_page_view(ctx)
-            .as_ref(ctx)
-            .current_page()
-            .clone()
-    }
 }
 
 impl PaneContent for EnvironmentManagementPane {
@@ -78,34 +44,7 @@ impl PaneContent for EnvironmentManagementPane {
     ) {
         self.view
             .update(ctx, |view, ctx| view.set_focus_handle(focus_handle, ctx));
-
         let pane_id = self.id();
-
-        ctx.subscribe_to_view(
-            &self.environments_page_view(ctx),
-            move |pane_group, _, event, ctx| match event {
-                SettingsPageEvent::Pane(pane_event_wrapper) => {
-                    let pane_event = match pane_event_wrapper {
-                        PaneEventWrapper::Close => PaneEvent::Close,
-                    };
-                    pane_group.handle_pane_event(pane_id, &pane_event, ctx);
-                }
-                SettingsPageEvent::EnvironmentSetupModeSelectorToggled { is_open } => {
-                    pane_group.pane_with_open_environment_setup_mode_selector =
-                        is_open.then_some(pane_id);
-                    ctx.notify();
-                }
-                SettingsPageEvent::AgentAssistedEnvironmentModalToggled { is_open } => {
-                    pane_group.pane_with_open_agent_assisted_environment_modal =
-                        is_open.then_some(pane_id);
-                    ctx.notify();
-                }
-                SettingsPageEvent::FocusModal => {
-                    // Not applicable when hosted in a pane.
-                }
-            },
-        );
-
         ctx.subscribe_to_view(&self.view, move |group, _, event, ctx| {
             group.handle_pane_view_event(pane_id, event, ctx);
         });
@@ -117,15 +56,11 @@ impl PaneContent for EnvironmentManagementPane {
         _detach_type: DetachType,
         ctx: &mut ViewContext<PaneGroup>,
     ) {
-        let environments_page_view = self.environments_page_view(ctx);
-        ctx.unsubscribe_to_view(&environments_page_view);
         ctx.unsubscribe_to_view(&self.view);
     }
 
-    fn snapshot(&self, ctx: &AppContext) -> LeafContents {
-        LeafContents::EnvironmentManagement(EnvironmentManagementPaneSnapshot {
-            mode: self.current_mode(ctx),
-        })
+    fn snapshot(&self, _ctx: &AppContext) -> LeafContents {
+        LeafContents::EnvironmentManagement(EnvironmentManagementPaneSnapshot)
     }
 
     fn has_application_focus(&self, ctx: &mut ViewContext<PaneGroup>) -> bool {
@@ -133,8 +68,7 @@ impl PaneContent for EnvironmentManagementPane {
     }
 
     fn focus(&self, ctx: &mut ViewContext<PaneGroup>) {
-        self.environments_page_view(ctx)
-            .update(ctx, |view, ctx| view.focus(ctx));
+        ctx.focus(&self.view);
     }
 
     fn shareable_link(
diff --git a/app/src/pane_group/pane/mod.rs b/app/src/pane_group/pane/mod.rs
index bd0608ea..ae8b5b5a 100644
--- a/app/src/pane_group/pane/mod.rs
+++ b/app/src/pane_group/pane/mod.rs
@@ -61,7 +61,6 @@ use crate::pane_group::pane::get_started_view::GetStartedView;
 use crate::server::network_log_view::NetworkLogView;
 use crate::server::telemetry::SharingDialogSource;
 use crate::settings::PaneSettings;
-use crate::settings_view::environments_page::EnvironmentsPageView;
 use crate::settings_view::SettingsView;
 use crate::terminal::available_shells::AvailableShell;
 use crate::terminal::TerminalView;
@@ -214,9 +213,9 @@ impl PaneId {
         Self::new_from_ctx(IPaneType::EnvVarCollection, ctx)
     }
 
-    /// Creates a [`PaneId`] from a [`ViewContext<PaneView<EnvironmentsPageView>>`]
+    /// Creates a [`PaneId`] from a [`ViewContext<PaneView<SettingsView>>`] (environment management stub)
     pub fn from_environment_management_pane_ctx(
-        ctx: &ViewContext<PaneView<EnvironmentsPageView>>,
+        ctx: &ViewContext<PaneView<SettingsView>>,
     ) -> Self {
         Self::new_from_ctx(IPaneType::EnvironmentManagement, ctx)
     }
@@ -312,9 +311,9 @@ impl PaneId {
         Self::new(IPaneType::EnvVarCollection, env_var_collection_view)
     }
 
-    /// Creates a [`PaneId`] from a [`PaneView<EnvironmentsPageView>`] entity ID.
+    /// Creates a [`PaneId`] from a [`PaneView<SettingsView>`] entity ID (environment management stub).
     pub fn from_environment_management_pane_view(
-        environment_management_pane_view: &ViewHandle<PaneView<EnvironmentsPageView>>,
+        environment_management_pane_view: &ViewHandle<PaneView<SettingsView>>,
     ) -> Self {
         Self::new(
             IPaneType::EnvironmentManagement,
@@ -469,7 +468,7 @@ impl PaneId {
                 ChildView::<PaneView<EnvVarCollectionView>>::with_id(self.0.pane_view_id).finish()
             }
             IPaneType::EnvironmentManagement => {
-                ChildView::<PaneView<EnvironmentsPageView>>::with_id(self.0.pane_view_id).finish()
+                ChildView::<PaneView<SettingsView>>::with_id(self.0.pane_view_id).finish()
             }
             IPaneType::Workflow => {
                 ChildView::<PaneView<WorkflowView>>::with_id(self.0.pane_view_id).finish()
diff --git a/app/src/server/server_api.rs b/app/src/server/server_api.rs
index 268aa32e..4280f9c4 100644
--- a/app/src/server/server_api.rs
+++ b/app/src/server/server_api.rs
@@ -1264,8 +1264,6 @@ impl ServerApiProvider {
         ServerExperiments::handle(ctx).update(ctx, |state, ctx| {
             state.apply_latest_state(experiments, ctx);
         });
-
-        settings_view::handle_experiment_change(ctx);
     }
 
     /// Constructs a new SeverApiProvider for tests.
diff --git a/app/src/settings_view/ai_page.rs b/app/src/settings_view/ai_page.rs
index 5ec492f6..6b158694 100644
--- a/app/src/settings_view/ai_page.rs
+++ b/app/src/settings_view/ai_page.rs
@@ -35,13 +35,7 @@ use regex::Regex;
 use settings::{Setting, ToggleableSetting};
 use strum::IntoEnumIterator;
 
-use super::custom_inference_modal::{
-    CustomEndpointModal, CustomEndpointModalEvent, CustomEndpointModalViewState,
-};
 use super::execution_profile_view::{ExecutionProfileView, ExecutionProfileViewEvent};
-use super::remove_custom_endpoint_confirmation_dialog::{
-    RemoveCustomEndpointConfirmationDialog, RemoveCustomEndpointConfirmationDialogEvent,
-};
 use super::set_default_model_modal::{SetDefaultModelModalBody, SetDefaultModelModalBodyEvent};
 use super::settings_page::{
     build_sub_header, build_toggle_element, render_body_item_label,
@@ -708,13 +702,6 @@ pub struct AISettingsPageView {
     #[cfg(feature = "local_fs")]
     add_router_button: ViewHandle<ActionButton>,
 
-    // Custom inference (custom endpoints)
-    custom_endpoint_modal_state: CustomEndpointModalViewState,
-    remove_custom_endpoint_confirmation_dialog: ViewHandle<RemoveCustomEndpointConfirmationDialog>,
-    pending_remove_custom_endpoint_index: Option<usize>,
-    custom_inference_add_button: ViewHandle<ActionButton>,
-    custom_endpoint_edit_buttons: Vec<ViewHandle<ActionButton>>,
-
     // Prompt offering to switch the default Agent Mode model after a BYO key or
     // custom endpoint is saved while the default isn't backed by a credential.
     set_default_model_modal: ModalViewState<Modal<SetDefaultModelModalBody>>,
@@ -765,7 +752,6 @@ impl AISettingsPageView {
                     ctx,
                 );
 
-                me.sync_custom_endpoint_buttons(ctx);
                 ctx.notify();
             }
         });
@@ -1075,7 +1061,6 @@ impl AISettingsPageView {
             // Re-render if teams-related data changed that may affect whether features such as voice input are enabled.
             Self::refresh_base_model_menu(&me.base_model_dropdown, ctx);
             Self::refresh_coding_model_menu(&me.coding_model_dropdown, ctx);
-            me.sync_custom_endpoint_buttons(ctx);
             ctx.notify();
         });
 
@@ -1146,7 +1131,6 @@ impl AISettingsPageView {
             Self::refresh_base_model_menu(&me.base_model_dropdown, ctx);
             Self::refresh_coding_model_menu(&me.coding_model_dropdown, ctx);
             me.sync_context_window_editor(ctx, false);
-            me.sync_custom_endpoint_buttons(ctx);
             // Driving the prompt off the key-store update (rather than the editor's
             // blur/Enter) means it fires reliably however the key was committed —
             // clicking outside the field, pressing Enter, or tabbing away.
@@ -1229,7 +1213,6 @@ impl AISettingsPageView {
                     Self::refresh_mcp_allowlist_dropdown(&me.mcp_allowlist_dropdown, ctx);
                     Self::refresh_mcp_denylist_dropdown(&me.mcp_denylist_dropdown, ctx);
                     me.sync_context_window_editor(ctx, true);
-                    me.sync_custom_endpoint_buttons(ctx);
                 }
                 AISettingsChangedEvent::VoiceInputEnabled { .. } => {
                     me.update_voice_input_dropdown_enablement(ctx);
@@ -1719,68 +1702,6 @@ impl AISettingsPageView {
             button.set_disabled(!is_any_ai_enabled, ctx);
         });
 
-        // Custom inference
-        let custom_inference_controls_enabled =
-            is_any_ai_enabled && UserWorkspaces::as_ref(ctx).is_custom_inference_enabled(ctx);
-        let custom_inference_add_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new("+ Add custom model", SecondaryTheme)
-                .with_size(ButtonSize::Small)
-                .on_click(|ctx| {
-                    ctx.dispatch_typed_action(AISettingsPageAction::OpenAddCustomEndpointModal);
-                })
-        });
-        custom_inference_add_button.update(ctx, |button, ctx| {
-            button.set_disabled(!custom_inference_controls_enabled, ctx);
-        });
-
-        let custom_endpoint_modal_body =
-            ctx.add_typed_action_view(|ctx| CustomEndpointModal::new(None, None, ctx));
-        ctx.subscribe_to_view(&custom_endpoint_modal_body, |me, _, event, ctx| {
-            me.handle_custom_endpoint_modal_event(event, ctx);
-        });
-
-        let custom_endpoint_modal_view = ctx.add_typed_action_view(|ctx| {
-            Modal::new(
-                Some("Add custom endpoint".to_string()),
-                custom_endpoint_modal_body.clone(),
-                ctx,
-            )
-            .with_modal_style(UiComponentStyles {
-                width: Some(560.),
-                ..Default::default()
-            })
-            .with_header_style(UiComponentStyles {
-                padding: Some(Coords {
-                    top: 24.,
-                    bottom: 0.,
-                    left: 24.,
-                    right: 24.,
-                }),
-                font_size: Some(16.),
-                font_weight: Some(Weight::Bold),
-                ..Default::default()
-            })
-            .with_body_style(UiComponentStyles {
-                padding: Some(Coords {
-                    top: 0.,
-                    bottom: 24.,
-                    left: 24.,
-                    right: 0.,
-                }),
-                ..Default::default()
-            })
-            .with_background_opacity(100)
-            .with_max_height_percentage(CUSTOM_ENDPOINT_MODAL_MAX_HEIGHT_PERCENTAGE)
-            .with_dismiss_on_click()
-            .with_dismiss_keystroke(Keystroke::parse("escape").unwrap())
-        });
-        ctx.subscribe_to_view(&custom_endpoint_modal_view, |me, _, event, ctx| {
-            me.handle_custom_endpoint_modal_close_event(event, ctx);
-        });
-
-        let custom_endpoint_modal_state =
-            CustomEndpointModalViewState::new(ModalViewState::new(custom_endpoint_modal_view));
-
         let set_default_model_modal_body = ctx.add_typed_action_view(SetDefaultModelModalBody::new);
         ctx.subscribe_to_view(&set_default_model_modal_body, |me, _, event, ctx| {
             me.handle_set_default_model_modal_event(event, ctx);
@@ -1813,21 +1734,6 @@ impl AISettingsPageView {
         let set_default_model_modal = ModalViewState::new(set_default_model_modal_view);
         let last_seen_provider_keys = ApiKeyManager::as_ref(ctx).keys().clone();
 
-        let remove_custom_endpoint_confirmation_dialog =
-            ctx.add_typed_action_view(RemoveCustomEndpointConfirmationDialog::new);
-        ctx.subscribe_to_view(
-            &remove_custom_endpoint_confirmation_dialog,
-            |me, _, event, ctx| {
-                me.handle_remove_custom_endpoint_confirmation_dialog_event(event, ctx);
-            },
-        );
-
-        let custom_endpoint_edit_buttons = Self::create_custom_endpoint_edit_buttons(
-            ApiKeyManager::as_ref(ctx).keys().custom_endpoints.len(),
-            custom_inference_controls_enabled,
-            ctx,
-        );
-
         let agent_toolbar_inline_editor = ctx.add_typed_action_view(|ctx| {
             AgentToolbarInlineEditor::new(AgentToolbarEditorMode::AgentView, ctx)
         });
@@ -1959,11 +1865,6 @@ impl AISettingsPageView {
             router_views,
             #[cfg(feature = "local_fs")]
             add_router_button,
-            custom_endpoint_modal_state,
-            remove_custom_endpoint_confirmation_dialog,
-            pending_remove_custom_endpoint_index: None,
-            custom_inference_add_button,
-            custom_endpoint_edit_buttons,
             set_default_model_modal,
             last_seen_provider_keys,
             #[cfg(not(target_family = "wasm"))]
@@ -1986,17 +1887,9 @@ impl AISettingsPageView {
         ctx.notify();
     }
 
-    pub fn get_modal_content(&self, app: &AppContext) -> Option<Box<dyn Element>> {
-        if self.custom_endpoint_modal_state.is_open() {
-            Some(self.custom_endpoint_modal_state.render())
-        } else if self.set_default_model_modal.is_open() {
+    pub fn get_modal_content(&self, _app: &AppContext) -> Option<Box<dyn Element>> {
+        if self.set_default_model_modal.is_open() {
             Some(self.set_default_model_modal.render())
-        } else if self
-            .remove_custom_endpoint_confirmation_dialog
-            .as_ref(app)
-            .is_visible()
-        {
-            Some(ChildView::new(&self.remove_custom_endpoint_confirmation_dialog).finish())
         } else {
             None
         }
@@ -2174,336 +2067,6 @@ impl AISettingsPageView {
         self.show_set_default_model_modal(description, choices, ctx);
     }
 
-    /// After a custom endpoint is added or saved, offer to switch the default
-    /// Agent Mode model to one of its models.
-    fn maybe_prompt_set_default_model_for_custom_endpoint(
-        &mut self,
-        endpoint_index: usize,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        if !Self::can_use_custom_inference_controls(ctx) {
-            return;
-        }
-        if !Self::should_offer_default_model_switch(ctx) {
-            return;
-        }
-        let Some(endpoint) = ApiKeyManager::as_ref(ctx)
-            .keys()
-            .custom_endpoints
-            .get(endpoint_index)
-            .cloned()
-        else {
-            return;
-        };
-        // Build directly from the endpoint's models rather than the synthetic
-        // `custom_llms`, which are rebuilt asynchronously on `KeysUpdated`.
-        let choices: Vec<(LLMId, String)> = endpoint
-            .models
-            .iter()
-            .filter(|m| !m.name.trim().is_empty() && !m.config_key.is_empty())
-            .map(|m| {
-                (
-                    LLMId::from(m.config_key.clone()),
-                    m.display_label().to_string(),
-                )
-            })
-            .collect();
-        if choices.is_empty() {
-            return;
-        }
-        let current_default = Self::active_base_model_display_name(ctx);
-        let description = format!(
-            "You added the \"{}\" custom endpoint, but your default model is currently set to \
-             {current_default}, which won't work without Warp credits. Would you like to change \
-             your default model?",
-            endpoint.name
-        );
-        self.show_set_default_model_modal(description, choices, ctx);
-    }
-
-    fn sync_custom_endpoint_buttons(&mut self, ctx: &mut ViewContext<Self>) {
-        let enabled = Self::can_use_custom_inference_controls(ctx);
-
-        self.custom_inference_add_button.update(ctx, |button, ctx| {
-            button.set_disabled(!enabled, ctx);
-        });
-
-        let endpoint_count = ApiKeyManager::as_ref(ctx).keys().custom_endpoints.len();
-        if self.custom_endpoint_edit_buttons.len() != endpoint_count {
-            self.custom_endpoint_edit_buttons =
-                Self::create_custom_endpoint_edit_buttons(endpoint_count, enabled, ctx);
-        } else {
-            for button in &self.custom_endpoint_edit_buttons {
-                button.update(ctx, |button, ctx| {
-                    button.set_disabled(!enabled, ctx);
-                });
-            }
-        }
-    }
-
-    fn create_custom_endpoint_edit_buttons(
-        count: usize,
-        enabled: bool,
-        ctx: &mut ViewContext<Self>,
-    ) -> Vec<ViewHandle<ActionButton>> {
-        (0..count)
-            .map(|index| {
-                let button = ctx.add_typed_action_view(move |_| {
-                    ActionButton::new("Edit", SecondaryTheme)
-                        .with_icon(Icon::Pencil)
-                        .with_size(ButtonSize::Small)
-                        .on_click(move |ctx| {
-                            ctx.dispatch_typed_action(
-                                AISettingsPageAction::OpenEditCustomEndpointModal(index),
-                            );
-                        })
-                });
-                button.update(ctx, |button, ctx| {
-                    button.set_disabled(!enabled, ctx);
-                });
-                button
-            })
-            .collect()
-    }
-    fn can_use_custom_inference_controls(app: &AppContext) -> bool {
-        FeatureFlag::CustomInferenceEndpoints.is_enabled()
-            && AISettings::as_ref(app).is_any_ai_enabled(app)
-            && UserWorkspaces::as_ref(app).is_custom_inference_enabled(app)
-    }
-
-    fn show_add_custom_endpoint_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        if !Self::can_use_custom_inference_controls(ctx) {
-            return;
-        }
-        self.remove_custom_endpoint_confirmation_dialog
-            .update(ctx, |dialog, ctx| {
-                dialog.hide(ctx);
-            });
-        self.pending_remove_custom_endpoint_index = None;
-
-        self.custom_endpoint_modal_state
-            .set_title(Some("Add custom endpoint".to_string()), ctx);
-        self.custom_endpoint_modal_state.prefill(None, None, ctx);
-        self.custom_endpoint_modal_state.open(ctx);
-        ctx.emit(AISettingsPageEvent::ShowModal);
-        ctx.notify();
-    }
-
-    fn show_edit_custom_endpoint_modal(&mut self, index: usize, ctx: &mut ViewContext<Self>) {
-        if !Self::can_use_custom_inference_controls(ctx) {
-            return;
-        }
-        let endpoint = ApiKeyManager::as_ref(ctx)
-            .keys()
-            .custom_endpoints
-            .get(index)
-            .cloned();
-        if endpoint.is_none() {
-            return;
-        }
-
-        self.remove_custom_endpoint_confirmation_dialog
-            .update(ctx, |dialog, ctx| {
-                dialog.hide(ctx);
-            });
-        self.pending_remove_custom_endpoint_index = None;
-
-        self.custom_endpoint_modal_state
-            .set_title(Some("Edit custom endpoint".to_string()), ctx);
-        self.custom_endpoint_modal_state
-            .prefill(endpoint.as_ref(), Some(index), ctx);
-        self.custom_endpoint_modal_state.open(ctx);
-        ctx.emit(AISettingsPageEvent::ShowModal);
-        ctx.notify();
-    }
-
-    fn hide_custom_endpoint_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.custom_endpoint_modal_state.close(ctx);
-        ctx.emit(AISettingsPageEvent::HideModal);
-        ctx.notify();
-    }
-
-    fn handle_custom_endpoint_modal_close_event(
-        &mut self,
-        event: &ModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ModalEvent::Close => {
-                self.hide_custom_endpoint_modal(ctx);
-            }
-        }
-    }
-
-    fn handle_custom_endpoint_modal_event(
-        &mut self,
-        event: &CustomEndpointModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            CustomEndpointModalEvent::Close => {
-                self.hide_custom_endpoint_modal(ctx);
-            }
-            CustomEndpointModalEvent::AddEndpoint {
-                name,
-                url,
-                api_key,
-                models,
-            } => {
-                if !Self::can_use_custom_inference_controls(ctx) {
-                    self.hide_custom_endpoint_modal(ctx);
-                    return;
-                }
-                ApiKeyManager::handle(ctx).update(ctx, |manager, ctx| {
-                    manager.add_custom_endpoint(
-                        name.clone(),
-                        url.clone(),
-                        api_key.clone(),
-                        models.clone(),
-                        ctx,
-                    );
-                });
-                self.hide_custom_endpoint_modal(ctx);
-
-                let window_id = ctx.window_id();
-                crate::ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
-                    let toast = crate::view_components::DismissibleToast::success(
-                        "Endpoint added".to_string(),
-                    );
-                    toast_stack.add_ephemeral_toast(toast, window_id, ctx);
-                });
-
-                // The new endpoint is appended last.
-                let new_index = ApiKeyManager::as_ref(ctx)
-                    .keys()
-                    .custom_endpoints
-                    .len()
-                    .saturating_sub(1);
-                self.maybe_prompt_set_default_model_for_custom_endpoint(new_index, ctx);
-                ctx.notify();
-            }
-            CustomEndpointModalEvent::SaveEndpoint {
-                index,
-                name,
-                url,
-                api_key,
-                models,
-            } => {
-                if !Self::can_use_custom_inference_controls(ctx) {
-                    self.hide_custom_endpoint_modal(ctx);
-                    return;
-                }
-                ApiKeyManager::handle(ctx).update(ctx, |manager, ctx| {
-                    manager.save_custom_endpoint(
-                        *index,
-                        name.clone(),
-                        url.clone(),
-                        api_key.clone(),
-                        models.clone(),
-                        ctx,
-                    );
-                });
-                self.hide_custom_endpoint_modal(ctx);
-
-                let window_id = ctx.window_id();
-                crate::ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
-                    let toast = crate::view_components::DismissibleToast::success(
-                        "Endpoint saved".to_string(),
-                    );
-                    toast_stack.add_ephemeral_toast(toast, window_id, ctx);
-                });
-                self.maybe_prompt_set_default_model_for_custom_endpoint(*index, ctx);
-                ctx.notify();
-            }
-            CustomEndpointModalEvent::RemoveEndpoint { index } => {
-                if !Self::can_use_custom_inference_controls(ctx) {
-                    self.hide_custom_endpoint_modal(ctx);
-                    return;
-                }
-                self.hide_custom_endpoint_modal(ctx);
-                self.show_remove_custom_endpoint_confirmation_dialog(*index, ctx);
-            }
-        }
-    }
-
-    fn show_remove_custom_endpoint_confirmation_dialog(
-        &mut self,
-        index: usize,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        if !Self::can_use_custom_inference_controls(ctx) {
-            return;
-        }
-        let endpoint = ApiKeyManager::as_ref(ctx)
-            .keys()
-            .custom_endpoints
-            .get(index)
-            .cloned();
-        let Some(endpoint) = endpoint else {
-            return;
-        };
-
-        let model_labels = endpoint
-            .models
-            .iter()
-            .map(|model| model.alias.clone().unwrap_or_else(|| model.name.clone()))
-            .filter(|s| !s.trim().is_empty())
-            .collect();
-
-        self.pending_remove_custom_endpoint_index = Some(index);
-        self.remove_custom_endpoint_confirmation_dialog
-            .update(ctx, |dialog, ctx| {
-                dialog.show(index, endpoint.name.clone(), model_labels, ctx);
-            });
-        ctx.notify();
-    }
-
-    fn handle_remove_custom_endpoint_confirmation_dialog_event(
-        &mut self,
-        event: &RemoveCustomEndpointConfirmationDialogEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            RemoveCustomEndpointConfirmationDialogEvent::Cancel => {
-                self.pending_remove_custom_endpoint_index = None;
-                self.remove_custom_endpoint_confirmation_dialog
-                    .update(ctx, |dialog, ctx| {
-                        dialog.hide(ctx);
-                    });
-                ctx.notify();
-            }
-            RemoveCustomEndpointConfirmationDialogEvent::Confirm(index) => {
-                if !Self::can_use_custom_inference_controls(ctx) {
-                    self.pending_remove_custom_endpoint_index = None;
-                    self.remove_custom_endpoint_confirmation_dialog
-                        .update(ctx, |dialog, ctx| {
-                            dialog.hide(ctx);
-                        });
-                    ctx.notify();
-                    return;
-                }
-                ApiKeyManager::handle(ctx).update(ctx, |manager, ctx| {
-                    manager.remove_custom_endpoint(*index, ctx);
-                });
-                self.pending_remove_custom_endpoint_index = None;
-                self.remove_custom_endpoint_confirmation_dialog
-                    .update(ctx, |dialog, ctx| {
-                        dialog.hide(ctx);
-                    });
-                self.sync_custom_endpoint_buttons(ctx);
-
-                let window_id = ctx.window_id();
-                crate::ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
-                    let toast = crate::view_components::DismissibleToast::success(
-                        "Endpoint removed".to_string(),
-                    );
-                    toast_stack.add_ephemeral_toast(toast, window_id, ctx);
-                });
-                ctx.notify();
-            }
-        }
-    }
-
     #[cfg(not(target_family = "wasm"))]
     fn create_grok_code_editor(ctx: &mut ViewContext<Self>) -> ViewHandle<EditorView> {
         ctx.add_typed_action_view(|ctx| {
@@ -3635,9 +3198,6 @@ pub enum AISettingsPageAction {
     #[cfg(feature = "local_fs")]
     OpenAddCustomRouter,
 
-    // Custom inference
-    OpenAddCustomEndpointModal,
-    OpenEditCustomEndpointModal(usize),
     ConnectGrokSubscription,
     DisconnectGrokSubscription,
 
@@ -4440,12 +4000,6 @@ impl TypedActionView for AISettingsPageView {
             AISettingsPageAction::OpenAddCustomRouter => {
                 ctx.emit(AISettingsPageEvent::OpenCustomRouterEditor(None));
             }
-            AISettingsPageAction::OpenAddCustomEndpointModal => {
-                self.show_add_custom_endpoint_modal(ctx);
-            }
-            AISettingsPageAction::OpenEditCustomEndpointModal(index) => {
-                self.show_edit_custom_endpoint_modal(*index, ctx);
-            }
             AISettingsPageAction::ToggleCloudHandoff => {
                 AISettings::handle(ctx).update(ctx, |settings, ctx| {
                     report_if_error!(settings
@@ -8528,11 +8082,7 @@ impl ApiKeysWidget {
                 .with_child(chips)
                 .finish();
 
-            let edit_button = view
-                .custom_endpoint_edit_buttons
-                .get(index)
-                .map(|button| button.as_ref(app).render(app))
-                .unwrap_or_else(|| Empty::new().finish());
+            let edit_button = Empty::new().finish();
 
             let row = Flex::row()
                 .with_main_axis_size(MainAxisSize::Max)
@@ -8782,7 +8332,6 @@ impl SettingsWidget for ApiKeysWidget {
                 .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
                 .with_cross_axis_alignment(CrossAxisAlignment::Center)
                 .with_child(header_left)
-                .with_child(view.custom_inference_add_button.as_ref(app).render(app))
                 .finish();
 
             column.add_child(
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_common.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_common.rs
deleted file mode 100644
index cafdb75e..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_common.rs
+++ /dev/null
@@ -1,421 +0,0 @@
-use std::cell::RefCell;
-use std::collections::HashMap;
-
-use galaxy_core::ui::appearance::Appearance;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use thousands::Separable;
-use warpui::elements::{
-    Align, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow, Empty,
-    Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Shrinkable,
-    Text,
-};
-use warpui::fonts::{Properties, Weight};
-use warpui::Element;
-
-use crate::settings_view::billing_and_usage_page_v2::{
-    AGGREGATE_CREDITS_DOT_COLOR, AMBIENT_CREDITS_DOT_COLOR, BASE_CREDITS_DOT_COLOR,
-    BONUS_CREDITS_DOT_COLOR, PAYG_CREDITS_DOT_COLOR,
-};
-use crate::ui_components::blended_colors;
-use crate::workspaces::workspace::{
-    AiCreditsUsageAndCostSubjectType, AiCreditsUsageAndCostType, AiCreditsUsageBucket,
-    BillingCycleUsageEntry,
-};
-
-// for a bunch of this (min fill ratio, cost type order, ... )
-// you will find analogous ts code in warp-server
-pub const ROW_BORDER_RADIUS: f32 = 8.;
-pub const ROW_BORDER_WIDTH: f32 = 1.;
-pub const TOOLTIP_GAP: f32 = 6.;
-
-const COST_TYPE_ORDER: &[AiCreditsUsageAndCostType] = &[
-    AiCreditsUsageAndCostType::BaseLimit,
-    AiCreditsUsageAndCostType::BonusGrant,
-    AiCreditsUsageAndCostType::Payg,
-    AiCreditsUsageAndCostType::AmbientBonusGrant,
-];
-const BUCKET_ORDER: &[AiCreditsUsageBucket] = &[
-    AiCreditsUsageBucket::Ai,
-    AiCreditsUsageBucket::Compute,
-    AiCreditsUsageBucket::Platform,
-];
-
-/// One colored slice of the stacked bar. `cost_type` drives color; `usage_bucket`
-/// drives the tooltip breakdown.
-#[derive(Clone, Debug)]
-pub struct BarSegment {
-    pub cost_type: AiCreditsUsageAndCostType,
-    pub usage_bucket: AiCreditsUsageBucket,
-    pub credits: i64,
-    pub cost_cents: i64,
-}
-
-/// Shared mouse-state bag for the billing-and-usage section: the
-/// All/Local/Cloud filter pills plus a tooltip handle for every interactive
-/// element keyed by string id (per-member rows, team-totals cards, ...).
-pub struct BillingUsageMouseStates {
-    pub filter_all: MouseStateHandle,
-    pub filter_local: MouseStateHandle,
-    pub filter_cloud: MouseStateHandle,
-    tooltip_by_subject: RefCell<HashMap<String, MouseStateHandle>>,
-}
-
-impl Default for BillingUsageMouseStates {
-    fn default() -> Self {
-        Self {
-            filter_all: MouseStateHandle::default(),
-            filter_local: MouseStateHandle::default(),
-            filter_cloud: MouseStateHandle::default(),
-            tooltip_by_subject: RefCell::new(HashMap::new()),
-        }
-    }
-}
-
-impl BillingUsageMouseStates {
-    pub fn tooltip_mouse_state(&self, key: &str) -> MouseStateHandle {
-        let mut map = self.tooltip_by_subject.borrow_mut();
-        map.entry(key.to_string()).or_default().clone()
-    }
-}
-
-/// Swatch color for one cost-type bucket, mirroring the legend palette.
-pub fn cost_type_color(cost_type: &AiCreditsUsageAndCostType) -> ColorU {
-    match cost_type {
-        AiCreditsUsageAndCostType::BaseLimit => BASE_CREDITS_DOT_COLOR,
-        AiCreditsUsageAndCostType::BonusGrant => BONUS_CREDITS_DOT_COLOR,
-        AiCreditsUsageAndCostType::Payg => PAYG_CREDITS_DOT_COLOR,
-        AiCreditsUsageAndCostType::AmbientBonusGrant => AMBIENT_CREDITS_DOT_COLOR,
-        AiCreditsUsageAndCostType::Aggregate => AGGREGATE_CREDITS_DOT_COLOR,
-        AiCreditsUsageAndCostType::Other(_) => BASE_CREDITS_DOT_COLOR,
-    }
-}
-
-fn cost_type_label(cost_type: &AiCreditsUsageAndCostType) -> &'static str {
-    match cost_type {
-        AiCreditsUsageAndCostType::BaseLimit => "Base",
-        AiCreditsUsageAndCostType::BonusGrant => "Add-ons",
-        AiCreditsUsageAndCostType::Payg => "Pay-as-you-go",
-        AiCreditsUsageAndCostType::AmbientBonusGrant => "Cloud-only",
-        AiCreditsUsageAndCostType::Aggregate => "Combined",
-        AiCreditsUsageAndCostType::Other(_) => "Other",
-    }
-}
-
-fn bucket_label(bucket: &AiCreditsUsageBucket) -> &'static str {
-    match bucket {
-        AiCreditsUsageBucket::Ai => "AI",
-        AiCreditsUsageBucket::Compute => "Compute",
-        AiCreditsUsageBucket::Platform => "Platform",
-        AiCreditsUsageBucket::SuggestedCodeDiffs => "Suggested code diffs",
-        AiCreditsUsageBucket::Voice => "Voice",
-        AiCreditsUsageBucket::Aggregate => "Total",
-        AiCreditsUsageBucket::Other(_) => "Other",
-    }
-}
-
-fn cost_type_rank(cost_type: &AiCreditsUsageAndCostType) -> usize {
-    COST_TYPE_ORDER
-        .iter()
-        .position(|c| c == cost_type)
-        .unwrap_or(COST_TYPE_ORDER.len())
-}
-
-fn bucket_rank(bucket: &AiCreditsUsageBucket) -> usize {
-    BUCKET_ORDER
-        .iter()
-        .position(|b| b == bucket)
-        .unwrap_or(BUCKET_ORDER.len())
-}
-
-fn segment_sort_key(segment: &BarSegment) -> (usize, usize) {
-    (
-        cost_type_rank(&segment.cost_type),
-        bucket_rank(&segment.usage_bucket),
-    )
-}
-
-/// Group `entries` by `(cost_type, usage_bucket)` into [`BarSegment`]s; returns
-/// sorted segments plus row totals. Linear Vec lookup since cynic enums don't
-/// impl Hash and per-row entry counts are small.
-pub fn aggregate_segments<'a>(
-    entries: impl IntoIterator<Item = &'a BillingCycleUsageEntry>,
-) -> (Vec<BarSegment>, i64, i64) {
-    let mut segments: Vec<BarSegment> = Vec::new();
-
-    for entry in entries {
-        if let Some(existing) = segments
-            .iter_mut()
-            .find(|s| s.cost_type == entry.cost_type && s.usage_bucket == entry.usage_bucket)
-        {
-            existing.credits += entry.credits_used as i64;
-            existing.cost_cents += entry.cost_cents as i64;
-        } else {
-            segments.push(BarSegment {
-                cost_type: entry.cost_type.clone(),
-                usage_bucket: entry.usage_bucket.clone(),
-                credits: entry.credits_used as i64,
-                cost_cents: entry.cost_cents as i64,
-            });
-        }
-    }
-
-    segments.retain(|s| s.credits > 0);
-    segments.sort_by_key(segment_sort_key);
-
-    let total_credits = segments.iter().map(|s| s.credits).sum();
-    let total_cost_cents = segments.iter().map(|s| s.cost_cents).sum();
-
-    (segments, total_credits, total_cost_cents)
-}
-
-/// Drops Voice / SuggestedCodeDiffs entries from the usage view.
-///
-/// These buckets are tracked server-side against their own dedicated per-cycle
-/// limits (`VoiceRequestLimit` / `SuggestedCodeDiffsLimit`) rather than the
-/// AI/Compute base credit pool — see
-/// `model/sql/ai_credits_usage_and_cost/get_base_limits_usage.sql` and
-/// `isBaseLimitExhaustedForBucket` in warp-server. Records are written with
-/// `cost_type = BASE_LIMIT` and `cost_cents = 0`, so surfacing them here
-/// would inflate the per-row `total_credits` and skew the `used / limit`
-/// math without contributing to anything the user is actually billed for.
-///
-/// TODO: this also hides the rare case where a user blows past their
-/// dedicated Voice or SuggestedCodeDiffs limit and the resolver falls
-/// through to bonus grants — those entries would have real `cost_cents`
-/// and *do* draw down add-on credits. In practice ~nobody (maybe ZL?) hits
-/// those limits, so we filter unconditionally for now; revisit if usage of
-/// those features ever grows enough that the overflow matters.
-pub fn filter_legacy_buckets(entries: &[BillingCycleUsageEntry]) -> Vec<BillingCycleUsageEntry> {
-    entries
-        .iter()
-        .filter(|e| {
-            e.usage_bucket != AiCreditsUsageBucket::Voice
-                && e.usage_bucket != AiCreditsUsageBucket::SuggestedCodeDiffs
-        })
-        .cloned()
-        .collect()
-}
-
-/// Cost-type buckets to surface in the usage legend, in display order.
-///
-/// Mirrors the buckets the stacked bars actually render: legacy buckets are
-/// dropped (see [`filter_legacy_buckets`]) and a cost type only counts when it
-/// has real usage (`credits_used > 0`), exactly like [`aggregate_segments`],
-/// which retains only segments with `credits > 0`. Without the usage check a
-/// zero-credit entry (e.g. an untouched base-limit row) would list "Base" in
-/// the legend even though it contributed nothing to the chart.
-pub fn legend_cost_types(entries: &[BillingCycleUsageEntry]) -> Vec<AiCreditsUsageAndCostType> {
-    let filtered = filter_legacy_buckets(entries);
-    [
-        AiCreditsUsageAndCostType::BaseLimit,
-        AiCreditsUsageAndCostType::BonusGrant,
-        AiCreditsUsageAndCostType::Payg,
-        AiCreditsUsageAndCostType::AmbientBonusGrant,
-        AiCreditsUsageAndCostType::Aggregate,
-    ]
-    .into_iter()
-    .filter(|cost_type| {
-        filtered
-            .iter()
-            .any(|e| e.cost_type == *cost_type && e.credits_used > 0)
-    })
-    .collect()
-}
-
-/// "Is there any data in `entries` that's not my own?"
-pub fn has_non_viewer_data(entries: &[BillingCycleUsageEntry], viewer_uid: Option<&str>) -> bool {
-    entries.iter().any(|e| match &e.subject_type {
-        AiCreditsUsageAndCostSubjectType::Team => e.credits_used > 0,
-        _ => match (e.subject_uid.as_deref(), viewer_uid) {
-            (Some(uid), Some(viewer)) => uid != viewer,
-            // Unknown subject — conservatively treat as non-viewer.
-            _ => true,
-        },
-    })
-}
-
-pub fn format_credits(credits: i64) -> String {
-    credits.separate_with_commas()
-}
-
-pub fn format_cost_cents(cents: i64) -> String {
-    let dollars = cents / 100;
-    let remainder = (cents.abs() % 100) as u8;
-    if dollars < 0 {
-        format!(
-            "-${}.{remainder:02}",
-            dollars.unsigned_abs().separate_with_commas()
-        )
-    } else {
-        format!("${}.{remainder:02}", dollars.separate_with_commas())
-    }
-}
-
-/// Section subheader (e.g. "Team totals", "Member usage"). One step below
-/// the v2 page's bold section title.
-pub fn render_section_subheader(label: &str, appearance: &Appearance) -> Box<dyn Element> {
-    Text::new_inline(label.to_string(), appearance.ui_font_family(), 14.)
-        .with_color(appearance.theme().active_ui_text_color().into())
-        .with_style(Properties::default().weight(Weight::Medium))
-        .finish()
-}
-
-/// Per-cost-type breakdown card. Parameterized by raw segments and totals so
-/// it can back team-totals card hovers as well as per-member row hovers.
-pub fn render_breakdown_tooltip(
-    segments: &[BarSegment],
-    total_credits: i64,
-    total_cost_cents: i64,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let font_family = appearance.ui_font_family();
-    let bg = theme.background().into_solid();
-    let main = blended_colors::text_main(theme, bg);
-    let sub = blended_colors::text_sub(theme, bg);
-
-    let mut column = Flex::column()
-        .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-        .with_spacing(6.);
-
-    for line in segments {
-        let label = if matches!(line.usage_bucket, AiCreditsUsageBucket::Aggregate) {
-            cost_type_label(&line.cost_type).to_string()
-        } else {
-            format!(
-                "{} ({})",
-                cost_type_label(&line.cost_type),
-                bucket_label(&line.usage_bucket)
-            )
-        };
-
-        column.add_child(render_tooltip_row(
-            Some(cost_type_color(&line.cost_type)),
-            label,
-            line.credits,
-            line.cost_cents,
-            sub,
-            main,
-            font_family,
-            /* bold */ false,
-        ));
-    }
-
-    // Divider before the total row.
-    column.add_child(
-        Container::new(Empty::new().finish())
-            .with_padding_top(1.)
-            .with_background_color(theme.outline().into_solid())
-            .finish(),
-    );
-
-    column.add_child(render_tooltip_row(
-        /* no swatch on the total row */ None,
-        "Total usage".to_string(),
-        total_credits,
-        total_cost_cents,
-        main,
-        main,
-        font_family,
-        /* bold */ true,
-    ));
-
-    ConstrainedBox::new(
-        Container::new(column.finish())
-            .with_background_color(bg)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-            .with_border(Border::all(1.).with_border_color(theme.outline().into_solid()))
-            .with_uniform_padding(10.)
-            .with_drop_shadow(
-                DropShadow::new_with_standard_offset_and_spread(ColorU::new(0, 0, 0, 48))
-                    .with_offset(vec2f(0., 4.)),
-            )
-            .finish(),
-    )
-    .with_min_width(200.)
-    .with_max_width(320.)
-    .finish()
-}
-
-/// Single tooltip row: `[swatch + label] [spacer] [credits / cost]` with
-/// fixed-width right-aligned number columns.
-#[allow(clippy::too_many_arguments)]
-fn render_tooltip_row(
-    swatch_color: Option<ColorU>,
-    label: String,
-    credits: i64,
-    cost_cents: i64,
-    label_color: ColorU,
-    value_color: ColorU,
-    font_family: warpui::fonts::FamilyId,
-    bold: bool,
-) -> Box<dyn Element> {
-    let style = if bold {
-        Properties::default().weight(Weight::Semibold)
-    } else {
-        Properties::default()
-    };
-
-    let label_text = Text::new_inline(label, font_family, 12.)
-        .with_color(label_color)
-        .with_style(style)
-        .finish();
-
-    let mut left = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-    if let Some(color) = swatch_color {
-        left.add_child(
-            ConstrainedBox::new(
-                Container::new(Empty::new().finish())
-                    .with_background_color(color)
-                    .with_corner_radius(CornerRadius::with_all(Radius::Pixels(2.)))
-                    .finish(),
-            )
-            .with_width(10.)
-            .with_height(10.)
-            .finish(),
-        );
-        left.add_child(Container::new(label_text).with_margin_left(8.).finish());
-    } else {
-        left.add_child(label_text);
-    }
-
-    let credits_text = Text::new_inline(format_credits(credits), font_family, 12.)
-        .with_color(value_color)
-        .with_style(style)
-        .finish();
-    let cost_text = Text::new_inline(format_cost_cents(cost_cents), font_family, 12.)
-        .with_color(value_color)
-        .with_style(style)
-        .finish();
-    let divider = Text::new_inline("/".to_string(), font_family, 12.)
-        .with_color(label_color)
-        .with_style(style)
-        .finish();
-
-    let credits_col = ConstrainedBox::new(Align::new(credits_text).right().finish())
-        .with_width(60.)
-        .finish();
-    let cost_col = ConstrainedBox::new(Align::new(cost_text).right().finish())
-        .with_width(64.)
-        .finish();
-
-    let right = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_child(credits_col)
-        .with_child(Container::new(divider).with_horizontal_margin(3.).finish())
-        .with_child(cost_col)
-        .finish();
-
-    Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-        .with_main_axis_size(MainAxisSize::Max)
-        .with_child(Shrinkable::new(1., left.finish()).finish())
-        .with_child(right)
-        .finish()
-}
-
-#[cfg(test)]
-#[path = "billing_cycle_usage_common_tests.rs"]
-mod tests;
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_common_tests.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_common_tests.rs
deleted file mode 100644
index 4bd1fcc0..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_common_tests.rs
+++ /dev/null
@@ -1,376 +0,0 @@
-use super::{
-    aggregate_segments, filter_legacy_buckets, has_non_viewer_data, legend_cost_types, BarSegment,
-};
-use crate::workspaces::workspace::{
-    AiCreditsUsageAndCostSubjectType, AiCreditsUsageAndCostType, AiCreditsUsageBucket,
-    AiCreditsUsageSource, BillingCycleUsageEntry,
-};
-
-const VIEWER_UID: &str = "viewer-uid";
-const OTHER_UID: &str = "other-uid";
-
-fn entry(
-    subject_type: AiCreditsUsageAndCostSubjectType,
-    subject_uid: Option<&str>,
-    cost_type: AiCreditsUsageAndCostType,
-    usage_bucket: AiCreditsUsageBucket,
-    usage_source: AiCreditsUsageSource,
-    credits_used: i32,
-    cost_cents: i32,
-) -> BillingCycleUsageEntry {
-    BillingCycleUsageEntry {
-        subject_type,
-        subject_uid: subject_uid.map(|s| s.to_string()),
-        subject_display_name: None,
-        cost_type,
-        usage_bucket,
-        usage_source,
-        credits_used,
-        cost_cents,
-    }
-}
-
-/// Boilerplate viewer-owned User row for predicate tests.
-fn viewer_user_entry() -> BillingCycleUsageEntry {
-    entry(
-        AiCreditsUsageAndCostSubjectType::User,
-        Some(VIEWER_UID),
-        AiCreditsUsageAndCostType::BaseLimit,
-        AiCreditsUsageBucket::Ai,
-        AiCreditsUsageSource::Local,
-        10,
-        0,
-    )
-}
-
-#[test]
-fn has_non_viewer_data_returns_false_when_entries_empty() {
-    assert!(!has_non_viewer_data(&[], Some(VIEWER_UID)));
-}
-
-#[test]
-fn has_non_viewer_data_returns_false_when_only_viewer_user_rows() {
-    let entries = vec![viewer_user_entry(), viewer_user_entry()];
-    assert!(!has_non_viewer_data(&entries, Some(VIEWER_UID)));
-}
-
-#[test]
-fn has_non_viewer_data_returns_true_for_team_aggregate_row() {
-    // TeamAggregate visibility represents "everyone else's usage" as a single
-    // Team-typed row, even when the workspace currently has only one member
-    // (e.g. a teammate left mid-cycle after incurring AI costs).
-    let entries = vec![
-        viewer_user_entry(),
-        entry(
-            AiCreditsUsageAndCostSubjectType::Team,
-            None,
-            AiCreditsUsageAndCostType::Aggregate,
-            AiCreditsUsageBucket::Aggregate,
-            AiCreditsUsageSource::Aggregate,
-            500,
-            300,
-        ),
-    ];
-    assert!(has_non_viewer_data(&entries, Some(VIEWER_UID)));
-}
-
-#[test]
-fn has_non_viewer_data_returns_true_for_other_user_row() {
-    // PerUserTotals / FullBreakdown emit per-user rows, so a departed teammate
-    // shows up as a User entry with a non-viewer UID.
-    let entries = vec![entry(
-        AiCreditsUsageAndCostSubjectType::User,
-        Some(OTHER_UID),
-        AiCreditsUsageAndCostType::BaseLimit,
-        AiCreditsUsageBucket::Ai,
-        AiCreditsUsageSource::Local,
-        50,
-        0,
-    )];
-    assert!(has_non_viewer_data(&entries, Some(VIEWER_UID)));
-}
-
-#[test]
-fn has_non_viewer_data_returns_true_for_service_account_row() {
-    let entries = vec![entry(
-        AiCreditsUsageAndCostSubjectType::ServiceAccount,
-        Some("sa-uid"),
-        AiCreditsUsageAndCostType::BaseLimit,
-        AiCreditsUsageBucket::Ai,
-        AiCreditsUsageSource::Cloud,
-        25,
-        0,
-    )];
-    assert!(has_non_viewer_data(&entries, Some(VIEWER_UID)));
-}
-
-#[test]
-fn has_non_viewer_data_treats_missing_subject_uid_as_non_viewer() {
-    // Defensive: a User row with no UID is conservatively treated as a non-
-    // viewer subject so we never accidentally drop team scaffolding.
-    let entries = vec![entry(
-        AiCreditsUsageAndCostSubjectType::User,
-        None,
-        AiCreditsUsageAndCostType::BaseLimit,
-        AiCreditsUsageBucket::Ai,
-        AiCreditsUsageSource::Local,
-        1,
-        0,
-    )];
-    assert!(has_non_viewer_data(&entries, Some(VIEWER_UID)));
-}
-
-#[test]
-fn has_non_viewer_data_treats_missing_viewer_uid_as_non_viewer() {
-    // Signed-out / unidentified viewer: any subject we can't prove belongs
-    // to them counts as non-viewer data.
-    let entries = vec![viewer_user_entry()];
-    assert!(has_non_viewer_data(&entries, None));
-}
-
-#[test]
-fn filter_legacy_buckets_drops_voice_and_suggested_code_diffs_in_input_order() {
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            10,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Voice,
-            AiCreditsUsageSource::Local,
-            3,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Compute,
-            AiCreditsUsageSource::Local,
-            5,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::SuggestedCodeDiffs,
-            AiCreditsUsageSource::Local,
-            7,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::Aggregate,
-            AiCreditsUsageBucket::Aggregate,
-            AiCreditsUsageSource::Aggregate,
-            100,
-            50,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Platform,
-            AiCreditsUsageSource::Cloud,
-            2,
-            0,
-        ),
-    ];
-
-    let filtered = filter_legacy_buckets(&entries);
-
-    let kept_buckets: Vec<_> = filtered.iter().map(|e| e.usage_bucket.clone()).collect();
-    assert_eq!(
-        kept_buckets,
-        vec![
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageBucket::Compute,
-            AiCreditsUsageBucket::Aggregate,
-            AiCreditsUsageBucket::Platform,
-        ],
-        "expected Voice + SuggestedCodeDiffs dropped while preserving the rest in input order"
-    );
-}
-
-#[test]
-fn aggregate_segments_merges_dupes_drops_zeros_and_sorts() {
-    let entries = [
-        // Same (BonusGrant, Compute) appears twice across different sources;
-        // should merge into one segment.
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BonusGrant,
-            AiCreditsUsageBucket::Compute,
-            AiCreditsUsageSource::Local,
-            10,
-            5,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BonusGrant,
-            AiCreditsUsageBucket::Compute,
-            AiCreditsUsageSource::Cloud,
-            7,
-            3,
-        ),
-        // BaseLimit/Ai — should sort before any BonusGrant entry.
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            20,
-            0,
-        ),
-        // Zero-credit entry: must be dropped before totals are computed (so
-        // the stray cost_cents don't leak into the row total).
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::Payg,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            0,
-            42,
-        ),
-    ];
-
-    let (segments, total_credits, total_cost_cents) = aggregate_segments(entries.iter());
-
-    let key = |s: &BarSegment| (s.cost_type.clone(), s.usage_bucket.clone());
-    let keys: Vec<_> = segments.iter().map(key).collect();
-    assert_eq!(
-        keys,
-        vec![
-            (
-                AiCreditsUsageAndCostType::BaseLimit,
-                AiCreditsUsageBucket::Ai
-            ),
-            (
-                AiCreditsUsageAndCostType::BonusGrant,
-                AiCreditsUsageBucket::Compute
-            ),
-        ],
-        "expected BaseLimit/Ai before BonusGrant/Compute, Payg zero-credit dropped"
-    );
-
-    let bonus = &segments[1];
-    assert_eq!(bonus.credits, 17, "10 + 7 merged credits");
-    assert_eq!(bonus.cost_cents, 8, "5 + 3 merged cost cents");
-
-    // Totals are summed *after* the zero-credit segment is dropped, so the
-    // stray 42 cents on the Payg/Ai entry must not appear here.
-    assert_eq!(total_credits, 20 + 17);
-    assert_eq!(total_cost_cents, 8);
-}
-
-#[test]
-fn legend_cost_types_excludes_zero_credit_bucket() {
-    // Regression: a base-limit row with no usage must not surface "Base" in
-    // the legend while only Pay-as-you-go credits were actually spent.
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            0,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::Payg,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            50,
-            120,
-        ),
-    ];
-
-    assert_eq!(
-        legend_cost_types(&entries),
-        vec![AiCreditsUsageAndCostType::Payg],
-        "zero-credit BaseLimit row must be dropped from the legend"
-    );
-}
-
-#[test]
-fn legend_cost_types_includes_used_buckets_in_display_order() {
-    // Buckets with real usage appear in the canonical legend order regardless
-    // of input order (Payg listed before BaseLimit here).
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::Payg,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            5,
-            10,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Ai,
-            AiCreditsUsageSource::Local,
-            8,
-            0,
-        ),
-    ];
-
-    assert_eq!(
-        legend_cost_types(&entries),
-        vec![
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageAndCostType::Payg,
-        ],
-        "used buckets should render in canonical order, not input order"
-    );
-}
-
-#[test]
-fn legend_cost_types_excludes_legacy_only_buckets() {
-    // Voice / SuggestedCodeDiffs usage is written as BaseLimit credits but is
-    // dropped from the bars; the legend must match and not show "Base".
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::Voice,
-            AiCreditsUsageSource::Local,
-            12,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageAndCostType::BaseLimit,
-            AiCreditsUsageBucket::SuggestedCodeDiffs,
-            AiCreditsUsageSource::Local,
-            4,
-            0,
-        ),
-    ];
-
-    assert!(
-        legend_cost_types(&entries).is_empty(),
-        "legacy-only base-limit usage must not surface any legend bucket"
-    );
-}
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_rows.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_rows.rs
deleted file mode 100644
index c6799b44..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_rows.rs
+++ /dev/null
@@ -1,838 +0,0 @@
-use std::collections::HashMap;
-
-use galaxy_core::channel::ChannelState;
-use galaxy_core::ui::appearance::Appearance;
-use itertools::Itertools as _;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use warpui::elements::{
-    Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DropShadow,
-    Empty, Expanded, Flex, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle,
-    OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius, Shrinkable, Stack,
-    Text,
-};
-use warpui::platform::Cursor;
-use warpui::ui_components::components::UiComponent;
-use warpui::{AppContext, Element, EventContext, SingletonEntity};
-
-use crate::ai::AIRequestUsageModel;
-use crate::auth::AuthStateProvider;
-use crate::settings_view::billing_and_usage::billing_cycle_usage_common::{
-    aggregate_segments, cost_type_color, format_cost_cents, format_credits,
-    render_breakdown_tooltip, render_section_subheader, BarSegment, BillingUsageMouseStates,
-    ROW_BORDER_RADIUS, ROW_BORDER_WIDTH, TOOLTIP_GAP,
-};
-use crate::ui_components::blended_colors;
-use crate::ui_components::icons::Icon;
-use crate::workspaces::workspace::{
-    AiCreditsUsageAndCostSubjectType, AiCreditsUsageAndCostType, AiCreditsUsageBucket,
-    AiCreditsUsageSource, BillingCycleUsageEntry, UsageVisibility, UsageVisibilityGranularity,
-    Workspace, WorkspaceMember,
-};
-
-const BAR_HEIGHT: f32 = 8.;
-const MIN_FILL_RATIO: f32 = 0.05;
-/// Size of the leading icons in the row credit cluster (coin + credit-card).
-const ROW_ICON_SIZE: f32 = 12.;
-/// Inner radius so the bar's curve sits flush against the card's inner border.
-const BAR_CORNER_RADIUS: f32 = ROW_BORDER_RADIUS - ROW_BORDER_WIDTH;
-const ROW_PADDING: f32 = 12.;
-
-const SELF_OWN_KEY: &str = "__self_own__";
-const OTHER_MEMBERS_KEY: &str = "__other_members__";
-
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum SourceFilter {
-    #[default]
-    All,
-    Local,
-    Cloud,
-}
-
-impl SourceFilter {
-    pub fn label(self) -> &'static str {
-        match self {
-            SourceFilter::All => "All",
-            SourceFilter::Local => "Local",
-            SourceFilter::Cloud => "Cloud",
-        }
-    }
-
-    fn matches(self, source: &AiCreditsUsageSource) -> bool {
-        match self {
-            SourceFilter::All => true,
-            SourceFilter::Local => *source == AiCreditsUsageSource::Local,
-            SourceFilter::Cloud => *source == AiCreditsUsageSource::Cloud,
-        }
-    }
-}
-
-/// Aggregated usage for one subject (or the synthetic team aggregate).
-#[derive(Debug)]
-pub struct MemberUsageRow {
-    pub subject_type: AiCreditsUsageAndCostSubjectType,
-    pub subject_key: String,
-    /// Used to deep-link `ServiceAccount` rows to their Oz agent page.
-    pub subject_uid: Option<String>,
-    pub display_name: String,
-    pub total_credits: i64,
-    pub total_cost_cents: i64,
-    /// Sorted by cost-type then bucket order; zero-credit entries dropped.
-    pub segments: Vec<BarSegment>,
-    /// Denominator the row's stacked bar fills against.
-    pub bar_max_credits: i64,
-}
-
-fn viewer_identity(app: &AppContext) -> (Option<String>, String) {
-    let auth_state = AuthStateProvider::as_ref(app).get();
-    let viewer_uid = auth_state.user_id().map(|uid| uid.as_string());
-    let display_name = auth_state
-        .display_name()
-        .or_else(|| auth_state.username_for_display())
-        .or_else(|| auth_state.user_email())
-        .unwrap_or_else(|| "Your usage".to_string());
-    (viewer_uid, display_name)
-}
-
-struct GroupedSubjectUsage {
-    subject_type: AiCreditsUsageAndCostSubjectType,
-    display_name: String,
-    entries: Vec<BillingCycleUsageEntry>,
-}
-
-impl MemberUsageRow {
-    fn for_viewer(
-        entries: &[BillingCycleUsageEntry],
-        viewer_uid: Option<&str>,
-        viewer_display_name: String,
-        source_filter: SourceFilter,
-    ) -> Self {
-        let viewer_entries = entries
-            .iter()
-            .filter(|e| source_filter.matches(&e.usage_source))
-            // Defensive: positive-attribute to the viewer only.
-            .filter(|e| match (viewer_uid, e.subject_uid.as_deref()) {
-                (Some(uid), Some(entry_uid)) => uid == entry_uid,
-                _ => false,
-            })
-            .collect_vec();
-        let (segments, total_credits, total_cost_cents) =
-            aggregate_segments(viewer_entries.iter().copied());
-
-        Self {
-            subject_type: AiCreditsUsageAndCostSubjectType::User,
-            subject_key: SELF_OWN_KEY.to_string(),
-            subject_uid: viewer_uid.map(str::to_string),
-            display_name: viewer_display_name,
-            total_credits,
-            total_cost_cents,
-            segments,
-            bar_max_credits: total_credits.max(1),
-        }
-    }
-
-    /// Viewer row built from a raw used-credits count, with no segment
-    /// breakdown. For callers that only have `AIRequestUsageModel`-style
-    /// data (no `billing_cycle_usage` entries / no workspace data).
-    fn for_viewer_from_total(
-        viewer_uid: Option<String>,
-        viewer_display_name: String,
-        used: i64,
-    ) -> Self {
-        let segments = if used > 0 {
-            vec![BarSegment {
-                cost_type: AiCreditsUsageAndCostType::BaseLimit,
-                usage_bucket: AiCreditsUsageBucket::Ai,
-                credits: used,
-                cost_cents: 0,
-            }]
-        } else {
-            Vec::new()
-        };
-        Self {
-            subject_type: AiCreditsUsageAndCostSubjectType::User,
-            subject_key: SELF_OWN_KEY.to_string(),
-            subject_uid: viewer_uid,
-            display_name: viewer_display_name,
-            total_credits: used,
-            total_cost_cents: 0,
-            segments,
-            bar_max_credits: used.max(1),
-        }
-    }
-
-    /// Synthetic "Other members" aggregate row used by TeamAggregate
-    /// visibility — represents everyone except the viewer.
-    fn for_other_members(entries: &[BillingCycleUsageEntry]) -> Self {
-        let team_entries = entries
-            .iter()
-            .filter(|e| e.subject_type == AiCreditsUsageAndCostSubjectType::Team);
-        let (segments, total_credits, total_cost_cents) = aggregate_segments(team_entries);
-
-        Self {
-            subject_type: AiCreditsUsageAndCostSubjectType::Team,
-            subject_key: OTHER_MEMBERS_KEY.to_string(),
-            subject_uid: None,
-            display_name: "Other members".to_string(),
-            total_credits,
-            total_cost_cents,
-            segments,
-            bar_max_credits: total_credits.max(1),
-        }
-    }
-
-    /// Per-member rows for `PerUserTotals` / `FullBreakdown` visibility.
-    /// Iterates the workspace member list so zero-usage members still
-    /// get a row. Service accounts and other non-member subjects surface
-    /// as extra rows at the bottom, sorted by total credits desc.
-    fn for_each_member(
-        entries: &[BillingCycleUsageEntry],
-        members: &[WorkspaceMember],
-        source_filter: SourceFilter,
-    ) -> Vec<Self> {
-        // Group entries by subject for joining against the member list below.
-        let mut grouped: HashMap<String, GroupedSubjectUsage> = HashMap::new();
-        let mut unknown_counter = 0usize;
-
-        for entry in entries
-            .iter()
-            .filter(|e| e.subject_type != AiCreditsUsageAndCostSubjectType::Team)
-        {
-            if !source_filter.matches(&entry.usage_source) {
-                continue;
-            }
-
-            let key = match entry.subject_uid.as_deref() {
-                Some(uid) => format!("{:?}:{uid}", entry.subject_type),
-                None => {
-                    unknown_counter += 1;
-                    format!("{:?}:unknown-{unknown_counter}", entry.subject_type)
-                }
-            };
-            let group = grouped.entry(key).or_insert_with(|| GroupedSubjectUsage {
-                subject_type: entry.subject_type.clone(),
-                display_name: entry
-                    .subject_display_name
-                    .clone()
-                    .unwrap_or_else(|| "Unknown".to_string()),
-                entries: Vec::new(),
-            });
-            group.entries.push(entry.clone());
-        }
-
-        let mut rows: Vec<Self> = Vec::with_capacity(members.len());
-
-        // One row per workspace member, including zero-usage members.
-        let mut seen_keys: std::collections::HashSet<String> = Default::default();
-        for member in members {
-            let key = format!(
-                "{:?}:{}",
-                AiCreditsUsageAndCostSubjectType::User,
-                member.uid.as_str()
-            );
-            seen_keys.insert(key.clone());
-
-            let (segments, total_credits, total_cost_cents) = match grouped.remove(&key) {
-                Some(group) => aggregate_segments(group.entries.iter()),
-                None => (Vec::new(), 0, 0),
-            };
-
-            rows.push(Self {
-                subject_type: AiCreditsUsageAndCostSubjectType::User,
-                subject_key: key,
-                subject_uid: Some(member.uid.as_str().to_string()),
-                display_name: member.email.clone(),
-                total_credits,
-                total_cost_cents,
-                segments,
-                bar_max_credits: 0,
-            });
-        }
-
-        // Subjects not in the member list (typically service accounts) render after.
-        for (key, group) in grouped {
-            if seen_keys.contains(&key) {
-                continue;
-            }
-            // All entries in a group share the same subject_uid by construction
-            // (it's part of the grouping key), so first.is representative.
-            let subject_uid = group.entries.first().and_then(|e| e.subject_uid.clone());
-            let (segments, total_credits, total_cost_cents) =
-                aggregate_segments(group.entries.iter());
-            rows.push(Self {
-                subject_type: group.subject_type,
-                subject_key: key,
-                subject_uid,
-                display_name: group.display_name,
-                total_credits,
-                total_cost_cents,
-                segments,
-                bar_max_credits: 0,
-            });
-        }
-
-        // Sort by total credits desc, stable by subject_key.
-        rows.sort_by(|a, b| {
-            b.total_credits
-                .cmp(&a.total_credits)
-                .then_with(|| a.subject_key.cmp(&b.subject_key))
-        });
-
-        rows
-    }
-}
-
-fn build_rows(
-    workspace: &Workspace,
-    entries: &[BillingCycleUsageEntry],
-    visibility: &UsageVisibility,
-    source_filter: SourceFilter,
-    app: &AppContext,
-) -> Vec<MemberUsageRow> {
-    let mut rows: Vec<MemberUsageRow> = match visibility.granularity {
-        UsageVisibilityGranularity::OwnOnly => {
-            let (viewer_uid, display_name) = viewer_identity(app);
-            vec![MemberUsageRow::for_viewer(
-                entries,
-                viewer_uid.as_deref(),
-                display_name,
-                source_filter,
-            )]
-        }
-        UsageVisibilityGranularity::TeamAggregate => {
-            // Force SourceFilter::All — TeamAggregate has no toggle.
-            let (viewer_uid, display_name) = viewer_identity(app);
-            let mut rows = vec![MemberUsageRow::for_viewer(
-                entries,
-                viewer_uid.as_deref(),
-                display_name,
-                SourceFilter::All,
-            )];
-            rows.push(MemberUsageRow::for_other_members(entries));
-            rows
-        }
-        UsageVisibilityGranularity::PerUserTotals | UsageVisibilityGranularity::FullBreakdown => {
-            MemberUsageRow::for_each_member(entries, &workspace.members, source_filter)
-        }
-    };
-
-    if matches!(
-        visibility.granularity,
-        UsageVisibilityGranularity::PerUserTotals | UsageVisibilityGranularity::FullBreakdown
-    ) {
-        let top = rows
-            .iter()
-            .map(|r| r.total_credits)
-            .max()
-            .unwrap_or(0)
-            .max(1);
-        for row in &mut rows {
-            row.bar_max_credits = top;
-        }
-    }
-
-    rows
-}
-
-/// True if any entry is cloud-sourced; gates the source filter toggle.
-pub fn has_cloud_usage(entries: &[BillingCycleUsageEntry]) -> bool {
-    entries
-        .iter()
-        .any(|e| e.usage_source == AiCreditsUsageSource::Cloud)
-}
-
-fn render_stacked_bar(
-    segments: &[BarSegment],
-    total_credits: i64,
-    team_max_credits: i64,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let track_bg = theme.surface_overlay_1();
-    let corner = Radius::Pixels(BAR_CORNER_RADIUS);
-
-    if team_max_credits == 0 || total_credits == 0 || segments.is_empty() {
-        // Empty track, top-rounded on both ends.
-        return ConstrainedBox::new(
-            Container::new(Empty::new().finish())
-                .with_background(track_bg)
-                .with_corner_radius(CornerRadius::with_top(corner))
-                .finish(),
-        )
-        .with_height(BAR_HEIGHT)
-        .finish();
-    }
-
-    let fill_ratio = (total_credits as f32 / team_max_credits as f32).clamp(MIN_FILL_RATIO, 1.0);
-    let unfill_ratio = 1.0 - fill_ratio;
-    let has_unfill = unfill_ratio > 0.0;
-    let last_segment_idx = segments.len() - 1;
-
-    // One Expanded per segment, weighted by share of total_credits. First/last
-    // segment get rounded top corners (last only if no muted tail).
-    let mut filled = Flex::row();
-    for (idx, seg) in segments.iter().enumerate() {
-        let weight = seg.credits as f32 / total_credits as f32;
-        if weight <= 0.0 {
-            continue;
-        }
-        let is_first = idx == 0;
-        let is_last_visible = idx == last_segment_idx && !has_unfill;
-        let segment_corner = match (is_first, is_last_visible) {
-            (true, true) => CornerRadius::with_top(corner),
-            (true, false) => CornerRadius::with_top_left(corner),
-            (false, true) => CornerRadius::with_top_right(corner),
-            (false, false) => CornerRadius::default(),
-        };
-        filled.add_child(
-            Expanded::new(
-                weight,
-                Container::new(Empty::new().finish())
-                    .with_background_color(cost_type_color(&seg.cost_type))
-                    .with_corner_radius(segment_corner)
-                    .finish(),
-            )
-            .finish(),
-        );
-    }
-
-    let mut bar = Flex::row();
-    bar.add_child(Expanded::new(fill_ratio, filled.finish()).finish());
-    if has_unfill {
-        bar.add_child(
-            Expanded::new(
-                unfill_ratio,
-                Container::new(Empty::new().finish())
-                    .with_background(track_bg)
-                    .with_corner_radius(CornerRadius::with_top_right(corner))
-                    .finish(),
-            )
-            .finish(),
-        );
-    }
-
-    ConstrainedBox::new(bar.finish())
-        .with_height(BAR_HEIGHT)
-        .finish()
-}
-
-/// Per-cost-type tooltip breakdown with a "Total usage" footer.
-fn render_usage_tooltip_content(row: &MemberUsageRow, appearance: &Appearance) -> Box<dyn Element> {
-    render_breakdown_tooltip(
-        &row.segments,
-        row.total_credits,
-        row.total_cost_cents,
-        appearance,
-    )
-}
-
-/// Small text-only tooltip surfaced on hover of the service-account info
-/// icon. Mirrors the visual treatment of `render_aggregate_legend_tooltip`.
-fn render_service_account_info_tooltip(appearance: &Appearance) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let text = Text::new_inline(
-        "This is an automated agent on your team.".to_string(),
-        appearance.ui_font_family(),
-        12.,
-    )
-    .with_color(theme.sub_text_color(theme.background()).into())
-    .finish();
-    Container::new(text)
-        .with_background_color(theme.background().into_solid())
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-        .with_border(Border::all(1.).with_border_color(theme.outline().into_solid()))
-        .with_horizontal_padding(12.)
-        .with_vertical_padding(6.)
-        .with_drop_shadow(
-            DropShadow::new_with_standard_offset_and_spread(ColorU::new(0, 0, 0, 48))
-                .with_offset(vec2f(0., 4.)),
-        )
-        .finish()
-}
-
-/// Renders one row card (stacked bar + name/totals).
-fn render_row_card(
-    row: &MemberUsageRow,
-    team_max_credits: i64,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let card_bg = theme.background().into_solid();
-    let main = blended_colors::text_main(theme, card_bg);
-
-    let bar = render_stacked_bar(
-        &row.segments,
-        row.total_credits,
-        team_max_credits,
-        appearance,
-    );
-
-    let is_service_account = matches!(
-        row.subject_type,
-        AiCreditsUsageAndCostSubjectType::ServiceAccount
-    );
-    // Service accounts with a known UID deep-link to their Oz agent page,
-    // mirroring the web admin panel's `getOzAgentHref` behavior.
-    let agent_href = if is_service_account {
-        row.subject_uid.as_deref().map(|uid| {
-            format!(
-                "{}/agents/{}",
-                ChannelState::oz_root_url(),
-                urlencoding::encode(uid)
-            )
-        })
-    } else {
-        None
-    };
-
-    let display_name_element: Box<dyn Element> = if let Some(href) = agent_href {
-        let link_state =
-            mouse_states.tooltip_mouse_state(&format!("{}__agent_link", row.subject_key));
-        appearance
-            .ui_builder()
-            .link(row.display_name.clone(), Some(href), None, link_state)
-            .build()
-            .finish()
-    } else {
-        Text::new_inline(
-            row.display_name.clone(),
-            appearance.ui_font_family(),
-            appearance.ui_font_size(),
-        )
-        .with_color(main)
-        .finish()
-    };
-
-    let mut name_row = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_child(display_name_element);
-
-    if is_service_account {
-        let info_state =
-            mouse_states.tooltip_mouse_state(&format!("{}__agent_info", row.subject_key));
-        let info_icon = Hoverable::new(info_state, move |state| {
-            let info_color = appearance
-                .theme()
-                .sub_text_color(appearance.theme().background());
-            let icon = ConstrainedBox::new(Icon::Info.to_warpui_icon(info_color).finish())
-                .with_width(ROW_ICON_SIZE)
-                .with_height(ROW_ICON_SIZE)
-                .finish();
-            let mut stack = Stack::new();
-            stack.add_child(icon);
-            if state.is_hovered() {
-                stack.add_positioned_overlay_child(
-                    render_service_account_info_tooltip(appearance),
-                    OffsetPositioning::offset_from_parent(
-                        vec2f(0., -TOOLTIP_GAP),
-                        ParentOffsetBounds::WindowByPosition,
-                        ParentAnchor::TopMiddle,
-                        ChildAnchor::BottomMiddle,
-                    ),
-                );
-            }
-            stack.finish()
-        })
-        .finish();
-        name_row.add_child(Container::new(info_icon).with_margin_left(6.).finish());
-    }
-
-    let credits_text = Text::new_inline(
-        format_credits(row.total_credits),
-        appearance.ui_font_family(),
-        appearance.ui_font_size(),
-    )
-    .with_color(main)
-    .finish();
-    let cost_text = Text::new_inline(
-        format_cost_cents(row.total_cost_cents),
-        appearance.ui_font_family(),
-        appearance.ui_font_size(),
-    )
-    .with_color(main)
-    .finish();
-    let icon_color = theme.sub_text_color(theme.background());
-    let coin_icon = ConstrainedBox::new(Icon::Credits.to_warpui_icon(icon_color).finish())
-        .with_width(ROW_ICON_SIZE)
-        .with_height(ROW_ICON_SIZE)
-        .finish();
-    let card_icon = ConstrainedBox::new(Icon::CreditCard.to_warpui_icon(icon_color).finish())
-        .with_width(ROW_ICON_SIZE)
-        .with_height(ROW_ICON_SIZE)
-        .finish();
-    let credits_cluster = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_child(coin_icon)
-        .with_child(Container::new(credits_text).with_margin_left(4.).finish())
-        .finish();
-    let cost_cluster = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_child(card_icon)
-        .with_child(Container::new(cost_text).with_margin_left(4.).finish())
-        .finish();
-
-    let credits_and_cost = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_child(credits_cluster)
-        .with_child(Container::new(cost_cluster).with_margin_left(6.).finish())
-        .finish();
-
-    let body = Container::new(
-        Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_child(Shrinkable::new(1., name_row.finish()).finish())
-            .with_child(
-                Container::new(credits_and_cost)
-                    .with_margin_left(16.)
-                    .finish(),
-            )
-            .finish(),
-    )
-    .with_uniform_padding(ROW_PADDING)
-    .finish();
-
-    Container::new(
-        Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_child(bar)
-            .with_child(body)
-            .finish(),
-    )
-    .with_background_color(card_bg)
-    .with_border(Border::all(ROW_BORDER_WIDTH).with_border_color(theme.outline().into_solid()))
-    .with_corner_radius(CornerRadius::with_all(Radius::Pixels(ROW_BORDER_RADIUS)))
-    .finish()
-}
-
-/// Row card wrapped in a Hoverable that opens the breakdown tooltip.
-fn render_member_row(
-    row: &MemberUsageRow,
-    team_max_credits: i64,
-    tooltip_mouse_state: MouseStateHandle,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    // No segments => no tooltip needed.
-    if row.segments.is_empty() {
-        return render_row_card(row, team_max_credits, mouse_states, appearance);
-    }
-
-    // The info icon sits inside the row card, so hovering it would otherwise
-    // trigger both this row's breakdown tooltip and the icon's own tooltip
-    // on top of each other. Pull the icon's hover state up so we can
-    // suppress the breakdown tooltip while the icon is hovered.
-    let info_state = matches!(
-        row.subject_type,
-        AiCreditsUsageAndCostSubjectType::ServiceAccount
-    )
-    .then(|| mouse_states.tooltip_mouse_state(&format!("{}__agent_info", row.subject_key)));
-
-    Hoverable::new(tooltip_mouse_state, move |state| {
-        let mut stack = Stack::new();
-        stack.add_child(render_row_card(
-            row,
-            team_max_credits,
-            mouse_states,
-            appearance,
-        ));
-
-        let info_hovered = info_state
-            .as_ref()
-            .is_some_and(|s| s.lock().is_ok_and(|guard| guard.is_hovered()));
-
-        if state.is_hovered() && !info_hovered {
-            stack.add_positioned_overlay_child(
-                render_usage_tooltip_content(row, appearance),
-                OffsetPositioning::offset_from_parent(
-                    vec2f(0., -TOOLTIP_GAP),
-                    ParentOffsetBounds::WindowByPosition,
-                    ParentAnchor::TopMiddle,
-                    ChildAnchor::BottomMiddle,
-                ),
-            );
-        }
-
-        stack.finish()
-    })
-    .finish()
-}
-
-pub type FilterChangeFn = std::sync::Arc<dyn Fn(SourceFilter, &mut EventContext) + 'static>;
-
-/// All / Local / Cloud pill toggle.
-fn render_source_filter_toggle(
-    current: SourceFilter,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-    on_change: FilterChangeFn,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let bg = theme.surface_1();
-    let main = blended_colors::text_main(theme, bg);
-    let sub = blended_colors::text_sub(theme, bg);
-
-    let options: [(SourceFilter, MouseStateHandle); 3] = [
-        (SourceFilter::All, mouse_states.filter_all.clone()),
-        (SourceFilter::Local, mouse_states.filter_local.clone()),
-        (SourceFilter::Cloud, mouse_states.filter_cloud.clone()),
-    ];
-
-    let mut row = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_main_axis_size(MainAxisSize::Min);
-
-    for (filter, mouse_state) in options {
-        let label = filter.label();
-        let is_selected = filter == current;
-        let fg = if is_selected { main } else { sub };
-        let font_family = appearance.ui_font_family();
-        let on_change = on_change.clone();
-
-        let cell = Hoverable::new(mouse_state, move |_state| {
-            let mut cell = Container::new(
-                Text::new_inline(label, font_family, 11.)
-                    .with_color(fg)
-                    .finish(),
-            )
-            .with_horizontal_padding(10.)
-            .with_vertical_padding(4.);
-            if is_selected {
-                cell = cell.with_background(theme.surface_overlay_1());
-            }
-            cell.finish()
-        })
-        .with_cursor(Cursor::PointingHand)
-        .on_click(move |ctx, _, _| {
-            on_change(filter, ctx);
-        })
-        .finish();
-
-        row.add_child(cell);
-    }
-
-    Container::new(row.finish())
-        .with_border(Border::all(1.).with_border_color(theme.surface_3().into_solid()))
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-        .finish()
-}
-
-pub fn render_own_usage_with_workspace_row(
-    entries: &[BillingCycleUsageEntry],
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-    app: &AppContext,
-) -> Box<dyn Element> {
-    let (viewer_uid, display_name) = viewer_identity(app);
-    let row = MemberUsageRow::for_viewer(
-        entries,
-        viewer_uid.as_deref(),
-        display_name,
-        SourceFilter::All,
-    );
-    render_member_row_list(std::slice::from_ref(&row), mouse_states, appearance)
-}
-
-pub fn render_own_usage_solo_row(
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-    app: &AppContext,
-) -> Box<dyn Element> {
-    let (viewer_uid, display_name) = viewer_identity(app);
-    let model = AIRequestUsageModel::as_ref(app);
-    let row = MemberUsageRow::for_viewer_from_total(
-        viewer_uid,
-        display_name,
-        model.requests_used() as i64,
-    );
-    render_member_row_list(std::slice::from_ref(&row), mouse_states, appearance)
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn render_rows(
-    workspace: &Workspace,
-    entries: &[BillingCycleUsageEntry],
-    visibility: &UsageVisibility,
-    source_filter: SourceFilter,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-    app: &AppContext,
-    on_filter_change: FilterChangeFn,
-) -> Box<dyn Element> {
-    let rows = build_rows(workspace, entries, visibility, source_filter, app);
-
-    let mut column = Flex::column()
-        .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-        .with_spacing(8.);
-    if let Some(header) = render_member_header(
-        visibility,
-        entries,
-        source_filter,
-        mouse_states,
-        appearance,
-        on_filter_change,
-    ) {
-        column.add_child(header);
-    }
-    column.add_child(render_member_row_list(&rows, mouse_states, appearance));
-    column.finish()
-}
-
-fn render_member_header(
-    visibility: &UsageVisibility,
-    entries: &[BillingCycleUsageEntry],
-    source_filter: SourceFilter,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-    on_filter_change: FilterChangeFn,
-) -> Option<Box<dyn Element>> {
-    let show_toggle = visibility.granularity == UsageVisibilityGranularity::FullBreakdown
-        && has_cloud_usage(entries);
-
-    let subheader = render_section_subheader("Members", appearance);
-    let header = if show_toggle {
-        Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_child(subheader)
-            .with_child(render_source_filter_toggle(
-                source_filter,
-                mouse_states,
-                appearance,
-                on_filter_change,
-            ))
-            .finish()
-    } else {
-        subheader
-    };
-
-    Some(Container::new(header).with_margin_bottom(8.).finish())
-}
-
-fn render_member_row_list(
-    rows: &[MemberUsageRow],
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let mut column = Flex::column()
-        .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-        .with_spacing(8.);
-    for row in rows {
-        let tooltip_state = mouse_states.tooltip_mouse_state(&row.subject_key);
-        column.add_child(render_member_row(
-            row,
-            row.bar_max_credits,
-            tooltip_state,
-            mouse_states,
-            appearance,
-        ));
-    }
-    column.finish()
-}
-
-#[cfg(test)]
-#[path = "billing_cycle_usage_rows_tests.rs"]
-mod tests;
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_rows_tests.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_rows_tests.rs
deleted file mode 100644
index 16d2052d..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_rows_tests.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use super::{MemberUsageRow, SourceFilter};
-use crate::workspaces::workspace::{
-    AiCreditsUsageAndCostSubjectType, AiCreditsUsageAndCostType, AiCreditsUsageBucket,
-    AiCreditsUsageSource, BillingCycleUsageEntry,
-};
-
-const VIEWER_UID: &str = "viewer-uid";
-const OTHER_UID: &str = "other-uid";
-
-fn entry(
-    subject_type: AiCreditsUsageAndCostSubjectType,
-    subject_uid: Option<&str>,
-    usage_source: AiCreditsUsageSource,
-    credits_used: i32,
-    cost_cents: i32,
-) -> BillingCycleUsageEntry {
-    BillingCycleUsageEntry {
-        subject_type,
-        subject_uid: subject_uid.map(|s| s.to_string()),
-        subject_display_name: None,
-        cost_type: AiCreditsUsageAndCostType::BaseLimit,
-        usage_bucket: AiCreditsUsageBucket::Ai,
-        usage_source,
-        credits_used,
-        cost_cents,
-    }
-}
-
-#[test]
-fn build_own_usage_row_drops_team_subject_entries() {
-    // Team-aggregate rows belong to "everyone else" by construction; they
-    // must never contribute to the viewer's own row totals.
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageSource::Local,
-            10,
-            5,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::Team,
-            None,
-            AiCreditsUsageSource::Aggregate,
-            999,
-            999,
-        ),
-    ];
-    let row = MemberUsageRow::for_viewer(
-        &entries,
-        Some(VIEWER_UID),
-        "viewer".to_string(),
-        SourceFilter::All,
-    );
-    assert_eq!(row.total_credits, 10);
-    assert_eq!(row.total_cost_cents, 5);
-}
-
-#[test]
-fn build_own_usage_row_drops_other_users_entries() {
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageSource::Local,
-            10,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(OTHER_UID),
-            AiCreditsUsageSource::Local,
-            999,
-            999,
-        ),
-    ];
-    let row = MemberUsageRow::for_viewer(
-        &entries,
-        Some(VIEWER_UID),
-        "viewer".to_string(),
-        SourceFilter::All,
-    );
-    assert_eq!(row.total_credits, 10);
-    assert_eq!(row.total_cost_cents, 0);
-}
-
-#[test]
-fn build_own_usage_row_local_filter_drops_cloud_entries() {
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageSource::Local,
-            10,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageSource::Cloud,
-            20,
-            0,
-        ),
-    ];
-    let row = MemberUsageRow::for_viewer(
-        &entries,
-        Some(VIEWER_UID),
-        "viewer".to_string(),
-        SourceFilter::Local,
-    );
-    assert_eq!(row.total_credits, 10);
-}
-
-#[test]
-fn build_own_usage_row_cloud_filter_drops_local_entries() {
-    let entries = vec![
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageSource::Local,
-            10,
-            0,
-        ),
-        entry(
-            AiCreditsUsageAndCostSubjectType::User,
-            Some(VIEWER_UID),
-            AiCreditsUsageSource::Cloud,
-            20,
-            0,
-        ),
-    ];
-    let row = MemberUsageRow::for_viewer(
-        &entries,
-        Some(VIEWER_UID),
-        "viewer".to_string(),
-        SourceFilter::Cloud,
-    );
-    assert_eq!(row.total_credits, 20);
-}
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_section.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_section.rs
deleted file mode 100644
index 03d12e94..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_section.rs
+++ /dev/null
@@ -1,801 +0,0 @@
-use chrono::{DateTime, Datelike, Local, Utc};
-use galaxy_core::ui::appearance::Appearance;
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use warpui::elements::{
-    Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
-    DropShadow, Empty, Flex, FormattedTextElement, HighlightedHyperlink, Hoverable, HyperlinkLens,
-    MainAxisAlignment, MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor,
-    ParentElement, ParentOffsetBounds, Radius, Stack, Text,
-};
-use warpui::fonts::{Properties, Weight};
-use warpui::platform::Cursor;
-use warpui::{
-    AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
-};
-
-use crate::ai::AIRequestUsageModel;
-use crate::auth::{AuthManager, AuthStateProvider};
-use crate::menu::{self, Menu, MenuItem, MenuItemFields};
-use crate::settings_view::admin_actions::AdminActions;
-use crate::settings_view::billing_and_usage::billing_cycle_usage_common::{
-    filter_legacy_buckets, has_non_viewer_data, legend_cost_types, BillingUsageMouseStates,
-};
-use crate::settings_view::billing_and_usage::billing_cycle_usage_rows::{
-    has_cloud_usage, render_own_usage_solo_row, render_own_usage_with_workspace_row, render_rows,
-    SourceFilter,
-};
-use crate::settings_view::billing_and_usage::billing_cycle_usage_team_totals::render_team_totals_block;
-use crate::settings_view::billing_and_usage_page_v2::{
-    AGGREGATE_CREDITS_DOT_COLOR, AMBIENT_CREDITS_DOT_COLOR, BASE_CREDITS_DOT_COLOR,
-    BONUS_CREDITS_DOT_COLOR, PAYG_CREDITS_DOT_COLOR,
-};
-use crate::ui_components::icons::Icon;
-use crate::workspaces::update_manager::TeamUpdateManager;
-use crate::workspaces::user_workspaces::UserWorkspaces;
-use crate::workspaces::workspace::{
-    AiCreditsUsageAndCostType, BillingCycleUsageSummary, MaxPriorCycles, UsageVisibility,
-    UsageVisibilityGranularity, Workspace,
-};
-
-const HEADER_FONT_SIZE: f32 = 16.;
-const LEGEND_DOT_SIZE: f32 = 8.;
-
-pub struct BillingCycleUsageSectionView {
-    selected_period_end: Option<DateTime<Utc>>,
-    period_selector_mouse_state: MouseStateHandle,
-    aggregate_legend_mouse_state: MouseStateHandle,
-    period_menu: ViewHandle<Menu<BillingCycleUsageAction>>,
-    period_menu_open: bool,
-    source_filter: SourceFilter,
-    row_mouse_states: BillingUsageMouseStates,
-}
-
-#[derive(Clone, Debug)]
-pub enum BillingCycleUsageAction {
-    SelectPeriod(Option<DateTime<Utc>>),
-    TogglePeriodMenu,
-    ChangeSourceFilter(SourceFilter),
-    OpenUpgrade,
-    OpenAdminPanel,
-}
-
-impl Entity for BillingCycleUsageSectionView {
-    type Event = ();
-}
-
-impl BillingCycleUsageSectionView {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        ctx.subscribe_to_model(&UserWorkspaces::handle(ctx), |me, _, _, ctx| {
-            me.reconcile_selected_period(ctx);
-            // If the period menu is open while the workspace or usage data
-            // changes, the menu's items become stale and clicking one could
-            // select a period_end that no longer exists in the new data
-            // (which `current_summary` would then fail to resolve). Rebuild
-            // the items in-place so the menu always reflects the live data.
-            if me.period_menu_open {
-                me.refresh_period_menu_items(ctx);
-            }
-            ctx.notify();
-        });
-        ctx.subscribe_to_model(&AIRequestUsageModel::handle(ctx), |_, _, _, ctx| {
-            ctx.notify()
-        });
-        ctx.subscribe_to_model(&AuthManager::handle(ctx), |_, _, _, ctx| ctx.notify());
-        ctx.subscribe_to_model(&TeamUpdateManager::handle(ctx), |_, _, _, ctx| ctx.notify());
-
-        // `prevent_interaction_with_other_elements` so a click on the
-        // trigger button while the menu is open is consumed by the menu's
-        // outside-click dismiss handler — without it, the trigger also
-        // received the click and immediately re-toggled the menu open.
-        let period_menu = ctx.add_typed_action_view(|_| {
-            Menu::new()
-                .with_drop_shadow()
-                .prevent_interaction_with_other_elements()
-        });
-        ctx.subscribe_to_view(&period_menu, |me, _, event, ctx| {
-            if let menu::Event::Close { .. } = event {
-                me.period_menu_open = false;
-                ctx.notify();
-            }
-        });
-
-        Self {
-            selected_period_end: None,
-            period_selector_mouse_state: MouseStateHandle::default(),
-            aggregate_legend_mouse_state: MouseStateHandle::default(),
-            period_menu,
-            period_menu_open: false,
-            source_filter: SourceFilter::default(),
-            row_mouse_states: BillingUsageMouseStates::default(),
-        }
-    }
-
-    fn resolved_viewer_email(app: &AppContext) -> Option<String> {
-        AuthStateProvider::as_ref(app).get().user_email()
-    }
-
-    fn viewer_is_admin(app: &AppContext) -> bool {
-        let Some(team) = UserWorkspaces::as_ref(app).current_team() else {
-            return false;
-        };
-        Self::resolved_viewer_email(app)
-            .as_deref()
-            .is_some_and(|email| team.has_admin_permissions(email))
-    }
-
-    fn current_summary<'a>(
-        &self,
-        workspace: &'a Workspace,
-    ) -> Option<&'a BillingCycleUsageSummary> {
-        let summaries = &workspace.billing_cycle_usage.as_ref()?.summaries;
-        match self.selected_period_end {
-            Some(end) => summaries.iter().find(|s| s.period_end == end),
-            None => summaries.first(),
-        }
-    }
-
-    fn reconcile_selected_period(&mut self, ctx: &AppContext) {
-        let Some(selected) = self.selected_period_end else {
-            return;
-        };
-        let still_present = UserWorkspaces::as_ref(ctx)
-            .current_workspace()
-            .and_then(|ws| ws.billing_cycle_usage.as_ref())
-            .map(|data| data.summaries.iter().any(|s| s.period_end == selected))
-            .unwrap_or(false);
-        if !still_present {
-            self.selected_period_end = None;
-        }
-    }
-
-    /// Whether the "Team" block + "Members" subheader should render. We
-    /// hide them when the viewer has no team data to show: `members.len()
-    /// > 1` covers the common multi-member case; `has_non_viewer_data`
-    /// catches the edge case where the roster shrank to one after a
-    /// teammate left mid-cycle but their usage is still attributed against
-    /// this cycle. Together they keep solo teams from showing orphan
-    /// scaffolding without dropping legitimate team data on departure.
-    ///
-    /// Note: per the backend invariant `VIS != OwnOnly => viewer is admin`,
-    /// so we don't need a separate admin gate here.
-    fn shows_team_section(&self, workspace: &Workspace, app: &AppContext) -> bool {
-        let visibility = workspace.resolve_usage_visibility(Self::viewer_is_admin(app));
-        if visibility.granularity == UsageVisibilityGranularity::OwnOnly {
-            return false;
-        }
-        let entries = filter_legacy_buckets(
-            self.current_summary(workspace)
-                .map(|s| s.entries.as_slice())
-                .unwrap_or_default(),
-        );
-        let viewer_uid = AuthStateProvider::as_ref(app)
-            .get()
-            .user_id()
-            .map(|uid| uid.as_string());
-        workspace.members.len() > 1 || has_non_viewer_data(&entries, viewer_uid.as_deref())
-    }
-}
-
-impl TypedActionView for BillingCycleUsageSectionView {
-    type Action = BillingCycleUsageAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            BillingCycleUsageAction::SelectPeriod(period_end) => {
-                self.selected_period_end = *period_end;
-                self.period_menu_open = false;
-                ctx.notify();
-            }
-            BillingCycleUsageAction::TogglePeriodMenu => {
-                self.period_menu_open = !self.period_menu_open;
-                if self.period_menu_open {
-                    self.refresh_period_menu_items(ctx);
-                }
-                ctx.notify();
-            }
-            BillingCycleUsageAction::ChangeSourceFilter(filter) => {
-                self.source_filter = *filter;
-                ctx.notify();
-            }
-            BillingCycleUsageAction::OpenUpgrade => {
-                if let Some(team_uid) = UserWorkspaces::as_ref(ctx).current_team_uid() {
-                    ctx.open_url(&UserWorkspaces::upgrade_link_for_team(team_uid));
-                }
-            }
-            BillingCycleUsageAction::OpenAdminPanel => {
-                if let Some(team_uid) = UserWorkspaces::as_ref(ctx).current_team_uid() {
-                    AdminActions::open_admin_panel(team_uid, ctx);
-                }
-            }
-        }
-    }
-}
-
-impl BillingCycleUsageSectionView {
-    fn refresh_period_menu_items(&self, ctx: &mut ViewContext<Self>) {
-        let Some(workspace) = UserWorkspaces::as_ref(ctx).current_workspace().cloned() else {
-            return;
-        };
-        let Some(data) = workspace.billing_cycle_usage.as_ref() else {
-            return;
-        };
-        let items: Vec<MenuItem<BillingCycleUsageAction>> = data
-            .summaries
-            .iter()
-            .map(|summary| {
-                let label = format_period_range(summary.period_start, summary.period_end);
-                MenuItem::Item(MenuItemFields::new(label).with_on_select_action(
-                    BillingCycleUsageAction::SelectPeriod(Some(summary.period_end)),
-                ))
-            })
-            .collect();
-
-        self.period_menu
-            .update(ctx, |menu: &mut Menu<BillingCycleUsageAction>, ctx| {
-                menu.set_items(items, ctx);
-            });
-    }
-}
-
-impl View for BillingCycleUsageSectionView {
-    fn ui_name() -> &'static str {
-        "BillingCycleUsageSection"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let workspace = UserWorkspaces::as_ref(app).current_workspace().cloned();
-        match workspace.as_ref() {
-            Some(w) if self.shows_team_section(w, app) => {
-                self.render_team_usage(w, appearance, app)
-            }
-            Some(w) => self.render_own_usage_with_workspace(w, appearance, app),
-            None => self.render_own_usage_solo(appearance, app),
-        }
-    }
-}
-
-impl BillingCycleUsageSectionView {
-    fn render_team_usage(
-        &self,
-        workspace: &Workspace,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let is_admin = Self::viewer_is_admin(app);
-        let visibility = workspace.resolve_usage_visibility(is_admin);
-
-        let mut column = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Stretch);
-        column.add_child(self.render_header(Some(workspace), &visibility, appearance, app));
-
-        let entries = filter_legacy_buckets(
-            self.current_summary(workspace)
-                .map(|summary| summary.entries.as_slice())
-                .unwrap_or_default(),
-        );
-
-        let is_source_filter_shown = visibility.granularity
-            == UsageVisibilityGranularity::FullBreakdown
-            && has_cloud_usage(&entries);
-        let source_filter = if is_source_filter_shown {
-            self.source_filter
-        } else {
-            SourceFilter::All
-        };
-
-        column.add_child(
-            Container::new(render_team_totals_block(
-                &entries,
-                &visibility,
-                &self.row_mouse_states,
-                appearance,
-            ))
-            .with_margin_top(16.)
-            .finish(),
-        );
-
-        if is_admin {
-            if let Some(banner) = self.render_visibility_cta_banner(workspace, appearance) {
-                column.add_child(Container::new(banner).with_margin_top(16.).finish());
-            }
-        }
-
-        column.add_child(
-            Container::new(render_rows(
-                workspace,
-                &entries,
-                &visibility,
-                source_filter,
-                &self.row_mouse_states,
-                appearance,
-                app,
-                std::sync::Arc::new(|filter, ctx| {
-                    ctx.dispatch_typed_action(BillingCycleUsageAction::ChangeSourceFilter(filter));
-                }),
-            ))
-            .with_margin_top(16.)
-            .finish(),
-        );
-
-        column.finish()
-    }
-
-    fn render_own_usage_with_workspace(
-        &self,
-        workspace: &Workspace,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let visibility = workspace.resolve_usage_visibility(Self::viewer_is_admin(app));
-        let entries = filter_legacy_buckets(
-            self.current_summary(workspace)
-                .map(|s| s.entries.as_slice())
-                .unwrap_or_default(),
-        );
-
-        let mut column = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Stretch);
-        column.add_child(self.render_header(Some(workspace), &visibility, appearance, app));
-        column.add_child(
-            Container::new(render_own_usage_with_workspace_row(
-                &entries,
-                &self.row_mouse_states,
-                appearance,
-                app,
-            ))
-            .with_margin_top(16.)
-            .finish(),
-        );
-        column.finish()
-    }
-
-    // Here when you're not on a team, there's no workspace to pull billing_cycle_usage data from.
-    // So we "fake" a row and source data from the AIRequestUsageModel instead
-    fn render_own_usage_solo(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let mut column = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Stretch);
-        column.add_child(self.render_header(None, &UsageVisibility::default(), appearance, app));
-        column.add_child(
-            Container::new(render_own_usage_solo_row(
-                &self.row_mouse_states,
-                appearance,
-                app,
-            ))
-            .with_margin_top(16.)
-            .finish(),
-        );
-        column.finish()
-    }
-}
-
-impl BillingCycleUsageSectionView {
-    fn render_header(
-        &self,
-        workspace: Option<&Workspace>,
-        visibility: &UsageVisibility,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let mut row = Flex::row()
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_size(MainAxisSize::Max);
-
-        row.add_child(
-            Text::new_inline("Usage", appearance.ui_font_family(), HEADER_FONT_SIZE)
-                .with_style(Properties::default().weight(Weight::Bold))
-                .with_color(theme.active_ui_text_color().into())
-                .finish(),
-        );
-
-        let mut right_side = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::End);
-
-        // Collapse to a static label when there's effectively one period to
-        // pick from: either the tier policy doesn't expose history at all, or
-        // the server returned a single canonical cycle.
-        if let Some(workspace) = workspace {
-            let summary_count = workspace
-                .billing_cycle_usage
-                .as_ref()
-                .map(|d| d.summaries.len())
-                .unwrap_or(0);
-            let use_selector =
-                visibility.max_prior_cycles != MaxPriorCycles::None && summary_count > 1;
-            let period_element = if use_selector {
-                self.render_period_selector(workspace, appearance)
-            } else {
-                self.render_period_range_static(workspace, appearance)
-            };
-            right_side.add_child(period_element);
-        }
-
-        row.add_child(right_side.finish());
-
-        let mut column = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Stretch);
-        column.add_child(row.finish());
-
-        let resets_text = self.render_resets_label(appearance, app);
-        let legend = workspace.and_then(|workspace| self.render_legend(workspace, appearance));
-        if resets_text.is_some() || legend.is_some() {
-            let mut secondary_row = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_main_axis_size(MainAxisSize::Max);
-            secondary_row.add_child(resets_text.unwrap_or_else(|| Empty::new().finish()));
-            secondary_row.add_child(legend.unwrap_or_else(|| Empty::new().finish()));
-            column.add_child(
-                Container::new(secondary_row.finish())
-                    .with_margin_top(4.)
-                    .finish(),
-            );
-        }
-
-        Container::new(column.finish()).finish()
-    }
-
-    /// "Resets May 27, 11:24 PM EDT"
-    fn render_resets_label(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Option<Box<dyn Element>> {
-        if self.selected_period_end.is_some() {
-            return None;
-        }
-        let theme = appearance.theme();
-        let reset_str = AIRequestUsageModel::as_ref(app)
-            .next_refresh_time_local()
-            .format("Resets %b %d, %-I:%M %p")
-            .to_string();
-        Some(
-            Text::new_inline(
-                reset_str,
-                appearance.ui_font_family(),
-                appearance.ui_font_size(),
-            )
-            .with_color(theme.sub_text_color(theme.background()).into())
-            .finish(),
-        )
-    }
-
-    // "May 13 - Jun 13, 2026"
-    fn render_period_range_static(
-        &self,
-        workspace: &Workspace,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let label = self
-            .current_summary(workspace)
-            .map(|s| format_period_range(s.period_start, s.period_end))
-            .or_else(|| {
-                workspace.billing_cycle_usage.as_ref().map(|data| {
-                    format_period_range(data.current_period_start, data.current_period_end)
-                })
-            })
-            .unwrap_or_default();
-        Text::new_inline(
-            label,
-            appearance.ui_font_family(),
-            appearance.ui_font_size(),
-        )
-        .with_color(theme.sub_text_color(theme.background()).into())
-        .finish()
-    }
-
-    fn render_period_selector(
-        &self,
-        workspace: &Workspace,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let bg = theme.background();
-        let label = self
-            .current_summary(workspace)
-            .map(|s| format_period_range(s.period_start, s.period_end))
-            .unwrap_or_default();
-
-        let mouse_state = self.period_selector_mouse_state.clone();
-        let font_family = appearance.ui_font_family();
-        let font_size = appearance.ui_font_size();
-        let main_text = theme.sub_text_color(bg);
-
-        let button = Hoverable::new(mouse_state, move |_| {
-            let mut inner = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_main_axis_size(MainAxisSize::Min);
-            inner.add_child(
-                Text::new_inline(label.clone(), font_family, font_size)
-                    .with_color(main_text.into())
-                    .finish(),
-            );
-            inner.add_child(
-                Container::new(
-                    ConstrainedBox::new(Icon::ChevronDown.to_warpui_icon(main_text).finish())
-                        .with_width(12.)
-                        .with_height(12.)
-                        .finish(),
-                )
-                .with_margin_left(4.)
-                .finish(),
-            );
-            inner.finish()
-        })
-        .with_cursor(Cursor::PointingHand)
-        .on_click(|ctx, _, _| {
-            ctx.dispatch_typed_action(BillingCycleUsageAction::TogglePeriodMenu);
-        })
-        .finish();
-
-        let mut stack = Stack::new();
-        stack.add_child(button);
-        if self.period_menu_open {
-            stack.add_positioned_overlay_child(
-                ChildView::new(&self.period_menu).finish(),
-                OffsetPositioning::offset_from_parent(
-                    vec2f(0., 4.),
-                    ParentOffsetBounds::WindowByPosition,
-                    ParentAnchor::BottomRight,
-                    ChildAnchor::TopRight,
-                ),
-            );
-        }
-        stack.finish()
-    }
-
-    fn render_legend(
-        &self,
-        workspace: &Workspace,
-        appearance: &Appearance,
-    ) -> Option<Box<dyn Element>> {
-        let summary = self.current_summary(workspace)?;
-        // Only list buckets that actually contribute to the stacked bars: drop
-        // legacy buckets and cost types with no usage, so the legend never
-        // shows a bucket (e.g. "Base") that has zero credits in the data.
-        let present_buckets = legend_cost_types(&summary.entries);
-        if present_buckets.is_empty() {
-            return None;
-        }
-
-        let mut row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_size(MainAxisSize::Min);
-        for (idx, bucket) in present_buckets.iter().enumerate() {
-            if idx > 0 {
-                row.add_child(
-                    Container::new(Empty::new().finish())
-                        .with_margin_right(12.)
-                        .finish(),
-                );
-            }
-            row.add_child(self.render_legend_entry(bucket.clone(), appearance));
-        }
-        Some(row.finish())
-    }
-
-    fn render_legend_entry(
-        &self,
-        cost_type: AiCreditsUsageAndCostType,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let (color, label) = legend_style_for(cost_type.clone());
-        let theme = appearance.theme();
-        let entry = {
-            let mut row = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_main_axis_size(MainAxisSize::Min);
-            row.add_child(
-                ConstrainedBox::new(
-                    Container::new(Empty::new().finish())
-                        .with_background_color(color)
-                        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(
-                            LEGEND_DOT_SIZE / 2.,
-                        )))
-                        .finish(),
-                )
-                .with_height(LEGEND_DOT_SIZE)
-                .with_width(LEGEND_DOT_SIZE)
-                .finish(),
-            );
-            row.add_child(
-                Container::new(
-                    Text::new_inline(
-                        label,
-                        appearance.ui_font_family(),
-                        appearance.ui_font_size(),
-                    )
-                    .with_color(theme.sub_text_color(theme.background()).into())
-                    .finish(),
-                )
-                .with_margin_left(6.)
-                .finish(),
-            );
-            row.finish()
-        };
-
-        // The Aggregate bucket replaces per-cost-type detail with a single
-        // "Combined" row, which isn't self-explanatory; surface a small
-        // hover tooltip clarifying what it includes.
-        if !matches!(cost_type, AiCreditsUsageAndCostType::Aggregate) {
-            return entry;
-        }
-
-        let mouse_state = self.aggregate_legend_mouse_state.clone();
-        Hoverable::new(mouse_state, move |state| {
-            let mut stack = Stack::new();
-            stack.add_child(entry);
-            if state.is_hovered() {
-                stack.add_positioned_overlay_child(
-                    render_aggregate_legend_tooltip(appearance),
-                    OffsetPositioning::offset_from_parent(
-                        vec2f(0., 6.),
-                        ParentOffsetBounds::WindowByPosition,
-                        ParentAnchor::BottomMiddle,
-                        ChildAnchor::TopMiddle,
-                    ),
-                );
-            }
-            stack.finish()
-        })
-        .finish()
-    }
-
-    /// Renders the CTA banner that sits between the team-totals block and
-    /// the per-member rows. The copy and action vary by visibility tier:
-    /// non-FullBreakdown admins see an upgrade nudge; FullBreakdown admins
-    /// see a pointer to the admin panel where per-user spend limits actually
-    /// get configured.
-    fn render_visibility_cta_banner(
-        &self,
-        workspace: &Workspace,
-        appearance: &Appearance,
-    ) -> Option<Box<dyn Element>> {
-        let admin_granularity = workspace
-            .billing_metadata
-            .tier
-            .usage_visibility_policy?
-            .admin_granularity;
-        if admin_granularity == UsageVisibilityGranularity::FullBreakdown
-            && !workspace.billing_metadata.is_enterprise_plan()
-        {
-            return None;
-        }
-        let (link_text, trailing_copy, action, leading_icon) =
-            visibility_cta_for(admin_granularity)?;
-
-        // Only show when there are teammates -- a single-member workspace
-        // doesn't benefit from any of the team-level visibility CTAs.
-        if workspace.members.len() <= 1 {
-            return None;
-        }
-
-        let theme = appearance.theme();
-        let sub_text = theme.sub_text_color(theme.background());
-        let body = FormattedTextElement::new(
-            FormattedText::new([FormattedTextLine::Line(vec![
-                FormattedTextFragment::hyperlink_action(link_text, action),
-                FormattedTextFragment::plain_text(format!(" {trailing_copy}")),
-            ])]),
-            appearance.ui_font_size(),
-            appearance.ui_font_family(),
-            appearance.ui_font_family(),
-            sub_text.into(),
-            HighlightedHyperlink::default(),
-        )
-        .with_hyperlink_font_color(theme.accent().into_solid())
-        .register_default_click_handlers_with_action_support(|lens, event, ctx| match lens {
-            HyperlinkLens::Url(u) => ctx.open_url(u),
-            HyperlinkLens::Action(a) => {
-                if let Some(act) = a.as_any().downcast_ref::<BillingCycleUsageAction>() {
-                    event.dispatch_typed_action(act.clone());
-                }
-            }
-        })
-        .finish();
-
-        let icon = ConstrainedBox::new(leading_icon.to_warpui_icon(sub_text).finish())
-            .with_width(14.)
-            .with_height(14.)
-            .finish();
-
-        let row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_child(Container::new(icon).with_margin_right(8.).finish())
-            .with_child(body)
-            .finish();
-
-        Some(
-            Container::new(row)
-                .with_background_color(theme.surface_1().into_solid())
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_uniform_padding(12.)
-                .finish(),
-        )
-    }
-}
-
-/// Returns the (link text, trailing copy, action, icon) tuple for the
-/// visibility CTA banner, or `None` to suppress the banner entirely.
-fn visibility_cta_for(
-    granularity: UsageVisibilityGranularity,
-) -> Option<(&'static str, &'static str, BillingCycleUsageAction, Icon)> {
-    match granularity {
-        UsageVisibilityGranularity::OwnOnly => Some((
-            "Upgrade to Build",
-            "to see team-level credit usage.",
-            BillingCycleUsageAction::OpenUpgrade,
-            Icon::ArrowCircleBrokenUp,
-        )),
-        UsageVisibilityGranularity::TeamAggregate => Some((
-            "Upgrade to Business",
-            "to see per-user credit attribution.",
-            BillingCycleUsageAction::OpenUpgrade,
-            Icon::ArrowCircleBrokenUp,
-        )),
-        UsageVisibilityGranularity::PerUserTotals => Some((
-            "Upgrade to Enterprise",
-            "to see fine-grained credit attribution and set per-user spend limits.",
-            BillingCycleUsageAction::OpenUpgrade,
-            Icon::ArrowCircleBrokenUp,
-        )),
-        // FullBreakdown viewers already have full visibility; nudge them to
-        // the admin panel where per-user spend limits actually get configured.
-        UsageVisibilityGranularity::FullBreakdown => Some((
-            "Open the admin panel",
-            "to set per-user spend limits.",
-            BillingCycleUsageAction::OpenAdminPanel,
-            Icon::Users,
-        )),
-    }
-}
-
-fn legend_style_for(cost_type: AiCreditsUsageAndCostType) -> (ColorU, &'static str) {
-    match cost_type {
-        AiCreditsUsageAndCostType::BaseLimit => (BASE_CREDITS_DOT_COLOR, "Base"),
-        AiCreditsUsageAndCostType::BonusGrant => (BONUS_CREDITS_DOT_COLOR, "Add-ons"),
-        AiCreditsUsageAndCostType::Payg => (PAYG_CREDITS_DOT_COLOR, "Pay-as-you-go"),
-        AiCreditsUsageAndCostType::AmbientBonusGrant => (AMBIENT_CREDITS_DOT_COLOR, "Cloud-only"),
-        AiCreditsUsageAndCostType::Aggregate => (AGGREGATE_CREDITS_DOT_COLOR, "Combined"),
-        AiCreditsUsageAndCostType::Other(_) => (BASE_CREDITS_DOT_COLOR, ""),
-    }
-}
-
-fn render_aggregate_legend_tooltip(appearance: &Appearance) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let text = Text::new_inline(
-        "Other team members' usage across add-on, pay-as-you-go, and cloud-only credits."
-            .to_string(),
-        appearance.ui_font_family(),
-        12.,
-    )
-    .with_color(theme.sub_text_color(theme.background()).into())
-    .finish();
-    Container::new(text)
-        .with_background_color(theme.background().into_solid())
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-        .with_border(Border::all(1.).with_border_color(theme.outline().into_solid()))
-        .with_horizontal_padding(12.)
-        .with_vertical_padding(6.)
-        .with_drop_shadow(
-            DropShadow::new_with_standard_offset_and_spread(ColorU::new(0, 0, 0, 48))
-                .with_offset(vec2f(0., 4.)),
-        )
-        .finish()
-}
-
-fn format_period_range(start: DateTime<Utc>, end: DateTime<Utc>) -> String {
-    let start = start.with_timezone(&Local);
-    let end = end.with_timezone(&Local);
-    if start.year() == end.year() {
-        format!("{} - {}", start.format("%b %d"), end.format("%b %d, %Y"))
-    } else {
-        format!(
-            "{} - {}",
-            start.format("%b %d, %Y"),
-            end.format("%b %d, %Y")
-        )
-    }
-}
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_team_totals.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_team_totals.rs
deleted file mode 100644
index f92962c2..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_team_totals.rs
+++ /dev/null
@@ -1,371 +0,0 @@
-use galaxy_core::ui::appearance::Appearance;
-use pathfinder_geometry::vector::vec2f;
-use warpui::elements::{
-    Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty,
-    Expanded, Flex, Hoverable, MainAxisAlignment, MainAxisSize, MouseStateHandle,
-    OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius, Shrinkable, Stack,
-    Text,
-};
-use warpui::fonts::{Properties, Weight};
-use warpui::Element;
-
-use crate::settings_view::billing_and_usage::billing_cycle_usage_common::{
-    aggregate_segments, cost_type_color, format_cost_cents, format_credits,
-    render_breakdown_tooltip, render_section_subheader, BarSegment, BillingUsageMouseStates,
-    ROW_BORDER_RADIUS, ROW_BORDER_WIDTH, TOOLTIP_GAP,
-};
-use crate::ui_components::blended_colors;
-use crate::workspaces::workspace::{
-    AiCreditsUsageBucket, AiCreditsUsageSource, BillingCycleUsageEntry, UsageVisibility,
-    UsageVisibilityGranularity,
-};
-
-fn collapse_segments_to_cost_type(segments: Vec<BarSegment>) -> Vec<BarSegment> {
-    let mut out: Vec<BarSegment> = Vec::new();
-    for seg in segments {
-        if let Some(existing) = out.iter_mut().find(|s| s.cost_type == seg.cost_type) {
-            existing.credits += seg.credits;
-            existing.cost_cents += seg.cost_cents;
-        } else {
-            out.push(BarSegment {
-                cost_type: seg.cost_type,
-                usage_bucket: AiCreditsUsageBucket::Aggregate,
-                credits: seg.credits,
-                cost_cents: seg.cost_cents,
-            });
-        }
-    }
-    out
-}
-
-/// Pill-shaped bar at the bottom of each team-totals card.
-const CARD_BAR_HEIGHT: f32 = 8.;
-const CARD_BAR_RADIUS: f32 = CARD_BAR_HEIGHT / 2.;
-
-/// Summary backing a single team-totals card (Overall / Local / Cloud).
-#[derive(Debug)]
-pub struct TeamTotalCardSummary {
-    pub title: &'static str,
-    pub card_key: &'static str,
-    pub segments: Vec<BarSegment>,
-    pub total_credits: i64,
-    pub total_cost_cents: i64,
-    pub limit_cents: Option<i64>,
-}
-
-pub fn build_team_total_card_summaries(
-    entries: &[BillingCycleUsageEntry],
-    visibility: &UsageVisibility,
-) -> Vec<TeamTotalCardSummary> {
-    let (overall_segments, overall_credits, overall_cost) = aggregate_segments(entries.iter());
-    let mut summaries = vec![TeamTotalCardSummary {
-        title: "Overall usage",
-        card_key: "__card_overall__",
-        segments: overall_segments,
-        total_credits: overall_credits,
-        total_cost_cents: overall_cost,
-        limit_cents: None,
-    }];
-
-    let shows_per_source = matches!(
-        visibility.granularity,
-        UsageVisibilityGranularity::FullBreakdown
-    );
-    if shows_per_source {
-        let (local_segments, local_credits, local_cost) = aggregate_segments(
-            entries
-                .iter()
-                .filter(|e| e.usage_source == AiCreditsUsageSource::Local),
-        );
-        let (cloud_segments, cloud_credits, cloud_cost) = aggregate_segments(
-            entries
-                .iter()
-                .filter(|e| e.usage_source == AiCreditsUsageSource::Cloud),
-        );
-        summaries.push(TeamTotalCardSummary {
-            title: "Local agent usage",
-            card_key: "__card_local__",
-            segments: local_segments,
-            total_credits: local_credits,
-            total_cost_cents: local_cost,
-            limit_cents: None,
-        });
-        summaries.push(TeamTotalCardSummary {
-            title: "Cloud agent usage",
-            card_key: "__card_cloud__",
-            segments: cloud_segments,
-            total_credits: cloud_credits,
-            total_cost_cents: cloud_cost,
-            limit_cents: None,
-        });
-    }
-
-    // Visibility tiers below FullBreakdown don't expose per-bucket detail,
-    // so collapse bucket-dimensioned segments into single per-cost-type lines.
-    // Otherwise we get a "Base (AI)" row + a separate bare "Base" row in the team aggregate card.
-    if !matches!(
-        visibility.granularity,
-        UsageVisibilityGranularity::FullBreakdown
-    ) {
-        for summary in &mut summaries {
-            summary.segments =
-                collapse_segments_to_cost_type(std::mem::take(&mut summary.segments));
-        }
-    }
-
-    summaries
-}
-
-fn render_card_pill_bar(
-    segments: &[BarSegment],
-    total_credits: i64,
-    total_cost_cents: i64,
-    limit_cents: Option<i64>,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let track_bg = theme.surface_overlay_1();
-    let corner = Radius::Pixels(CARD_BAR_RADIUS);
-
-    if total_credits == 0 || segments.is_empty() {
-        return ConstrainedBox::new(
-            Container::new(Empty::new().finish())
-                .with_background(track_bg)
-                .with_corner_radius(CornerRadius::with_all(corner))
-                .finish(),
-        )
-        .with_height(CARD_BAR_HEIGHT)
-        .finish();
-    }
-
-    let fill_ratio = match limit_cents {
-        Some(limit) if limit > 0 => (total_cost_cents as f32 / limit as f32).clamp(0.0, 1.0),
-        _ => 1.0,
-    };
-    let unfill_ratio = 1.0 - fill_ratio;
-    let has_unfill = unfill_ratio > 0.0;
-    let last_segment_idx = segments.len() - 1;
-
-    let mut filled = Flex::row();
-    for (idx, seg) in segments.iter().enumerate() {
-        let weight = seg.credits as f32 / total_credits as f32;
-        if weight <= 0.0 {
-            continue;
-        }
-        let is_first = idx == 0;
-        let is_last_visible = idx == last_segment_idx && !has_unfill;
-        let segment_corner = match (is_first, is_last_visible) {
-            (true, true) => CornerRadius::with_all(corner),
-            (true, false) => CornerRadius::with_left(corner),
-            (false, true) => CornerRadius::with_right(corner),
-            (false, false) => CornerRadius::default(),
-        };
-        filled.add_child(
-            Expanded::new(
-                weight,
-                Container::new(Empty::new().finish())
-                    .with_background_color(cost_type_color(&seg.cost_type))
-                    .with_corner_radius(segment_corner)
-                    .finish(),
-            )
-            .finish(),
-        );
-    }
-
-    let mut bar = Flex::row();
-    bar.add_child(Expanded::new(fill_ratio, filled.finish()).finish());
-    if has_unfill {
-        bar.add_child(
-            Expanded::new(
-                unfill_ratio,
-                Container::new(Empty::new().finish())
-                    .with_background(track_bg)
-                    .with_corner_radius(CornerRadius::with_right(corner))
-                    .finish(),
-            )
-            .finish(),
-        );
-    }
-
-    ConstrainedBox::new(bar.finish())
-        .with_height(CARD_BAR_HEIGHT)
-        .finish()
-}
-
-/// Card body for one team-totals slice. Layout (top to bottom):
-///   [title]
-///   [$X.XX]                    [Limit: $Y.YY]   (limit optional)
-///   [(N credits)]
-///   [pill stacked bar]
-fn build_team_total_card(
-    summary: &TeamTotalCardSummary,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let card_bg = theme.background().into_solid();
-    let main = blended_colors::text_main(theme, card_bg);
-    let sub = blended_colors::text_sub(theme, card_bg);
-
-    let title_text = Text::new_inline(summary.title.to_string(), appearance.ui_font_family(), 13.)
-        .with_color(sub)
-        .with_style(Properties::default().weight(Weight::Medium))
-        .finish();
-
-    let cost_text = Text::new_inline(
-        format_cost_cents(summary.total_cost_cents),
-        appearance.ui_font_family(),
-        24.,
-    )
-    .with_color(main)
-    .with_style(Properties::default().weight(Weight::Semibold))
-    .finish();
-
-    let credits_text = Text::new_inline(
-        format!("({} credits)", format_credits(summary.total_credits)),
-        appearance.ui_font_family(),
-        13.,
-    )
-    .with_color(sub)
-    .finish();
-
-    let totals_col = Flex::column()
-        .with_cross_axis_alignment(CrossAxisAlignment::Start)
-        .with_child(cost_text)
-        .with_child(Container::new(credits_text).with_margin_top(2.).finish())
-        .finish();
-
-    let totals_row: Box<dyn Element> = match summary.limit_cents {
-        Some(limit) => {
-            let limit_text = Text::new_inline(
-                format!("Limit: {}", format_cost_cents(limit)),
-                appearance.ui_font_family(),
-                12.,
-            )
-            .with_color(sub)
-            .finish();
-            Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_main_axis_size(MainAxisSize::Max)
-                .with_child(Shrinkable::new(1., totals_col).finish())
-                .with_child(Container::new(limit_text).with_margin_left(16.).finish())
-                .finish()
-        }
-        None => totals_col,
-    };
-
-    let bar = render_card_pill_bar(
-        &summary.segments,
-        summary.total_credits,
-        summary.total_cost_cents,
-        summary.limit_cents,
-        appearance,
-    );
-
-    let body = Flex::column()
-        .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-        .with_spacing(12.)
-        .with_child(
-            Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                .with_spacing(6.)
-                .with_child(title_text)
-                .with_child(totals_row)
-                .finish(),
-        )
-        .with_child(bar)
-        .finish();
-
-    Container::new(body)
-        .with_background_color(card_bg)
-        .with_border(Border::all(ROW_BORDER_WIDTH).with_border_color(theme.outline().into_solid()))
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(ROW_BORDER_RADIUS)))
-        .with_uniform_padding(16.)
-        .finish()
-}
-
-fn render_team_total_card(
-    summary: &TeamTotalCardSummary,
-    tooltip_mouse_state: MouseStateHandle,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    if summary.segments.is_empty() {
-        return build_team_total_card(summary, appearance);
-    }
-
-    Hoverable::new(tooltip_mouse_state, move |state| {
-        let mut stack = Stack::new();
-        stack.add_child(build_team_total_card(summary, appearance));
-
-        if state.is_hovered() {
-            stack.add_positioned_overlay_child(
-                render_breakdown_tooltip(
-                    &summary.segments,
-                    summary.total_credits,
-                    summary.total_cost_cents,
-                    appearance,
-                ),
-                OffsetPositioning::offset_from_parent(
-                    vec2f(0., -TOOLTIP_GAP),
-                    ParentOffsetBounds::WindowByPosition,
-                    ParentAnchor::TopMiddle,
-                    ChildAnchor::BottomMiddle,
-                ),
-            );
-        }
-
-        stack.finish()
-    })
-    .finish()
-}
-
-/// Horizontal row of team-totals cards (Overall + Local + Cloud).
-fn render_team_totals_section(
-    entries: &[BillingCycleUsageEntry],
-    visibility: &UsageVisibility,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let summaries = build_team_total_card_summaries(entries, visibility);
-    let mut row = Flex::row()
-        .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-        .with_main_axis_size(MainAxisSize::Max)
-        .with_spacing(12.);
-    for summary in &summaries {
-        let tooltip_state = mouse_states.tooltip_mouse_state(summary.card_key);
-        row.add_child(
-            Expanded::new(
-                1.,
-                render_team_total_card(summary, tooltip_state, appearance),
-            )
-            .finish(),
-        );
-    }
-    row.finish()
-}
-
-/// "Team" subheader + cards
-pub fn render_team_totals_block(
-    entries: &[BillingCycleUsageEntry],
-    visibility: &UsageVisibility,
-    mouse_states: &BillingUsageMouseStates,
-    appearance: &Appearance,
-) -> Box<dyn Element> {
-    let mut column = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Stretch);
-    column.add_child(
-        Container::new(render_section_subheader("Team", appearance))
-            .with_margin_bottom(8.)
-            .finish(),
-    );
-    column.add_child(render_team_totals_section(
-        entries,
-        visibility,
-        mouse_states,
-        appearance,
-    ));
-    column.finish()
-}
-
-#[cfg(test)]
-#[path = "billing_cycle_usage_team_totals_tests.rs"]
-mod tests;
diff --git a/app/src/settings_view/billing_and_usage/billing_cycle_usage_team_totals_tests.rs b/app/src/settings_view/billing_and_usage/billing_cycle_usage_team_totals_tests.rs
deleted file mode 100644
index b7058a74..00000000
--- a/app/src/settings_view/billing_and_usage/billing_cycle_usage_team_totals_tests.rs
+++ /dev/null
@@ -1,95 +0,0 @@
-use super::{build_team_total_card_summaries, TeamTotalCardSummary};
-use crate::workspaces::workspace::{
-    AiCreditsUsageAndCostSubjectType, AiCreditsUsageAndCostType, AiCreditsUsageBucket,
-    AiCreditsUsageSource, BillingCycleUsageEntry, UsageVisibility, UsageVisibilityGranularity,
-};
-
-fn entry(
-    usage_source: AiCreditsUsageSource,
-    credits_used: i32,
-    cost_cents: i32,
-) -> BillingCycleUsageEntry {
-    BillingCycleUsageEntry {
-        subject_type: AiCreditsUsageAndCostSubjectType::User,
-        subject_uid: Some("u".to_string()),
-        subject_display_name: None,
-        cost_type: AiCreditsUsageAndCostType::BaseLimit,
-        usage_bucket: AiCreditsUsageBucket::Ai,
-        usage_source,
-        credits_used,
-        cost_cents,
-    }
-}
-
-fn visibility(granularity: UsageVisibilityGranularity) -> UsageVisibility {
-    UsageVisibility {
-        granularity,
-        max_prior_cycles: Default::default(),
-    }
-}
-
-fn entries_two_per_source() -> Vec<BillingCycleUsageEntry> {
-    vec![
-        entry(AiCreditsUsageSource::Local, 30, 10),
-        entry(AiCreditsUsageSource::Cloud, 70, 25),
-    ]
-}
-
-fn titles(summaries: &[TeamTotalCardSummary]) -> Vec<&'static str> {
-    summaries.iter().map(|s| s.title).collect()
-}
-
-#[test]
-fn team_aggregate_visibility_yields_overall_card_only() {
-    // Server collapses teammates' usage into an `Aggregate`-source row under
-    // TeamAggregate, so the Local/Cloud split can't be honestly attributed
-    // — only the Overall card is meaningful.
-    let summaries = build_team_total_card_summaries(
-        &entries_two_per_source(),
-        &visibility(UsageVisibilityGranularity::TeamAggregate),
-    );
-    assert_eq!(titles(&summaries), vec!["Overall usage"]);
-}
-
-#[test]
-fn own_only_visibility_yields_overall_card_only() {
-    // OwnOnly viewers don't normally render the team-totals block at all,
-    // but the builder should still degrade gracefully to a single card.
-    let summaries = build_team_total_card_summaries(
-        &entries_two_per_source(),
-        &visibility(UsageVisibilityGranularity::OwnOnly),
-    );
-    assert_eq!(titles(&summaries), vec!["Overall usage"]);
-}
-
-#[test]
-fn per_user_totals_visibility_yields_overall_card_only() {
-    let summaries = build_team_total_card_summaries(
-        &entries_two_per_source(),
-        &visibility(UsageVisibilityGranularity::PerUserTotals),
-    );
-    assert_eq!(titles(&summaries), vec!["Overall usage"]);
-}
-
-#[test]
-fn full_breakdown_visibility_returns_three_cards_with_partitioned_sums() {
-    let summaries = build_team_total_card_summaries(
-        &entries_two_per_source(),
-        &visibility(UsageVisibilityGranularity::FullBreakdown),
-    );
-
-    assert_eq!(
-        titles(&summaries),
-        vec!["Overall usage", "Local agent usage", "Cloud agent usage"]
-    );
-
-    // Overall = Local + Cloud; Local card = only Local entries; Cloud card =
-    // only Cloud entries. Distinct credits/cost per source catch any swapped
-    // filter.
-    assert_eq!(summaries[0].total_credits, 30 + 70);
-    assert_eq!(summaries[0].total_cost_cents, 10 + 25);
-    assert_eq!(summaries[1].total_credits, 30);
-    assert_eq!(summaries[1].total_cost_cents, 10);
-    assert_eq!(summaries[2].total_credits, 70);
-    assert_eq!(summaries[2].total_cost_cents, 25);
-}
diff --git a/app/src/settings_view/billing_and_usage/mod.rs b/app/src/settings_view/billing_and_usage/mod.rs
deleted file mode 100644
index a1d9c139..00000000
--- a/app/src/settings_view/billing_and_usage/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod billing_cycle_usage_common;
-pub mod billing_cycle_usage_rows;
-pub mod billing_cycle_usage_section;
-pub mod billing_cycle_usage_team_totals;
-pub mod overage_limit_modal;
-pub mod usage_history_entry;
-pub mod usage_history_model;
diff --git a/app/src/settings_view/billing_and_usage/overage_limit_modal.rs b/app/src/settings_view/billing_and_usage/overage_limit_modal.rs
deleted file mode 100644
index 6b98e562..00000000
--- a/app/src/settings_view/billing_and_usage/overage_limit_modal.rs
+++ /dev/null
@@ -1,352 +0,0 @@
-use galaxyui::elements::{
-    Align, Border, ChildView, Clipped, Container, CornerRadius, CrossAxisAlignment, Expanded, Flex,
-    MouseStateHandle, Padding, ParentElement, Radius, Text,
-};
-use galaxyui::ui_components::button::ButtonVariant;
-use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use galaxyui::{
-    AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
-};
-
-use crate::editor::{EditorView, Event as EditorEvent, SingleLineEditorOptions, TextOptions};
-use crate::Appearance;
-
-const MAXIMUM_SPENDING_LIMIT_CENTS: u32 = 999999999;
-
-pub struct SpendingLimitModal {
-    amount_editor: ViewHandle<EditorView>,
-    cancel_button_mouse_state: MouseStateHandle,
-    update_button_mouse_state: MouseStateHandle,
-    input_error_state: Option<SpendingLimitModalInputErrorState>,
-}
-
-#[derive(Debug, Clone)]
-pub enum SpendingLimitModalEvent {
-    Close,
-    Update { amount_cents: u32 },
-}
-
-impl Entity for SpendingLimitModal {
-    type Event = SpendingLimitModalEvent;
-}
-
-#[derive(Debug, Clone)]
-pub enum SpendingLimitModalAction {
-    Close,
-    Update,
-}
-
-pub enum SpendingLimitModalInputErrorState {
-    InvalidNumberFormat,
-    NumberOutOfRange,
-}
-
-impl SpendingLimitModal {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        let font_family = Appearance::as_ref(ctx).ui_font_family();
-        let amount_editor = ctx.add_typed_action_view(|ctx| {
-            let options = SingleLineEditorOptions {
-                text: TextOptions {
-                    font_family_override: Some(font_family),
-                    ..Default::default()
-                },
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text("50.00", ctx);
-            editor
-        });
-        ctx.subscribe_to_view(&amount_editor, |me, _, event, ctx| {
-            me.handle_editor_event(event, ctx);
-        });
-
-        Self {
-            amount_editor,
-            cancel_button_mouse_state: MouseStateHandle::default(),
-            update_button_mouse_state: MouseStateHandle::default(),
-            input_error_state: None,
-        }
-    }
-
-    fn parse_amount(&self, app: &AppContext) -> Option<u32> {
-        let text = self.amount_editor.as_ref(app).buffer_text(app);
-        let text = text.trim();
-        if text.is_empty() {
-            return None;
-        }
-
-        let cleaned = text.strip_prefix('$').unwrap_or(text);
-
-        if let Ok(dollars) = cleaned.parse::<f64>() {
-            Some((dollars * 100.0).round() as u32)
-        } else {
-            None
-        }
-    }
-
-    fn validate_input(&mut self, ctx: &mut ViewContext<Self>) {
-        let text = self.amount_editor.as_ref(ctx).buffer_text(ctx);
-
-        if !self.is_valid_us_currency_format(&text) {
-            self.input_error_state = Some(SpendingLimitModalInputErrorState::InvalidNumberFormat);
-        } else if self
-            .parse_amount(ctx)
-            .is_some_and(|cents| !self.is_valid_number_range(cents))
-        {
-            self.input_error_state = Some(SpendingLimitModalInputErrorState::NumberOutOfRange);
-        } else {
-            self.input_error_state = None;
-        }
-
-        ctx.notify();
-    }
-
-    fn is_valid_number_range(&self, amount_cents: u32) -> bool {
-        if amount_cents < 1 {
-            return false;
-        }
-
-        if amount_cents > MAXIMUM_SPENDING_LIMIT_CENTS {
-            return false;
-        }
-
-        true
-    }
-
-    fn is_valid_us_currency_format(&self, text: &str) -> bool {
-        if text.is_empty() {
-            return true;
-        }
-
-        let cleaned = text.strip_prefix('$').unwrap_or(text);
-
-        let decimal_count = cleaned.chars().filter(|&c| c == '.').count();
-        if decimal_count > 1 {
-            return false;
-        }
-
-        if !cleaned.chars().all(|c| c.is_ascii_digit() || c == '.') {
-            return false;
-        }
-
-        if let Some(decimal_pos) = cleaned.find('.') {
-            let after_decimal = &cleaned[decimal_pos + 1..];
-            if after_decimal.len() > 2 {
-                return false;
-            }
-        }
-
-        true
-    }
-
-    pub fn update_amount_editor(&self, cents: u32, ctx: &mut ViewContext<Self>) {
-        let placeholder_text = format!("{:.2}", cents as f64 / 100.0);
-        self.amount_editor.update(ctx, |editor, ctx| {
-            editor.set_placeholder_text(&placeholder_text, ctx);
-            editor.clear_buffer(ctx);
-        });
-
-        ctx.notify();
-    }
-
-    fn error_text(&self) -> Option<String> {
-        match self.input_error_state {
-            Some(SpendingLimitModalInputErrorState::InvalidNumberFormat) => {
-                Some("Please enter a valid currency amount".to_string())
-            }
-            Some(SpendingLimitModalInputErrorState::NumberOutOfRange) => {
-                Some("Please enter a price between $0.01 and $10,000,000".to_string())
-            }
-            None => None,
-        }
-    }
-
-    pub fn focus_input(&self, ctx: &mut ViewContext<Self>) {
-        ctx.focus(&self.amount_editor);
-    }
-
-    fn handle_editor_event(&mut self, event: &EditorEvent, ctx: &mut ViewContext<Self>) {
-        match event {
-            EditorEvent::Enter => {
-                if self.input_error_state.is_none() {
-                    if let Some(amount_cents) = self.parse_amount(ctx) {
-                        ctx.emit(SpendingLimitModalEvent::Update { amount_cents });
-                    }
-                }
-            }
-            EditorEvent::Escape => {
-                ctx.emit(SpendingLimitModalEvent::Close);
-            }
-            EditorEvent::Edited(_) => {
-                self.validate_input(ctx);
-            }
-            _ => {}
-        }
-    }
-}
-
-impl View for SpendingLimitModal {
-    fn ui_name() -> &'static str {
-        "SpendingLimitModal"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let theme = appearance.theme();
-
-        let description_text = Text::new(
-            "Warp will prevent use of premium models when this dollar limit is reached. Resets on a monthly basis.",
-            appearance.ui_font_family(),
-            14.,
-        )
-        .with_color(theme.sub_text_color(theme.surface_2()).into())
-        .finish();
-
-        let additional_note_text = Text::new(
-            "Note that AI credits made near your chosen limit may exceed it by a few dollars.",
-            appearance.ui_font_family(),
-            12.,
-        )
-        .with_color(theme.sub_text_color(theme.surface_2()).into())
-        .finish();
-
-        let description_section = Flex::column()
-            .with_child(
-                Container::new(description_text)
-                    .with_margin_bottom(8.)
-                    .finish(),
-            )
-            .with_child(additional_note_text)
-            .finish();
-
-        let input_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_child(
-                Text::new("$", appearance.ui_font_family(), appearance.ui_font_size())
-                    .with_color(theme.active_ui_text_color().into())
-                    .finish(),
-            )
-            .with_child(
-                Expanded::new(
-                    1.,
-                    Container::new(
-                        Clipped::new(ChildView::new(&self.amount_editor).finish()).finish(),
-                    )
-                    .with_margin_left(12.)
-                    .finish(),
-                )
-                .finish(),
-            )
-            .finish();
-
-        let border_color = if self.input_error_state.is_some() {
-            theme.ui_error_color().into()
-        } else {
-            theme.outline()
-        };
-
-        let input_container = Container::new(input_row)
-            .with_padding(Padding::uniform(8.).with_left(16.).with_right(16.))
-            .with_border(Border::all(1.).with_border_fill(border_color))
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-            .finish();
-
-        let button_style = UiComponentStyles {
-            font_size: Some(14.),
-            padding: Some(Coords::uniform(8.).left(12.).right(12.)),
-            ..Default::default()
-        };
-
-        let mut update_button = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Accent,
-                self.update_button_mouse_state.clone(),
-            )
-            .with_text_label("Update".to_string())
-            .with_style(button_style);
-
-        if self.input_error_state.is_some() {
-            update_button = update_button.disabled();
-        }
-
-        let buttons_row = Flex::row()
-            .with_child(
-                appearance
-                    .ui_builder()
-                    .button(
-                        ButtonVariant::Secondary,
-                        self.cancel_button_mouse_state.clone(),
-                    )
-                    .with_text_label("Cancel".to_string())
-                    .with_style(button_style)
-                    .build()
-                    .on_click(|ctx, _, _| {
-                        ctx.dispatch_typed_action(SpendingLimitModalAction::Close);
-                    })
-                    .finish(),
-            )
-            .with_child(
-                Container::new(
-                    update_button
-                        .build()
-                        .on_click(|ctx, _, _| {
-                            ctx.dispatch_typed_action(SpendingLimitModalAction::Update);
-                        })
-                        .finish(),
-                )
-                .with_margin_left(12.)
-                .finish(),
-            )
-            .finish();
-
-        let mut main_column = Flex::column()
-            .with_child(
-                Container::new(description_section)
-                    .with_margin_bottom(16.)
-                    .finish(),
-            )
-            .with_child(
-                Container::new(input_container)
-                    .with_margin_bottom(if self.input_error_state.is_some() {
-                        8.
-                    } else {
-                        24.
-                    })
-                    .finish(),
-            );
-
-        if let Some(error_text) = self.error_text() {
-            let error_text = Text::new(error_text, appearance.ui_font_family(), 12.)
-                .with_color(theme.ui_error_color())
-                .finish();
-
-            main_column =
-                main_column.with_child(Container::new(error_text).with_margin_bottom(24.).finish());
-        }
-
-        main_column
-            .with_child(Align::new(buttons_row).right().finish())
-            .finish()
-    }
-}
-
-impl TypedActionView for SpendingLimitModal {
-    type Action = SpendingLimitModalAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            SpendingLimitModalAction::Close => {
-                self.amount_editor.update(ctx, |editor, ctx| {
-                    editor.clear_buffer(ctx);
-                });
-                ctx.emit(SpendingLimitModalEvent::Close);
-            }
-            SpendingLimitModalAction::Update => {
-                if let Some(amount_cents) = self.parse_amount(ctx) {
-                    ctx.emit(SpendingLimitModalEvent::Update { amount_cents });
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/settings_view/billing_and_usage/usage_history_entry.rs b/app/src/settings_view/billing_and_usage/usage_history_entry.rs
deleted file mode 100644
index b3c09cae..00000000
--- a/app/src/settings_view/billing_and_usage/usage_history_entry.rs
+++ /dev/null
@@ -1,224 +0,0 @@
-use chrono::Local;
-use galaxy_core::ui::appearance::Appearance;
-use galaxy_graphql::queries::get_conversation_usage::ConversationUsage;
-use galaxyui::elements::{
-    Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty, Flex, Hoverable,
-    MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
-};
-use warpui::platform::Cursor;
-use warpui::{AppContext, Element, View};
-
-use crate::ai::blocklist::format_credits;
-use crate::ai::blocklist::usage::conversation_usage_view::{
-    ConversationUsageInfo, ConversationUsageView, DisplayMode,
-};
-use crate::settings_view::billing_and_usage_page::BillingAndUsagePageAction;
-use crate::ui_components::blended_colors;
-use crate::ui_components::icons::Icon;
-
-pub struct UsageHistoryEntry {
-    // If no entry is provided, we will assume that this is a placeholder entry
-    // to display in the loading UI.
-    entry: Option<ConversationUsage>,
-    is_expanded: bool,
-    mouse_state: Option<MouseStateHandle>,
-    tooltip_mouse_state: MouseStateHandle,
-}
-
-impl UsageHistoryEntry {
-    pub fn new(
-        entry: Option<ConversationUsage>,
-        is_expanded: bool,
-        mouse_state: Option<MouseStateHandle>,
-        tooltip_mouse_state: MouseStateHandle,
-    ) -> Self {
-        Self {
-            entry,
-            mouse_state,
-            is_expanded,
-            tooltip_mouse_state,
-        }
-    }
-
-    pub fn render(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let mut res = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_child(self.render_header(appearance));
-
-        if let Some(entry) = &self.entry {
-            if self.is_expanded {
-                res = res
-                    .with_child(
-                        // Separator between header and usage component
-                        Container::new(Empty::new().finish())
-                            .with_border(
-                                Border::top(2.0).with_border_fill(appearance.theme().outline()),
-                            )
-                            .with_overdraw_bottom(0.)
-                            .finish(),
-                    )
-                    .with_child(
-                        ConversationUsageView::new(
-                            ConversationUsageInfo::from(entry),
-                            DisplayMode::Settings,
-                            None,
-                            self.tooltip_mouse_state.clone(),
-                        )
-                        .render(app),
-                    );
-            }
-        }
-
-        Container::new(res.finish())
-            .with_border(Border::all(2.).with_border_fill(appearance.theme().surface_3()))
-            .with_background(appearance.theme().surface_2())
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-            .finish()
-    }
-
-    fn render_header(&self, appearance: &Appearance) -> Box<dyn Element> {
-        let Some(entry) = &self.entry else {
-            return self.render_loading_entry(appearance);
-        };
-        let Some(mouse_state) = &self.mouse_state else {
-            // If there is a provided entry, there should always be a mouse state as well.
-            log::error!("Mouse state is required to render usage history entry header");
-            return Empty::new().finish();
-        };
-
-        let title_text = Text::new_inline(entry.title.clone(), appearance.ui_font_family(), 14.)
-            .with_color(
-                appearance
-                    .theme()
-                    .main_text_color(appearance.theme().surface_2())
-                    .into(),
-            )
-            .finish();
-
-        let formatted_time = entry
-            .last_updated
-            .utc()
-            .with_timezone(&Local)
-            .format("%-m/%-d/%y %-I:%M %p")
-            .to_string();
-        let time_text = Text::new_inline(formatted_time, appearance.ui_font_family(), 12.)
-            .with_color(blended_colors::text_sub(
-                appearance.theme(),
-                appearance.theme().surface_1(),
-            ))
-            .finish();
-
-        let total_credits =
-            entry.usage_metadata.credits_spent + entry.usage_metadata.platform_credits_spent;
-        let credits_spent = Text::new_inline(
-            format_credits(total_credits as f32),
-            appearance.ui_font_family(),
-            14.,
-        )
-        .with_color(blended_colors::text_sub(
-            appearance.theme(),
-            appearance.theme().surface_1(),
-        ))
-        .finish();
-
-        let chevron_icon = if self.is_expanded {
-            Icon::ChevronDown
-        } else {
-            Icon::ChevronRight
-        };
-        let chevron = ConstrainedBox::new(
-            chevron_icon
-                .to_galaxyui_icon(appearance.theme().foreground())
-                .finish(),
-        )
-        .with_width(16.)
-        .with_height(16.)
-        .finish();
-
-        let header_row = Container::new(
-            Flex::row()
-                .with_child(
-                    Shrinkable::new(
-                        1.,
-                        Container::new(
-                            Flex::column()
-                                .with_child(title_text)
-                                .with_child(Container::new(time_text).with_margin_top(4.).finish())
-                                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                                .finish(),
-                        )
-                        .finish(),
-                    )
-                    .finish(),
-                )
-                .with_child(
-                    Flex::row()
-                        .with_child(credits_spent)
-                        .with_child(chevron)
-                        .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                        .finish(),
-                )
-                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_main_axis_size(MainAxisSize::Max)
-                .finish(),
-        )
-        .with_uniform_padding(12.)
-        .with_corner_radius(if self.is_expanded {
-            CornerRadius::with_top(Radius::Pixels(6.))
-        } else {
-            CornerRadius::with_all(Radius::Pixels(6.))
-        })
-        .with_background(appearance.theme().surface_2())
-        .finish();
-
-        let conversation_id = entry.conversation_id.clone();
-        Hoverable::new(mouse_state.clone(), |_| header_row)
-            .with_cursor(Cursor::PointingHand)
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::ToggleUsageEntryExpanded {
-                    conversation_id: conversation_id.clone(),
-                });
-            })
-            .finish()
-    }
-
-    /// Render a placeholder entry for the loading state
-    fn render_loading_entry(&self, appearance: &Appearance) -> Box<dyn Element> {
-        let left_side = Flex::column()
-            .with_child(self.render_empty_text_placeholder(360., 16., appearance))
-            .with_child(self.render_empty_text_placeholder(160., 12., appearance))
-            .with_spacing(4.)
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .finish();
-
-        Container::new(
-            Flex::row()
-                .with_child(left_side)
-                .with_child(self.render_empty_text_placeholder(52., 16., appearance))
-                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_main_axis_size(MainAxisSize::Max)
-                .finish(),
-        )
-        .with_uniform_padding(12.)
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-        .with_background(appearance.theme().surface_2())
-        .finish()
-    }
-
-    /// Renders an empty rectangle to represent loading text
-    fn render_empty_text_placeholder(
-        &self,
-        width: f32,
-        height: f32,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        Container::new(Empty::new().finish())
-            .with_padding_left(width)
-            .with_padding_top(height)
-            .with_background(appearance.theme().surface_3())
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-            .finish()
-    }
-}
diff --git a/app/src/settings_view/billing_and_usage/usage_history_model.rs b/app/src/settings_view/billing_and_usage/usage_history_model.rs
deleted file mode 100644
index 6d73bbc9..00000000
--- a/app/src/settings_view/billing_and_usage/usage_history_model.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::sync::Arc;
-
-use galaxy_core::report_error;
-use galaxy_graphql::scalars::Time;
-use galaxyui::{Entity, ModelContext, SingletonEntity};
-
-use crate::auth::AuthStateProvider;
-use crate::server::server_api::ai::AIClient;
-use crate::server::server_api::ServerApiProvider;
-
-const PAGE_SIZE: i32 = 20;
-
-pub struct UsageHistoryModel {
-    ai_client: Arc<dyn AIClient>,
-    entries: Vec<galaxy_graphql::queries::get_conversation_usage::ConversationUsage>,
-    is_loading: bool,
-    // Whether the server indicated that there may be more entries to load.
-    has_more_entries: bool,
-}
-
-impl Entity for UsageHistoryModel {
-    type Event = ();
-}
-
-impl SingletonEntity for UsageHistoryModel {}
-
-impl UsageHistoryModel {
-    pub fn new(ctx: &mut ModelContext<Self>) -> Self {
-        let ai_client = ServerApiProvider::as_ref(ctx).get_ai_client();
-        Self {
-            ai_client,
-            entries: Vec::new(),
-            is_loading: false,
-            has_more_entries: true,
-        }
-    }
-
-    pub fn entries(&self) -> &[galaxy_graphql::queries::get_conversation_usage::ConversationUsage] {
-        &self.entries
-    }
-
-    pub fn is_loading(&self) -> bool {
-        self.is_loading
-    }
-
-    pub fn has_more_entries(&self) -> bool {
-        self.has_more_entries
-    }
-
-    /// Fetches conversation usage over the past 30 days.
-    /// If some usage has already been loaded, this fetches the same number of entries.
-    /// If no usage has been loaded, this fetches PAGE_SIZE entries.
-    pub fn refresh_usage_history_async(&mut self, ctx: &mut ModelContext<Self>) {
-        if self.is_loading || !AuthStateProvider::as_ref(ctx).get().is_logged_in() {
-            return;
-        }
-
-        // If the user has already loaded some number of entries,
-        // we should load that same number of items on refresh so that the list doesn't shrink
-        // every time the page is refreshed.
-        let num_items_to_fetch = if self.entries.is_empty() {
-            PAGE_SIZE
-        } else {
-            self.entries.len() as i32
-        };
-
-        // Reset pagination state and clear any existing entries.
-        self.entries.clear();
-        self.has_more_entries = true;
-
-        self.fetch_next_page(num_items_to_fetch, None, ctx);
-    }
-
-    /// Fetches the next page of conversation usage entries, appending them to the existing list.
-    pub fn load_more_usage_history_async(&mut self, ctx: &mut ModelContext<Self>) {
-        if self.is_loading || !self.has_more_entries {
-            return;
-        }
-
-        let last_updated_end_timestamp: Option<Time> =
-            self.entries.last().map(|entry| entry.last_updated);
-        if last_updated_end_timestamp.is_none() {
-            return;
-        }
-
-        self.fetch_next_page(PAGE_SIZE, last_updated_end_timestamp, ctx);
-    }
-
-    /// Fetches the next page of conversation usage entries, appending them to the existing list.
-    /// last_updated_end_timestamp is the timestamp of the last entry in the existing list,
-    /// and is used to paginate the results and only return entries that we don't already have.
-    fn fetch_next_page(
-        &mut self,
-        limit: i32,
-        last_updated_end_timestamp: Option<Time>,
-        ctx: &mut ModelContext<Self>,
-    ) {
-        // If no time stamp is provided for pagination, we can assume that this is the first page of results.
-        let is_initial_load = last_updated_end_timestamp.is_none();
-        let ai_client = self.ai_client.clone();
-
-        if is_initial_load {
-            self.is_loading = true;
-            ctx.notify();
-        }
-
-        ctx.spawn(
-            async move {
-                ai_client
-                    .get_conversation_usage_history(
-                        Some(30),
-                        Some(limit),
-                        last_updated_end_timestamp,
-                    )
-                    .await
-            },
-            move |me, result, ctx| {
-                me.is_loading = false;
-                match result {
-                    Ok(entries) => {
-                        let fetched_count = entries.len() as i32;
-
-                        // If we received fewer than requested, assume there are no more entries.
-                        me.has_more_entries = fetched_count == limit;
-
-                        if !is_initial_load {
-                            me.entries.extend(entries);
-                        } else {
-                            me.entries = entries;
-                        }
-                    }
-                    Err(e) => {
-                        report_error!(e.context("Failed to fetch conversation usage"));
-                    }
-                }
-                ctx.notify();
-            },
-        );
-    }
-}
diff --git a/app/src/settings_view/billing_and_usage_dispatch.rs b/app/src/settings_view/billing_and_usage_dispatch.rs
deleted file mode 100644
index edd20658..00000000
--- a/app/src/settings_view/billing_and_usage_dispatch.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-//! Dispatch wrapper that routes between the legacy and v2 billing & usage
-//! pages.
-
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::ui::appearance::Appearance;
-use warpui::elements::{ChildView, Container};
-use warpui::{AppContext, Element, Entity, SingletonEntity, View, ViewContext, ViewHandle};
-
-use super::billing_and_usage_page::{BillingAndUsagePageEvent, BillingAndUsagePageView};
-use super::billing_and_usage_page_v2::BillingAndUsagePageV2View;
-use super::settings_page::{
-    MatchData, PageType, SettingsPageMeta, SettingsPageViewHandle, SettingsWidget, HEADER_PADDING,
-};
-use super::SettingsSection;
-use crate::auth::{AuthManager, AuthStateProvider};
-use crate::workspaces::user_workspaces::UserWorkspaces;
-use crate::workspaces::workspace::Workspace;
-
-pub struct BillingAndUsageDispatchView {
-    page: PageType<Self>,
-    v1: ViewHandle<BillingAndUsagePageView>,
-    v2: ViewHandle<BillingAndUsagePageV2View>,
-}
-
-impl BillingAndUsageDispatchView {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        let v1 = ctx.add_typed_action_view(BillingAndUsagePageView::new);
-        let v2 = ctx.add_typed_action_view(BillingAndUsagePageV2View::new);
-
-        // Both children stay alive; only forward events from the active one
-        // to avoid duplicate toasts.
-        ctx.subscribe_to_view(&v1, |this, _, event, ctx| {
-            if !this.use_v2(ctx) {
-                ctx.emit(event.clone());
-            }
-        });
-        ctx.subscribe_to_view(&v2, |this, _, event, ctx| {
-            if this.use_v2(ctx) {
-                ctx.emit(event.clone());
-            }
-        });
-
-        ctx.subscribe_to_model(&UserWorkspaces::handle(ctx), |_, _, _, ctx| {
-            ctx.notify();
-        });
-        ctx.subscribe_to_model(&AuthManager::handle(ctx), |_, _, _, ctx| {
-            ctx.notify();
-        });
-
-        let page = PageType::new_monolith(BillingAndUsageWidget, Some("Billing and Usage"), true);
-
-        Self { page, v1, v2 }
-    }
-
-    fn use_v2(&self, ctx: &AppContext) -> bool {
-        if !FeatureFlag::BillingAndUsagePageV2.is_enabled() {
-            return false;
-        }
-        Self::workspace_uses_v2(UserWorkspaces::as_ref(ctx).current_workspace())
-    }
-
-    fn workspace_uses_v2(workspace: Option<&Workspace>) -> bool {
-        workspace.is_none_or(|workspace| {
-            let bm = &workspace.billing_metadata;
-            bm.is_on_build_plan()
-                || bm.is_on_build_max_plan()
-                || bm.is_on_build_business_plan()
-                || bm.is_enterprise_plan()
-                || bm.is_free_plan()
-        })
-    }
-
-    pub fn get_modal_content(&self, app: &AppContext) -> Option<Box<dyn Element>> {
-        if self.use_v2(app) {
-            self.v2.read(app, |view, _| view.get_modal_content())
-        } else {
-            self.v1.read(app, |view, _| view.get_modal_content())
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "billing_and_usage_dispatch_tests.rs"]
-mod tests;
-
-impl Entity for BillingAndUsageDispatchView {
-    type Event = BillingAndUsagePageEvent;
-}
-
-impl View for BillingAndUsageDispatchView {
-    fn ui_name() -> &'static str {
-        "Billing and usage"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        self.page.render(self, app)
-    }
-}
-
-impl SettingsPageMeta for BillingAndUsageDispatchView {
-    fn section() -> SettingsSection {
-        SettingsSection::BillingAndUsage
-    }
-
-    fn should_render(&self, ctx: &AppContext) -> bool {
-        !AuthStateProvider::as_ref(ctx)
-            .get()
-            .is_anonymous_or_logged_out()
-    }
-
-    fn on_page_selected(&mut self, allow_steal_focus: bool, ctx: &mut ViewContext<Self>) {
-        if self.use_v2(ctx) {
-            self.v2.update(ctx, |view, ctx| {
-                view.on_page_selected(allow_steal_focus, ctx)
-            });
-        } else {
-            self.v1.update(ctx, |view, ctx| {
-                view.on_page_selected(allow_steal_focus, ctx)
-            });
-        }
-    }
-
-    fn update_filter(&mut self, query: &str, ctx: &mut ViewContext<Self>) -> MatchData {
-        self.page.update_filter(query, ctx)
-    }
-
-    fn scroll_to_widget(&mut self, widget_id: &'static str) {
-        self.page.scroll_to_widget(widget_id);
-    }
-
-    fn clear_highlighted_widget(&mut self) {
-        self.page.clear_highlighted_widget();
-    }
-}
-
-impl From<ViewHandle<BillingAndUsageDispatchView>> for SettingsPageViewHandle {
-    fn from(view_handle: ViewHandle<BillingAndUsageDispatchView>) -> Self {
-        SettingsPageViewHandle::BillingAndUsage(view_handle)
-    }
-}
-
-#[derive(Default)]
-struct BillingAndUsageWidget;
-
-impl SettingsWidget for BillingAndUsageWidget {
-    type View = BillingAndUsageDispatchView;
-
-    fn search_terms(&self) -> &str {
-        "plan billing a.i. ai usage limit credits balance overview"
-    }
-
-    fn render(
-        &self,
-        view: &Self::View,
-        _appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let inner = if view.use_v2(app) {
-            ChildView::new(&view.v2).finish()
-        } else {
-            ChildView::new(&view.v1).finish()
-        };
-        Container::new(inner)
-            .with_margin_top(HEADER_PADDING)
-            .finish()
-    }
-}
diff --git a/app/src/settings_view/billing_and_usage_dispatch_tests.rs b/app/src/settings_view/billing_and_usage_dispatch_tests.rs
deleted file mode 100644
index 8553e2c7..00000000
--- a/app/src/settings_view/billing_and_usage_dispatch_tests.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use super::*;
-use crate::workspaces::workspace::{BillingMetadata, CustomerType};
-
-fn workspace_with_customer_type(customer_type: CustomerType) -> Workspace {
-    Workspace {
-        uid: "workspace_uid123456789".to_string().into(),
-        name: "test".to_string(),
-        stripe_customer_id: None,
-        teams: vec![],
-        billing_metadata: BillingMetadata {
-            customer_type,
-            ..Default::default()
-        },
-        bonus_grants_purchased_this_month: Default::default(),
-        billing_cycle_usage: None,
-        has_billing_history: false,
-        settings: Default::default(),
-        invite_code: None,
-        invite_link_domain_restrictions: vec![],
-        pending_email_invites: vec![],
-        is_eligible_for_discovery: false,
-        members: vec![],
-        total_requests_used_since_last_refresh: 0,
-    }
-}
-
-#[test]
-fn uses_v2_when_user_has_no_workspace() {
-    assert!(BillingAndUsageDispatchView::workspace_uses_v2(None));
-}
-
-#[test]
-fn uses_v2_for_free_workspace() {
-    let workspace = workspace_with_customer_type(CustomerType::Free);
-
-    assert!(BillingAndUsageDispatchView::workspace_uses_v2(Some(
-        &workspace
-    )));
-}
-
-#[test]
-fn does_not_use_v2_for_legacy_paid_workspace() {
-    let workspace = workspace_with_customer_type(CustomerType::Prosumer);
-
-    assert!(!BillingAndUsageDispatchView::workspace_uses_v2(Some(
-        &workspace
-    )));
-}
diff --git a/app/src/settings_view/billing_and_usage_page.rs b/app/src/settings_view/billing_and_usage_page.rs
deleted file mode 100644
index 162cf0ff..00000000
--- a/app/src/settings_view/billing_and_usage_page.rs
+++ /dev/null
@@ -1,3625 +0,0 @@
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use chrono::Local;
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::ui::appearance::Appearance;
-use galaxy_core::ui::theme::Fill;
-use galaxy_graphql::billing::AddonCreditsOption;
-use galaxyui::elements::{
-    Align, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty,
-    Flex, FormattedTextElement, HighlightedHyperlink, Hoverable, HyperlinkUrl, MainAxisAlignment,
-    MainAxisSize, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
-    ParentOffsetBounds, Radius, Shrinkable, Text, Wrap,
-};
-use galaxyui::fonts::{Properties, Weight};
-use galaxyui::platform::Cursor;
-use galaxyui::prelude::ChildView;
-use galaxyui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
-use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use galaxyui::ui_components::switch::SwitchStateHandle;
-use galaxyui::{
-    AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, UpdateView, View,
-    ViewContext, ViewHandle,
-};
-use itertools::Itertools;
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use settings::Setting;
-use thousands::Separable;
-
-use super::admin_actions::AdminActions;
-use super::billing_and_usage::overage_limit_modal::{SpendingLimitModal, SpendingLimitModalEvent};
-use super::billing_and_usage::usage_history_entry::UsageHistoryEntry;
-use super::billing_and_usage::usage_history_model::UsageHistoryModel;
-use super::settings_page::{
-    build_sub_header, render_body_item, render_customer_type_badge, render_info_icon,
-    AdditionalInfo, HEADER_PADDING,
-};
-use super::SettingsSection;
-use crate::ai::AIRequestUsageModel;
-use crate::auth::auth_manager::LoginGatedFeature;
-use crate::auth::auth_state::AuthState;
-use crate::auth::auth_view_modal::AuthViewVariant;
-use crate::auth::{AuthManager, AuthStateProvider, UserUid};
-use crate::menu::{Event as MenuEvent, Menu, MenuItem, MenuItemFields};
-use crate::modal::{Modal, ModalEvent, ModalViewState};
-use crate::pricing::{PricingInfoModel, PricingInfoModelEvent};
-use crate::server::ids::ServerId;
-use crate::server::telemetry::TelemetryEvent;
-use crate::settings::ai::AISettings;
-use crate::settings_view::settings_page::TOGGLE_BUTTON_RIGHT_PADDING;
-use crate::ui_components::blended_colors;
-use crate::ui_components::buttons::icon_button;
-use crate::ui_components::icons::Icon;
-use crate::ui_components::menu_button::{icon_button_with_context_menu, MenuDirection};
-use crate::ui_components::tab_selector::{self, SettingsTab};
-use crate::view_components::action_button::{ActionButton, PrimaryTheme, SecondaryTheme};
-use crate::view_components::ToastFlavor;
-use crate::workspaces::team::Team;
-use crate::workspaces::update_manager::TeamUpdateManager;
-use crate::workspaces::user_profiles::UserProfiles;
-use crate::workspaces::user_workspaces::{UserWorkspaces, UserWorkspacesEvent};
-use crate::workspaces::workspace::{CustomerType, Workspace};
-use crate::{send_telemetry_from_ctx, WorkspaceAction};
-
-const HEADER_FONT_SIZE: f32 = 16.;
-const OVERAGE_USAGE_LINK_TEXT: &str = "View details on overage usage";
-const OVERAGE_TOGGLE_ADMIN_HEADER: &str = "Enable premium model usage overages";
-const OVERAGE_TOGGLE_USER_HEADER_ENABLED: &str = "Premium model usage overages are enabled";
-const OVERAGE_TOGGLE_USER_HEADER_DISABLED: &str = "Premium model usage overages are not enabled";
-const OVERAGE_TOGGLE_DESCRIPTION: &str = "Continue using premium models beyond your plan's limits. Usage is charged in $20 increments up to your spending limit, with any remaining balance charged on your scheduled billing date.";
-const OVERAGE_TOGGLE_USER_DESCRIPTION: &str =
-    "Ask a team admin to enable overages for more AI usage.";
-
-const SORT_MENU_ITEM_DISPLAY_NAME_A_Z_LABEL: &str = "A to Z";
-const SORT_MENU_ITEM_DISPLAY_NAME_Z_A_LABEL: &str = "Z to A";
-const SORT_MENU_ITEM_REQUEST_USAGE_ASCENDING_LABEL: &str = "Usage ascending";
-const SORT_MENU_ITEM_REQUEST_USAGE_DESCENDING_LABEL: &str = "Usage descending";
-
-const AUTO_RELOAD_EXCEED_LIMIT_WARNING_STRING: &str =
-    "Auto reload is disabled, as the next reload would exceed your monthly spend limit. Increase your limit to use auto reload.";
-const AUTO_RELOAD_DELINQUENT_WARNING_STRING: &str =
-    "Restricted due to billing issue. Update your payment method to purchase add-on credits.";
-const RESTRICTED_BILLING_USAGE_WARNING_STRING: &str =
-    "Auto reload is disabled due to recent failed reload. Please update your payment method and try again.";
-
-const OVERVIEW_TAB_TEXT: &str = "Overview";
-const USAGE_HISTORY_TAB_TEXT: &str = "Usage History";
-
-const ENTERPRISE_USAGE_CALLOUT_HEADER: &str = "Usage reporting is currently limited";
-const ENTERPRISE_USAGE_CALLOUT_BODY_ADMIN_PREFIX: &str =
-    "Enterprise credit usage isn't fully available in this view yet. For the most accurate spend tracking, ";
-const ENTERPRISE_USAGE_CALLOUT_BODY_ADMIN_LINK: &str = "visit the admin panel";
-const ENTERPRISE_USAGE_CALLOUT_BODY_ADMIN_SUFFIX: &str = ".";
-const ENTERPRISE_USAGE_CALLOUT_BODY_NON_ADMIN: &str =
-    "Enterprise credit usage isn't fully available in this view yet. Contact a team admin for detailed usage reporting.";
-
-const ADDON_CREDITS_DESCRIPTION: &str = "Add-on credits are purchased in prepaid packages that roll over each billing cycle and expire after one year. The more you purchase, the better the per-credit rate. Once your base plan credits are used, add-on credits will be consumed.";
-const ADDITIONAL_ADDON_CREDITS_DESCRIPTION_FOR_TEAM: &str =
-    "Purchased add-on credits are shared across your team.";
-
-// Cloud agent trial widget constants.
-const AMBIENT_AGENT_TRIAL_TITLE: &str = "Cloud agent trial";
-/// The threshold below which we only show the "Buy more" button (not "New agent").
-use crate::ai::request_usage_model::AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD;
-
-pub fn create_discount_badge(discount: u32, appearance: &Appearance) -> Box<dyn Element> {
-    if discount == 0 {
-        return Empty::new().finish();
-    }
-
-    let theme = appearance.theme();
-    let bg_color: Fill = theme.terminal_colors().normal.green.into();
-
-    Container::new(
-        Text::new_inline(format!("{discount}% off"), appearance.ui_font_family(), 10.)
-            .with_color(theme.main_text_color(bg_color).into())
-            .finish(),
-    )
-    .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-    .with_background(bg_color)
-    .with_uniform_padding(4.)
-    .finish()
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum BillingUsageTab {
-    Overview,
-    UsageHistory,
-}
-impl BillingUsageTab {
-    pub fn get_tab_from_label(label: &str) -> Self {
-        match label {
-            OVERVIEW_TAB_TEXT => BillingUsageTab::Overview,
-            USAGE_HISTORY_TAB_TEXT => BillingUsageTab::UsageHistory,
-            _ => BillingUsageTab::Overview,
-        }
-    }
-
-    pub fn label(&self) -> &str {
-        match self {
-            BillingUsageTab::Overview => OVERVIEW_TAB_TEXT,
-            BillingUsageTab::UsageHistory => USAGE_HISTORY_TAB_TEXT,
-        }
-    }
-}
-
-/// Represents a user item for sorting in the billing and usage page.
-/// The display_name should already have email as fallback before creating this struct.
-pub(crate) struct UserSortingCriteria<T> {
-    pub display_name: String,
-    pub requests_used: usize,
-    pub data: T,
-}
-
-impl<T> UserSortingCriteria<T> {
-    pub fn new(display_name: String, requests_used: usize, data: T) -> Self {
-        Self {
-            display_name,
-            requests_used,
-            data,
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum SortKey {
-    DisplayName,
-    Requests,
-}
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub enum SortOrder {
-    Asc,
-    Desc,
-}
-
-pub(crate) struct ProratedRequestLimitsInfo {
-    pub is_request_limit_prorated: bool,
-    pub mouse_state: MouseStateHandle,
-    pub is_current_user: bool,
-}
-
-pub struct BillingAndUsagePageView {
-    auth_state: Arc<AuthState>,
-    overage_limit_modal_state: ModalViewState<Modal<SpendingLimitModal>>,
-    addon_credit_modal_state: ModalViewState<Modal<SpendingLimitModal>>,
-    // Since UBP can take a second to enable due to needing to contact Stripe,
-    // we allow the view to override the state of the toggle temporarily.
-    usage_based_pricing_toggle_override: Option<bool>,
-    usage_based_pricing_toggle_loading: bool,
-    // Sorting menu state
-    sorting_menu: ViewHandle<Menu<BillingAndUsagePageAction>>,
-    sorting_menu_open: bool,
-    // Current sort state for the members list
-    current_sort_key: Option<SortKey>,
-    current_sort_order: SortOrder,
-    // Which view tab is currently selected
-    selected_tab: BillingUsageTab,
-    // Model for Usage History tab data
-    usage_history_model: ModelHandle<UsageHistoryModel>,
-    // Track which usage history entries have been expanded
-    expanded_usage_entries: HashMap<String, bool>,
-    // Persistent mouse states for usage history entries, keyed by conversation_id
-    usage_entries_mouse_states: RefCell<HashMap<String, MouseStateHandle>>,
-    // Persistent mouse states for tooltips in usage history entries, keyed by conversation_id
-    usage_entries_tooltip_mouse_states: RefCell<HashMap<String, MouseStateHandle>>,
-    // Action button for loading more usage history entries
-    load_more_button: ViewHandle<ActionButton>,
-    selected_addon_denomination: usize,
-    addon_credits_options: Vec<AddonCreditsOption>,
-    addon_credit_denomination_buttons: Vec<ViewHandle<ActionButton>>,
-    purchase_addon_credits_loading: bool,
-    prorated_request_limits_info_mouse_states: Vec<MouseStateHandle>,
-    // ── Plan-header mouse states ─────────────────────────────────────────
-    upgrade_link: MouseStateHandle,
-    anonymous_user_sign_up_button: MouseStateHandle,
-    enterprise_contact_us_link: MouseStateHandle,
-    stripe_billing_portal_link: MouseStateHandle,
-    admin_panel_link: MouseStateHandle,
-    // ── Page-body mouse / switch states ──────────────────────────────────
-    requests_highlight_index: HighlightedHyperlink,
-    ubp_switch_state: SwitchStateHandle,
-    ubp_info_icon_mouse_state: MouseStateHandle,
-    pencil_icon_mouse_state: MouseStateHandle,
-    overage_usage_link_mouse_state: MouseStateHandle,
-    // Mouse state for the inline "Increase your limit" link inside the warning row
-    exceed_limit_link_mouse_state: MouseStateHandle,
-    refresh_icon_mouse_state: MouseStateHandle,
-    sort_icon_mouse_state: MouseStateHandle,
-    overview_tab_mouse_state: MouseStateHandle,
-    usage_history_tab_mouse_state: MouseStateHandle,
-    addon_info_icon_mouse_state: MouseStateHandle,
-    edit_monthly_limit: MouseStateHandle,
-    auto_reload_switch: SwitchStateHandle,
-    buy_button: MouseStateHandle,
-    // Ambient agent trial widget buttons.
-    ambient_trial_new_agent_button: MouseStateHandle,
-    ambient_trial_buy_more_button: MouseStateHandle,
-    ambient_trial_dismiss_button: MouseStateHandle,
-}
-
-impl BillingAndUsagePageView {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        ctx.subscribe_to_model(&UserWorkspaces::handle(ctx), |me, _handle, event, ctx| {
-            me.handle_workspaces_event(event, ctx);
-            ctx.notify();
-        });
-
-        ctx.subscribe_to_model(&AuthManager::handle(ctx), |me, _, _, ctx| {
-            me.refresh_addon_credits_settings(ctx);
-            ctx.notify();
-        });
-
-        let team_update_manager = TeamUpdateManager::handle(ctx);
-        ctx.subscribe_to_model(&team_update_manager, |_, _handle, _, ctx| {
-            ctx.notify();
-        });
-
-        ctx.subscribe_to_model(&AIRequestUsageModel::handle(ctx), |_, _, _, ctx| {
-            ctx.notify()
-        });
-
-        ctx.subscribe_to_model(&PricingInfoModel::handle(ctx), |me, _handle, event, ctx| {
-            #[allow(irrefutable_let_patterns)]
-            if let PricingInfoModelEvent::PricingInfoUpdated = event {
-                me.update_addon_credits_options(ctx);
-                me.refresh_addon_credits_settings(ctx);
-                ctx.notify();
-            }
-        });
-
-        let usage_history_model = ctx.add_model(UsageHistoryModel::new);
-        ctx.subscribe_to_model(&usage_history_model, |_, _, _, ctx| {
-            ctx.notify();
-        });
-        // On page init, fetch the usage history for the current user.
-        usage_history_model.update(ctx, |m, ctx| m.refresh_usage_history_async(ctx));
-
-        let auth_state = AuthStateProvider::as_ref(ctx).get().clone();
-
-        let overage_limit_modal = ctx.add_typed_action_view(SpendingLimitModal::new);
-        ctx.subscribe_to_view(&overage_limit_modal, |me, _, event, ctx| {
-            me.handle_overage_limit_modal_event(event, ctx);
-        });
-
-        let overage_limit_modal_view = ctx.add_typed_action_view(|ctx| {
-            Modal::new(
-                Some("Overage spending limit".to_string()),
-                overage_limit_modal,
-                ctx,
-            )
-            .with_header_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).bottom(16.)),
-                ..Default::default()
-            })
-            .with_body_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).top(0.).bottom(12.)),
-                ..Default::default()
-            })
-        });
-        ctx.subscribe_to_view(&overage_limit_modal_view, |me, _, event, ctx| {
-            me.handle_overage_modal_close_event(event, ctx);
-        });
-
-        let addon_credit_modal = ctx.add_typed_action_view(SpendingLimitModal::new);
-        ctx.subscribe_to_view(&addon_credit_modal, |me, _, event, ctx| {
-            me.handle_addon_credit_modal_event(event, ctx);
-        });
-
-        let addon_credit_modal_view = ctx.add_typed_action_view(|ctx| {
-            Modal::new(
-                Some("Monthly spending limit".to_string()),
-                addon_credit_modal,
-                ctx,
-            )
-            .with_header_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).bottom(16.)),
-                ..Default::default()
-            })
-            .with_body_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).top(0.).bottom(12.)),
-                ..Default::default()
-            })
-        });
-        ctx.subscribe_to_view(&addon_credit_modal_view, |me, _, event, ctx| {
-            me.handle_addon_credit_modal_close_event(event, ctx);
-        });
-
-        // Sorting menu view and close handling
-        let sorting_menu =
-            ctx.add_typed_action_view(|_ctx| Menu::<BillingAndUsagePageAction>::new());
-        ctx.subscribe_to_view(&sorting_menu, |me, _, event, ctx| {
-            if let MenuEvent::Close { .. } = event {
-                me.sorting_menu_open = false;
-                ctx.notify();
-            }
-        });
-
-        let load_more_button = ctx.add_typed_action_view(|_ctx| {
-            ActionButton::new("Load more", SecondaryTheme).on_click(|ctx| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::RenderMoreUsageEntries);
-            })
-        });
-
-        let mut me = Self {
-            auth_state,
-            overage_limit_modal_state: ModalViewState::new(overage_limit_modal_view),
-            addon_credit_modal_state: ModalViewState::new(addon_credit_modal_view),
-            usage_based_pricing_toggle_override: None,
-            usage_based_pricing_toggle_loading: false,
-            sorting_menu,
-            sorting_menu_open: false,
-            usage_history_model,
-            current_sort_key: Some(SortKey::DisplayName),
-            current_sort_order: SortOrder::Asc,
-            selected_tab: BillingUsageTab::Overview,
-            expanded_usage_entries: HashMap::new(),
-            usage_entries_mouse_states: RefCell::new(HashMap::new()),
-            usage_entries_tooltip_mouse_states: RefCell::new(HashMap::new()),
-            load_more_button,
-            selected_addon_denomination: 0,
-            addon_credits_options: Default::default(),
-            addon_credit_denomination_buttons: Default::default(),
-            purchase_addon_credits_loading: false,
-            prorated_request_limits_info_mouse_states: Default::default(),
-            upgrade_link: MouseStateHandle::default(),
-            anonymous_user_sign_up_button: MouseStateHandle::default(),
-            enterprise_contact_us_link: MouseStateHandle::default(),
-            stripe_billing_portal_link: MouseStateHandle::default(),
-            admin_panel_link: MouseStateHandle::default(),
-            requests_highlight_index: HighlightedHyperlink::default(),
-            ubp_switch_state: SwitchStateHandle::default(),
-            ubp_info_icon_mouse_state: MouseStateHandle::default(),
-            pencil_icon_mouse_state: MouseStateHandle::default(),
-            overage_usage_link_mouse_state: MouseStateHandle::default(),
-            exceed_limit_link_mouse_state: MouseStateHandle::default(),
-            refresh_icon_mouse_state: MouseStateHandle::default(),
-            sort_icon_mouse_state: MouseStateHandle::default(),
-            overview_tab_mouse_state: MouseStateHandle::default(),
-            usage_history_tab_mouse_state: MouseStateHandle::default(),
-            addon_info_icon_mouse_state: MouseStateHandle::default(),
-            edit_monthly_limit: MouseStateHandle::default(),
-            auto_reload_switch: SwitchStateHandle::default(),
-            buy_button: MouseStateHandle::default(),
-            ambient_trial_new_agent_button: MouseStateHandle::default(),
-            ambient_trial_buy_more_button: MouseStateHandle::default(),
-            ambient_trial_dismiss_button: MouseStateHandle::default(),
-        };
-        me.update_addon_credits_options(ctx);
-        me.refresh_addon_credits_settings(ctx);
-        me.update_prorated_mouse_states(ctx);
-        me
-    }
-
-    fn refresh_addon_credits_settings(&mut self, ctx: &mut ViewContext<Self>) {
-        let Some(workspace) = UserWorkspaces::as_ref(ctx).current_workspace() else {
-            return;
-        };
-        let addon_credits_settings = &workspace.settings.addon_credits_settings;
-        if addon_credits_settings.auto_reload_enabled {
-            self.selected_addon_denomination = addon_credits_settings
-                .selected_auto_reload_credit_denomination
-                .and_then(|amount| {
-                    self.addon_credits_options
-                        .iter()
-                        .find_position(|option| option.credits == amount)
-                })
-                .map_or(0, |pair| pair.0);
-        }
-        self.update_denomination_buttons_focus(ctx);
-    }
-
-    fn update_denomination_buttons_focus(&mut self, ctx: &mut ViewContext<Self>) {
-        for (i, button_handle) in self.addon_credit_denomination_buttons.iter().enumerate() {
-            ctx.update_view(button_handle, |button, ctx| {
-                if i == self.selected_addon_denomination {
-                    button.set_theme(PrimaryTheme, ctx);
-                } else {
-                    button.set_theme(SecondaryTheme, ctx);
-                }
-            });
-        }
-    }
-
-    fn handle_workspaces_event(
-        &mut self,
-        event: &UserWorkspacesEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            UserWorkspacesEvent::TeamsChanged => {
-                self.update_spending_limit_modals(ctx);
-                self.update_prorated_mouse_states(ctx);
-            }
-            UserWorkspacesEvent::UpdateWorkspaceSettingsSuccess => {
-                self.update_spending_limit_modals(ctx);
-                self.refresh_addon_credits_settings(ctx);
-                self.update_prorated_mouse_states(ctx);
-                self.usage_based_pricing_toggle_override = None;
-                self.usage_based_pricing_toggle_loading = false;
-                ctx.notify();
-            }
-            UserWorkspacesEvent::UpdateWorkspaceSettingsRejected(_err) => {
-                self.show_toast(
-                    "Failed to update workspace settings",
-                    ToastFlavor::Error,
-                    ctx,
-                );
-                self.usage_based_pricing_toggle_override = None;
-                self.usage_based_pricing_toggle_loading = false;
-            }
-            UserWorkspacesEvent::AiOveragesUpdated => {
-                ctx.notify();
-            }
-            UserWorkspacesEvent::PurchaseAddonCreditsSuccess => {
-                self.purchase_addon_credits_loading = false;
-                self.show_toast(
-                    "Successfully purchased add-on credits",
-                    ToastFlavor::Success,
-                    ctx,
-                );
-                AIRequestUsageModel::handle(ctx).update(ctx, |ai_request_usage_model, ctx| {
-                    ai_request_usage_model.refresh_request_usage_async(ctx)
-                });
-            }
-            UserWorkspacesEvent::PurchaseAddonCreditsRejected(err) => {
-                self.purchase_addon_credits_loading = false;
-                self.show_toast(&err.to_string(), ToastFlavor::Error, ctx);
-            }
-            _ => {}
-        }
-    }
-
-    fn show_toast(&self, message: &str, flavor: ToastFlavor, ctx: &mut ViewContext<Self>) {
-        ctx.emit(BillingAndUsagePageEvent::ShowToast {
-            message: message.to_string(),
-            flavor,
-        });
-    }
-
-    pub fn get_modal_content(&self) -> Option<Box<dyn Element>> {
-        if self.overage_limit_modal_state.is_open() {
-            Some(self.overage_limit_modal_state.render())
-        } else if self.addon_credit_modal_state.is_open() {
-            Some(self.addon_credit_modal_state.render())
-        } else {
-            None
-        }
-    }
-
-    fn handle_overage_modal_close_event(
-        &mut self,
-        event: &ModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ModalEvent::Close => {
-                self.overage_limit_modal_state.close();
-                ctx.emit(BillingAndUsagePageEvent::HideModal);
-            }
-        }
-    }
-
-    fn handle_addon_credit_modal_close_event(
-        &mut self,
-        event: &ModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ModalEvent::Close => {
-                self.addon_credit_modal_state.close();
-                ctx.emit(BillingAndUsagePageEvent::HideModal);
-            }
-        }
-    }
-
-    fn handle_overage_limit_modal_event(
-        &mut self,
-        event: &SpendingLimitModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            SpendingLimitModalEvent::Close => {
-                self.hide_overage_limit_modal(ctx);
-            }
-            SpendingLimitModalEvent::Update { amount_cents } => {
-                let workspaces = UserWorkspaces::as_ref(ctx);
-                let team_uid = workspaces.current_team_uid();
-                let usage_settings = workspaces.usage_based_pricing_settings();
-
-                if let Some(team_uid) = team_uid {
-                    self.update_usage_based_pricing_settings(
-                        team_uid,
-                        usage_settings.enabled,
-                        Some(*amount_cents),
-                        ctx,
-                    );
-                    self.hide_overage_limit_modal(ctx);
-                    ctx.notify();
-                }
-            }
-        }
-    }
-
-    fn handle_addon_credit_modal_event(
-        &mut self,
-        event: &SpendingLimitModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            SpendingLimitModalEvent::Close => {
-                self.hide_addon_credit_modal(ctx);
-            }
-            SpendingLimitModalEvent::Update { amount_cents } => {
-                let workspaces = UserWorkspaces::as_ref(ctx);
-                let team_uid = workspaces.current_team_uid();
-
-                if let Some(team_uid) = team_uid {
-                    UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                        user_workspaces.update_addon_credits_settings(
-                            team_uid,
-                            None,
-                            Some(*amount_cents as i32),
-                            None,
-                            ctx,
-                        );
-                    });
-                    self.hide_addon_credit_modal(ctx);
-                    ctx.notify();
-                }
-            }
-        }
-    }
-
-    fn update_usage_based_pricing_settings(
-        &mut self,
-        team_uid: ServerId,
-        enabled: bool,
-        max_monthly_spend_cents: Option<u32>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.usage_based_pricing_toggle_loading = true;
-        UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-            user_workspaces.update_usage_based_pricing_settings(
-                team_uid,
-                enabled,
-                max_monthly_spend_cents,
-                ctx,
-            );
-        });
-
-        self.usage_based_pricing_toggle_override = Some(enabled);
-    }
-
-    fn show_overage_limit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.overage_limit_modal_state.open();
-
-        self.overage_limit_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.focus_input(ctx);
-                });
-            });
-
-        ctx.emit(BillingAndUsagePageEvent::ShowModal);
-    }
-
-    fn hide_overage_limit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.overage_limit_modal_state.close();
-        ctx.emit(BillingAndUsagePageEvent::HideModal);
-    }
-
-    fn update_spending_limit_modals(&mut self, ctx: &mut ViewContext<Self>) {
-        let workspaces = UserWorkspaces::as_ref(ctx);
-        let usage_settings = workspaces.usage_based_pricing_settings();
-        let overage_limit = usage_settings.max_monthly_spend_cents.unwrap_or(5000);
-        let addon_limit = workspaces
-            .current_workspace()
-            .and_then(|workspace| {
-                workspace
-                    .settings
-                    .addon_credits_settings
-                    .max_monthly_spend_cents
-            })
-            .unwrap_or(20000);
-
-        self.overage_limit_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.update_amount_editor(overage_limit, ctx);
-                });
-            });
-        self.addon_credit_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.update_amount_editor(addon_limit.max(0) as u32, ctx);
-                });
-            });
-
-        ctx.notify();
-    }
-
-    fn update_addon_credits_options(&mut self, ctx: &mut ViewContext<Self>) {
-        self.addon_credits_options = PricingInfoModel::as_ref(ctx)
-            .addon_credits_options()
-            .map(|opts| opts.to_vec())
-            .unwrap_or_default();
-        self.addon_credit_denomination_buttons = self
-            .addon_credits_options
-            .iter()
-            .enumerate()
-            .map(|(i, option)| {
-                ctx.add_typed_action_view(move |_ctx| {
-                    ActionButton::new(option.credits.separate_with_commas(), SecondaryTheme)
-                        .with_icon(Icon::Credits)
-                        .on_click(move |ctx| {
-                            ctx.dispatch_typed_action(
-                                BillingAndUsagePageAction::SelectTopupDenomination(i),
-                            );
-                        })
-                })
-            })
-            .collect();
-    }
-
-    fn update_prorated_mouse_states(&mut self, ctx: &mut ViewContext<Self>) {
-        let workspace_members_count = UserWorkspaces::as_ref(ctx)
-            .current_workspace()
-            .map(|workspace| workspace.members.len())
-            .unwrap_or(0);
-        self.prorated_request_limits_info_mouse_states = (0..workspace_members_count)
-            .map(|_| MouseStateHandle::default())
-            .collect();
-    }
-
-    fn show_addon_credit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.addon_credit_modal_state.open();
-
-        self.addon_credit_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.focus_input(ctx);
-                });
-            });
-
-        ctx.emit(BillingAndUsagePageEvent::ShowModal);
-    }
-
-    fn hide_addon_credit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.addon_credit_modal_state.close();
-        ctx.emit(BillingAndUsagePageEvent::HideModal);
-    }
-}
-
-impl BillingAndUsagePageView {
-    pub(super) fn on_page_selected(
-        &mut self,
-        _allow_steal_focus: bool,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.purchase_addon_credits_loading = false;
-        std::mem::drop(
-            TeamUpdateManager::handle(ctx)
-                .update(ctx, |manager, ctx| manager.refresh_workspace_metadata(ctx)),
-        );
-
-        AIRequestUsageModel::handle(ctx).update(ctx, |ai_request_usage_model, ctx| {
-            ai_request_usage_model.refresh_request_usage_async(ctx)
-        });
-
-        self.usage_history_model
-            .update(ctx, |m, ctx| m.refresh_usage_history_async(ctx));
-
-        self.refresh_addon_credits_settings(ctx);
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum BillingAndUsagePageEvent {
-    SignupAnonymousUser,
-    ShowToast {
-        message: String,
-        flavor: ToastFlavor,
-    },
-    ShowModal,
-    HideModal,
-}
-
-impl Entity for BillingAndUsagePageView {
-    type Event = BillingAndUsagePageEvent;
-}
-
-impl View for BillingAndUsagePageView {
-    fn ui_name() -> &'static str {
-        "Billing and usage"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        Flex::column()
-            .with_child(self.render_plan_header(appearance, app))
-            .with_child(self.render_page_body(appearance, app))
-            .finish()
-    }
-}
-
-impl TypedActionView for BillingAndUsagePageView {
-    type Action = BillingAndUsagePageAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        if AuthStateProvider::as_ref(ctx)
-            .get()
-            .is_anonymous_or_logged_out()
-            && action.blocked_for_anonymous_user()
-        {
-            AuthManager::handle(ctx).update(ctx, |auth_manager, ctx| {
-                auth_manager.attempt_login_gated_feature(
-                    action.into(),
-                    AuthViewVariant::RequireLoginCloseable,
-                    ctx,
-                )
-            });
-            return;
-        }
-
-        match action {
-            BillingAndUsagePageAction::Upgrade { team_uid, user_id } => match team_uid {
-                Some(team_uid) => {
-                    ctx.open_url(&UserWorkspaces::upgrade_link_for_team(*team_uid));
-                }
-                None => {
-                    ctx.open_url(&UserWorkspaces::upgrade_link(*user_id));
-                }
-            },
-            BillingAndUsagePageAction::GenerateStripeBillingPortalLink { team_uid } => {
-                UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                    user_workspaces.generate_stripe_billing_portal_link(*team_uid, ctx);
-                });
-            }
-            BillingAndUsagePageAction::OpenAdminPanel { team_uid } => {
-                AdminActions::open_admin_panel(*team_uid, ctx);
-            }
-            BillingAndUsagePageAction::ContactSupport => {
-                AdminActions::contact_support(ctx);
-            }
-            BillingAndUsagePageAction::SignupAnonymousUser => {
-                ctx.emit(BillingAndUsagePageEvent::SignupAnonymousUser);
-            }
-            BillingAndUsagePageAction::AttemptLoginGatedUpgrade => {
-                AuthManager::handle(ctx).update(ctx, |auth_manager, ctx| {
-                    auth_manager.attempt_login_gated_feature(
-                        action.into(),
-                        AuthViewVariant::RequireLoginCloseable,
-                        ctx,
-                    )
-                });
-            }
-            BillingAndUsagePageAction::OpenUrl(url) => {
-                ctx.open_url(&url.url);
-            }
-            BillingAndUsagePageAction::UpdateUsageBasedPricingSettings {
-                team_uid,
-                enabled,
-                max_monthly_spend_cents,
-            } => {
-                self.update_usage_based_pricing_settings(
-                    *team_uid,
-                    *enabled,
-                    *max_monthly_spend_cents,
-                    ctx,
-                );
-            }
-            BillingAndUsagePageAction::ShowOverageLimitModal => {
-                self.show_overage_limit_modal(ctx);
-            }
-            BillingAndUsagePageAction::ToggleSortingMenu => {
-                if self.sorting_menu_open {
-                    self.sorting_menu_open = false;
-                    ctx.focus_self();
-                    ctx.notify();
-                    return;
-                }
-                // Build four menu items with checkmark for selected state
-                let sort_options = [
-                    (
-                        SORT_MENU_ITEM_DISPLAY_NAME_A_Z_LABEL,
-                        SortKey::DisplayName,
-                        SortOrder::Asc,
-                    ),
-                    (
-                        SORT_MENU_ITEM_DISPLAY_NAME_Z_A_LABEL,
-                        SortKey::DisplayName,
-                        SortOrder::Desc,
-                    ),
-                    (
-                        SORT_MENU_ITEM_REQUEST_USAGE_ASCENDING_LABEL,
-                        SortKey::Requests,
-                        SortOrder::Asc,
-                    ),
-                    (
-                        SORT_MENU_ITEM_REQUEST_USAGE_DESCENDING_LABEL,
-                        SortKey::Requests,
-                        SortOrder::Desc,
-                    ),
-                ];
-
-                let items: Vec<MenuItem<BillingAndUsagePageAction>> = sort_options
-                    .iter()
-                    .map(|(label, key, order)| {
-                        let is_selected = matches!(
-                            (self.current_sort_key, self.current_sort_order),
-                            (Some(k), o) if k == *key && o == *order
-                        );
-
-                        let mut menu_item = MenuItemFields::new(*label).with_on_select_action(
-                            BillingAndUsagePageAction::ChangeUsageSort {
-                                key: *key,
-                                order: *order,
-                            },
-                        );
-
-                        menu_item = if is_selected {
-                            menu_item.with_icon(Icon::Check)
-                        } else {
-                            menu_item.with_indent()
-                        };
-
-                        menu_item.into_item()
-                    })
-                    .collect();
-
-                ctx.update_view(&self.sorting_menu, |menu, ctx| menu.set_items(items, ctx));
-                self.sorting_menu_open = true;
-                ctx.focus(&self.sorting_menu);
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::RefreshWorkspaceData => {
-                std::mem::drop(
-                    TeamUpdateManager::handle(ctx)
-                        .update(ctx, |manager, ctx| manager.refresh_workspace_metadata(ctx)),
-                );
-
-                AIRequestUsageModel::handle(ctx).update(ctx, |ai_request_usage_model, ctx| {
-                    ai_request_usage_model.refresh_request_usage_async(ctx)
-                });
-            }
-            BillingAndUsagePageAction::ChangeUsageSort { key, order } => {
-                self.current_sort_key = Some(*key);
-                self.current_sort_order = *order;
-                self.sorting_menu_open = false;
-                ctx.focus_self();
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::SelectTab(tab) => {
-                if self.selected_tab != *tab {
-                    self.selected_tab = tab.clone();
-                    ctx.notify();
-                }
-            }
-            BillingAndUsagePageAction::ToggleUsageEntryExpanded { conversation_id } => {
-                let is_expanded = self
-                    .expanded_usage_entries
-                    .get(conversation_id)
-                    .copied()
-                    .unwrap_or(false);
-
-                self.expanded_usage_entries
-                    .insert(conversation_id.clone(), !is_expanded);
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::RenderMoreUsageEntries => {
-                self.usage_history_model
-                    .update(ctx, |m, ctx| m.load_more_usage_history_async(ctx));
-            }
-            BillingAndUsagePageAction::SelectTopupDenomination(i) => {
-                self.selected_addon_denomination = *i;
-                self.update_denomination_buttons_focus(ctx);
-                UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                    let team_uid = user_workspaces.current_team_uid();
-                    if let Some((workspace, team_uid)) =
-                        user_workspaces.current_workspace().zip(team_uid)
-                    {
-                        if workspace
-                            .settings
-                            .addon_credits_settings
-                            .auto_reload_enabled
-                        {
-                            if let Some(option) = self
-                                .addon_credits_options
-                                .get(self.selected_addon_denomination)
-                            {
-                                user_workspaces.update_addon_credits_settings(
-                                    team_uid,
-                                    None,
-                                    None,
-                                    Some(option.credits),
-                                    ctx,
-                                );
-                            }
-                        }
-                    }
-                });
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::PurchaseAddonCredits { team_uid } => {
-                if let Some(option) = self
-                    .addon_credits_options
-                    .get(self.selected_addon_denomination)
-                {
-                    let credits = option.credits;
-                    let team_uid = *team_uid;
-                    self.purchase_addon_credits_loading = true;
-                    UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                        user_workspaces.purchase_addon_credits(team_uid, credits, ctx);
-                    });
-                    ctx.notify();
-                }
-            }
-            BillingAndUsagePageAction::ShowAddOnCreditModal => {
-                self.show_addon_credit_modal(ctx);
-            }
-            BillingAndUsagePageAction::UpdateAutoReloadEnabled { team_uid, enabled } => {
-                send_telemetry_from_ctx!(
-                    TelemetryEvent::AutoReloadToggledFromBillingSettings {
-                        enabled: *enabled,
-                        banner_toggle_flag_enabled: FeatureFlag::BuildPlanAutoReloadBannerToggle
-                            .is_enabled(),
-                        post_purchase_modal_flag_enabled:
-                            FeatureFlag::BuildPlanAutoReloadPostPurchaseModal.is_enabled(),
-                    },
-                    ctx
-                );
-
-                let selected_auto_reload_value = if *enabled {
-                    self.addon_credits_options
-                        .get(self.selected_addon_denomination)
-                        .map(|option| option.credits)
-                } else {
-                    None
-                };
-                UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                    user_workspaces.update_addon_credits_settings(
-                        *team_uid,
-                        Some(*enabled),
-                        None,
-                        selected_auto_reload_value,
-                        ctx,
-                    );
-                });
-            }
-            BillingAndUsagePageAction::DismissAmbientAgentTrialWidget => {
-                AISettings::handle(ctx).update(ctx, |settings, ctx| {
-                    let _ = settings
-                        .ambient_agent_trial_widget_dismissed
-                        .set_value(true, ctx);
-                });
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::NavigateToByokSettings => {
-                ctx.dispatch_typed_action_deferred(WorkspaceAction::ShowSettingsPageWithSearch {
-                    search_query: "api".to_string(),
-                    section: Some(SettingsSection::WarpAgent),
-                });
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum BillingAndUsagePageAction {
-    OpenUrl(HyperlinkUrl),
-    Upgrade {
-        team_uid: Option<ServerId>,
-        user_id: UserUid,
-    },
-    GenerateStripeBillingPortalLink {
-        team_uid: ServerId,
-    },
-    OpenAdminPanel {
-        team_uid: ServerId,
-    },
-    ContactSupport,
-    SignupAnonymousUser,
-    AttemptLoginGatedUpgrade,
-    UpdateUsageBasedPricingSettings {
-        team_uid: ServerId,
-        enabled: bool,
-        max_monthly_spend_cents: Option<u32>,
-    },
-    ShowOverageLimitModal,
-    RefreshWorkspaceData,
-    ToggleSortingMenu,
-    ChangeUsageSort {
-        key: SortKey,
-        order: SortOrder,
-    },
-    SelectTab(BillingUsageTab),
-    ToggleUsageEntryExpanded {
-        conversation_id: String,
-    },
-    RenderMoreUsageEntries,
-    SelectTopupDenomination(usize),
-    PurchaseAddonCredits {
-        team_uid: ServerId,
-    },
-    ShowAddOnCreditModal,
-    UpdateAutoReloadEnabled {
-        team_uid: ServerId,
-        enabled: bool,
-    },
-    DismissAmbientAgentTrialWidget,
-    NavigateToByokSettings,
-}
-
-impl BillingAndUsagePageAction {
-    fn blocked_for_anonymous_user(&self) -> bool {
-        use BillingAndUsagePageAction::*;
-        matches!(
-            self,
-            Upgrade { .. } | GenerateStripeBillingPortalLink { .. },
-        )
-    }
-}
-
-impl From<&BillingAndUsagePageAction> for LoginGatedFeature {
-    fn from(val: &BillingAndUsagePageAction) -> LoginGatedFeature {
-        match val {
-            BillingAndUsagePageAction::Upgrade { .. } => "Upgrade Plan",
-            BillingAndUsagePageAction::GenerateStripeBillingPortalLink { .. } => {
-                "Generate Stripe Billing Portal Link"
-            }
-            _ => "Unknown reason",
-        }
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-enum Divisor {
-    Unlimited,
-    Limit(usize),
-}
-
-impl BillingAndUsagePageView {
-    /// Renders the ambient agent trial widget showing remaining credits and action buttons.
-    /// Returns None if the user has no ambient-only credits (None value from server),
-    /// or if the widget has been dismissed (only dismissible when below threshold).
-    fn render_ambient_agent_trial_widget(
-        &self,
-        ai_request_usage_model: &AIRequestUsageModel,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Option<Box<dyn Element>> {
-        let credits_remaining = ai_request_usage_model.ambient_only_credits_remaining()?;
-
-        // Check if the widget has been dismissed.
-        let is_dismissed = *AISettings::as_ref(app).ambient_agent_trial_widget_dismissed;
-        if is_dismissed {
-            return None;
-        }
-
-        let theme = appearance.theme();
-        let ui_builder = appearance.ui_builder();
-        let fg = theme.foreground().into_solid();
-        let bg = theme.background().into_solid();
-
-        let title = Text::new_inline(AMBIENT_AGENT_TRIAL_TITLE, appearance.ui_font_family(), 14.)
-            .with_color(theme.active_ui_text_color().into())
-            .with_style(Properties::default().weight(Weight::Semibold))
-            .finish();
-
-        let credits_text = if credits_remaining == 1 {
-            "1 credit remaining".to_string()
-        } else {
-            format!(
-                "{} credits remaining",
-                credits_remaining.separate_with_commas()
-            )
-        };
-        let credits_label = Text::new_inline(credits_text, appearance.ui_font_family(), 12.)
-            .with_color(blended_colors::text_sub(theme, theme.surface_1()))
-            .finish();
-
-        let left_side = Flex::row()
-            .with_child(title)
-            .with_child(Container::new(credits_label).with_margin_left(8.).finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .finish();
-
-        let mut right_side = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-
-        // Only show "New agent" button if credits >= threshold.
-        if credits_remaining >= AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD {
-            let new_agent_button = ui_builder
-                .button(
-                    ButtonVariant::Secondary,
-                    self.ambient_trial_new_agent_button.clone(),
-                )
-                .with_text_label("New agent".to_string())
-                .with_style(UiComponentStyles {
-                    font_color: Some(bg),
-                    background: Some(fg.into()),
-                    font_size: Some(14.),
-                    font_weight: Some(Weight::Semibold),
-                    padding: Some(Coords {
-                        top: 7.,
-                        bottom: 7.,
-                        left: 12.,
-                        right: 12.,
-                    }),
-                    ..Default::default()
-                })
-                .build()
-                .on_click(|ctx, _, _| {
-                    ctx.dispatch_typed_action(WorkspaceAction::AddAmbientAgentTab);
-                })
-                .finish();
-            right_side.add_child(
-                Container::new(new_agent_button)
-                    .with_margin_right(8.)
-                    .finish(),
-            );
-        }
-
-        // Only show "Buy more" button for users not on a paid plan.
-        let is_on_paid_plan = UserWorkspaces::as_ref(app)
-            .current_team()
-            .is_some_and(|team| team.billing_metadata.is_user_on_paid_plan());
-        if !is_on_paid_plan {
-            let user_id = AuthStateProvider::as_ref(app).get().user_id();
-            let buy_more_button = ui_builder
-                .button(
-                    ButtonVariant::Secondary,
-                    self.ambient_trial_buy_more_button.clone(),
-                )
-                .with_text_label("Buy more".to_string())
-                .with_style(UiComponentStyles {
-                    background: Some(bg.into()),
-                    font_size: Some(14.),
-                    font_weight: Some(Weight::Semibold),
-                    padding: Some(Coords {
-                        top: 7.,
-                        bottom: 7.,
-                        left: 12.,
-                        right: 12.,
-                    }),
-                    ..Default::default()
-                })
-                .build()
-                .on_click(move |ctx, _, _| {
-                    if let Some(user_id) = user_id {
-                        ctx.dispatch_typed_action(BillingAndUsagePageAction::Upgrade {
-                            team_uid: None,
-                            user_id,
-                        });
-                    }
-                })
-                .finish();
-            right_side.add_child(buy_more_button);
-        }
-
-        // Show dismiss button only when credits are below threshold.
-        if credits_remaining < AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD {
-            let dismiss_button = icon_button(
-                appearance,
-                Icon::X,
-                false,
-                self.ambient_trial_dismiss_button.clone(),
-            )
-            .with_style(UiComponentStyles {
-                width: Some(32.),
-                height: Some(32.),
-                padding: Some(Coords::uniform(8.)),
-                ..Default::default()
-            })
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(
-                    BillingAndUsagePageAction::DismissAmbientAgentTrialWidget,
-                );
-            })
-            .finish();
-            right_side.add_child(Container::new(dismiss_button).with_margin_left(4.).finish());
-        }
-
-        let row_content = Flex::row()
-            .with_child(Shrinkable::new(1., left_side).finish())
-            .with_child(right_side.finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_main_axis_size(MainAxisSize::Max)
-            .finish();
-
-        let bright_blue: ColorU = theme.terminal_colors().bright.blue.into();
-        let gradient_start = ColorU::transparent_black();
-        let gradient_end = ColorU::new(bright_blue.r, bright_blue.g, bright_blue.b, 40);
-
-        let card = Container::new(row_content)
-            .with_horizontal_background_gradient(gradient_start, gradient_end)
-            .with_border(Border::all(1.).with_border_color(theme.accent_overlay().into()))
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-            .with_margin_bottom(16.)
-            .with_uniform_padding(12.)
-            .finish();
-
-        Some(card)
-    }
-
-    fn render_usage_based_pricing_section(
-        &self,
-        enabled: bool,
-        team: &Team,
-        appearance: &Appearance,
-        app: &AppContext,
-        has_admin_permissions: bool,
-        ubp_toggle_loading: bool,
-    ) -> Box<dyn Element> {
-        let is_delinquent = team.billing_metadata.is_delinquent_due_to_payment_issue();
-        let enabled_and_not_delinquent = enabled && !is_delinquent;
-
-        let (header_text, description_text) = if has_admin_permissions {
-            (OVERAGE_TOGGLE_ADMIN_HEADER, OVERAGE_TOGGLE_DESCRIPTION)
-        } else if enabled {
-            (
-                OVERAGE_TOGGLE_USER_HEADER_ENABLED,
-                OVERAGE_TOGGLE_DESCRIPTION,
-            )
-        } else {
-            (
-                OVERAGE_TOGGLE_USER_HEADER_DISABLED,
-                OVERAGE_TOGGLE_USER_DESCRIPTION,
-            )
-        };
-
-        let header = Text::new_inline(header_text, appearance.ui_font_family(), 14.)
-            .with_color(appearance.theme().active_ui_text_color().into())
-            .finish();
-
-        let description = appearance
-            .ui_builder()
-            .paragraph(description_text)
-            .with_style(UiComponentStyles {
-                font_color: Some(blended_colors::text_sub(
-                    appearance.theme(),
-                    appearance.theme().surface_1(),
-                )),
-                font_size: Some(12.),
-                margin: Some(Coords {
-                    top: 4.,
-                    bottom: 0.,
-                    left: 0.,
-                    right: 0.,
-                }),
-                ..Default::default()
-            })
-            .build()
-            .finish();
-
-        let mut column = Flex::column();
-
-        if has_admin_permissions {
-            let team_uid = team.uid;
-            let toggle = appearance
-                .ui_builder()
-                .switch(self.ubp_switch_state.clone())
-                .check(enabled_and_not_delinquent)
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(
-                        BillingAndUsagePageAction::UpdateUsageBasedPricingSettings {
-                            team_uid,
-                            enabled: !enabled,
-                            max_monthly_spend_cents: None,
-                        },
-                    );
-                });
-
-            let toggle = if ubp_toggle_loading || is_delinquent {
-                toggle.disable().finish()
-            } else {
-                toggle.finish()
-            };
-
-            column.add_child(
-                Flex::row()
-                    .with_child(header)
-                    .with_child(Container::new(toggle).with_margin_left(16.).finish())
-                    .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                    .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                    .with_main_axis_size(MainAxisSize::Max)
-                    .finish(),
-            );
-        } else {
-            column.add_child(header);
-        }
-
-        column.add_child(Container::new(description).with_margin_right(100.).finish());
-
-        if enabled_and_not_delinquent || team.billing_metadata.has_overages_used() {
-            column.add_child(self.render_monthly_overage_spending_limit(
-                appearance,
-                app,
-                has_admin_permissions,
-            ));
-            column.add_child(self.render_total_overages_row(appearance, app));
-            if let Some(manage_link) =
-                self.render_manage_overages_link(appearance, team.uid, has_admin_permissions)
-            {
-                column.add_child(manage_link);
-            }
-        }
-
-        column.finish()
-    }
-
-    fn render_monthly_overage_spending_limit(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-        has_admin_permissions: bool,
-    ) -> Box<dyn Element> {
-        let workspaces = UserWorkspaces::as_ref(app);
-        let usage_settings = workspaces.usage_based_pricing_settings();
-
-        let spend_limit_text = if let Some(cents) = usage_settings.max_monthly_spend_cents {
-            format!("${:.2}", cents as f64 / 100.0)
-        } else {
-            "Not set".to_string()
-        };
-
-        let info_icon = render_info_icon(
-            appearance,
-            AdditionalInfo::<BillingAndUsagePageAction> {
-                mouse_state: self.ubp_info_icon_mouse_state.clone(),
-                on_click_action: None,
-                secondary_text: None,
-                tooltip_override_text: Some(
-                    "Sets the monthly overage spending limit beyond the plan amount".to_string(),
-                ),
-            },
-        );
-
-        let label = Text::new_inline(
-            "Monthly overage spending limit",
-            appearance.ui_font_family(),
-            12.,
-        )
-        .with_color(appearance.theme().active_ui_text_color().into())
-        .finish();
-
-        let value = Text::new_inline(spend_limit_text, appearance.ui_font_family(), 12.)
-            .with_color(blended_colors::text_sub(
-                appearance.theme(),
-                appearance.theme().surface_1(),
-            ))
-            .finish();
-
-        let mut right_side = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-
-        if has_admin_permissions {
-            let pencil_icon = icon_button(
-                appearance,
-                Icon::Pencil,
-                false,
-                self.pencil_icon_mouse_state.clone(),
-            )
-            .with_style(UiComponentStyles {
-                width: Some(20.),
-                height: Some(20.),
-                ..Default::default()
-            })
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::ShowOverageLimitModal);
-            })
-            .finish();
-
-            right_side.add_child(Container::new(pencil_icon).with_margin_right(8.).finish());
-        }
-
-        right_side.add_child(value);
-
-        Container::new(
-            Flex::row()
-                .with_child(
-                    Flex::row()
-                        .with_child(label)
-                        .with_child(Container::new(info_icon).with_margin_left(4.).finish())
-                        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                        .finish(),
-                )
-                .with_child(right_side.finish())
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_main_axis_size(MainAxisSize::Max)
-                .finish(),
-        )
-        .with_margin_top(16.)
-        .finish()
-    }
-
-    fn render_manage_overages_link(
-        &self,
-        appearance: &Appearance,
-        team_uid: ServerId,
-        has_admin_permissions: bool,
-    ) -> Option<Box<dyn Element>> {
-        if has_admin_permissions {
-            Some(
-                appearance
-                    .ui_builder()
-                    .link(
-                        OVERAGE_USAGE_LINK_TEXT.to_string(),
-                        None,
-                        Some(Box::new(move |ctx| {
-                            ctx.dispatch_typed_action(
-                                BillingAndUsagePageAction::GenerateStripeBillingPortalLink {
-                                    team_uid,
-                                },
-                            );
-                        })),
-                        self.overage_usage_link_mouse_state.clone(),
-                    )
-                    .build()
-                    .with_margin_top(16.)
-                    .finish(),
-            )
-        } else {
-            None
-        }
-    }
-
-    fn render_warning_icon(appearance: &Appearance) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        ConstrainedBox::new(
-            Icon::AlertTriangle
-                .to_galaxyui_icon(theme.ui_error_color().into())
-                .finish(),
-        )
-        .with_height(16.)
-        .with_width(16.)
-        .finish()
-    }
-
-    fn render_warning_row_with_content(
-        appearance: &Appearance,
-        content: Box<dyn Element>,
-    ) -> Box<dyn Element> {
-        Container::new(
-            Flex::row()
-                .with_child(
-                    Container::new(Self::render_warning_icon(appearance))
-                        .with_margin_right(8.)
-                        .finish(),
-                )
-                .with_child(Shrinkable::new(1.0, content).finish())
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .finish(),
-        )
-        .with_margin_top(8.) // 8px from spacing + 8px here = 16px total
-        .finish()
-    }
-
-    fn render_warning_row(
-        &self,
-        appearance: &Appearance,
-        warning_string: String,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let warning_text = Text::new(warning_string, appearance.ui_font_family(), 12.)
-            .with_color(theme.ui_error_color())
-            .finish();
-
-        Self::render_warning_row_with_content(appearance, warning_text)
-    }
-
-    fn render_warning_row_with_link(
-        &self,
-        appearance: &Appearance,
-        text_fragments: Vec<FormattedTextFragment>,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-
-        // Build: [plain text] [always-underlined link] [plain text]
-        let mut children: Vec<Box<dyn Element>> = Vec::new();
-        let ui_builder = appearance.ui_builder();
-
-        for fragment in text_fragments {
-            match fragment.styles.hyperlink {
-                Some(markdown_parser::Hyperlink::Url(url)) => {
-                    let link = ui_builder
-                        .link(
-                            fragment.text,
-                            Some(url),
-                            None,
-                            self.exceed_limit_link_mouse_state.clone(),
-                        )
-                        .with_style(UiComponentStyles {
-                            // Make it look like a link in the error row
-                            font_size: Some(12.),
-                            font_color: Some(theme.ui_error_color()),
-                            border_color: Some(theme.ui_error_color().into()), // always underline
-                            border_width: Some(1.),
-                            ..Default::default()
-                        })
-                        .build()
-                        .finish();
-                    children.push(link);
-                }
-                Some(markdown_parser::Hyperlink::Action(action)) => {
-                    // Downcast to our action type and dispatch on click
-                    let maybe_action = action
-                        .as_any()
-                        .downcast_ref::<BillingAndUsagePageAction>()
-                        .cloned();
-                    let link = ui_builder
-                        .link(
-                            fragment.text,
-                            None,
-                            maybe_action.map(|act| {
-                                Box::new(move |ctx: &mut galaxyui::EventContext| {
-                                    ctx.dispatch_typed_action(act.clone());
-                                })
-                                    as Box<dyn Fn(&mut galaxyui::EventContext)>
-                            }),
-                            self.exceed_limit_link_mouse_state.clone(),
-                        )
-                        .with_style(UiComponentStyles {
-                            font_size: Some(12.),
-                            font_color: Some(theme.ui_error_color()),
-                            border_color: Some(theme.ui_error_color().into()),
-                            border_width: Some(1.),
-                            ..Default::default()
-                        })
-                        .build()
-                        .finish();
-                    children.push(link);
-                }
-                None => {
-                    // Plain text in error color
-                    let text = Text::new_inline(fragment.text, appearance.ui_font_family(), 12.)
-                        .with_color(theme.ui_error_color())
-                        .finish();
-                    children.push(text);
-                }
-            }
-        }
-
-        let content = Flex::row().with_children(children).finish();
-        Self::render_warning_row_with_content(appearance, content)
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn render_addon_credits_panel(
-        &self,
-        selected_topup_denomination: usize,
-        workspace: &Workspace,
-        team_uid: ServerId,
-        has_admin_permissions: bool,
-        bonus_credit_balance: i32,
-        addon_credits_options: &[AddonCreditsOption],
-        addon_credit_denomination_buttons: &[ViewHandle<ActionButton>],
-        purchase_addon_credits_loading: bool,
-        delinquent_due_to_payment_issue: bool,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let fg = appearance.theme().foreground();
-        let bg = appearance.theme().background();
-        let ui_builder = appearance.ui_builder();
-        let theme = appearance.theme();
-
-        let header = Text::new_inline("Add-on credits", appearance.ui_font_family(), 16.)
-            .with_color(fg.into())
-            .with_style(Properties::default().weight(Weight::Bold))
-            .finish();
-
-        let credits_value = Text::new_inline(
-            bonus_credit_balance.separate_with_commas(),
-            appearance.ui_font_family(),
-            16.,
-        )
-        .with_color(fg.into())
-        .finish();
-
-        let icon = Container::new(
-            ConstrainedBox::new(Icon::Credits.to_galaxyui_icon(fg).finish())
-                .with_height(16.)
-                .with_width(16.)
-                .finish(),
-        )
-        .with_margin_right(12.)
-        .finish();
-
-        let card_header = Flex::row()
-            .with_child(Shrinkable::new(1., Align::new(header).left().finish()).finish())
-            .with_child(icon)
-            .with_child(credits_value)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .finish();
-
-        let team_can_purchase_addon_credits = UserWorkspaces::as_ref(app)
-            .current_team()
-            .and_then(|team| team.billing_metadata.tier.purchase_add_on_credits_policy)
-            .is_some_and(|policy| policy.enabled);
-        let can_upgrade_to_build = UserWorkspaces::as_ref(app)
-            .current_workspace()
-            .map(|workspace| workspace.billing_metadata.can_upgrade_to_build_plan())
-            .unwrap_or(false);
-
-        let no_credits_access_explanation = match (
-            team_can_purchase_addon_credits,
-            can_upgrade_to_build,
-            has_admin_permissions,
-        ) {
-            // If the team can purchase addon credits (which implies they're already on a Build-like plan)
-            // and the current user is a team admin, don't show any explanation, so that we show the
-            // fuller experience with the rest of the settings below this.
-            (true, _, true) => None,
-            // If the team cannot purchase addon credits, but they can upgrade to a Build-like plan,
-            // and the current user is an admin, then we show them a nudge to switch to Build.
-            (false, true, true) => {
-                let upgrade_url = UserWorkspaces::upgrade_link_for_team(team_uid);
-                let is_legacy_paid = UserWorkspaces::handle(app)
-                    .as_ref(app)
-                    .current_team()
-                    .is_some_and(|team| team.billing_metadata.is_on_legacy_paid_plan());
-                let (link_text, suffix) = if is_legacy_paid {
-                    ("Switch to the Build plan", " to purchase add-on credits.")
-                } else {
-                    ("Upgrade to the Build plan", " to purchase add-on credits.")
-                };
-
-                let text_fragments = vec![
-                    FormattedTextFragment::hyperlink(link_text, upgrade_url),
-                    FormattedTextFragment::plain_text(suffix),
-                ];
-
-                Some(
-                    FormattedTextElement::new(
-                        FormattedText::new([FormattedTextLine::Line(text_fragments)]),
-                        appearance.ui_font_size(),
-                        appearance.ui_font_family(),
-                        appearance.ui_font_family(),
-                        theme.sub_text_color(bg).into(),
-                        HighlightedHyperlink::default(),
-                    )
-                    .with_hyperlink_font_color(theme.accent().into_solid())
-                    .register_default_click_handlers_with_action_support(
-                        |hyperlink_lens, event, ctx| match hyperlink_lens {
-                            galaxyui::elements::HyperlinkLens::Url(url) => {
-                                ctx.open_url(url);
-                            }
-                            galaxyui::elements::HyperlinkLens::Action(action_ref) => {
-                                if let Some(action) = action_ref
-                                    .as_any()
-                                    .downcast_ref::<BillingAndUsagePageAction>()
-                                {
-                                    event.dispatch_typed_action(action.clone());
-                                }
-                            }
-                        },
-                    )
-                    .finish(),
-                )
-            }
-            // If the team cannot purchase addon credits, and they can't upgrade to Build, that means
-            // they're on an Enterprise-like plan. For admins, we show them a message to contact their
-            // Account Executive.
-            (false, false, true) => {
-                let paragraph_text = "Contact your Account Executive for more add-on credits.";
-                Some(
-                    ui_builder
-                        .paragraph(paragraph_text)
-                        .with_style(UiComponentStyles {
-                            font_color: Some(theme.sub_text_color(bg).into()),
-                            ..Default::default()
-                        })
-                        .build()
-                        .finish(),
-                )
-            }
-            // Every other case relates to not being a team admin. If you aren't an admin, we show
-            // a generic message telling you to talk to them.
-            (_, _, false) => {
-                let paragraph_text = "Contact a team admin to purchase add-on credits.";
-                Some(
-                    ui_builder
-                        .paragraph(paragraph_text)
-                        .with_style(UiComponentStyles {
-                            font_color: Some(theme.sub_text_color(bg).into()),
-                            ..Default::default()
-                        })
-                        .build()
-                        .finish(),
-                )
-            }
-        };
-
-        // If we have an explanation, render it + return early, since the rest of the content
-        // here (monthly spend limits, ad-hoc purchasing of credits) isn't relevant.
-        if let Some(no_credits_access_explanation) = no_credits_access_explanation {
-            let card_content = Flex::column()
-                .with_children([
-                    Container::new(card_header).with_margin_bottom(8.).finish(),
-                    no_credits_access_explanation,
-                ])
-                .finish();
-            return Container::new(card_content)
-                .with_background_color(theme.surface_1().into_solid())
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_margin_bottom(16.)
-                .with_uniform_padding(16.)
-                .finish();
-        }
-
-        let team_member_count = UserWorkspaces::as_ref(app)
-            .current_team()
-            .map(|team| team.members.len())
-            .unwrap_or(1);
-
-        let paragraph_text = if team_member_count > 1 {
-            format!("{ADDON_CREDITS_DESCRIPTION} {ADDITIONAL_ADDON_CREDITS_DESCRIPTION_FOR_TEAM}")
-        } else {
-            ADDON_CREDITS_DESCRIPTION.to_string()
-        };
-        let paragraph = ui_builder
-            .paragraph(paragraph_text)
-            .with_style(UiComponentStyles {
-                font_color: Some(theme.sub_text_color(bg).into()),
-                ..Default::default()
-            })
-            .build()
-            .finish();
-
-        let info_icon = render_info_icon(
-            appearance,
-            AdditionalInfo::<BillingAndUsagePageAction> {
-                mouse_state: self.addon_info_icon_mouse_state.clone(),
-                on_click_action: None,
-                secondary_text: None,
-                tooltip_override_text: Some(
-                    "Sets the monthly limit spent on add-on credits".to_string(),
-                ),
-            },
-        );
-
-        let spend_limit_text = workspace
-            .settings
-            .addon_credits_settings
-            .max_monthly_spend_cents
-            .map(|cents| format!("${:.2}", cents as f64 / 100.0))
-            .unwrap_or_else(|| "$200.00".to_string());
-
-        let monthly_spend_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_children([
-                ui_builder.span("Monthly spend limit").build().finish(),
-                Shrinkable::new(1., Align::new(info_icon).left().finish()).finish(),
-                icon_button(
-                    appearance,
-                    Icon::Pencil,
-                    false,
-                    self.edit_monthly_limit.clone(),
-                )
-                .build()
-                .on_click(|ctx, _, _| {
-                    ctx.dispatch_typed_action(BillingAndUsagePageAction::ShowAddOnCreditModal);
-                })
-                .finish(),
-                ui_builder.span(spend_limit_text).build().finish(),
-            ])
-            .finish();
-
-        let bonus_grants_purchased = UserWorkspaces::as_ref(app)
-            .current_workspace()
-            .map(|workspace| workspace.bonus_grants_purchased_this_month.clone());
-
-        let purchased_this_month_row = if let Some(bonus_grants) = bonus_grants_purchased {
-            if bonus_grants.total_credits_purchased == 0 {
-                None
-            } else {
-                let credits_purchased = bonus_grants.total_credits_purchased;
-                let cost_cents = bonus_grants.cents_spent;
-                let cost_dollars = cost_cents as f64 / 100.0;
-
-                let label =
-                    Text::new_inline("Purchased this month", appearance.ui_font_family(), 12.)
-                        .with_color(appearance.theme().active_ui_text_color().into())
-                        .finish();
-
-                let credits_text = if credits_purchased == 1 {
-                    "1 credit".to_string()
-                } else {
-                    format!("{} credits", credits_purchased.separate_with_commas())
-                };
-
-                let credits_component = Container::new(
-                    Text::new_inline(credits_text, appearance.ui_font_family(), 12.)
-                        .with_color(blended_colors::text_disabled(
-                            appearance.theme(),
-                            appearance.theme().surface_1(),
-                        ))
-                        .finish(),
-                )
-                .with_margin_right(8.)
-                .finish();
-
-                let cost_component = Text::new_inline(
-                    format!("${cost_dollars:.2}"),
-                    appearance.ui_font_family(),
-                    12.,
-                )
-                .with_color(blended_colors::text_sub(
-                    appearance.theme(),
-                    appearance.theme().surface_1(),
-                ))
-                .finish();
-
-                let right_side = Flex::row()
-                    .with_child(credits_component)
-                    .with_child(cost_component)
-                    .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                    .finish();
-
-                Some(
-                    Container::new(
-                        Flex::row()
-                            .with_child(label)
-                            .with_child(right_side)
-                            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                            .with_main_axis_size(MainAxisSize::Max)
-                            .finish(),
-                    )
-                    .with_margin_bottom(4.)
-                    .finish(),
-                )
-            }
-        } else {
-            None
-        };
-
-        let selected_option = addon_credits_options.get(selected_topup_denomination);
-
-        let auto_reload_enabled = workspace
-            .settings
-            .addon_credits_settings
-            .auto_reload_enabled;
-
-        let auto_reload_amount = selected_option
-            .map(|option| option.credits.to_string())
-            .filter(|_| auto_reload_enabled)
-            .unwrap_or("your selected".to_string());
-        let auto_reload_switch = ui_builder
-            .switch(self.auto_reload_switch.clone())
-            .check(auto_reload_enabled);
-        let auto_reload_switch = if delinquent_due_to_payment_issue {
-            auto_reload_switch.disable().build().finish()
-        } else {
-            auto_reload_switch
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(BillingAndUsagePageAction::UpdateAutoReloadEnabled {
-                        team_uid,
-                        enabled: !auto_reload_enabled,
-                    });
-                })
-                .finish()
-        };
-
-        let auto_reload_switch = Container::new(render_body_item::<BillingAndUsagePageAction>(
-            "Auto reload".into(),
-            None,
-            Default::default(),
-            Default::default(),
-            appearance,
-            auto_reload_switch,
-            Some(format!(
-                "When enabled, auto reload will automatically purchase {auto_reload_amount} \
-                credits when your add-on credit balance reaches 100 credits remaining."
-            )),
-        ))
-        .with_padding_right(-TOGGLE_BUTTON_RIGHT_PADDING)
-        .finish();
-
-        let denomination_buttons = addon_credit_denomination_buttons
-            .iter()
-            .map(|button_handle| ChildView::new(button_handle).finish())
-            .collect::<Vec<Box<dyn Element>>>();
-        let denominations = Wrap::row()
-            .with_children(denomination_buttons)
-            .with_spacing(8.)
-            .finish();
-
-        let mut card_content_upper = Flex::column()
-            .with_children([card_header, paragraph, monthly_spend_row])
-            .with_spacing(8.);
-
-        if let Some(purchased_row) = purchased_this_month_row {
-            card_content_upper.add_child(purchased_row);
-        }
-        card_content_upper.add_child(auto_reload_switch);
-
-        let base_rate = addon_credits_options
-            .first()
-            .map_or(0., |option| option.rate());
-
-        let (rendered_price, discount_badge) = match selected_option {
-            Some(option) => {
-                let price_dollars = option.price_usd_cents as f64 / 100.0;
-                let rendered_price = Container::new(
-                    Text::new_inline(
-                        format!("${price_dollars:.2}"),
-                        appearance.ui_font_family(),
-                        16.,
-                    )
-                    .with_color(fg.into())
-                    .finish(),
-                )
-                .with_margin_right(16.)
-                .finish();
-
-                let discount_percent = if base_rate > 0.0 {
-                    let actual_rate = option.rate();
-                    ((base_rate - actual_rate) / base_rate * 100.0).round() as u32
-                } else {
-                    0
-                };
-
-                let discount_badge =
-                    Container::new(create_discount_badge(discount_percent, appearance))
-                        .with_margin_right(8.)
-                        .finish();
-                (rendered_price, discount_badge)
-            }
-            None => (Empty::new().finish(), Empty::new().finish()),
-        };
-
-        let button_text = if purchase_addon_credits_loading {
-            "Buying…".to_string()
-        } else {
-            "Buy".to_string()
-        };
-
-        let would_exceed_limit = selected_option.is_some_and(|option| {
-            let purchase_cost_cents = option.price_usd_cents;
-            let monthly_limit_cents = workspace
-                .settings
-                .addon_credits_settings
-                .max_monthly_spend_cents
-                .unwrap_or(20000); // Default $200 limit
-
-            let already_spent_cents = workspace.bonus_grants_purchased_this_month.cents_spent;
-
-            (already_spent_cents + purchase_cost_cents) > monthly_limit_cents
-        });
-
-        let is_buy_button_disabled =
-            purchase_addon_credits_loading || would_exceed_limit || delinquent_due_to_payment_issue;
-
-        let button_font_color = is_buy_button_disabled.then_some(
-            appearance
-                .theme()
-                .disabled_text_color(appearance.theme().surface_3())
-                .into(),
-        );
-        let button_bg_color =
-            is_buy_button_disabled.then_some(appearance.theme().surface_3().into());
-        let button_border = is_buy_button_disabled.then_some(ColorU::transparent_black().into());
-        let mut buy_button = ui_builder
-            .button(ButtonVariant::Accent, self.buy_button.clone())
-            .with_text_label(button_text)
-            .with_style(UiComponentStyles {
-                font_size: Some(14.),
-                font_weight: Some(Weight::Semibold),
-                font_color: button_font_color,
-                background: button_bg_color,
-                border_color: button_border,
-                ..Default::default()
-            })
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::PurchaseAddonCredits {
-                    team_uid,
-                });
-            });
-
-        if is_buy_button_disabled {
-            buy_button = buy_button.disable();
-        }
-
-        let buy_button = buy_button.finish();
-
-        let mut buy_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_children([
-                Shrinkable::new(1., denominations).finish(),
-                Flex::row()
-                    .with_children([discount_badge, rendered_price])
-                    .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                    .finish(),
-            ]);
-
-        if auto_reload_enabled {
-            card_content_upper.add_child(buy_row.finish());
-            if delinquent_due_to_payment_issue {
-                card_content_upper.add_child(self.render_warning_row(
-                    appearance,
-                    AUTO_RELOAD_DELINQUENT_WARNING_STRING.to_string(),
-                ));
-            } else if would_exceed_limit {
-                card_content_upper.add_child(self.render_warning_row(
-                    appearance,
-                    AUTO_RELOAD_EXCEED_LIMIT_WARNING_STRING.to_string(),
-                ));
-            }
-            let card_upper = Container::new(card_content_upper.finish())
-                .with_uniform_padding(16.)
-                .finish();
-            Container::new(card_upper)
-                .with_background_color(theme.surface_1().into_solid())
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_margin_bottom(16.)
-                .finish()
-        } else {
-            buy_row.add_child(buy_button);
-            let card_upper = Container::new(card_content_upper.finish())
-                .with_horizontal_padding(16.)
-                .with_padding_top(16.)
-                .finish();
-
-            let mut card_content_lower_children = vec![
-                ui_builder.span("One-time purchase").build().finish(),
-                buy_row.finish(),
-            ];
-
-            if delinquent_due_to_payment_issue {
-                card_content_lower_children.push(self.render_warning_row(
-                    appearance,
-                    AUTO_RELOAD_DELINQUENT_WARNING_STRING.to_string(),
-                ));
-            } else if workspace
-                .billing_metadata
-                .has_failed_addon_credit_auto_reload_status()
-            {
-                card_content_lower_children.push(self.render_warning_row(
-                    appearance,
-                    RESTRICTED_BILLING_USAGE_WARNING_STRING.to_string(),
-                ));
-            } else if would_exceed_limit {
-                let warning_fragments = vec![
-                    FormattedTextFragment::plain_text(
-                        "Reloading would exceed your monthly limit. ",
-                    ),
-                    FormattedTextFragment::hyperlink_action(
-                        "Increase your limit",
-                        BillingAndUsagePageAction::ShowAddOnCreditModal,
-                    ),
-                    FormattedTextFragment::plain_text(" to continue."),
-                ];
-                card_content_lower_children
-                    .push(self.render_warning_row_with_link(appearance, warning_fragments));
-            }
-
-            let card_content_lower = Flex::column()
-                .with_children(card_content_lower_children)
-                .with_spacing(8.)
-                .finish();
-
-            let card_lower = Container::new(card_content_lower)
-                .with_uniform_padding(16.)
-                .with_border(Border::top(1.).with_border_color(theme.outline().into()))
-                .finish();
-
-            let card_content = Flex::column()
-                .with_children([card_upper, card_lower])
-                .finish();
-
-            Container::new(card_content)
-                .with_background_color(theme.surface_1().into_solid())
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_margin_bottom(16.)
-                .finish()
-        }
-    }
-
-    fn render_total_overages_row(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let billing_metadata = UserWorkspaces::as_ref(app)
-            .current_team()
-            .map(|team| team.billing_metadata.clone())
-            .unwrap_or_default();
-        let ai_overages = billing_metadata.ai_overages.as_ref();
-        let is_period_over_now = ai_overages
-            .map(|overages| overages.current_period_end < chrono::Utc::now())
-            .unwrap_or(false);
-
-        let (total_overages_count, total_overages_cost, total_overages_period_end) =
-            if is_period_over_now {
-                (Some(0), Some(0), None)
-            } else {
-                (
-                    ai_overages.map(|o| o.current_monthly_requests_used),
-                    ai_overages.map(|o| o.current_monthly_request_cost_cents),
-                    ai_overages.map(|overages| overages.current_period_end),
-                )
-            };
-
-        let (request_count_label, cost_label) =
-            if let (Some(count), Some(cost)) = (total_overages_count, total_overages_cost) {
-                if count == 1 {
-                    (
-                        "1 credit".to_string(),
-                        format!("${:.2}", cost as f64 / 100.0),
-                    )
-                } else {
-                    (
-                        format!("{} credits", count.separate_with_commas()),
-                        format!("${:.2}", cost as f64 / 100.0),
-                    )
-                }
-            } else {
-                ("0 credits".to_string(), "$0.00".to_string())
-            };
-
-        let mut left_side_component =
-            Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-        let label = Text::new_inline("Total overages", appearance.ui_font_family(), 12.)
-            .with_color(appearance.theme().active_ui_text_color().into())
-            .finish();
-
-        left_side_component.add_child(Container::new(label).with_margin_right(8.).finish());
-
-        let request_count_component = Container::new(
-            Text::new_inline(request_count_label, appearance.ui_font_family(), 12.)
-                .with_color(blended_colors::text_disabled(
-                    appearance.theme(),
-                    appearance.theme().surface_1(),
-                ))
-                .finish(),
-        )
-        .with_margin_right(8.)
-        .finish();
-
-        let cost_component = Text::new_inline(cost_label, appearance.ui_font_family(), 12.)
-            .with_color(blended_colors::text_sub(
-                appearance.theme(),
-                appearance.theme().surface_1(),
-            ))
-            .finish();
-
-        if let Some(period_end) = total_overages_period_end {
-            let local_period_end = period_end.with_timezone(&Local);
-            let formatted_date = local_period_end.format("%b %d at %-I:%M %p").to_string();
-            let billing_date_text = format!("Usage resets on {formatted_date}");
-            left_side_component.add_child(
-                Container::new(
-                    Text::new_inline(billing_date_text, appearance.ui_font_family(), 12.)
-                        .with_color(blended_colors::text_disabled(
-                            appearance.theme(),
-                            appearance.theme().surface_1(),
-                        ))
-                        .finish(),
-                )
-                .with_margin_right(8.)
-                .finish(),
-            );
-        };
-
-        let right_side_components = Flex::row()
-            .with_child(request_count_component)
-            .with_child(cost_component)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center);
-
-        Container::new(
-            Flex::row()
-                .with_child(left_side_component.finish())
-                .with_child(right_side_components.finish())
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_main_axis_size(MainAxisSize::Max)
-                .finish(),
-        )
-        .with_margin_top(16.)
-        .finish()
-    }
-
-    fn render_request_usage_count(
-        &self,
-        used: usize,
-        divisor: Option<Divisor>,
-        workspace_is_delinquent_due_to_payment_issue: bool,
-        appearance: &Appearance,
-        prorated_request_limits_info: Option<ProratedRequestLimitsInfo>,
-    ) -> Box<dyn galaxyui::Element> {
-        let mut row = Flex::row();
-
-        let show_alert = workspace_is_delinquent_due_to_payment_issue
-            || matches!(divisor, Some(Divisor::Limit(limit)) if used >= limit);
-
-        if let Some(info) = prorated_request_limits_info {
-            if info.is_request_limit_prorated {
-                row.add_child(render_info_icon(
-                appearance,
-                AdditionalInfo::<BillingAndUsagePageAction> {
-                    mouse_state: info.mouse_state,
-                    on_click_action: None,
-                    secondary_text: None,
-                    tooltip_override_text: match info.is_current_user {
-                        true => Some("Your credit limit is prorated because you joined midway through the billing cycle.".to_string()),
-                        false => Some("This credit limit is prorated because this user joined midway through the billing cycle.".to_string()),
-                    },
-                },
-            ))
-            }
-        }
-
-        if show_alert {
-            row.add_child(
-                ConstrainedBox::new(
-                    Icon::AlertTriangle
-                        .to_galaxyui_icon(appearance.theme().ui_error_color().into())
-                        .finish(),
-                )
-                .with_height(16.)
-                .with_width(16.)
-                .finish(),
-            )
-        }
-
-        let request_count_label = if workspace_is_delinquent_due_to_payment_issue {
-            "Restricted due to billing issue".to_string()
-        } else {
-            match divisor {
-                Some(Divisor::Unlimited) => {
-                    format!("{}/Unlimited", used.separate_with_commas())
-                }
-                Some(Divisor::Limit(limit)) => format!(
-                    "{}/{}",
-                    used.separate_with_commas(),
-                    limit.separate_with_commas()
-                ),
-                None => used.separate_with_commas(),
-            }
-        };
-
-        row.add_child(
-            appearance
-                .ui_builder()
-                .paragraph(request_count_label)
-                .with_style(UiComponentStyles {
-                    font_color: {
-                        if show_alert {
-                            Some(appearance.theme().ui_error_color())
-                        } else {
-                            Some(blended_colors::text_sub(
-                                appearance.theme(),
-                                appearance.theme().surface_1(),
-                            ))
-                        }
-                    },
-                    font_size: Some(14.),
-                    margin: Some(Coords {
-                        top: 0.,
-                        bottom: 0.,
-                        left: 8.,
-                        right: 0.,
-                    }),
-                    ..Default::default()
-                })
-                .build()
-                .finish(),
-        );
-
-        row.finish()
-    }
-
-    /// Renders a row of what is being limited, along with the current used/limit.
-    #[allow(clippy::too_many_arguments)]
-    fn render_ai_usage_limit_row(
-        &self,
-        name: String,
-        used: usize,
-        divisor: Option<Divisor>,
-        refresh_duration: String,
-        workspace_is_delinquent_due_to_payment_issue: bool,
-        appearance: &Appearance,
-        prorated_request_limits_info: Option<ProratedRequestLimitsInfo>,
-    ) -> Box<dyn galaxyui::Element> {
-        let request_usage_details = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::End)
-            .with_child(self.render_request_usage_count(
-                used,
-                divisor,
-                workspace_is_delinquent_due_to_payment_issue,
-                appearance,
-                prorated_request_limits_info,
-            ));
-
-        let left_side = if !name.is_empty() {
-            Shrinkable::new(
-                2.,
-                Container::new(
-                    Text::new_inline(name, appearance.ui_font_family(), 14.)
-                        .with_style(Properties::default())
-                        .with_color(
-                            appearance
-                                .theme()
-                                .main_text_color(appearance.theme().surface_2())
-                                .into(),
-                        )
-                        .finish(),
-                )
-                .with_margin_bottom(20.)
-                .finish(),
-            )
-            .finish()
-        } else {
-            let header = "Credits";
-            let description =
-                format!("This is the {refresh_duration} limit of AI credits for your account.");
-
-            let request_usage_description = FormattedTextElement::from_str(
-                description,
-                appearance.ui_font_family(),
-                appearance.ui_font_size(),
-            )
-            .with_color(blended_colors::text_sub(
-                appearance.theme(),
-                appearance.theme().surface_1(),
-            ));
-
-            Shrinkable::new(
-                2.,
-                Container::new(
-                    Flex::column()
-                        .with_child(
-                            appearance
-                                .ui_builder()
-                                .paragraph(header)
-                                .with_style(UiComponentStyles {
-                                    font_color: Some(blended_colors::text_main(
-                                        appearance.theme(),
-                                        appearance.theme().surface_1(),
-                                    )),
-                                    margin: Some(Coords {
-                                        top: 0.,
-                                        bottom: 4.,
-                                        left: 0.,
-                                        right: 0.,
-                                    }),
-                                    ..Default::default()
-                                })
-                                .build()
-                                .finish(),
-                        )
-                        .with_child(request_usage_description.finish())
-                        .finish(),
-                )
-                .with_margin_bottom(16.)
-                .finish(),
-            )
-            .finish()
-        };
-
-        Flex::row()
-            .with_child(left_side)
-            .with_child(
-                Shrinkable::new(
-                    1.,
-                    Container::new(request_usage_details.finish())
-                        .with_margin_bottom(16.)
-                        .finish(),
-                )
-                .finish(),
-            )
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_main_axis_size(MainAxisSize::Max)
-            .finish()
-    }
-}
-
-impl BillingAndUsagePageView {
-    fn render_page_body(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let ai_request_usage_model = AIRequestUsageModel::as_ref(app);
-        let formatted_next_refresh_time = ai_request_usage_model
-            .next_refresh_time_local()
-            .format("%b %d at %-I:%M %p")
-            .to_string();
-        let workspace_is_delinquent_due_to_payment_issue = UserWorkspaces::as_ref(app)
-            .current_team()
-            .map(|team| team.billing_metadata.is_delinquent_due_to_payment_issue())
-            .unwrap_or_default();
-
-        let mut usage = Flex::column();
-
-        let tabs = vec![
-            SettingsTab::new(
-                BillingUsageTab::Overview.label(),
-                self.overview_tab_mouse_state.clone(),
-            ),
-            SettingsTab::new(
-                BillingUsageTab::UsageHistory.label(),
-                self.usage_history_tab_mouse_state.clone(),
-            ),
-        ];
-
-        let tab_selector = tab_selector::render_tab_selector(
-            tabs,
-            self.selected_tab.label(),
-            // On click, set clicked tab as selected
-            |label, ctx| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::SelectTab(
-                    BillingUsageTab::get_tab_from_label(label),
-                ));
-            },
-            appearance,
-        );
-        usage.add_child(tab_selector);
-
-        // Render correct page based on selected tab
-        if self.selected_tab == BillingUsageTab::Overview {
-            let prorated_mouse_states = self.prorated_request_limits_info_mouse_states.clone();
-            let usage_content = self.render_usage_content(
-                appearance,
-                app,
-                ai_request_usage_model,
-                &formatted_next_refresh_time,
-                workspace_is_delinquent_due_to_payment_issue,
-                &prorated_mouse_states,
-            );
-            usage.add_child(usage_content);
-        } else {
-            usage.add_child(self.render_usage_history_content(appearance, app));
-        }
-
-        usage.finish()
-    }
-}
-
-impl BillingAndUsagePageView {
-    fn render_usage_history_content(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let usage_history = self.usage_history_model.as_ref(app);
-        if usage_history.entries().is_empty() {
-            return self.render_empty_usage_history_content(
-                usage_history.is_loading(),
-                appearance,
-                app,
-            );
-        }
-
-        let mut content = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_main_axis_alignment(MainAxisAlignment::Center)
-            .with_child(
-                Container::new(
-                    Text::new_inline("Last 30 days".to_string(), appearance.ui_font_family(), 14.)
-                        .with_color(blended_colors::text_sub(
-                            appearance.theme(),
-                            appearance.theme().surface_1(),
-                        ))
-                        .finish(),
-                )
-                .with_vertical_margin(12.)
-                .finish(),
-            );
-
-        let mut usage_history_list = Flex::column().with_spacing(8.);
-        let entries = usage_history.entries();
-        for entry in entries.iter() {
-            let is_expanded = self
-                .expanded_usage_entries
-                .get(&entry.conversation_id)
-                .copied()
-                .unwrap_or(false);
-
-            let mouse_state = self
-                .usage_entries_mouse_states
-                .borrow_mut()
-                .entry(entry.conversation_id.clone())
-                .or_default()
-                .clone();
-
-            let tooltip_mouse_state = self
-                .usage_entries_tooltip_mouse_states
-                .borrow_mut()
-                .entry(entry.conversation_id.clone())
-                .or_default()
-                .clone();
-
-            usage_history_list.add_child(
-                Container::new(
-                    UsageHistoryEntry::new(
-                        Some(entry.clone()),
-                        is_expanded,
-                        Some(mouse_state),
-                        tooltip_mouse_state,
-                    )
-                    .render(appearance, app),
-                )
-                .finish(),
-            );
-        }
-        content.add_child(usage_history_list.finish());
-
-        if usage_history.has_more_entries() {
-            let load_more = self.load_more_button.as_ref(app).render(app);
-            content.add_child(
-                Container::new(
-                    Flex::row()
-                        .with_child(load_more)
-                        .with_main_axis_alignment(MainAxisAlignment::Center)
-                        .with_main_axis_size(MainAxisSize::Max)
-                        .finish(),
-                )
-                .with_margin_top(24.)
-                .finish(),
-            );
-        }
-
-        Container::new(content.finish()).finish()
-    }
-
-    /// Renders default views to show when there is no usage history,
-    /// either because the history is loading or because there is no history.
-    fn render_empty_usage_history_content(
-        &self,
-        is_loading: bool,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let mut content = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_main_axis_alignment(MainAxisAlignment::Center);
-
-        if is_loading {
-            let mut loading_usage_entry_list = Flex::column().with_spacing(8.);
-            for _ in 0..3 {
-                loading_usage_entry_list.add_child(
-                    UsageHistoryEntry::new(None, false, None, MouseStateHandle::default())
-                        .render(appearance, app),
-                );
-            }
-            content.add_child(loading_usage_entry_list.finish());
-        } else {
-            let res = Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_child(
-                    Container::new(
-                        ConstrainedBox::new(
-                            Icon::Conversation
-                                .to_galaxyui_icon(
-                                    blended_colors::text_sub(
-                                        appearance.theme(),
-                                        appearance.theme().surface_1(),
-                                    )
-                                    .into(),
-                                )
-                                .finish(),
-                        )
-                        .with_width(24.)
-                        .with_height(24.)
-                        .finish(),
-                    )
-                    .with_margin_bottom(12.)
-                    .finish(),
-                )
-                .with_child(
-                    Container::new(
-                        Text::new("No usage history", appearance.ui_font_family(), 14.)
-                            .with_color(blended_colors::text_sub(
-                                appearance.theme(),
-                                appearance.theme().surface_1(),
-                            ))
-                            .finish(),
-                    )
-                    .with_margin_bottom(4.)
-                    .finish(),
-                )
-                .with_child(
-                    Text::new(
-                        "Kick off an agent task to view usage history here.",
-                        appearance.ui_font_family(),
-                        14.,
-                    )
-                    .with_color(blended_colors::text_disabled(
-                        appearance.theme(),
-                        appearance.theme().surface_1(),
-                    ))
-                    .finish(),
-                );
-
-            content.add_child(
-                Container::new(res.finish())
-                    .with_vertical_margin(160.)
-                    .finish(),
-            );
-        }
-
-        content.finish()
-    }
-
-    /// Renders usage reporting callout card for Enterprise users indicating that usage reporting
-    /// is currently limited. Admins see a link to the admin panel; non-admins see a message to
-    /// contact their admin.
-    pub fn render_enterprise_usage_card(
-        &self,
-        team_uid: ServerId,
-        has_admin_permissions: bool,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let bg = theme.background();
-
-        let icon = Container::new(
-            ConstrainedBox::new(
-                Icon::AlertCircle
-                    .to_galaxyui_icon(blended_colors::text_sub(theme, theme.surface_1()).into())
-                    .finish(),
-            )
-            .with_width(16.)
-            .with_height(16.)
-            .finish(),
-        )
-        .with_margin_right(8.)
-        .finish();
-
-        let header = Text::new_inline(
-            ENTERPRISE_USAGE_CALLOUT_HEADER,
-            appearance.ui_font_family(),
-            16.,
-        )
-        .with_color(theme.foreground().into())
-        .with_style(Properties::default().weight(Weight::Bold))
-        .finish();
-
-        let card_header = Flex::row()
-            .with_child(icon)
-            .with_child(Shrinkable::new(1., Align::new(header).left().finish()).finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .finish();
-
-        // Body text differs for admin vs non-admin
-        let body = if has_admin_permissions {
-            let admin_panel_url = AdminActions::admin_panel_link_for_team(team_uid);
-            let text_fragments = vec![
-                FormattedTextFragment::plain_text(ENTERPRISE_USAGE_CALLOUT_BODY_ADMIN_PREFIX),
-                FormattedTextFragment::hyperlink(
-                    ENTERPRISE_USAGE_CALLOUT_BODY_ADMIN_LINK,
-                    admin_panel_url,
-                ),
-                FormattedTextFragment::plain_text(ENTERPRISE_USAGE_CALLOUT_BODY_ADMIN_SUFFIX),
-            ];
-            FormattedTextElement::new(
-                FormattedText::new([FormattedTextLine::Line(text_fragments)]),
-                12.,
-                appearance.ui_font_family(),
-                appearance.ui_font_family(),
-                theme.sub_text_color(bg).into(),
-                HighlightedHyperlink::default(),
-            )
-            .with_hyperlink_font_color(theme.accent().into_solid())
-            .register_default_click_handlers(|hyperlink, _event_ctx, app_ctx| {
-                app_ctx.open_url(&hyperlink.url);
-            })
-            .finish()
-        } else {
-            appearance
-                .ui_builder()
-                .paragraph(ENTERPRISE_USAGE_CALLOUT_BODY_NON_ADMIN)
-                .with_style(UiComponentStyles {
-                    font_color: Some(theme.sub_text_color(bg).into()),
-                    font_size: Some(12.),
-                    ..Default::default()
-                })
-                .build()
-                .finish()
-        };
-
-        let card_content = Flex::column()
-            .with_children([
-                Container::new(card_header).with_margin_bottom(8.).finish(),
-                body,
-            ])
-            .finish();
-
-        let card_container = Container::new(card_content)
-            .with_background_color(theme.surface_1().into_solid())
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-            .with_uniform_padding(16.)
-            .with_margin_bottom(16.)
-            .finish();
-
-        Flex::column().with_child(card_container).finish()
-    }
-
-    #[allow(clippy::too_many_arguments)]
-    fn render_usage_content(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-        ai_request_usage_model: &AIRequestUsageModel,
-        formatted_next_refresh_time: &str,
-        workspace_is_delinquent_due_to_payment_issue: bool,
-        prorated_request_limits_info_mouse_states: &[MouseStateHandle],
-    ) -> Box<dyn Element> {
-        let mut usage = Flex::column();
-
-        let workspace = UserWorkspaces::as_ref(app).current_workspace();
-        // Check if we should show the sort button (admin with team size > 1)
-        let workspace_team_members = workspace
-            .map(|workspace| workspace.members.clone())
-            .unwrap_or_default();
-        let current_user_email = AuthStateProvider::as_ref(app)
-            .get()
-            .user_email()
-            .unwrap_or_default();
-        let team = UserWorkspaces::as_ref(app).current_team();
-        let has_admin_permissions =
-            team.is_some_and(|team| team.has_admin_permissions(&current_user_email));
-
-        let mut usage_header_right_side = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_child(
-                appearance
-                    .ui_builder()
-                    .paragraph(format!("Resets {formatted_next_refresh_time}"))
-                    .with_style(UiComponentStyles {
-                        font_color: Some(blended_colors::text_sub(
-                            appearance.theme(),
-                            appearance.theme().surface_1(),
-                        )),
-                        ..Default::default()
-                    })
-                    .build()
-                    .finish(),
-            )
-            .with_child(
-                Container::new(
-                    icon_button(
-                        appearance,
-                        Icon::Refresh,
-                        false,
-                        self.refresh_icon_mouse_state.clone(),
-                    )
-                    .build()
-                    .on_click(move |ctx, _, _| {
-                        ctx.dispatch_typed_action(BillingAndUsagePageAction::RefreshWorkspaceData);
-                    })
-                    .finish(),
-                )
-                .with_margin_left(8.)
-                .finish(),
-            );
-
-        // only show sort button if user is admin and has more than 1 member
-        if has_admin_permissions && workspace_team_members.len() > 1 {
-            usage_header_right_side.add_child(
-                Container::new({
-                    let mut button = icon_button_with_context_menu(
-                        Icon::Sort,
-                        move |ctx, _, _| {
-                            ctx.dispatch_typed_action(BillingAndUsagePageAction::ToggleSortingMenu)
-                        },
-                        self.sort_icon_mouse_state.clone(),
-                        &self.sorting_menu,
-                        self.sorting_menu_open,
-                        MenuDirection::Right,
-                        Some(Cursor::PointingHand),
-                        None,
-                        appearance,
-                    );
-
-                    let hoverable =
-                        Hoverable::new(self.sort_icon_mouse_state.clone(), |mouse_state| {
-                            if mouse_state.is_hovered() {
-                                let tooltip =
-                                    appearance.ui_builder().tool_tip("Sort by".to_string());
-
-                                button.add_positioned_overlay_child(
-                                    tooltip.build().finish(),
-                                    OffsetPositioning::offset_from_parent(
-                                        vec2f(0., 4.),
-                                        ParentOffsetBounds::Unbounded,
-                                        ParentAnchor::BottomMiddle,
-                                        ChildAnchor::TopMiddle,
-                                    ),
-                                );
-                            }
-                            button.finish()
-                        });
-
-                    hoverable.finish()
-                })
-                .with_margin_left(8.)
-                .finish(),
-            );
-        }
-
-        // Render the ambient agent trial widget if the user has ambient-only credits.
-        if let Some(ambient_trial_widget) =
-            self.render_ambient_agent_trial_widget(ai_request_usage_model, appearance, app)
-        {
-            usage.add_child(ambient_trial_widget);
-        }
-
-        if let (Some(workspace), Some(team)) = (workspace, team) {
-            let bonus_credit_balance =
-                ai_request_usage_model.total_workspace_bonus_credits_remaining(workspace.uid);
-
-            // Hide addon credits panel for Enterprise PAYG users when they have 0 credits.
-            let is_enterprise_payg_with_zero_credits = workspace
-                .billing_metadata
-                .is_enterprise_pay_as_you_go_enabled()
-                && bonus_credit_balance == 0;
-
-            if !is_enterprise_payg_with_zero_credits {
-                usage.add_child(self.render_addon_credits_panel(
-                    self.selected_addon_denomination,
-                    workspace,
-                    team.uid,
-                    has_admin_permissions,
-                    bonus_credit_balance,
-                    &self.addon_credits_options,
-                    &self.addon_credit_denomination_buttons,
-                    self.purchase_addon_credits_loading,
-                    workspace_is_delinquent_due_to_payment_issue,
-                    app,
-                ));
-            }
-        }
-
-        let usage_header = Container::new(
-            Flex::row()
-                .with_main_axis_size(MainAxisSize::Max)
-                .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_child(
-                    build_sub_header(
-                        appearance,
-                        "Usage",
-                        Some(
-                            appearance
-                                .theme()
-                                .main_text_color(appearance.theme().surface_2()),
-                        ),
-                    )
-                    .finish(),
-                )
-                .with_child(usage_header_right_side.finish())
-                .finish(),
-        )
-        .with_padding_bottom(HEADER_PADDING)
-        .finish();
-
-        usage.add_child(usage_header);
-
-        // For enterprise plan users with base limit = 0, show a limited usage reporting callout
-        // as this is not applicable to them
-        if let Some(t) = team {
-            if t.billing_metadata.customer_type == CustomerType::Enterprise
-                && t.billing_metadata
-                    .tier
-                    .warp_ai_policy
-                    .is_some_and(|p| p.limit == 0)
-            {
-                usage.add_child(self.render_enterprise_usage_card(
-                    t.uid,
-                    has_admin_permissions,
-                    appearance,
-                ));
-                return usage.finish();
-            }
-        }
-
-        // Show a summed "Team total" row first.
-        let num_team_members = workspace_team_members.len();
-        let should_show_team_total = num_team_members > 1 && has_admin_permissions;
-        if should_show_team_total {
-            let team_total_used: usize = workspace_team_members
-                .iter()
-                .map(|m| m.usage_info.requests_used_since_last_refresh as usize)
-                .sum();
-            let is_unlimited = ai_request_usage_model.is_unlimited();
-
-            let team_divisor = if is_unlimited {
-                Some(Divisor::Unlimited)
-            } else {
-                None
-            };
-
-            usage.add_child(self.render_ai_usage_limit_row(
-                "Team total".to_string(),
-                team_total_used,
-                team_divisor,
-                ai_request_usage_model.refresh_duration_to_string(),
-                workspace_is_delinquent_due_to_payment_issue,
-                appearance,
-                None,
-            ));
-            let divider = Container::new(
-                ConstrainedBox::new(Empty::new().finish())
-                    .with_height(1.)
-                    .finish(),
-            )
-            .with_background_color(appearance.theme().outline().into_solid())
-            .with_margin_bottom(16.)
-            .finish();
-
-            usage.add_child(divider);
-        }
-
-        // Build UserSortingCriteria with (display_name, requests_used, rendered_row)
-        // Note: display_name already has email as fallback
-        let mut user_information = if !has_admin_permissions {
-            vec![]
-        } else {
-            workspace_team_members
-                .iter()
-                .enumerate()
-                .map(|(i, member)| {
-                    // Compute effective display name (fallback to email if missing or empty)
-                    let display_name = UserProfiles::as_ref(app)
-                        .profile_for_uid(member.uid)
-                        .and_then(|profile| profile.display_name.clone())
-                        .filter(|s| !s.trim().is_empty())
-                        .unwrap_or_else(|| member.email.clone());
-
-                    let requests_used = member.usage_info.requests_used_since_last_refresh as usize;
-
-                    let row = self.render_ai_usage_limit_row(
-                        display_name.clone(),
-                        requests_used,
-                        if member.usage_info.is_unlimited {
-                            Some(Divisor::Unlimited)
-                        } else {
-                            Some(Divisor::Limit(member.usage_info.request_limit as usize))
-                        },
-                        ai_request_usage_model.refresh_duration_to_string(),
-                        workspace_is_delinquent_due_to_payment_issue,
-                        appearance,
-                        Some(ProratedRequestLimitsInfo {
-                            is_request_limit_prorated: member.usage_info.is_request_limit_prorated,
-                            mouse_state: prorated_request_limits_info_mouse_states[i].clone(),
-                            is_current_user: member.email == current_user_email,
-                        }),
-                    );
-
-                    UserSortingCriteria::new(display_name, requests_used, row)
-                })
-                .collect_vec()
-        };
-
-        if user_information.is_empty() {
-            let display_name = AuthStateProvider::as_ref(app)
-                .get()
-                .display_name()
-                .filter(|s| !s.trim().is_empty())
-                .unwrap_or_else(|| current_user_email.clone());
-            let user_workspace_member = workspace_team_members
-                .iter()
-                .find(|m| m.email == current_user_email);
-
-            let row = self.render_ai_usage_limit_row(
-                display_name.clone(),
-                ai_request_usage_model.requests_used(),
-                if ai_request_usage_model.is_unlimited() {
-                    Some(Divisor::Unlimited)
-                } else {
-                    Some(Divisor::Limit(ai_request_usage_model.request_limit()))
-                },
-                ai_request_usage_model.refresh_duration_to_string(),
-                workspace_is_delinquent_due_to_payment_issue,
-                appearance,
-                user_workspace_member.map(|member| ProratedRequestLimitsInfo {
-                    is_request_limit_prorated: member.usage_info.is_request_limit_prorated,
-                    mouse_state: prorated_request_limits_info_mouse_states[0].clone(), // We know the workspace has at least one member, so just take the first mouse state handle since we don't use the others.
-                    is_current_user: true,
-                }),
-            );
-            user_information.push(UserSortingCriteria::new(
-                display_name,
-                ai_request_usage_model.requests_used(),
-                row,
-            ));
-        }
-
-        // Apply sort according to current_sort_key/current_sort_order via shared helper
-        // Get current user's display name (with email fallback) for pinning
-        let current_user_display_name = AuthStateProvider::as_ref(app)
-            .get()
-            .display_name()
-            .filter(|s| !s.trim().is_empty())
-            .unwrap_or_else(|| current_user_email.clone());
-
-        // TODO: move sorting once per initial load or sort option change https://github.com/warpdotdev/warp-internal/pull/18288/files#r2392139761
-        sort_user_items_in_place(
-            &mut user_information,
-            &current_user_display_name,
-            self.current_sort_key,
-            self.current_sort_order,
-        );
-
-        let user_information = user_information
-            .into_iter()
-            .map(|item| item.data)
-            .collect_vec();
-
-        usage.extend(user_information);
-
-        let auth_state = AuthStateProvider::as_ref(app).get();
-
-        let upgrade_cta_text_fragments = if let Some(team) =
-            UserWorkspaces::as_ref(app).current_team()
-        {
-            if workspace_is_delinquent_due_to_payment_issue {
-                if has_admin_permissions {
-                    vec![
-                        FormattedTextFragment::hyperlink_action(
-                            "Manage billing",
-                            BillingAndUsagePageAction::GenerateStripeBillingPortalLink {
-                                team_uid: team.uid,
-                            },
-                        ),
-                        FormattedTextFragment::plain_text(" to regain access to AI features."),
-                    ]
-                } else {
-                    // Non-admin team member - show message to contact admin
-                    vec![FormattedTextFragment::plain_text(
-                        "Contact your team admin to resolve billing issues.",
-                    )]
-                }
-            } else if team.billing_metadata.can_upgrade_to_higher_tier_plan() {
-                let upgrade_url = UserWorkspaces::upgrade_link_for_team(team.uid);
-                if has_admin_permissions {
-                    if team.billing_metadata.can_upgrade_to_build_plan() {
-                        if team.billing_metadata.is_on_legacy_paid_plan() {
-                            vec![
-                                FormattedTextFragment::hyperlink(
-                                    "Switch to the Build plan",
-                                    upgrade_url,
-                                ),
-                                FormattedTextFragment::plain_text(
-                                    " for a more flexible pricing model.",
-                                ),
-                            ]
-                        } else {
-                            let mut fragments = vec![FormattedTextFragment::hyperlink(
-                                "Upgrade to the Build plan",
-                                upgrade_url,
-                            )];
-                            if team.billing_metadata.is_byo_api_key_enabled() {
-                                fragments.push(FormattedTextFragment::plain_text(" or "));
-                                fragments.push(FormattedTextFragment::hyperlink_action(
-                                    "bring your own key",
-                                    BillingAndUsagePageAction::NavigateToByokSettings,
-                                ));
-                            }
-                            fragments.push(FormattedTextFragment::plain_text(
-                                " for increased access to AI features.",
-                            ));
-                            fragments
-                        }
-                    } else {
-                        let upgrade_text = match team.billing_metadata.customer_type {
-                            CustomerType::Prosumer => "Upgrade to Turbo plan",
-                            CustomerType::Turbo => "Upgrade to Lightspeed plan",
-                            _ => "Upgrade",
-                        };
-                        vec![
-                            FormattedTextFragment::hyperlink(upgrade_text, upgrade_url),
-                            FormattedTextFragment::plain_text(" to get more AI usage."),
-                        ]
-                    }
-                } else {
-                    vec![]
-                }
-            } else if team.billing_metadata.is_on_build_plan() {
-                vec![
-                    FormattedTextFragment::hyperlink(
-                        "Upgrade to Max",
-                        UserWorkspaces::upgrade_link_for_team(team.uid),
-                    ),
-                    FormattedTextFragment::plain_text(" for more AI credits."),
-                ]
-            } else if team.billing_metadata.is_on_build_max_plan() {
-                vec![
-                    FormattedTextFragment::hyperlink(
-                        "Switch to Business",
-                        UserWorkspaces::upgrade_link_for_team(team.uid),
-                    ),
-                    FormattedTextFragment::plain_text(
-                        " for security features like SSO and automatically applied zero data retention.",
-                    ),
-                ]
-            } else if team.billing_metadata.is_on_build_business_plan()
-                || team.billing_metadata.is_on_legacy_business_plan()
-            {
-                vec![
-                    FormattedTextFragment::hyperlink(
-                        "Upgrade to Enterprise",
-                        "mailto:sales@warp.dev",
-                    ),
-                    FormattedTextFragment::plain_text(" for custom limits and dedicated support."),
-                ]
-            } else if !team.billing_metadata.is_usage_based_pricing_toggleable() {
-                vec![
-                    FormattedTextFragment::hyperlink("Contact support", "mailto:support@warp.dev"),
-                    FormattedTextFragment::plain_text(" for more AI usage."),
-                ]
-            } else {
-                vec![]
-            }
-        } else {
-            let user_id = auth_state.user_id().unwrap_or_default();
-            let upgrade_url = UserWorkspaces::upgrade_link(user_id);
-            let mut fragments = vec![FormattedTextFragment::hyperlink(
-                "Upgrade to the Build plan",
-                upgrade_url,
-            )];
-            if UserWorkspaces::as_ref(app).is_byo_api_key_enabled(app) {
-                fragments.push(FormattedTextFragment::plain_text(" or "));
-                fragments.push(FormattedTextFragment::hyperlink_action(
-                    "bring your own key",
-                    BillingAndUsagePageAction::NavigateToByokSettings,
-                ));
-            }
-            fragments.push(FormattedTextFragment::plain_text(
-                " for more credits and access to more models.",
-            ));
-            fragments
-        };
-
-        let mut upgrade_cta = FormattedTextElement::new(
-            FormattedText::new([FormattedTextLine::Line(upgrade_cta_text_fragments)]),
-            appearance.ui_font_size(),
-            appearance.ui_font_family(),
-            appearance.ui_font_family(),
-            blended_colors::text_sub(appearance.theme(), appearance.theme().surface_1()),
-            self.requests_highlight_index.clone(),
-        )
-        .with_hyperlink_font_color(appearance.theme().accent().into_solid());
-
-        if AuthStateProvider::as_ref(app)
-            .get()
-            .is_anonymous_or_logged_out()
-        {
-            upgrade_cta = upgrade_cta.register_default_click_handlers(|_, ctx, _| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::AttemptLoginGatedUpgrade);
-            });
-        } else {
-            upgrade_cta = upgrade_cta.register_default_click_handlers_with_action_support(
-                |hyperlink_lens, event, ctx| match hyperlink_lens {
-                    galaxyui::elements::HyperlinkLens::Url(url) => {
-                        ctx.open_url(url);
-                    }
-                    galaxyui::elements::HyperlinkLens::Action(action_ref) => {
-                        if let Some(action) = action_ref
-                            .as_any()
-                            .downcast_ref::<BillingAndUsagePageAction>()
-                        {
-                            event.dispatch_typed_action(action.clone());
-                        }
-                    }
-                },
-            );
-        };
-
-        usage.add_child(
-            Container::new(upgrade_cta.finish())
-                .with_margin_bottom(16.)
-                .finish(),
-        );
-
-        let workspaces = UserWorkspaces::as_ref(app);
-        if let Some(team) = workspaces.current_team() {
-            if team.billing_metadata.is_usage_based_pricing_toggleable() {
-                let usage_based_pricing_settings = workspaces.usage_based_pricing_settings();
-
-                let enabled = self
-                    .usage_based_pricing_toggle_override
-                    .unwrap_or(usage_based_pricing_settings.enabled);
-
-                usage.add_child(
-                    Container::new(self.render_usage_based_pricing_section(
-                        enabled,
-                        team,
-                        appearance,
-                        app,
-                        has_admin_permissions,
-                        self.usage_based_pricing_toggle_loading,
-                    ))
-                    .with_margin_bottom(16.)
-                    .finish(),
-                );
-            }
-        }
-
-        usage.finish()
-    }
-}
-
-/// Sorts items in-place. The current user is always pinned first.
-/// For display name sort, comparison is case-insensitive on display name.
-/// For requests sort, ties are broken by display name ascending.
-pub(crate) fn sort_user_items_in_place<T>(
-    items: &mut [UserSortingCriteria<T>],
-    display_name: &str,
-    key: Option<SortKey>,
-    order: SortOrder,
-) {
-    let pin_current_user =
-        |a: &UserSortingCriteria<T>, b: &UserSortingCriteria<T>| -> Option<std::cmp::Ordering> {
-            if a.display_name == display_name {
-                Some(std::cmp::Ordering::Less)
-            } else if b.display_name == display_name {
-                Some(std::cmp::Ordering::Greater)
-            } else {
-                None
-            }
-        };
-
-    let compare_by_name = |a: &UserSortingCriteria<T>,
-                           b: &UserSortingCriteria<T>,
-                           ascending: bool|
-     -> std::cmp::Ordering {
-        let a_key = a.display_name.to_lowercase();
-        let b_key = b.display_name.to_lowercase();
-        if ascending {
-            a_key.cmp(&b_key)
-        } else {
-            b_key.cmp(&a_key)
-        }
-    };
-
-    items.sort_by(|a, b| {
-        if let Some(ordering) = pin_current_user(a, b) {
-            return ordering;
-        }
-
-        match (key, order) {
-            (Some(SortKey::DisplayName), SortOrder::Asc) => compare_by_name(a, b, true),
-            (Some(SortKey::DisplayName), SortOrder::Desc) => compare_by_name(a, b, false),
-            (Some(SortKey::Requests), SortOrder::Asc) => {
-                let primary = a.requests_used.cmp(&b.requests_used);
-                if primary == std::cmp::Ordering::Equal {
-                    compare_by_name(a, b, true)
-                } else {
-                    primary
-                }
-            }
-            (Some(SortKey::Requests), SortOrder::Desc) => {
-                let primary = b.requests_used.cmp(&a.requests_used);
-                if primary == std::cmp::Ordering::Equal {
-                    compare_by_name(a, b, true)
-                } else {
-                    primary
-                }
-            }
-            _ => a.display_name.cmp(&b.display_name),
-        }
-    });
-}
-
-impl BillingAndUsagePageView {
-    fn render_anonymous_account_info(
-        &self,
-        auth_state: &AuthState,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let button_styles = UiComponentStyles {
-            font_size: Some(14.),
-            font_weight: Some(Weight::Semibold),
-            border_radius: Some(CornerRadius::with_all(Radius::Pixels(4.))),
-            padding: Some(Coords {
-                top: 12.,
-                bottom: 12.,
-                left: 40.,
-                right: 40.,
-            }),
-            ..Default::default()
-        };
-
-        let user_info = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Accent,
-                self.anonymous_user_sign_up_button.clone(),
-            )
-            .with_style(button_styles)
-            .with_text_label("Sign up".to_owned())
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::SignupAnonymousUser);
-            })
-            .finish();
-
-        let mut plan_info = Flex::column()
-            .with_main_axis_alignment(MainAxisAlignment::SpaceEvenly)
-            .with_cross_axis_alignment(CrossAxisAlignment::End);
-        let current_user_id = auth_state.user_id().unwrap_or_default();
-
-        plan_info.add_child(render_customer_type_badge(appearance, "Free".into()));
-        plan_info.add_child(
-            Container::new(
-                appearance
-                    .ui_builder()
-                    .button(ButtonVariant::Link, self.upgrade_link.clone())
-                    .with_text_and_icon_label(
-                        TextAndIcon::new(
-                            TextAndIconAlignment::IconFirst,
-                            "Compare plans",
-                            Icon::CoinsStacked.to_galaxyui_icon(appearance.theme().accent()),
-                            MainAxisSize::Min,
-                            MainAxisAlignment::Center,
-                            vec2f(14., 14.),
-                        )
-                        .with_inner_padding(4.),
-                    )
-                    .build()
-                    .on_click(move |ctx, _, _| {
-                        ctx.dispatch_typed_action(BillingAndUsagePageAction::Upgrade {
-                            team_uid: None,
-                            user_id: current_user_id,
-                        });
-                    })
-                    .finish(),
-            )
-            .with_margin_top(8.)
-            .finish(),
-        );
-
-        Flex::row()
-            .with_child(
-                Shrinkable::new(
-                    1.0,
-                    Flex::row()
-                        .with_child(user_info)
-                        .with_main_axis_alignment(MainAxisAlignment::Start)
-                        .with_main_axis_size(MainAxisSize::Max)
-                        .finish(),
-                )
-                .finish(),
-            )
-            .with_child(Align::new(plan_info.finish()).right().finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .finish()
-    }
-
-    fn render_plan_header_text(&self, appearance: &Appearance) -> Box<dyn Element> {
-        Text::new_inline("Plan", appearance.ui_font_family(), HEADER_FONT_SIZE)
-            .with_style(Properties::default().weight(Weight::Bold))
-            .with_color(appearance.theme().active_ui_text_color().into())
-            .finish()
-    }
-
-    fn render_team_admin_actions(
-        &self,
-        team: &Team,
-        _current_user_id: UserUid,
-        appearance: &Appearance,
-    ) -> Option<Box<dyn Element>> {
-        if team.billing_metadata.customer_type == CustomerType::Enterprise
-            || !team.has_billing_history
-        {
-            return None;
-        }
-
-        let team_uid = team.uid;
-        let content = Container::new(
-            appearance
-                .ui_builder()
-                .button(ButtonVariant::Link, self.enterprise_contact_us_link.clone())
-                .with_text_and_icon_label(
-                    TextAndIcon::new(
-                        TextAndIconAlignment::IconFirst,
-                        "Manage billing",
-                        Icon::CoinsStacked.to_galaxyui_icon(appearance.theme().accent()),
-                        MainAxisSize::Min,
-                        MainAxisAlignment::Center,
-                        vec2f(14., 14.),
-                    )
-                    .with_inner_padding(4.),
-                )
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(
-                        BillingAndUsagePageAction::GenerateStripeBillingPortalLink { team_uid },
-                    );
-                })
-                .finish(),
-        )
-        .with_margin_left(12.)
-        .finish();
-
-        Some(
-            Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_child(content)
-                .finish(),
-        )
-    }
-
-    fn render_plan_badge_for_team(
-        &self,
-        team: &Team,
-        appearance: &Appearance,
-    ) -> Option<Box<dyn Element>> {
-        if team.billing_metadata.customer_type != CustomerType::Unknown {
-            Some(
-                Container::new(render_customer_type_badge(
-                    appearance,
-                    team.billing_metadata.customer_type.to_display_string(),
-                ))
-                .with_margin_right(12.)
-                .finish(),
-            )
-        } else {
-            None
-        }
-    }
-
-    fn render_admin_panel_button(
-        &self,
-        team_uid: ServerId,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        Container::new(
-            appearance
-                .ui_builder()
-                .button(ButtonVariant::Link, self.stripe_billing_portal_link.clone())
-                .with_text_and_icon_label(
-                    TextAndIcon::new(
-                        TextAndIconAlignment::IconFirst,
-                        "Open admin panel",
-                        Icon::Users.to_galaxyui_icon(appearance.theme().accent()),
-                        MainAxisSize::Min,
-                        MainAxisAlignment::Center,
-                        vec2f(14., 14.),
-                    )
-                    .with_inner_padding(4.),
-                )
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(BillingAndUsagePageAction::OpenAdminPanel {
-                        team_uid,
-                    });
-                })
-                .finish(),
-        )
-        .with_margin_left(12.)
-        .finish()
-    }
-
-    fn render_non_team_user_actions(
-        &self,
-        auth_state: &AuthState,
-        appearance: &Appearance,
-    ) -> (Box<dyn Element>, Box<dyn Element>) {
-        let current_user_id = auth_state.user_id().unwrap_or_default();
-
-        let plan_badge = render_customer_type_badge(appearance, "Free".into());
-
-        let badge_element = Container::new(plan_badge).with_margin_right(16.).finish();
-
-        let compare_plans_button = Container::new(
-            appearance
-                .ui_builder()
-                .button(ButtonVariant::Link, self.admin_panel_link.clone())
-                .with_text_and_icon_label(
-                    TextAndIcon::new(
-                        TextAndIconAlignment::IconFirst,
-                        "Compare plans",
-                        Icon::CoinsStacked.to_galaxyui_icon(appearance.theme().accent()),
-                        MainAxisSize::Min,
-                        MainAxisAlignment::Center,
-                        vec2f(14., 14.),
-                    )
-                    .with_inner_padding(4.),
-                )
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(BillingAndUsagePageAction::Upgrade {
-                        team_uid: None,
-                        user_id: current_user_id,
-                    });
-                })
-                .finish(),
-        )
-        .with_margin_left(12.)
-        .finish();
-
-        (badge_element, compare_plans_button)
-    }
-
-    fn render_account_info(
-        &self,
-        auth_state: &AuthState,
-        app: &AppContext,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let mut plan_header = Flex::row()
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_size(MainAxisSize::Max);
-
-        plan_header.add_child(self.render_plan_header_text(appearance));
-
-        let mut right_side = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::End);
-
-        let current_user_id = auth_state.user_id().unwrap_or_default();
-        let workspaces = UserWorkspaces::as_ref(app);
-
-        if let Some(team) = workspaces.current_team() {
-            if let Some(plan_badge) = self.render_plan_badge_for_team(team, appearance) {
-                right_side.add_child(plan_badge);
-            }
-
-            let current_user_email = auth_state.user_email().unwrap_or_default();
-            let has_admin_permissions = team.has_admin_permissions(&current_user_email);
-
-            if has_admin_permissions {
-                if let Some(admin_actions) =
-                    self.render_team_admin_actions(team, current_user_id, appearance)
-                {
-                    right_side.add_child(admin_actions);
-                }
-
-                if team.billing_metadata.is_enterprise_plan() {
-                    let admin_panel_button = self.render_admin_panel_button(team.uid, appearance);
-                    right_side.add_child(admin_panel_button);
-                }
-            }
-        } else {
-            let (plan_badge, compare_plans_button) =
-                self.render_non_team_user_actions(auth_state, appearance);
-            right_side.add_child(plan_badge);
-            right_side.add_child(compare_plans_button);
-        }
-
-        plan_header.add_child(right_side.finish());
-        plan_header.finish()
-    }
-}
-
-impl BillingAndUsagePageView {
-    fn render_plan_header(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let account_info = if self.auth_state.is_anonymous_or_logged_out() {
-            self.render_anonymous_account_info(self.auth_state.as_ref(), appearance)
-        } else {
-            self.render_account_info(self.auth_state.as_ref(), app, appearance)
-        };
-
-        let mut col = Flex::column();
-
-        col.add_child(
-            Container::new(account_info)
-                .with_margin_bottom(HEADER_PADDING)
-                .finish(),
-        );
-
-        col.finish()
-    }
-}
-
-#[cfg(test)]
-#[path = "billing_and_usage_page_tests.rs"]
-mod tests;
diff --git a/app/src/settings_view/billing_and_usage_page_tests.rs b/app/src/settings_view/billing_and_usage_page_tests.rs
deleted file mode 100644
index 97af38f9..00000000
--- a/app/src/settings_view/billing_and_usage_page_tests.rs
+++ /dev/null
@@ -1,146 +0,0 @@
-use super::{sort_user_items_in_place, SortKey, SortOrder, UserSortingCriteria};
-
-#[test]
-pub fn test_default_sorting_pins_current_user_first_then_display_name_asc() {
-    let mut items = vec![
-        UserSortingCriteria::new("Zed".to_string(), 10, ()),
-        UserSortingCriteria::new("Alice".to_string(), 5, ()),
-        UserSortingCriteria::new("Bob".to_string(), 15, ()),
-    ];
-
-    sort_user_items_in_place(&mut items, "Bob", None, SortOrder::Asc);
-
-    // Expected: Bob (current user) first, then Alice, then Zed (by display name asc)
-    assert_eq!(items[0].display_name, "Bob");
-    assert_eq!(items[1].display_name, "Alice");
-    assert_eq!(items[2].display_name, "Zed");
-}
-
-#[test]
-fn test_display_name_az_sorting_pins_current_user() {
-    let mut items = vec![
-        UserSortingCriteria::new("Zed".to_string(), 10, ()),
-        UserSortingCriteria::new("Alice".to_string(), 5, ()),
-        UserSortingCriteria::new("Bob".to_string(), 15, ()),
-        UserSortingCriteria::new("charlie@example.com".to_string(), 8, ()), // Using email as display name fallback
-    ];
-
-    sort_user_items_in_place(
-        &mut items,
-        "Bob",
-        Some(SortKey::DisplayName),
-        SortOrder::Asc,
-    );
-
-    // Expected: Bob (current user) first, then Alice, charlie@ (fallback to email), Zed
-    assert_eq!(items[0].display_name, "Bob");
-    assert_eq!(items[1].display_name, "Alice");
-    assert_eq!(items[2].display_name, "charlie@example.com"); // Email as display name fallback
-    assert_eq!(items[3].display_name, "Zed");
-}
-
-#[test]
-fn test_display_name_za_sorting_pins_current_user() {
-    let mut items = vec![
-        UserSortingCriteria::new("Zed".to_string(), 10, ()),
-        UserSortingCriteria::new("Alice".to_string(), 5, ()),
-        UserSortingCriteria::new("Bob".to_string(), 15, ()),
-    ];
-
-    sort_user_items_in_place(
-        &mut items,
-        "Alice",
-        Some(SortKey::DisplayName),
-        SortOrder::Desc,
-    );
-
-    // Expected: Alice (current user) first, then Zed, Bob (by name desc)
-    assert_eq!(items[0].display_name, "Alice");
-    assert_eq!(items[1].display_name, "Zed");
-    assert_eq!(items[2].display_name, "Bob");
-}
-
-#[test]
-fn test_requests_usage_desc_sorting_pins_current_user_with_display_name_tie_breaker() {
-    let mut items = vec![
-        UserSortingCriteria::new("Alice".to_string(), 10, ()),
-        UserSortingCriteria::new("Bob".to_string(), 15, ()),
-        UserSortingCriteria::new("Charlie".to_string(), 10, ()), // Same usage as Alice
-        UserSortingCriteria::new("Diana".to_string(), 5, ()),
-    ];
-
-    sort_user_items_in_place(
-        &mut items,
-        "Diana",
-        Some(SortKey::Requests),
-        SortOrder::Desc,
-    );
-
-    // Expected: Diana (current user) first, then Bob (15), then Alice/Charlie by name (10 tie)
-    assert_eq!(items[0].display_name, "Diana");
-    assert_eq!(items[1].display_name, "Bob"); // Highest usage (15)
-    assert_eq!(items[2].display_name, "Alice"); // Tied at 10, "Alice" < "Charlie"
-    assert_eq!(items[3].display_name, "Charlie");
-}
-
-#[test]
-fn test_requests_usage_asc_sorting_pins_current_user_with_display_name_tie_breaker() {
-    let mut items = vec![
-        UserSortingCriteria::new("Alice".to_string(), 10, ()),
-        UserSortingCriteria::new("Bob".to_string(), 15, ()),
-        UserSortingCriteria::new("Charlie".to_string(), 10, ()), // Same usage as Alice
-        UserSortingCriteria::new("Diana".to_string(), 5, ()),
-    ];
-
-    sort_user_items_in_place(&mut items, "Bob", Some(SortKey::Requests), SortOrder::Asc);
-
-    // Expected: Bob (current user) first, then Diana (5), then Alice/Charlie by name (10 tie)
-    assert_eq!(items[0].display_name, "Bob");
-    assert_eq!(items[1].display_name, "Diana"); // Lowest usage (5)
-    assert_eq!(items[2].display_name, "Alice"); // Tied at 10, "Alice" < "Charlie"
-    assert_eq!(items[3].display_name, "Charlie");
-}
-
-#[test]
-fn test_display_name_az_sorting_with_emails() {
-    let mut items = vec![
-        UserSortingCriteria::new("zuser@example.com".to_string(), 10, ()),
-        UserSortingCriteria::new("Alice".to_string(), 5, ()),
-        UserSortingCriteria::new("buser@example.com".to_string(), 15, ()),
-    ];
-
-    sort_user_items_in_place(
-        &mut items,
-        "Alice",
-        Some(SortKey::DisplayName),
-        SortOrder::Asc,
-    );
-
-    // Expected: Alice (current user) first, then buser@... < zuser@... (by email fallback)
-    assert_eq!(items[0].display_name, "Alice");
-    assert_eq!(items[1].display_name, "buser@example.com"); // Email as display name
-    assert_eq!(items[2].display_name, "zuser@example.com"); // Email as display name
-}
-
-#[test]
-fn test_case_insensitive_display_name_sorting() {
-    let mut items = vec![
-        UserSortingCriteria::new("alice".to_string(), 10, ()),
-        UserSortingCriteria::new("Bob".to_string(), 5, ()),
-        UserSortingCriteria::new("CHARLIE".to_string(), 8, ()),
-        UserSortingCriteria::new("Diana".to_string(), 12, ()),
-    ];
-
-    sort_user_items_in_place(
-        &mut items,
-        "Diana",
-        Some(SortKey::DisplayName),
-        SortOrder::Asc,
-    );
-
-    // Expected: Diana (current user) first, then alice, Bob, CHARLIE (case-insensitive asc)
-    assert_eq!(items[0].display_name, "Diana");
-    assert_eq!(items[1].display_name, "alice"); // "alice" (lowercase)
-    assert_eq!(items[2].display_name, "Bob"); // "Bob"
-    assert_eq!(items[3].display_name, "CHARLIE"); // "CHARLIE"
-}
diff --git a/app/src/settings_view/billing_and_usage_page_v2.rs b/app/src/settings_view/billing_and_usage_page_v2.rs
deleted file mode 100644
index 2c525d61..00000000
--- a/app/src/settings_view/billing_and_usage_page_v2.rs
+++ /dev/null
@@ -1,2243 +0,0 @@
-use std::cell::RefCell;
-use std::collections::HashMap;
-use std::sync::Arc;
-
-use chrono::Local;
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::ui::appearance::Appearance;
-use itertools::Itertools;
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use settings::Setting;
-use thousands::Separable;
-use warp_graphql::billing::AddonCreditsOption;
-use warpui::elements::{
-    Align, Border, Clipped, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty,
-    Expanded, Flex, FormattedTextElement, HighlightedHyperlink, MainAxisAlignment, MainAxisSize,
-    MouseStateHandle, ParentElement, Radius, Shrinkable, Text, Wrap,
-};
-use warpui::fonts::{Properties, Weight};
-use warpui::prelude::ChildView;
-use warpui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
-use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use warpui::ui_components::switch::SwitchStateHandle;
-use warpui::{
-    AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, UpdateView, View,
-    ViewContext, ViewHandle,
-};
-
-use super::billing_and_usage::billing_cycle_usage_section::BillingCycleUsageSectionView;
-use super::billing_and_usage::overage_limit_modal::{SpendingLimitModal, SpendingLimitModalEvent};
-use super::billing_and_usage::usage_history_entry::UsageHistoryEntry;
-use super::billing_and_usage::usage_history_model::UsageHistoryModel;
-pub use super::billing_and_usage_page::BillingAndUsagePageEvent;
-use super::billing_and_usage_page::{BillingAndUsagePageAction, BillingUsageTab};
-use super::settings_page::{render_customer_type_badge, render_info_icon, AdditionalInfo};
-use super::SettingsSection;
-use crate::ai::request_usage_model::{
-    BonusGrant, BonusGrantScope, BonusGrantType, AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD,
-};
-use crate::ai::AIRequestUsageModel;
-use crate::auth::auth_state::AuthState;
-use crate::auth::auth_view_modal::AuthViewVariant;
-use crate::auth::{AuthManager, AuthStateProvider};
-use crate::modal::{Modal, ModalEvent, ModalViewState};
-use crate::pricing::PricingInfoModel;
-use crate::server::ids::ServerId;
-use crate::server::telemetry::TelemetryEvent;
-use crate::settings::ai::AISettings;
-use crate::ui_components::blended_colors;
-use crate::ui_components::buttons::icon_button;
-use crate::ui_components::icons::Icon;
-use crate::ui_components::tab_selector::{self, SettingsTab};
-use crate::view_components::action_button::{ActionButton, PrimaryTheme, SecondaryTheme};
-use crate::view_components::ToastFlavor;
-use crate::workspaces::update_manager::TeamUpdateManager;
-use crate::workspaces::user_workspaces::{UserWorkspaces, UserWorkspacesEvent};
-use crate::workspaces::workspace::{CustomerType, Workspace, WorkspaceUid};
-use crate::{send_telemetry_from_ctx, WorkspaceAction};
-
-const ADDON_CREDITS_DESCRIPTION: &str = "Add-on credits are purchased in prepaid packages that roll over each billing cycle and expire after one year. The more you purchase, the better the per-credit rate. Once your base plan credits are used, add-on credits will be consumed.";
-const ADDITIONAL_ADDON_CREDITS_DESCRIPTION_FOR_TEAM: &str =
-    "Purchased add-on credits are added to your personal balance.";
-const MANAGED_AUTO_RELOAD_HEADER: &str = "Auto-reload is enabled";
-
-const ADDON_CREDITS_DELINQUENT_WARNING_STRING: &str =
-    "Restricted due to billing issue. Update your payment method to purchase add-on credits.";
-const ADDON_CREDITS_NON_ADMIN_DELINQUENT_WARNING_STRING: &str =
-    "Restricted due to billing issue. Contact your team admin to update their payment method.";
-const RESTRICTED_BILLING_USAGE_WARNING_STRING: &str = "Auto reload is disabled due to recent failed reload. Please update your payment method and try again.";
-const RESTRICTED_BILLING_USAGE_NON_ADMIN_WARNING_STRING: &str = "Auto reload is disabled due to recent failed reload. Contact your team admin to update their payment method.";
-
-const HEADER_FONT_SIZE: f32 = 16.;
-
-pub(super) const BASE_CREDITS_DOT_COLOR: ColorU = ColorU {
-    r: 207,
-    g: 145,
-    b: 216,
-    a: 255,
-};
-pub(super) const BONUS_CREDITS_DOT_COLOR: ColorU = ColorU {
-    r: 236,
-    g: 148,
-    b: 85,
-    a: 255,
-};
-pub(super) const PAYG_CREDITS_DOT_COLOR: ColorU = ColorU {
-    r: 94,
-    g: 177,
-    b: 239,
-    a: 255,
-};
-pub(super) const AMBIENT_CREDITS_DOT_COLOR: ColorU = ColorU {
-    r: 99,
-    g: 102,
-    b: 241,
-    a: 255,
-};
-pub(super) const AGGREGATE_CREDITS_DOT_COLOR: ColorU = ColorU {
-    r: 140,
-    g: 140,
-    b: 140,
-    a: 255,
-};
-const DEFAULT_MAX_MONTHLY_SPEND_CENTS: i32 = 20_000;
-const AMBIENT_AGENT_TRIAL_TITLE: &str = "Cloud agent trial";
-
-#[derive(Default)]
-struct PlanSectionMouseStates {
-    manage_billing_link: MouseStateHandle,
-    open_admin_panel_link: MouseStateHandle,
-    admin_panel_link: MouseStateHandle,
-    refresh_button: MouseStateHandle,
-}
-
-#[derive(Default)]
-struct BuyCreditsMouseStates {
-    addon_info_icon: MouseStateHandle,
-    edit_monthly_limit: MouseStateHandle,
-    auto_reload_switch: SwitchStateHandle,
-    auto_reload_info: MouseStateHandle,
-    buy_button: MouseStateHandle,
-}
-#[derive(Default)]
-struct AmbientTrialMouseStates {
-    new_agent_button: MouseStateHandle,
-    buy_more_button: MouseStateHandle,
-    dismiss_button: MouseStateHandle,
-}
-
-#[derive(Default)]
-struct TabMouseStates {
-    overview: MouseStateHandle,
-    usage_history: MouseStateHandle,
-}
-
-struct AddonCreditsState {
-    selected_denomination: usize,
-    options: Vec<AddonCreditsOption>,
-    denomination_buttons: Vec<ViewHandle<ActionButton>>,
-    purchase_loading: bool,
-}
-enum AddonCreditsPanelState {
-    IneligiblePlan(AddonCreditsRestriction),
-    AutoreloadNonAdmin {
-        description_text: String,
-        warning_text: Option<&'static str>,
-    },
-    Purchase(AddonCreditsPurchaseState),
-}
-
-enum AddonCreditsRestriction {
-    UpgradeToBuild {
-        link_text: &'static str,
-        url: String,
-    },
-    ContactAccountExecutive,
-    ContactTeamAdmin,
-}
-
-struct AddonCreditsPurchaseState {
-    description_text: String,
-    auto_reload_enabled: bool,
-    has_admin_permissions: bool,
-    purchase_disabled: bool,
-    auto_reload_switch_disabled: bool,
-    price_label: String,
-    auto_reload_tooltip_text: String,
-    warning_text: Option<&'static str>,
-}
-
-struct UsageHistoryState {
-    model: ModelHandle<UsageHistoryModel>,
-    expanded_entries: HashMap<String, bool>,
-    entry_mouse_states: RefCell<HashMap<String, MouseStateHandle>>,
-    tooltip_mouse_states: RefCell<HashMap<String, MouseStateHandle>>,
-    load_more_button: ViewHandle<ActionButton>,
-}
-
-struct GrantBucket {
-    grants: Vec<BonusGrant>,
-}
-
-impl GrantBucket {
-    fn is_empty(&self) -> bool {
-        self.grants.is_empty()
-    }
-
-    fn total_balance(&self) -> i64 {
-        self.grants
-            .iter()
-            .map(|g| g.request_credits_remaining as i64)
-            .sum()
-    }
-
-    fn expiry_label(&self) -> String {
-        let expiries: Vec<_> = self.grants.iter().filter_map(|g| g.expiration).collect();
-        if expiries.is_empty() {
-            return String::new();
-        }
-        let first = expiries[0];
-        if expiries
-            .iter()
-            .all(|e| e.date_naive() == first.date_naive())
-        {
-            let local = first.with_timezone(&Local);
-            format!("Expires {}", local.format("%b %d, %Y"))
-        } else {
-            String::new()
-        }
-    }
-}
-
-struct ClassifiedGrants {
-    personal: GrantBucket,
-    team: GrantBucket,
-}
-
-impl ClassifiedGrants {
-    fn new(grants: &[BonusGrant], workspace_uid: Option<WorkspaceUid>) -> Self {
-        let now = chrono::Utc::now();
-        let mut personal = Vec::new();
-        let mut team = Vec::new();
-
-        for grant in grants {
-            if grant.expiration.is_some_and(|exp| now >= exp) {
-                continue;
-            }
-            if grant.request_credits_remaining <= 0 {
-                continue;
-            }
-            let in_user_scope = grant.scope == BonusGrantScope::User;
-            let in_workspace_scope =
-                workspace_uid.is_some_and(|uid| grant.scope == BonusGrantScope::Workspace(uid));
-            if grant.grant_type == BonusGrantType::AmbientOnly {
-                continue;
-            } else if in_user_scope {
-                personal.push(grant.clone());
-            } else if in_workspace_scope {
-                team.push(grant.clone());
-            }
-        }
-
-        Self {
-            personal: GrantBucket { grants: personal },
-            team: GrantBucket { grants: team },
-        }
-    }
-
-    fn has_any(&self) -> bool {
-        !self.personal.is_empty() || !self.team.is_empty()
-    }
-}
-
-pub struct BillingAndUsagePageV2View {
-    auth_state: Arc<AuthState>,
-    addon_credit_modal_state: ModalViewState<Modal<SpendingLimitModal>>,
-    selected_tab: BillingUsageTab,
-    usage_history: UsageHistoryState,
-    addon_credits: AddonCreditsState,
-    pending_auto_reload_toast: Option<String>,
-    tab_mouse_states: TabMouseStates,
-    plan_mouse_states: PlanSectionMouseStates,
-    buy_credits_mouse_states: BuyCreditsMouseStates,
-    ambient_trial_mouse_states: AmbientTrialMouseStates,
-    billing_cycle_usage_section: ViewHandle<BillingCycleUsageSectionView>,
-}
-
-impl BillingAndUsagePageV2View {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        ctx.subscribe_to_model(&UserWorkspaces::handle(ctx), |me, _handle, event, ctx| {
-            me.handle_workspaces_event(event, ctx);
-            ctx.notify();
-        });
-
-        ctx.subscribe_to_model(&AuthManager::handle(ctx), |me, _, _, ctx| {
-            me.refresh_addon_credits_settings(ctx);
-            ctx.notify();
-        });
-
-        let team_update_manager = TeamUpdateManager::handle(ctx);
-        ctx.subscribe_to_model(&team_update_manager, |_, _handle, _, ctx| {
-            ctx.notify();
-        });
-
-        ctx.subscribe_to_model(&AIRequestUsageModel::handle(ctx), |_, _, _, ctx| {
-            ctx.notify()
-        });
-
-        ctx.subscribe_to_model(
-            &PricingInfoModel::handle(ctx),
-            |me, _handle, _event, ctx| {
-                me.update_addon_credits_options(ctx);
-                me.refresh_addon_credits_settings(ctx);
-                ctx.notify();
-            },
-        );
-
-        let usage_history_model = ctx.add_model(UsageHistoryModel::new);
-        ctx.subscribe_to_model(&usage_history_model, |_, _, _, ctx| {
-            ctx.notify();
-        });
-        usage_history_model.update(ctx, |m, ctx| m.refresh_usage_history_async(ctx));
-
-        let auth_state = AuthStateProvider::as_ref(ctx).get().clone();
-
-        let addon_credit_modal = ctx.add_typed_action_view(SpendingLimitModal::new);
-        ctx.subscribe_to_view(&addon_credit_modal, |me, _, event, ctx| {
-            me.handle_addon_credit_modal_event(event, ctx);
-        });
-
-        let addon_credit_modal_view = ctx.add_typed_action_view(|ctx| {
-            Modal::new(
-                Some("Monthly spending limit".to_string()),
-                addon_credit_modal,
-                ctx,
-            )
-            .with_header_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).bottom(16.)),
-                ..Default::default()
-            })
-            .with_body_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).top(0.).bottom(12.)),
-                ..Default::default()
-            })
-        });
-        ctx.subscribe_to_view(&addon_credit_modal_view, |me, _, event, ctx| {
-            me.handle_addon_credit_modal_close_event(event, ctx);
-        });
-
-        let load_more_button = ctx.add_typed_action_view(|_ctx| {
-            ActionButton::new("Load more", SecondaryTheme).on_click(|ctx| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::RenderMoreUsageEntries);
-            })
-        });
-
-        let billing_cycle_usage_section =
-            ctx.add_typed_action_view(BillingCycleUsageSectionView::new);
-
-        let mut me = Self {
-            auth_state,
-            addon_credit_modal_state: ModalViewState::new(addon_credit_modal_view),
-            selected_tab: BillingUsageTab::Overview,
-            usage_history: UsageHistoryState {
-                model: usage_history_model,
-                expanded_entries: HashMap::new(),
-                entry_mouse_states: RefCell::new(HashMap::new()),
-                tooltip_mouse_states: RefCell::new(HashMap::new()),
-                load_more_button,
-            },
-            addon_credits: AddonCreditsState {
-                selected_denomination: 0,
-                options: Default::default(),
-                denomination_buttons: Default::default(),
-                purchase_loading: false,
-            },
-            pending_auto_reload_toast: None,
-            tab_mouse_states: Default::default(),
-            plan_mouse_states: Default::default(),
-            buy_credits_mouse_states: Default::default(),
-            ambient_trial_mouse_states: Default::default(),
-            billing_cycle_usage_section,
-        };
-        me.update_addon_credits_options(ctx);
-        me.refresh_addon_credits_settings(ctx);
-        me
-    }
-
-    fn refresh_addon_credits_settings(&mut self, ctx: &mut ViewContext<Self>) {
-        let Some(workspace) = UserWorkspaces::as_ref(ctx).current_workspace() else {
-            return;
-        };
-        let addon_credits_settings = &workspace.settings.addon_credits_settings;
-        if addon_credits_settings.auto_reload_enabled {
-            self.addon_credits.selected_denomination = addon_credits_settings
-                .selected_auto_reload_credit_denomination
-                .and_then(|amount| {
-                    self.addon_credits
-                        .options
-                        .iter()
-                        .find_position(|option| option.credits == amount)
-                })
-                .map_or(0, |pair| pair.0);
-        }
-        self.update_denomination_buttons_focus(ctx);
-    }
-
-    fn update_denomination_buttons_focus(&mut self, ctx: &mut ViewContext<Self>) {
-        for (i, button_handle) in self.addon_credits.denomination_buttons.iter().enumerate() {
-            ctx.update_view(button_handle, |button, ctx| {
-                if i == self.addon_credits.selected_denomination {
-                    button.set_theme(PrimaryTheme, ctx);
-                } else {
-                    button.set_theme(SecondaryTheme, ctx);
-                }
-            });
-        }
-    }
-
-    fn handle_workspaces_event(
-        &mut self,
-        event: &UserWorkspacesEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            UserWorkspacesEvent::TeamsChanged => {
-                self.update_addon_credit_modal(ctx);
-            }
-            UserWorkspacesEvent::UpdateWorkspaceSettingsSuccess => {
-                self.update_addon_credit_modal(ctx);
-                self.refresh_addon_credits_settings(ctx);
-                if let Some(message) = self.pending_auto_reload_toast.take() {
-                    self.show_toast(&message, ToastFlavor::Success, ctx);
-                }
-                ctx.notify();
-            }
-            UserWorkspacesEvent::UpdateWorkspaceSettingsRejected(_err) => {
-                self.pending_auto_reload_toast = None;
-                self.show_toast(
-                    "Failed to update workspace settings",
-                    ToastFlavor::Error,
-                    ctx,
-                );
-            }
-            UserWorkspacesEvent::AiOveragesUpdated => {
-                ctx.notify();
-            }
-            UserWorkspacesEvent::PurchaseAddonCreditsSuccess => {
-                self.addon_credits.purchase_loading = false;
-                self.show_toast(
-                    "Successfully purchased add-on credits",
-                    ToastFlavor::Success,
-                    ctx,
-                );
-                AIRequestUsageModel::handle(ctx)
-                    .update(ctx, |m, ctx| m.refresh_request_usage_async(ctx));
-            }
-            UserWorkspacesEvent::PurchaseAddonCreditsRejected(err) => {
-                self.addon_credits.purchase_loading = false;
-                self.show_toast(&err.to_string(), ToastFlavor::Error, ctx);
-            }
-            _ => {}
-        }
-    }
-
-    fn show_toast(&self, message: &str, flavor: ToastFlavor, ctx: &mut ViewContext<Self>) {
-        ctx.emit(BillingAndUsagePageEvent::ShowToast {
-            message: message.to_string(),
-            flavor,
-        });
-    }
-
-    pub fn get_modal_content(&self) -> Option<Box<dyn Element>> {
-        if self.addon_credit_modal_state.is_open() {
-            Some(self.addon_credit_modal_state.render())
-        } else {
-            None
-        }
-    }
-
-    fn handle_addon_credit_modal_close_event(
-        &mut self,
-        event: &ModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ModalEvent::Close => {
-                self.addon_credit_modal_state.close();
-                ctx.emit(BillingAndUsagePageEvent::HideModal);
-            }
-        }
-    }
-
-    fn handle_addon_credit_modal_event(
-        &mut self,
-        event: &SpendingLimitModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            SpendingLimitModalEvent::Close => {
-                self.hide_addon_credit_modal(ctx);
-            }
-            SpendingLimitModalEvent::Update { amount_cents } => {
-                let workspaces = UserWorkspaces::as_ref(ctx);
-                let team_uid = workspaces.current_team_uid();
-
-                if let Some(team_uid) = team_uid {
-                    UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                        user_workspaces.update_addon_credits_settings(
-                            team_uid,
-                            None,
-                            Some(*amount_cents as i32),
-                            None,
-                            ctx,
-                        );
-                    });
-                    self.hide_addon_credit_modal(ctx);
-                    ctx.notify();
-                }
-            }
-        }
-    }
-
-    fn show_addon_credit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.addon_credit_modal_state.open();
-        self.addon_credit_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.focus_input(ctx);
-                });
-            });
-        ctx.emit(BillingAndUsagePageEvent::ShowModal);
-    }
-
-    fn hide_addon_credit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.addon_credit_modal_state.close();
-        ctx.emit(BillingAndUsagePageEvent::HideModal);
-    }
-
-    fn update_addon_credit_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        let addon_limit = UserWorkspaces::as_ref(ctx)
-            .current_workspace()
-            .and_then(|ws| ws.settings.addon_credits_settings.max_monthly_spend_cents)
-            .unwrap_or(DEFAULT_MAX_MONTHLY_SPEND_CENTS);
-
-        self.addon_credit_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.update_amount_editor(addon_limit.max(0) as u32, ctx);
-                });
-            });
-        ctx.notify();
-    }
-
-    fn update_addon_credits_options(&mut self, ctx: &mut ViewContext<Self>) {
-        self.addon_credits.options = PricingInfoModel::as_ref(ctx)
-            .addon_credits_options()
-            .map(|options| options.to_vec())
-            .unwrap_or_default();
-        self.addon_credits.denomination_buttons = self
-            .addon_credits
-            .options
-            .iter()
-            .enumerate()
-            .map(|(i, option)| {
-                ctx.add_typed_action_view(move |_ctx| {
-                    ActionButton::new(option.credits.separate_with_commas(), SecondaryTheme)
-                        .with_icon(Icon::Credits)
-                        .on_click(move |ctx| {
-                            ctx.dispatch_typed_action(
-                                BillingAndUsagePageAction::SelectTopupDenomination(i),
-                            );
-                        })
-                })
-            })
-            .collect();
-    }
-
-    // ── Rendering ────────────────────────────────────────────────────────
-
-    fn render_plan_section(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let mut plan_header = Flex::row()
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_size(MainAxisSize::Max);
-
-        plan_header.add_child(
-            Text::new_inline("Plan", appearance.ui_font_family(), HEADER_FONT_SIZE)
-                .with_style(Properties::default().weight(Weight::Bold))
-                .with_color(appearance.theme().active_ui_text_color().into())
-                .finish(),
-        );
-
-        let mut right_side = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::End);
-
-        let workspaces = UserWorkspaces::as_ref(app);
-
-        if let Some(team) = workspaces.current_team() {
-            if team.billing_metadata.customer_type != CustomerType::Unknown {
-                right_side.add_child(
-                    Container::new(render_customer_type_badge(
-                        appearance,
-                        team.billing_metadata.customer_type.to_display_string(),
-                    ))
-                    .with_margin_right(8.)
-                    .finish(),
-                );
-            }
-
-            let current_user_email = AuthStateProvider::as_ref(app)
-                .get()
-                .user_email()
-                .unwrap_or_default();
-            let has_admin_permissions = team.has_admin_permissions(&current_user_email);
-
-            if has_admin_permissions {
-                if team.billing_metadata.customer_type != CustomerType::Enterprise
-                    && team.has_billing_history
-                {
-                    let team_uid = team.uid;
-                    let fg_color = appearance.theme().active_ui_text_color();
-                    right_side.add_child(
-                        Container::new(
-                            appearance
-                                .ui_builder()
-                                .button(
-                                    ButtonVariant::Link,
-                                    self.plan_mouse_states.manage_billing_link.clone(),
-                                )
-                                .with_text_and_icon_label(
-                                    TextAndIcon::new(
-                                        TextAndIconAlignment::IconFirst,
-                                        "Manage billing",
-                                        Icon::CoinsStacked.to_warpui_icon(fg_color),
-                                        MainAxisSize::Min,
-                                        MainAxisAlignment::Center,
-                                        vec2f(14., 14.),
-                                    )
-                                    .with_inner_padding(4.),
-                                )
-                                .with_style(UiComponentStyles {
-                                    font_color: Some(fg_color.into()),
-                                    ..Default::default()
-                                })
-                                .build()
-                                .on_click(move |ctx, _, _| {
-                                    ctx.dispatch_typed_action(
-                                        BillingAndUsagePageAction::GenerateStripeBillingPortalLink {
-                                            team_uid,
-                                        },
-                                    );
-                                })
-                                .finish(),
-                        )
-                        .with_margin_left(8.)
-                        .finish(),
-                    );
-                }
-
-                if team.billing_metadata.is_enterprise_plan() {
-                    let team_uid = team.uid;
-                    let fg_color = appearance.theme().active_ui_text_color();
-                    right_side.add_child(
-                        Container::new(
-                            appearance
-                                .ui_builder()
-                                .button(
-                                    ButtonVariant::Link,
-                                    self.plan_mouse_states.open_admin_panel_link.clone(),
-                                )
-                                .with_text_and_icon_label(
-                                    TextAndIcon::new(
-                                        TextAndIconAlignment::IconFirst,
-                                        "Open admin panel",
-                                        Icon::Users.to_warpui_icon(fg_color),
-                                        MainAxisSize::Min,
-                                        MainAxisAlignment::Center,
-                                        vec2f(14., 14.),
-                                    )
-                                    .with_inner_padding(4.),
-                                )
-                                .with_style(UiComponentStyles {
-                                    font_color: Some(fg_color.into()),
-                                    ..Default::default()
-                                })
-                                .build()
-                                .on_click(move |ctx, _, _| {
-                                    ctx.dispatch_typed_action(
-                                        BillingAndUsagePageAction::OpenAdminPanel { team_uid },
-                                    );
-                                })
-                                .finish(),
-                        )
-                        .with_margin_left(8.)
-                        .finish(),
-                    );
-                }
-            }
-        } else {
-            let current_user_id = self.auth_state.user_id().unwrap_or_default();
-            right_side.add_child(
-                Container::new(render_customer_type_badge(appearance, "Free".into()))
-                    .with_margin_right(8.)
-                    .finish(),
-            );
-            right_side.add_child(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .button(
-                            ButtonVariant::Link,
-                            self.plan_mouse_states.admin_panel_link.clone(),
-                        )
-                        .with_text_and_icon_label(
-                            TextAndIcon::new(
-                                TextAndIconAlignment::IconFirst,
-                                "Compare plans",
-                                Icon::CoinsStacked
-                                    .to_warpui_icon(appearance.theme().active_ui_text_color()),
-                                MainAxisSize::Min,
-                                MainAxisAlignment::Center,
-                                vec2f(14., 14.),
-                            )
-                            .with_inner_padding(4.),
-                        )
-                        .with_style(UiComponentStyles {
-                            font_color: Some(appearance.theme().active_ui_text_color().into()),
-                            ..Default::default()
-                        })
-                        .build()
-                        .on_click(move |ctx, _, _| {
-                            ctx.dispatch_typed_action(BillingAndUsagePageAction::Upgrade {
-                                team_uid: None,
-                                user_id: current_user_id,
-                            });
-                        })
-                        .finish(),
-                )
-                .with_margin_left(8.)
-                .finish(),
-            );
-        }
-
-        right_side.add_child(
-            Container::new(self.render_plan_refresh_button(appearance))
-                .with_margin_left(8.)
-                .finish(),
-        );
-
-        plan_header.add_child(right_side.finish());
-
-        Container::new(plan_header.finish())
-            .with_margin_bottom(24.)
-            .finish()
-    }
-
-    fn render_plan_refresh_button(&self, appearance: &Appearance) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let icon_color = theme.sub_text_color(theme.background());
-        let mouse_state = self.plan_mouse_states.refresh_button.clone();
-        warpui::elements::Hoverable::new(mouse_state, move |_| {
-            Container::new(
-                ConstrainedBox::new(Icon::Refresh.to_warpui_icon(icon_color).finish())
-                    .with_width(16.)
-                    .with_height(16.)
-                    .finish(),
-            )
-            .with_uniform_padding(2.)
-            .finish()
-        })
-        .with_cursor(warpui::platform::Cursor::PointingHand)
-        .on_click(|ctx, _, _| {
-            ctx.dispatch_typed_action(BillingAndUsagePageAction::RefreshWorkspaceData);
-        })
-        .finish()
-    }
-
-    fn render_balance_section(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Option<Box<dyn Element>> {
-        let theme = appearance.theme();
-        let ai_model = AIRequestUsageModel::as_ref(app);
-
-        let has_base_credits = ai_model.request_limit() > 0;
-
-        let grants = ai_model.bonus_grants();
-        let workspace_uid = UserWorkspaces::as_ref(app)
-            .current_workspace()
-            .map(|ws| ws.uid);
-        let classified = ClassifiedGrants::new(grants, workspace_uid);
-
-        if !has_base_credits && !classified.has_any() {
-            return None;
-        }
-
-        let mut cards_row = Flex::row()
-            .with_spacing(8.)
-            .with_main_axis_size(MainAxisSize::Max);
-
-        let outline_color = theme.outline().into_solid();
-
-        if has_base_credits {
-            let reset_str = ai_model
-                .next_refresh_time_local()
-                .format("Resets %b %d at %-I:%M %p")
-                .to_string();
-            let base_remaining = ai_model
-                .request_limit()
-                .saturating_sub(ai_model.requests_used()) as i64;
-            let base_limit = (!ai_model.is_unlimited()).then(|| ai_model.request_limit() as i64);
-            cards_row.add_child(
-                Expanded::new(
-                    1.,
-                    render_balance_card(
-                        appearance,
-                        BASE_CREDITS_DOT_COLOR,
-                        "Base credits",
-                        &reset_str,
-                        base_remaining,
-                        base_limit,
-                        outline_color,
-                    ),
-                )
-                .finish(),
-            );
-        }
-
-        if !classified.personal.is_empty() {
-            cards_row.add_child(
-                Expanded::new(
-                    1.,
-                    render_balance_card(
-                        appearance,
-                        BONUS_CREDITS_DOT_COLOR,
-                        "Personal credits",
-                        &classified.personal.expiry_label(),
-                        classified.personal.total_balance(),
-                        None,
-                        outline_color,
-                    ),
-                )
-                .finish(),
-            );
-        }
-
-        if !classified.team.is_empty() {
-            cards_row.add_child(
-                Expanded::new(
-                    1.,
-                    render_balance_card(
-                        appearance,
-                        BONUS_CREDITS_DOT_COLOR,
-                        "Team credits",
-                        &classified.team.expiry_label(),
-                        classified.team.total_balance(),
-                        None,
-                        outline_color,
-                    ),
-                )
-                .finish(),
-            );
-        }
-
-        Some(
-            Flex::column()
-                .with_child(
-                    Container::new(
-                        Text::new_inline("Balance", appearance.ui_font_family(), HEADER_FONT_SIZE)
-                            .with_style(Properties::default().weight(Weight::Bold))
-                            .with_color(theme.active_ui_text_color().into())
-                            .finish(),
-                    )
-                    .with_margin_bottom(12.)
-                    .finish(),
-                )
-                .with_child(cards_row.finish())
-                .with_child(
-                    ConstrainedBox::new(Empty::new().finish())
-                        .with_height(24.)
-                        .finish(),
-                )
-                .finish(),
-        )
-    }
-
-    fn render_ambient_agent_trial_widget(
-        &self,
-        ai_model: &AIRequestUsageModel,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Option<Box<dyn Element>> {
-        let credits_remaining = ai_model.ambient_only_credits_remaining()?;
-        if credits_remaining == 0 {
-            return None;
-        }
-
-        if *AISettings::as_ref(app).ambient_agent_trial_widget_dismissed {
-            return None;
-        }
-
-        let theme = appearance.theme();
-        let ui_builder = appearance.ui_builder();
-        let fg = theme.foreground().into_solid();
-        let bg = theme.background().into_solid();
-
-        let title = Text::new_inline(AMBIENT_AGENT_TRIAL_TITLE, appearance.ui_font_family(), 14.)
-            .with_color(theme.active_ui_text_color().into())
-            .with_style(Properties::default().weight(Weight::Semibold))
-            .finish();
-
-        let credits_text = if credits_remaining == 1 {
-            "1 credit remaining".to_string()
-        } else {
-            format!(
-                "{} credits remaining",
-                credits_remaining.separate_with_commas()
-            )
-        };
-        let credits_label = Text::new_inline(credits_text, appearance.ui_font_family(), 12.)
-            .with_color(blended_colors::text_sub(theme, theme.surface_1()))
-            .finish();
-
-        let left_side = Flex::row()
-            .with_child(title)
-            .with_child(Container::new(credits_label).with_margin_left(8.).finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .finish();
-
-        let mut right_side = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-
-        if credits_remaining >= AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD {
-            let new_agent_button = ui_builder
-                .button(
-                    ButtonVariant::Secondary,
-                    self.ambient_trial_mouse_states.new_agent_button.clone(),
-                )
-                .with_text_label("New agent".to_string())
-                .with_style(UiComponentStyles {
-                    font_color: Some(bg),
-                    background: Some(fg.into()),
-                    font_size: Some(14.),
-                    font_weight: Some(Weight::Semibold),
-                    padding: Some(Coords {
-                        top: 7.,
-                        bottom: 7.,
-                        left: 12.,
-                        right: 12.,
-                    }),
-                    ..Default::default()
-                })
-                .build()
-                .on_click(|ctx, _, _| {
-                    ctx.dispatch_typed_action(WorkspaceAction::AddAmbientAgentTab);
-                })
-                .finish();
-            right_side.add_child(
-                Container::new(new_agent_button)
-                    .with_margin_right(8.)
-                    .finish(),
-            );
-        }
-
-        let is_on_paid_plan = UserWorkspaces::as_ref(app)
-            .current_team()
-            .is_some_and(|team| team.billing_metadata.is_user_on_paid_plan());
-        if !is_on_paid_plan {
-            let user_id = AuthStateProvider::as_ref(app).get().user_id();
-            let buy_more_button = ui_builder
-                .button(
-                    ButtonVariant::Secondary,
-                    self.ambient_trial_mouse_states.buy_more_button.clone(),
-                )
-                .with_text_label("Buy more".to_string())
-                .with_style(UiComponentStyles {
-                    background: Some(bg.into()),
-                    font_size: Some(14.),
-                    font_weight: Some(Weight::Semibold),
-                    padding: Some(Coords {
-                        top: 7.,
-                        bottom: 7.,
-                        left: 12.,
-                        right: 12.,
-                    }),
-                    ..Default::default()
-                })
-                .build()
-                .on_click(move |ctx, _, _| {
-                    if let Some(user_id) = user_id {
-                        ctx.dispatch_typed_action(BillingAndUsagePageAction::Upgrade {
-                            team_uid: None,
-                            user_id,
-                        });
-                    }
-                })
-                .finish();
-            right_side.add_child(buy_more_button);
-        }
-
-        if credits_remaining < AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD {
-            let dismiss_button = icon_button(
-                appearance,
-                Icon::X,
-                false,
-                self.ambient_trial_mouse_states.dismiss_button.clone(),
-            )
-            .with_style(UiComponentStyles {
-                width: Some(32.),
-                height: Some(32.),
-                padding: Some(Coords::uniform(8.)),
-                ..Default::default()
-            })
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(
-                    BillingAndUsagePageAction::DismissAmbientAgentTrialWidget,
-                );
-            })
-            .finish();
-            right_side.add_child(Container::new(dismiss_button).with_margin_left(4.).finish());
-        }
-
-        let row_content = Flex::row()
-            .with_child(Shrinkable::new(1., left_side).finish())
-            .with_child(right_side.finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_main_axis_size(MainAxisSize::Max)
-            .finish();
-
-        let bright_blue: ColorU = theme.terminal_colors().bright.blue.into();
-        let gradient_start = ColorU::transparent_black();
-        let gradient_end = ColorU::new(bright_blue.r, bright_blue.g, bright_blue.b, 40);
-
-        Some(
-            Container::new(row_content)
-                .with_horizontal_background_gradient(gradient_start, gradient_end)
-                .with_border(Border::all(1.).with_border_color(theme.accent_overlay().into()))
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_margin_bottom(16.)
-                .with_uniform_padding(12.)
-                .finish(),
-        )
-    }
-
-    fn render_addon_credits_panel(
-        &self,
-        workspace: &Workspace,
-        team_uid: ServerId,
-        has_admin_permissions: bool,
-        delinquent: bool,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        match self.addon_credits_panel_state(
-            workspace,
-            team_uid,
-            has_admin_permissions,
-            delinquent,
-            app,
-        ) {
-            AddonCreditsPanelState::IneligiblePlan(restriction) => {
-                self.render_addon_credits_ineligible_plan_card(restriction, appearance)
-            }
-            AddonCreditsPanelState::AutoreloadNonAdmin {
-                description_text,
-                warning_text,
-            } => self.render_addon_credits_non_admin_auto_reload_card(
-                appearance,
-                description_text,
-                warning_text,
-            ),
-            AddonCreditsPanelState::Purchase(state) => {
-                self.render_addon_credits_purchase_card(workspace, team_uid, state, appearance)
-            }
-        }
-    }
-
-    fn addon_credits_panel_state(
-        &self,
-        workspace: &Workspace,
-        team_uid: ServerId,
-        has_admin_permissions: bool,
-        delinquent: bool,
-        app: &AppContext,
-    ) -> AddonCreditsPanelState {
-        let team_can_purchase = UserWorkspaces::as_ref(app)
-            .current_team()
-            .and_then(|t| t.billing_metadata.tier.purchase_add_on_credits_policy)
-            .is_some_and(|p| p.enabled);
-        let can_upgrade = workspace.billing_metadata.can_upgrade_to_build_plan();
-
-        if !team_can_purchase {
-            if !has_admin_permissions {
-                return AddonCreditsPanelState::IneligiblePlan(
-                    AddonCreditsRestriction::ContactTeamAdmin,
-                );
-            } else if can_upgrade {
-                return AddonCreditsPanelState::IneligiblePlan(
-                    AddonCreditsRestriction::UpgradeToBuild {
-                        link_text: "Upgrade to Build",
-                        url: UserWorkspaces::upgrade_link_for_team(team_uid),
-                    },
-                );
-            }
-            return AddonCreditsPanelState::IneligiblePlan(
-                AddonCreditsRestriction::ContactAccountExecutive,
-            );
-        }
-
-        let selected_credit_option = self
-            .addon_credits
-            .options
-            .get(self.addon_credits.selected_denomination);
-        let auto_reload_enabled = workspace
-            .settings
-            .addon_credits_settings
-            .auto_reload_enabled;
-
-        let team_count = UserWorkspaces::as_ref(app)
-            .current_team()
-            .map(|t| t.members.len())
-            .unwrap_or(1);
-        let description_text = if team_count > 1 {
-            format!("{ADDON_CREDITS_DESCRIPTION} {ADDITIONAL_ADDON_CREDITS_DESCRIPTION_FOR_TEAM}")
-        } else {
-            ADDON_CREDITS_DESCRIPTION.to_string()
-        };
-
-        let would_exceed = selected_credit_option.is_some_and(|opt| {
-            let limit = workspace
-                .settings
-                .addon_credits_settings
-                .max_monthly_spend_cents
-                .unwrap_or(DEFAULT_MAX_MONTHLY_SPEND_CENTS);
-            (workspace.bonus_grants_purchased_this_month.cents_spent + opt.price_usd_cents) > limit
-        });
-        let purchase_disabled = self.addon_credits.purchase_loading
-            || would_exceed
-            || delinquent
-            || auto_reload_enabled;
-        let auto_reload_switch_disabled = !has_admin_permissions
-            || delinquent
-            || (!auto_reload_enabled && selected_credit_option.is_none());
-        let price_label = selected_credit_option
-            .map(|opt| {
-                let credits = opt.credits.separate_with_commas();
-                let dollars = format!("${:.2}", opt.price_usd_cents as f64 / 100.0);
-                format!("{credits} credits / {dollars}")
-            })
-            .unwrap_or_default();
-        let auto_reload_credit_amount = selected_credit_option
-            .map(|o| format!("{} credits", o.credits.separate_with_commas()))
-            .unwrap_or_else(|| "selected credit amount".to_string());
-        let auto_reload_tooltip_text = format!(
-            "When any member on your team’s credit balance reaches 100 credits remaining, \
-            automatically purchase {auto_reload_credit_amount}."
-        );
-        let warning_text = if delinquent && has_admin_permissions {
-            Some(ADDON_CREDITS_DELINQUENT_WARNING_STRING)
-        } else if delinquent {
-            Some(ADDON_CREDITS_NON_ADMIN_DELINQUENT_WARNING_STRING)
-        } else if workspace
-            .billing_metadata
-            .has_failed_addon_credit_auto_reload_status()
-        {
-            Some(if has_admin_permissions {
-                RESTRICTED_BILLING_USAGE_WARNING_STRING
-            } else {
-                RESTRICTED_BILLING_USAGE_NON_ADMIN_WARNING_STRING
-            })
-        } else if would_exceed {
-            Some(match (auto_reload_enabled, has_admin_permissions) {
-                (true, true) => {
-                    "Auto-reload is paused because the next reload would exceed your monthly spend limit. Increase your limit to continue using auto-reload."
-                }
-                (true, false) => {
-                    "Auto-reload is paused because the next reload would exceed your team’s monthly spend limit. Contact a team admin to increase it."
-                }
-                (false, true) => {
-                    "This purchase would exceed your monthly limit. Increase your limit to continue."
-                }
-                (false, false) => {
-                    "This purchase would exceed your team’s monthly spend limit. Contact a team admin to increase it."
-                }
-            })
-        } else {
-            None
-        };
-
-        if !has_admin_permissions && auto_reload_enabled {
-            let configured_auto_reload_option = workspace
-                .settings
-                .addon_credits_settings
-                .selected_auto_reload_credit_denomination
-                .and_then(|credits| {
-                    self.addon_credits
-                        .options
-                        .iter()
-                        .find(|option| option.credits == credits)
-                })
-                .or(selected_credit_option);
-            let description_text = match configured_auto_reload_option {
-                Some(option) => {
-                    let credits = option.credits.separate_with_commas();
-                    let price = format!("${:.2}", option.price_usd_cents as f64 / 100.0);
-                    format!(
-                        "Your admin has enabled auto-reload for add-on credits. When your personal add-on credit balance runs low, Warp will automatically purchase {credits} credits for {price} and add them to your balance."
-                    )
-                }
-                None => {
-                    "Your admin has enabled auto-reload for add-on credits. When your personal add-on credit balance runs low, Warp will automatically purchase add-on credits and add them to your balance.".to_string()
-                }
-            };
-            return AddonCreditsPanelState::AutoreloadNonAdmin {
-                description_text,
-                warning_text,
-            };
-        }
-
-        AddonCreditsPanelState::Purchase(AddonCreditsPurchaseState {
-            description_text,
-            auto_reload_enabled,
-            has_admin_permissions,
-            purchase_disabled,
-            auto_reload_switch_disabled,
-            price_label,
-            auto_reload_tooltip_text,
-            warning_text,
-        })
-    }
-
-    fn render_addon_credits_ineligible_plan_card(
-        &self,
-        restriction: AddonCreditsRestriction,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let bg = theme.background();
-        let explanation = match restriction {
-            AddonCreditsRestriction::UpgradeToBuild { link_text, url } => {
-                FormattedTextElement::new(
-                    FormattedText::new([FormattedTextLine::Line(vec![
-                        FormattedTextFragment::hyperlink(link_text, url),
-                        FormattedTextFragment::plain_text(" to purchase add-on credits."),
-                    ])]),
-                    appearance.ui_font_size(),
-                    appearance.ui_font_family(),
-                    appearance.ui_font_family(),
-                    theme.sub_text_color(bg).into(),
-                    HighlightedHyperlink::default(),
-                )
-                .with_hyperlink_font_color(theme.accent().into_solid())
-                .register_default_click_handlers_with_action_support(
-                    |lens, event, ctx| match lens {
-                        warpui::elements::HyperlinkLens::Url(u) => ctx.open_url(u),
-                        warpui::elements::HyperlinkLens::Action(a) => {
-                            if let Some(act) =
-                                a.as_any().downcast_ref::<BillingAndUsagePageAction>()
-                            {
-                                event.dispatch_typed_action(act.clone());
-                            }
-                        }
-                    },
-                )
-                .finish()
-            }
-            AddonCreditsRestriction::ContactAccountExecutive => appearance
-                .ui_builder()
-                .paragraph("Contact your Account Executive for more add-on credits.")
-                .with_style(UiComponentStyles {
-                    font_color: Some(theme.sub_text_color(bg).into()),
-                    ..Default::default()
-                })
-                .build()
-                .finish(),
-            AddonCreditsRestriction::ContactTeamAdmin => appearance
-                .ui_builder()
-                .paragraph("Contact a team admin to enable add-on credits.")
-                .with_style(UiComponentStyles {
-                    font_color: Some(theme.sub_text_color(bg).into()),
-                    ..Default::default()
-                })
-                .build()
-                .finish(),
-        };
-        let header = Text::new_inline("Buy credits", appearance.ui_font_family(), HEADER_FONT_SIZE)
-            .with_color(theme.foreground().into())
-            .with_style(Properties::default().weight(Weight::Medium))
-            .finish();
-        let card = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_children([
-                Container::new(header).with_margin_bottom(8.).finish(),
-                explanation,
-            ])
-            .finish();
-
-        Container::new(card)
-            .with_background_color(theme.surface_1().into_solid())
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-            .with_margin_bottom(16.)
-            .with_uniform_padding(16.)
-            .finish()
-    }
-
-    fn render_addon_credits_non_admin_auto_reload_card(
-        &self,
-        appearance: &Appearance,
-        description_text: String,
-        warning_text: Option<&'static str>,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let bg = theme.background();
-        let auto_reload_header = Text::new_inline(
-            MANAGED_AUTO_RELOAD_HEADER,
-            appearance.ui_font_family(),
-            HEADER_FONT_SIZE,
-        )
-        .with_color(theme.foreground().into())
-        .with_style(Properties::default().weight(Weight::Medium))
-        .finish();
-        let auto_reload_description = appearance
-            .ui_builder()
-            .paragraph(description_text)
-            .with_style(UiComponentStyles {
-                font_color: Some(theme.sub_text_color(bg).into()),
-                ..Default::default()
-            })
-            .build()
-            .finish();
-        let mut card_children = vec![auto_reload_header, auto_reload_description];
-        if let Some(warning_text) = warning_text {
-            card_children.push(self.render_warning_row(appearance, warning_text.to_string()));
-        }
-        let card = Flex::column()
-            .with_children(card_children)
-            .with_spacing(8.)
-            .finish();
-
-        Container::new(card)
-            .with_background_color(theme.surface_1().into_solid())
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-            .with_margin_bottom(16.)
-            .with_uniform_padding(16.)
-            .finish()
-    }
-
-    fn render_addon_credits_purchase_card(
-        &self,
-        workspace: &Workspace,
-        team_uid: ServerId,
-        state: AddonCreditsPurchaseState,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let card_upper = self.render_addon_credits_upper_section(workspace, &state, appearance);
-        let card_lower = self.render_addon_credits_lower_section(team_uid, &state, appearance);
-
-        Container::new(
-            Flex::column()
-                .with_children([card_upper, card_lower])
-                .finish(),
-        )
-        .with_background_color(theme.surface_1().into_solid())
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-        .with_margin_bottom(16.)
-        .finish()
-    }
-
-    fn render_addon_credits_upper_section(
-        &self,
-        workspace: &Workspace,
-        state: &AddonCreditsPurchaseState,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let bg = theme.background();
-        let ui_builder = appearance.ui_builder();
-        let header = Text::new_inline("Buy credits", appearance.ui_font_family(), HEADER_FONT_SIZE)
-            .with_color(theme.foreground().into())
-            .with_style(Properties::default().weight(Weight::Medium))
-            .finish();
-        let paragraph = ui_builder
-            .paragraph(state.description_text.clone())
-            .with_style(UiComponentStyles {
-                font_color: Some(theme.sub_text_color(bg).into()),
-                ..Default::default()
-            })
-            .build()
-            .finish();
-        let mut upper_section = Flex::column()
-            .with_children([header, paragraph])
-            .with_spacing(8.);
-
-        if state.has_admin_permissions {
-            let info_icon = render_info_icon(
-                appearance,
-                AdditionalInfo::<BillingAndUsagePageAction> {
-                    mouse_state: self.buy_credits_mouse_states.addon_info_icon.clone(),
-                    on_click_action: None,
-                    secondary_text: None,
-                    tooltip_override_text: Some(
-                        "Sets the monthly limit spent on add-on credits".to_string(),
-                    ),
-                },
-            );
-            let spend_limit = workspace
-                .settings
-                .addon_credits_settings
-                .max_monthly_spend_cents
-                .map(|c| format!("${:.2}", c as f64 / 100.0))
-                .unwrap_or_else(|| "$200.00".to_string());
-            let spend_row = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_children([
-                    ui_builder.span("Monthly spend limit").build().finish(),
-                    Shrinkable::new(1., Align::new(info_icon).left().finish()).finish(),
-                    icon_button(
-                        appearance,
-                        Icon::Pencil,
-                        false,
-                        self.buy_credits_mouse_states.edit_monthly_limit.clone(),
-                    )
-                    .build()
-                    .on_click(|ctx, _, _| {
-                        ctx.dispatch_typed_action(BillingAndUsagePageAction::ShowAddOnCreditModal);
-                    })
-                    .finish(),
-                    ui_builder.span(spend_limit).build().finish(),
-                ])
-                .finish();
-            upper_section.add_child(spend_row);
-
-            if let Some(purchased_row) =
-                Self::render_purchased_this_month_row(workspace, appearance)
-            {
-                upper_section.add_child(purchased_row);
-            }
-        }
-
-        if state.has_admin_permissions || !state.auto_reload_enabled {
-            let denomination_button_elements = self
-                .addon_credits
-                .denomination_buttons
-                .iter()
-                .map(|button_handle| ChildView::new(button_handle).finish())
-                .collect::<Vec<_>>();
-            upper_section.add_child(
-                Container::new(
-                    Wrap::row()
-                        .with_children(denomination_button_elements)
-                        .with_spacing(8.)
-                        .finish(),
-                )
-                .finish(),
-            );
-        }
-
-        Container::new(upper_section.finish())
-            .with_horizontal_padding(16.)
-            .with_padding_top(16.)
-            .with_padding_bottom(16.)
-            .finish()
-    }
-
-    fn render_purchased_this_month_row(
-        workspace: &Workspace,
-        appearance: &Appearance,
-    ) -> Option<Box<dyn Element>> {
-        let bonus_grants = &workspace.bonus_grants_purchased_this_month;
-        if bonus_grants.total_credits_purchased == 0 {
-            return None;
-        }
-
-        let credits_purchased = bonus_grants.total_credits_purchased;
-        let cost_dollars = bonus_grants.cents_spent as f64 / 100.0;
-        let theme = appearance.theme();
-
-        let label = Text::new_inline("Purchased this month", appearance.ui_font_family(), 12.)
-            .with_color(theme.active_ui_text_color().into())
-            .finish();
-
-        let credits_text = if credits_purchased == 1 {
-            "1 credit".to_string()
-        } else {
-            format!("{} credits", credits_purchased.separate_with_commas())
-        };
-
-        let credits_component = Container::new(
-            Text::new_inline(credits_text, appearance.ui_font_family(), 12.)
-                .with_color(blended_colors::text_disabled(theme, theme.surface_1()))
-                .finish(),
-        )
-        .with_margin_right(8.)
-        .finish();
-
-        let cost_component = Text::new_inline(
-            format!("${cost_dollars:.2}"),
-            appearance.ui_font_family(),
-            12.,
-        )
-        .with_color(blended_colors::text_sub(theme, theme.surface_1()))
-        .finish();
-
-        Some(
-            Container::new(
-                Flex::row()
-                    .with_child(label)
-                    .with_child(
-                        Flex::row()
-                            .with_child(credits_component)
-                            .with_child(cost_component)
-                            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                            .finish(),
-                    )
-                    .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                    .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-                    .with_main_axis_size(MainAxisSize::Max)
-                    .finish(),
-            )
-            .with_margin_bottom(4.)
-            .finish(),
-        )
-    }
-
-    fn render_addon_credits_lower_section(
-        &self,
-        team_uid: ServerId,
-        state: &AddonCreditsPurchaseState,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let fg = theme.foreground();
-        let auto_reload_enabled = state.auto_reload_enabled;
-        let purchase_button_label = if self.addon_credits.purchase_loading {
-            "Buying\u{2026}"
-        } else {
-            "One-time purchase"
-        };
-        let purchase_button_font_color = state
-            .purchase_disabled
-            .then_some(theme.disabled_text_color(theme.surface_3()).into());
-        let purchase_button_background_color =
-            state.purchase_disabled.then_some(theme.surface_3().into());
-        let purchase_button_border_color = state
-            .purchase_disabled
-            .then_some(ColorU::transparent_black().into());
-        let mut purchase_button = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Accent,
-                self.buy_credits_mouse_states.buy_button.clone(),
-            )
-            .with_text_label(purchase_button_label.to_string())
-            .with_style(UiComponentStyles {
-                font_size: Some(14.),
-                font_weight: Some(Weight::Semibold),
-                font_color: purchase_button_font_color,
-                background: purchase_button_background_color,
-                border_color: purchase_button_border_color,
-                ..Default::default()
-            })
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::PurchaseAddonCredits {
-                    team_uid,
-                });
-            });
-        if state.purchase_disabled {
-            purchase_button = purchase_button.disable();
-        }
-        let purchase_button = purchase_button.finish();
-        let price_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_child(
-                Text::new_inline(state.price_label.clone(), appearance.ui_font_family(), 14.)
-                    .with_color(fg.into())
-                    .with_style(Properties::default().weight(Weight::Medium))
-                    .finish(),
-            );
-
-        let mut right_group = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-        if state.has_admin_permissions {
-            let auto_reload_switch_element = {
-                let switch_builder = appearance
-                    .ui_builder()
-                    .switch(self.buy_credits_mouse_states.auto_reload_switch.clone())
-                    .check(auto_reload_enabled);
-                if state.auto_reload_switch_disabled {
-                    switch_builder.disable().build().finish()
-                } else {
-                    switch_builder
-                        .build()
-                        .on_click(move |ctx, _, _| {
-                            ctx.dispatch_typed_action(
-                                BillingAndUsagePageAction::UpdateAutoReloadEnabled {
-                                    team_uid,
-                                    enabled: !auto_reload_enabled,
-                                },
-                            );
-                        })
-                        .finish()
-                }
-            };
-            let auto_reload_info_icon = render_info_icon(
-                appearance,
-                AdditionalInfo::<BillingAndUsagePageAction> {
-                    mouse_state: self.buy_credits_mouse_states.auto_reload_info.clone(),
-                    on_click_action: None,
-                    secondary_text: None,
-                    tooltip_override_text: Some(state.auto_reload_tooltip_text.clone()),
-                },
-            );
-
-            right_group.add_children([
-                Text::new_inline("Auto-reload", appearance.ui_font_family(), 14.)
-                    .with_color(fg.into())
-                    .with_style(Properties::default().weight(Weight::Semibold))
-                    .finish(),
-                Container::new(auto_reload_info_icon)
-                    .with_margin_left(4.)
-                    .finish(),
-                Container::new(auto_reload_switch_element)
-                    .with_margin_left(8.)
-                    .finish(),
-            ]);
-        }
-        right_group.add_child(
-            Container::new(purchase_button)
-                .with_margin_left(if state.has_admin_permissions { 16. } else { 0. })
-                .finish(),
-        );
-        let lower_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_child(price_row.finish())
-            .with_child(right_group.finish());
-        let mut lower_children: Vec<Box<dyn Element>> = vec![lower_row.finish()];
-
-        if let Some(warning_text) = state.warning_text {
-            lower_children.push(self.render_warning_row(appearance, warning_text.to_string()));
-        }
-
-        Container::new(
-            Flex::column()
-                .with_children(lower_children)
-                .with_spacing(8.)
-                .finish(),
-        )
-        .with_uniform_padding(16.)
-        .with_border(Border::top(1.).with_border_color(theme.outline().into()))
-        .finish()
-    }
-
-    fn render_warning_row(&self, appearance: &Appearance, msg: String) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let icon = ConstrainedBox::new(
-            Icon::AlertTriangle
-                .to_warpui_icon(theme.ui_error_color().into())
-                .finish(),
-        )
-        .with_height(16.)
-        .with_width(16.)
-        .finish();
-        let text = Text::new(msg, appearance.ui_font_family(), 12.)
-            .with_color(theme.ui_error_color())
-            .finish();
-        Container::new(
-            Flex::row()
-                .with_child(Container::new(icon).with_margin_right(8.).finish())
-                .with_child(Shrinkable::new(1.0, text).finish())
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .finish(),
-        )
-        .with_margin_top(8.)
-        .finish()
-    }
-
-    fn render_overview_tab(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let mut content = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Stretch);
-        let ai_model = AIRequestUsageModel::as_ref(app);
-        if let Some(ambient_trial_widget) =
-            self.render_ambient_agent_trial_widget(ai_model, appearance, app)
-        {
-            content.add_child(ambient_trial_widget);
-        }
-        if let Some(balance) = self.render_balance_section(appearance, app) {
-            content.add_child(balance);
-        }
-
-        let delinquent = UserWorkspaces::as_ref(app)
-            .current_team()
-            .map(|t| t.billing_metadata.is_delinquent_due_to_payment_issue())
-            .unwrap_or_default();
-
-        if let (Some(ws), Some(team)) = (
-            UserWorkspaces::as_ref(app).current_workspace(),
-            UserWorkspaces::as_ref(app).current_team(),
-        ) {
-            let workspace_bonus_credits = ai_model.total_workspace_bonus_credits_remaining(ws.uid);
-            let is_payg_zero = ws.billing_metadata.is_enterprise_pay_as_you_go_enabled()
-                && workspace_bonus_credits == 0;
-
-            if !is_payg_zero {
-                let current_user_is_admin = {
-                    let email = AuthStateProvider::as_ref(app)
-                        .get()
-                        .user_email()
-                        .unwrap_or_default();
-                    team.has_admin_permissions(&email)
-                };
-                content.add_child(self.render_addon_credits_panel(
-                    ws,
-                    team.uid,
-                    current_user_is_admin,
-                    delinquent,
-                    app,
-                ));
-            }
-        }
-
-        let mut billing_cycle_usage_section =
-            Container::new(ChildView::new(&self.billing_cycle_usage_section).finish());
-        if !content.is_empty() {
-            billing_cycle_usage_section = billing_cycle_usage_section
-                .with_margin_top(16.)
-                .with_padding_top(24.)
-                .with_border(
-                    Border::top(1.).with_border_color(appearance.theme().outline().into()),
-                );
-        }
-        content.add_child(billing_cycle_usage_section.finish());
-
-        content.finish()
-    }
-
-    fn render_usage_history_tab(
-        &self,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let history = self.usage_history.model.as_ref(app);
-        if history.entries().is_empty() {
-            return self.render_empty_usage_history(history.is_loading(), appearance, app);
-        }
-
-        let mut content = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_main_axis_alignment(MainAxisAlignment::Center)
-            .with_child(
-                Container::new(
-                    Text::new_inline("Last 30 days", appearance.ui_font_family(), 14.)
-                        .with_color(blended_colors::text_sub(
-                            appearance.theme(),
-                            appearance.theme().surface_1(),
-                        ))
-                        .finish(),
-                )
-                .with_vertical_margin(12.)
-                .finish(),
-            );
-
-        let mut list = Flex::column().with_spacing(8.);
-        for entry in history.entries().iter() {
-            let expanded = self
-                .usage_history
-                .expanded_entries
-                .get(&entry.conversation_id)
-                .copied()
-                .unwrap_or(false);
-            let entry_mouse_state = self
-                .usage_history
-                .entry_mouse_states
-                .borrow_mut()
-                .entry(entry.conversation_id.clone())
-                .or_default()
-                .clone();
-            let entry_tooltip_mouse_state = self
-                .usage_history
-                .tooltip_mouse_states
-                .borrow_mut()
-                .entry(entry.conversation_id.clone())
-                .or_default()
-                .clone();
-            list.add_child(
-                Container::new(
-                    UsageHistoryEntry::new(
-                        Some(entry.clone()),
-                        expanded,
-                        Some(entry_mouse_state),
-                        entry_tooltip_mouse_state,
-                    )
-                    .render(appearance, app),
-                )
-                .finish(),
-            );
-        }
-        content.add_child(list.finish());
-
-        if history.has_more_entries() {
-            content.add_child(
-                Container::new(
-                    Flex::row()
-                        .with_child(self.usage_history.load_more_button.as_ref(app).render(app))
-                        .with_main_axis_alignment(MainAxisAlignment::Center)
-                        .with_main_axis_size(MainAxisSize::Max)
-                        .finish(),
-                )
-                .with_margin_top(24.)
-                .finish(),
-            );
-        }
-
-        content.finish()
-    }
-
-    fn render_empty_usage_history(
-        &self,
-        loading: bool,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let mut content = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_main_axis_alignment(MainAxisAlignment::Center);
-
-        if loading {
-            let mut list = Flex::column().with_spacing(8.);
-            for _ in 0..3 {
-                list.add_child(
-                    UsageHistoryEntry::new(None, false, None, MouseStateHandle::default())
-                        .render(appearance, app),
-                );
-            }
-            content.add_child(list.finish());
-        } else {
-            let zero = Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_child(
-                    Container::new(
-                        ConstrainedBox::new(
-                            Icon::Conversation
-                                .to_warpui_icon(
-                                    blended_colors::text_sub(
-                                        appearance.theme(),
-                                        appearance.theme().surface_1(),
-                                    )
-                                    .into(),
-                                )
-                                .finish(),
-                        )
-                        .with_width(24.)
-                        .with_height(24.)
-                        .finish(),
-                    )
-                    .with_margin_bottom(12.)
-                    .finish(),
-                )
-                .with_child(
-                    Container::new(
-                        Text::new("No usage history", appearance.ui_font_family(), 14.)
-                            .with_color(blended_colors::text_sub(
-                                appearance.theme(),
-                                appearance.theme().surface_1(),
-                            ))
-                            .finish(),
-                    )
-                    .with_margin_bottom(4.)
-                    .finish(),
-                )
-                .with_child(
-                    Text::new(
-                        "Kick off an agent task to view usage history here.",
-                        appearance.ui_font_family(),
-                        14.,
-                    )
-                    .with_color(blended_colors::text_disabled(
-                        appearance.theme(),
-                        appearance.theme().surface_1(),
-                    ))
-                    .finish(),
-                );
-            content.add_child(
-                Container::new(zero.finish())
-                    .with_vertical_margin(160.)
-                    .finish(),
-            );
-        }
-
-        content.finish()
-    }
-}
-
-impl BillingAndUsagePageV2View {
-    pub(super) fn on_page_selected(
-        &mut self,
-        _allow_steal_focus: bool,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.addon_credits.purchase_loading = false;
-        std::mem::drop(
-            TeamUpdateManager::handle(ctx)
-                .update(ctx, |mgr, ctx| mgr.refresh_workspace_metadata(ctx)),
-        );
-        AIRequestUsageModel::handle(ctx).update(ctx, |m, ctx| m.refresh_request_usage_async(ctx));
-        self.usage_history
-            .model
-            .update(ctx, |m, ctx| m.refresh_usage_history_async(ctx));
-        self.refresh_addon_credits_settings(ctx);
-    }
-}
-
-impl Entity for BillingAndUsagePageV2View {
-    type Event = BillingAndUsagePageEvent;
-}
-
-impl View for BillingAndUsagePageV2View {
-    fn ui_name() -> &'static str {
-        "Billing and usage v2"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let mut page = Flex::column();
-        page.add_child(self.render_plan_section(appearance, app));
-
-        let tabs = vec![
-            SettingsTab::new(
-                BillingUsageTab::Overview.label(),
-                self.tab_mouse_states.overview.clone(),
-            ),
-            SettingsTab::new(
-                BillingUsageTab::UsageHistory.label(),
-                self.tab_mouse_states.usage_history.clone(),
-            ),
-        ];
-
-        page.add_child(tab_selector::render_tab_selector(
-            tabs,
-            self.selected_tab.label(),
-            |label, ctx| {
-                ctx.dispatch_typed_action(BillingAndUsagePageAction::SelectTab(
-                    BillingUsageTab::get_tab_from_label(label),
-                ));
-            },
-            appearance,
-        ));
-
-        if self.selected_tab == BillingUsageTab::Overview {
-            page.add_child(self.render_overview_tab(appearance, app));
-        } else {
-            page.add_child(self.render_usage_history_tab(appearance, app));
-        }
-
-        page.finish()
-    }
-}
-
-impl TypedActionView for BillingAndUsagePageV2View {
-    type Action = BillingAndUsagePageAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        let is_login_gated = matches!(
-            action,
-            BillingAndUsagePageAction::Upgrade { .. }
-                | BillingAndUsagePageAction::GenerateStripeBillingPortalLink { .. },
-        );
-        if AuthStateProvider::as_ref(ctx)
-            .get()
-            .is_anonymous_or_logged_out()
-            && is_login_gated
-        {
-            AuthManager::handle(ctx).update(ctx, |auth_manager, ctx| {
-                auth_manager.attempt_login_gated_feature(
-                    action.into(),
-                    AuthViewVariant::RequireLoginCloseable,
-                    ctx,
-                )
-            });
-            return;
-        }
-
-        match action {
-            BillingAndUsagePageAction::Upgrade { team_uid, user_id } => match team_uid {
-                Some(team_uid) => ctx.open_url(&UserWorkspaces::upgrade_link_for_team(*team_uid)),
-                None => ctx.open_url(&UserWorkspaces::upgrade_link(*user_id)),
-            },
-            BillingAndUsagePageAction::GenerateStripeBillingPortalLink { team_uid } => {
-                UserWorkspaces::handle(ctx).update(ctx, |ws, ctx| {
-                    ws.generate_stripe_billing_portal_link(*team_uid, ctx);
-                });
-            }
-            BillingAndUsagePageAction::OpenAdminPanel { team_uid } => {
-                super::admin_actions::AdminActions::open_admin_panel(*team_uid, ctx);
-            }
-            BillingAndUsagePageAction::ContactSupport => {
-                super::admin_actions::AdminActions::contact_support(ctx);
-            }
-            BillingAndUsagePageAction::SignupAnonymousUser => {
-                ctx.emit(BillingAndUsagePageEvent::SignupAnonymousUser);
-            }
-            BillingAndUsagePageAction::AttemptLoginGatedUpgrade => {
-                AuthManager::handle(ctx).update(ctx, |auth_manager, ctx| {
-                    auth_manager.attempt_login_gated_feature(
-                        action.into(),
-                        AuthViewVariant::RequireLoginCloseable,
-                        ctx,
-                    )
-                });
-            }
-            BillingAndUsagePageAction::OpenUrl(url) => ctx.open_url(&url.url),
-            // Not applicable in v2
-            BillingAndUsagePageAction::UpdateUsageBasedPricingSettings { .. }
-            | BillingAndUsagePageAction::ShowOverageLimitModal => {}
-            // Not applicable in v2
-            BillingAndUsagePageAction::ToggleSortingMenu
-            | BillingAndUsagePageAction::ChangeUsageSort { .. } => {}
-            BillingAndUsagePageAction::RefreshWorkspaceData => {
-                std::mem::drop(
-                    TeamUpdateManager::handle(ctx)
-                        .update(ctx, |mgr, ctx| mgr.refresh_workspace_metadata(ctx)),
-                );
-                AIRequestUsageModel::handle(ctx)
-                    .update(ctx, |m, ctx| m.refresh_request_usage_async(ctx));
-            }
-            BillingAndUsagePageAction::SelectTab(tab) => {
-                if self.selected_tab != *tab {
-                    self.selected_tab = tab.clone();
-                    ctx.notify();
-                }
-            }
-            BillingAndUsagePageAction::ToggleUsageEntryExpanded { conversation_id } => {
-                let expanded = self
-                    .usage_history
-                    .expanded_entries
-                    .get(conversation_id)
-                    .copied()
-                    .unwrap_or(false);
-                self.usage_history
-                    .expanded_entries
-                    .insert(conversation_id.clone(), !expanded);
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::RenderMoreUsageEntries => {
-                self.usage_history
-                    .model
-                    .update(ctx, |m, ctx| m.load_more_usage_history_async(ctx));
-            }
-            BillingAndUsagePageAction::SelectTopupDenomination(i) => {
-                self.addon_credits.selected_denomination = *i;
-                self.update_denomination_buttons_focus(ctx);
-                UserWorkspaces::handle(ctx).update(ctx, |ws, ctx| {
-                    let has_admin_permissions = ws.current_team().is_some_and(|team| {
-                        AuthStateProvider::as_ref(ctx)
-                            .get()
-                            .user_email()
-                            .is_some_and(|email| team.has_admin_permissions(&email))
-                    });
-                    let team_uid = ws.current_team_uid();
-                    if let Some((workspace, team_uid)) = ws.current_workspace().zip(team_uid) {
-                        if has_admin_permissions
-                            && workspace
-                                .settings
-                                .addon_credits_settings
-                                .auto_reload_enabled
-                        {
-                            if let Some(opt) = self
-                                .addon_credits
-                                .options
-                                .get(self.addon_credits.selected_denomination)
-                            {
-                                ws.update_addon_credits_settings(
-                                    team_uid,
-                                    None,
-                                    None,
-                                    Some(opt.credits),
-                                    ctx,
-                                );
-                            }
-                        }
-                    }
-                });
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::PurchaseAddonCredits { team_uid } => {
-                if let Some(opt) = self
-                    .addon_credits
-                    .options
-                    .get(self.addon_credits.selected_denomination)
-                {
-                    let credits = opt.credits;
-                    let purchase_team_uid = *team_uid;
-                    self.addon_credits.purchase_loading = true;
-                    UserWorkspaces::handle(ctx).update(ctx, |ws, ctx| {
-                        ws.purchase_addon_credits(purchase_team_uid, credits, ctx);
-                    });
-                    ctx.notify();
-                }
-            }
-            BillingAndUsagePageAction::ShowAddOnCreditModal => {
-                self.show_addon_credit_modal(ctx);
-            }
-            BillingAndUsagePageAction::UpdateAutoReloadEnabled { team_uid, enabled } => {
-                let auto_reload_denomination_credits = if *enabled {
-                    let Some(option) = self
-                        .addon_credits
-                        .options
-                        .get(self.addon_credits.selected_denomination)
-                    else {
-                        self.show_toast(
-                            "Unable to enable auto-reload until pricing options load.",
-                            ToastFlavor::Error,
-                            ctx,
-                        );
-                        return;
-                    };
-                    Some(option.credits)
-                } else {
-                    None
-                };
-                send_telemetry_from_ctx!(
-                    TelemetryEvent::AutoReloadToggledFromBillingSettings {
-                        enabled: *enabled,
-                        banner_toggle_flag_enabled: FeatureFlag::BuildPlanAutoReloadBannerToggle
-                            .is_enabled(),
-                        post_purchase_modal_flag_enabled:
-                            FeatureFlag::BuildPlanAutoReloadPostPurchaseModal.is_enabled(),
-                    },
-                    ctx
-                );
-                self.pending_auto_reload_toast = Some(if *enabled {
-                    let credits = auto_reload_denomination_credits
-                        .map(|c| c.separate_with_commas())
-                        .unwrap_or_else(|| "your selected".to_string());
-                    format!(
-                        "Auto-reload enabled. We'll refill with {credits} credits when your balance runs low."
-                    )
-                } else {
-                    "Auto-reload disabled.".to_string()
-                });
-                UserWorkspaces::handle(ctx).update(ctx, |ws, ctx| {
-                    ws.update_addon_credits_settings(
-                        *team_uid,
-                        Some(*enabled),
-                        None,
-                        auto_reload_denomination_credits,
-                        ctx,
-                    );
-                });
-            }
-            BillingAndUsagePageAction::DismissAmbientAgentTrialWidget => {
-                AISettings::handle(ctx).update(ctx, |settings, ctx| {
-                    let _ = settings
-                        .ambient_agent_trial_widget_dismissed
-                        .set_value(true, ctx);
-                });
-                ctx.notify();
-            }
-            BillingAndUsagePageAction::NavigateToByokSettings => {
-                ctx.dispatch_typed_action_deferred(WorkspaceAction::ShowSettingsPageWithSearch {
-                    search_query: "api".to_string(),
-                    section: Some(SettingsSection::WarpAgent),
-                });
-            }
-        }
-    }
-}
-
-fn render_balance_card(
-    appearance: &Appearance,
-    dot_color: ColorU,
-    label: &str,
-    date: &str,
-    remaining: i64,
-    total: Option<i64>,
-    border_color: ColorU,
-) -> Box<dyn Element> {
-    let theme = appearance.theme();
-    let sub_color = blended_colors::text_sub(theme, theme.background());
-
-    let status_dot = ConstrainedBox::new(
-        Container::new(Empty::new().finish())
-            .with_background_color(dot_color)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-            .finish(),
-    )
-    .with_width(8.)
-    .with_height(8.)
-    .finish();
-
-    let label_text = Text::new_inline(label.to_string(), appearance.ui_font_family(), 12.)
-        .with_color(sub_color)
-        .with_style(Properties::default().weight(Weight::Semibold))
-        .finish();
-
-    let date_text = Clipped::new(
-        Text::new_inline(date.to_string(), appearance.ui_font_family(), 10.)
-            .with_color(sub_color)
-            .finish(),
-    )
-    .finish();
-
-    let header = Flex::row()
-        .with_child(status_dot)
-        .with_child(
-            Container::new(Shrinkable::new(1., label_text).finish())
-                .with_margin_left(8.)
-                .with_margin_right(8.)
-                .finish(),
-        )
-        .with_child(Shrinkable::new(1., Align::new(date_text).right().finish()).finish())
-        .with_cross_axis_alignment(CrossAxisAlignment::Center)
-        .with_main_axis_size(MainAxisSize::Max)
-        .finish();
-
-    let credit_count = Text::new_inline(
-        remaining.separate_with_commas(),
-        appearance.ui_font_family(),
-        24.,
-    )
-    .with_color(theme.active_ui_text_color().into())
-    .with_style(Properties::default().weight(Weight::Semibold))
-    .finish();
-
-    let remaining_label_text = match total {
-        Some(limit) => format!("/ {} remaining", limit.separate_with_commas()),
-        None => "remaining".to_string(),
-    };
-    let remaining_label = Text::new_inline(remaining_label_text, appearance.ui_font_family(), 14.)
-        .with_color(sub_color)
-        .finish();
-
-    let value_row = Flex::row()
-        .with_child(credit_count)
-        .with_child(
-            Container::new(remaining_label)
-                .with_margin_left(4.)
-                .with_padding_bottom(1.)
-                .finish(),
-        )
-        .with_cross_axis_alignment(CrossAxisAlignment::End);
-
-    Container::new(
-        Flex::column()
-            .with_child(header)
-            .with_child(value_row.finish())
-            .with_spacing(8.)
-            .with_main_axis_alignment(MainAxisAlignment::Center)
-            .finish(),
-    )
-    .with_border(Border::all(1.).with_border_color(border_color))
-    .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-    .with_horizontal_padding(16.)
-    .with_vertical_padding(12.)
-    .finish()
-}
diff --git a/app/src/settings_view/custom_inference_modal.rs b/app/src/settings_view/custom_inference_modal.rs
deleted file mode 100644
index 34151a2a..00000000
--- a/app/src/settings_view/custom_inference_modal.rs
+++ /dev/null
@@ -1,1130 +0,0 @@
-use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-
-use ::ai::api_keys::CustomEndpoint;
-use url::Url;
-use warp_editor::editor::NavigationKey;
-use warpui::elements::{
-    Border, ChildView, ClippedScrollStateHandle, ClippedScrollable, ConstrainedBox, Container,
-    CornerRadius, CrossAxisAlignment, Empty, Expanded, Flex, MainAxisSize, MouseStateHandle,
-    ParentElement, Radius, SavePosition, ScrollTarget, ScrollToPositionMode, ScrollbarWidth,
-    Shrinkable, Text,
-};
-use warpui::fonts::FamilyId;
-use warpui::ui_components::button::ButtonVariant;
-use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use warpui::units::Pixels;
-use warpui::{
-    AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
-};
-
-use crate::appearance::{Appearance, AppearanceEvent};
-use crate::editor::{
-    EditorView, Event as EditorEvent, PropagateAndNoOpNavigationKeys, SingleLineEditorOptions,
-    TextOptions,
-};
-use crate::modal::{Modal, ModalViewState};
-use crate::ui_components::icons::Icon;
-use crate::view_components::action_button::{ActionButton, DangerSecondaryTheme};
-
-const LABEL_FONT_SIZE: f32 = 12.;
-const INPUT_WIDTH: f32 = 480.;
-const ENDPOINT_NAME_SCROLL_POSITION_ID: &str = "custom_endpoint_name";
-const ENDPOINT_URL_SCROLL_POSITION_ID: &str = "custom_endpoint_url";
-const API_KEY_SCROLL_POSITION_ID: &str = "custom_endpoint_api_key";
-const ACTIONS_POSITION_ID: &str = "custom_endpoint_actions";
-
-const MODEL_ROW_SPACING: f32 = 16.;
-const REMOVE_MODEL_BUTTON_SPACING: f32 = 8.;
-const REMOVE_MODEL_BUTTON_COL_WIDTH: f32 = 20.;
-const MODAL_SCROLLBAR_WIDTH: f32 = 4.;
-// Right margin shared by the scrollable content and the (non-scrollable) actions
-// row. It includes the overlayed scrollbar width so the scrollable content's right
-// edge (e.g. the remove-model "X" buttons) lines up with the Save/Cancel buttons,
-// which have no scrollbar.
-const SCROLL_CONTENT_RIGHT_MARGIN: f32 = 24. + MODAL_SCROLLBAR_WIDTH;
-const MODEL_INPUT_WIDTH: f32 = (INPUT_WIDTH - MODEL_ROW_SPACING) / 2.;
-fn model_row_scroll_position_id(index: usize) -> String {
-    format!("custom_endpoint_model_row_{index}")
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum CustomEndpointModalEvent {
-    Close,
-    AddEndpoint {
-        name: String,
-        url: String,
-        api_key: String,
-        models: Vec<(String, Option<String>, Option<String>)>,
-    },
-    SaveEndpoint {
-        index: usize,
-        name: String,
-        url: String,
-        api_key: String,
-        models: Vec<(String, Option<String>, Option<String>)>,
-    },
-    RemoveEndpoint {
-        index: usize,
-    },
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum CustomEndpointModalAction {
-    Cancel,
-    Save,
-    AddModel,
-    RemoveModel(usize),
-    RemoveEndpoint,
-}
-
-struct ModelRow {
-    name_editor: ViewHandle<EditorView>,
-    alias_editor: ViewHandle<EditorView>,
-    remove_mouse_state: MouseStateHandle,
-    config_key: Option<String>,
-}
-
-pub struct CustomEndpointModal {
-    endpoint_name_editor: ViewHandle<EditorView>,
-    endpoint_url_editor: ViewHandle<EditorView>,
-    api_key_editor: ViewHandle<EditorView>,
-    model_rows: Vec<ModelRow>,
-    cancel_button_mouse_state: MouseStateHandle,
-    save_button_mouse_state: MouseStateHandle,
-    add_model_button_mouse_state: MouseStateHandle,
-    remove_endpoint_button: ViewHandle<ActionButton>,
-    editing_index: Option<usize>,
-    url_has_error: bool,
-    scroll_state: ClippedScrollStateHandle,
-}
-
-impl CustomEndpointModal {
-    pub fn new(
-        endpoint: Option<&CustomEndpoint>,
-        editing_index: Option<usize>,
-        ctx: &mut ViewContext<Self>,
-    ) -> Self {
-        // Editor text colors are snapshotted at construction via
-        // `text_colors_override`, so refresh them whenever the theme changes.
-        ctx.subscribe_to_model(&Appearance::handle(ctx), |me, _, event, ctx| {
-            if let AppearanceEvent::ThemeChanged = event {
-                me.update_editor_text_colors(ctx);
-            }
-        });
-        let font_family = Appearance::as_ref(ctx).ui_font_family();
-        let text_colors = crate::settings_view::editor_text_colors(Appearance::as_ref(ctx));
-
-        let endpoint_name_text_colors = text_colors.clone();
-        let endpoint_name_editor = ctx.add_typed_action_view(move |ctx| {
-            let options = SingleLineEditorOptions {
-                text: TextOptions {
-                    font_family_override: Some(font_family),
-                    text_colors_override: Some(endpoint_name_text_colors.clone()),
-                    ..Default::default()
-                },
-                propagate_and_no_op_vertical_navigation_keys:
-                    PropagateAndNoOpNavigationKeys::Always,
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text("e.g., Zach's external models", ctx);
-            if let Some(ep) = endpoint {
-                editor.set_buffer_text(&ep.name, ctx);
-            }
-            editor
-        });
-
-        let endpoint_url_text_colors = text_colors.clone();
-        let endpoint_url_editor = ctx.add_typed_action_view(move |ctx| {
-            let options = SingleLineEditorOptions {
-                text: TextOptions {
-                    font_family_override: Some(font_family),
-                    text_colors_override: Some(endpoint_url_text_colors.clone()),
-                    ..Default::default()
-                },
-                propagate_and_no_op_vertical_navigation_keys:
-                    PropagateAndNoOpNavigationKeys::Always,
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text("Please include 'https://'", ctx);
-            if let Some(ep) = endpoint {
-                editor.set_buffer_text(&ep.url, ctx);
-            }
-            editor
-        });
-
-        let api_key_text_colors = text_colors.clone();
-        let api_key_editor = ctx.add_typed_action_view(move |ctx| {
-            let options = SingleLineEditorOptions {
-                is_password: true,
-                text: TextOptions {
-                    font_family_override: Some(font_family),
-                    text_colors_override: Some(api_key_text_colors.clone()),
-                    ..Default::default()
-                },
-                propagate_and_no_op_vertical_navigation_keys:
-                    PropagateAndNoOpNavigationKeys::Always,
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text("e.g., sk-...", ctx);
-            if let Some(ep) = endpoint {
-                editor.set_buffer_text(&ep.api_key, ctx);
-            }
-            editor
-        });
-
-        let mut model_rows = Vec::new();
-        if let Some(ep) = endpoint {
-            for model in &ep.models {
-                model_rows.push(Self::create_model_row(
-                    Some(&model.name),
-                    model.alias.as_deref(),
-                    Some(model.config_key.clone()),
-                    font_family,
-                    &text_colors,
-                    ctx,
-                ));
-            }
-        }
-        if model_rows.is_empty() {
-            model_rows.push(Self::create_model_row(
-                None,
-                None,
-                None,
-                font_family,
-                &text_colors,
-                ctx,
-            ));
-        }
-
-        ctx.subscribe_to_view(&endpoint_name_editor, |me, _, event, ctx| {
-            me.handle_endpoint_name_event(event, ctx);
-        });
-        ctx.subscribe_to_view(&endpoint_url_editor, |me, _, event, ctx| {
-            me.handle_endpoint_url_event(event, ctx);
-        });
-        // Validate initial URL (if any) so the error state is accurate on open.
-        let initial_url = endpoint_url_editor.as_ref(ctx).buffer_text(ctx);
-        let url_has_error = !initial_url.trim().is_empty() && validate_url(&initial_url).is_err();
-        ctx.subscribe_to_view(&api_key_editor, |me, _, event, ctx| {
-            me.handle_api_key_event(event, ctx);
-        });
-        for row in &model_rows {
-            let name_editor = row.name_editor.clone();
-            ctx.subscribe_to_view(&name_editor, |me, editor, event, ctx| {
-                me.handle_model_editor_event(&editor, event, ctx);
-            });
-            let alias_editor = row.alias_editor.clone();
-            ctx.subscribe_to_view(&alias_editor, |me, editor, event, ctx| {
-                me.handle_model_editor_event(&editor, event, ctx);
-            });
-        }
-        let remove_endpoint_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new("Remove", DangerSecondaryTheme)
-                .with_icon(Icon::Trash)
-                .on_click(|ctx| {
-                    ctx.dispatch_typed_action(CustomEndpointModalAction::RemoveEndpoint);
-                })
-        });
-
-        Self {
-            endpoint_name_editor,
-            endpoint_url_editor,
-            api_key_editor,
-            model_rows,
-            cancel_button_mouse_state: Default::default(),
-            save_button_mouse_state: Default::default(),
-            add_model_button_mouse_state: Default::default(),
-            remove_endpoint_button,
-            editing_index,
-            url_has_error,
-            scroll_state: Default::default(),
-        }
-    }
-
-    fn create_model_row(
-        name: Option<&str>,
-        alias: Option<&str>,
-        config_key: Option<String>,
-        font_family: FamilyId,
-        text_colors: &crate::editor::TextColors,
-        ctx: &mut ViewContext<Self>,
-    ) -> ModelRow {
-        let tc = text_colors.clone();
-        let name_editor = ctx.add_typed_action_view(move |ctx| {
-            let options = SingleLineEditorOptions {
-                text: TextOptions {
-                    font_family_override: Some(font_family),
-                    text_colors_override: Some(tc.clone()),
-                    ..Default::default()
-                },
-                propagate_and_no_op_vertical_navigation_keys:
-                    PropagateAndNoOpNavigationKeys::Always,
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text("e.g., GLM-5-FP8", ctx);
-            if let Some(n) = name {
-                editor.set_buffer_text(n, ctx);
-            }
-            editor
-        });
-
-        let tc = text_colors.clone();
-        let alias_editor = ctx.add_typed_action_view(move |ctx| {
-            let options = SingleLineEditorOptions {
-                text: TextOptions {
-                    font_family_override: Some(font_family),
-                    text_colors_override: Some(tc.clone()),
-                    ..Default::default()
-                },
-                propagate_and_no_op_vertical_navigation_keys:
-                    PropagateAndNoOpNavigationKeys::Always,
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text("e.g., GLM-5", ctx);
-            if let Some(a) = alias {
-                editor.set_buffer_text(a, ctx);
-            }
-            editor
-        });
-
-        ModelRow {
-            name_editor,
-            alias_editor,
-            remove_mouse_state: Default::default(),
-            config_key,
-        }
-    }
-
-    pub fn prefill(
-        &mut self,
-        endpoint: Option<&CustomEndpoint>,
-        editing_index: Option<usize>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.editing_index = editing_index;
-        self.scroll_state = Default::default();
-        self.endpoint_name_editor.update(ctx, |editor, ctx| {
-            editor.set_buffer_text(endpoint.map(|e| e.name.as_str()).unwrap_or(""), ctx);
-        });
-        self.endpoint_url_editor.update(ctx, |editor, ctx| {
-            editor.set_buffer_text(endpoint.map(|e| e.url.as_str()).unwrap_or(""), ctx);
-        });
-        let url = self.endpoint_url_editor.as_ref(ctx).buffer_text(ctx);
-        self.url_has_error = !url.trim().is_empty() && validate_url(&url).is_err();
-        self.api_key_editor.update(ctx, |editor, ctx| {
-            editor.set_buffer_text(endpoint.map(|e| e.api_key.as_str()).unwrap_or(""), ctx);
-        });
-        // Rebuild model rows
-        // Old model row editors will be dropped with the modal body
-        self.model_rows.clear();
-        let font_family = Appearance::as_ref(ctx).ui_font_family();
-        let text_colors = crate::settings_view::editor_text_colors(Appearance::as_ref(ctx));
-        if let Some(ep) = endpoint {
-            for model in &ep.models {
-                self.model_rows.push(Self::create_model_row(
-                    Some(&model.name),
-                    model.alias.as_deref(),
-                    Some(model.config_key.clone()),
-                    font_family,
-                    &text_colors,
-                    ctx,
-                ));
-            }
-        }
-        if self.model_rows.is_empty() {
-            self.model_rows.push(Self::create_model_row(
-                None,
-                None,
-                None,
-                font_family,
-                &text_colors,
-                ctx,
-            ));
-        }
-        for row in &self.model_rows {
-            let name_editor = row.name_editor.clone();
-            ctx.subscribe_to_view(&name_editor, |me, editor, event, ctx| {
-                me.handle_model_editor_event(&editor, event, ctx);
-            });
-            let alias_editor = row.alias_editor.clone();
-            ctx.subscribe_to_view(&alias_editor, |me, editor, event, ctx| {
-                me.handle_model_editor_event(&editor, event, ctx);
-            });
-        }
-    }
-
-    pub fn on_open(&mut self, ctx: &mut ViewContext<Self>) {
-        self.scroll_state.scroll_to(Pixels::zero());
-        self.focus_editor(&self.endpoint_name_editor, ctx);
-    }
-
-    pub fn on_close(&mut self, ctx: &mut ViewContext<Self>) {
-        self.endpoint_name_editor.update(ctx, |editor, ctx| {
-            editor.clear_buffer_and_reset_undo_stack(ctx);
-        });
-        self.endpoint_url_editor.update(ctx, |editor, ctx| {
-            editor.clear_buffer_and_reset_undo_stack(ctx);
-        });
-        self.api_key_editor.update(ctx, |editor, ctx| {
-            editor.clear_buffer_and_reset_undo_stack(ctx);
-        });
-        for row in &self.model_rows {
-            row.name_editor.update(ctx, |editor, ctx| {
-                editor.clear_buffer_and_reset_undo_stack(ctx);
-            });
-            row.alias_editor.update(ctx, |editor, ctx| {
-                editor.clear_buffer_and_reset_undo_stack(ctx);
-            });
-        }
-    }
-
-    /// Re-applies theme-derived text colors to every editor in the modal.
-    /// Called on appearance changes since editors only snapshot their text
-    /// colors at construction.
-    fn update_editor_text_colors(&mut self, ctx: &mut ViewContext<Self>) {
-        let text_colors = crate::settings_view::editor_text_colors(Appearance::as_ref(ctx));
-        let mut editors = vec![
-            self.endpoint_name_editor.clone(),
-            self.endpoint_url_editor.clone(),
-            self.api_key_editor.clone(),
-        ];
-        for row in &self.model_rows {
-            editors.push(row.name_editor.clone());
-            editors.push(row.alias_editor.clone());
-        }
-        for editor in editors {
-            let colors = text_colors.clone();
-            editor.update(ctx, move |editor, ctx| {
-                editor.set_text_colors(colors, ctx);
-            });
-        }
-    }
-
-    fn save(&mut self, ctx: &mut ViewContext<Self>) {
-        self.validate_url_field(ctx);
-        if !self.is_valid(ctx) {
-            return;
-        }
-        let name = self.endpoint_name_editor.as_ref(ctx).buffer_text(ctx);
-        let url = self.endpoint_url_editor.as_ref(ctx).buffer_text(ctx);
-        let api_key = self.api_key_editor.as_ref(ctx).buffer_text(ctx);
-        let models: Vec<(String, Option<String>, Option<String>)> = self
-            .model_rows
-            .iter()
-            .map(|row| {
-                let name = row.name_editor.as_ref(ctx).buffer_text(ctx);
-                let alias = row.alias_editor.as_ref(ctx).buffer_text(ctx);
-                let alias_opt = if alias.trim().is_empty() {
-                    None
-                } else {
-                    Some(alias)
-                };
-                (name, alias_opt, row.config_key.clone())
-            })
-            .filter(|(name, _, _)| !name.trim().is_empty())
-            .collect();
-        if let Some(index) = self.editing_index {
-            ctx.emit(CustomEndpointModalEvent::SaveEndpoint {
-                index,
-                name,
-                url,
-                api_key,
-                models,
-            });
-        } else {
-            ctx.emit(CustomEndpointModalEvent::AddEndpoint {
-                name,
-                url,
-                api_key,
-                models,
-            });
-        }
-    }
-
-    fn cancel(&mut self, ctx: &mut ViewContext<Self>) {
-        ctx.emit(CustomEndpointModalEvent::Close);
-    }
-
-    fn add_model(&mut self, ctx: &mut ViewContext<Self>) {
-        let font_family = Appearance::as_ref(ctx).ui_font_family();
-        let text_colors = crate::settings_view::editor_text_colors(Appearance::as_ref(ctx));
-        let row = Self::create_model_row(None, None, None, font_family, &text_colors, ctx);
-        // Subscribe to the new editors
-        let name_editor = row.name_editor.clone();
-        ctx.subscribe_to_view(&name_editor, |me, editor, event, ctx| {
-            me.handle_model_editor_event(&editor, event, ctx);
-        });
-        let alias_editor = row.alias_editor.clone();
-        ctx.subscribe_to_view(&alias_editor, |me, editor, event, ctx| {
-            me.handle_model_editor_event(&editor, event, ctx);
-        });
-        self.model_rows.push(row);
-        // ClippedScrollable clamps this to its true maximum after laying out the new row.
-        // Until the form overflows, that maximum remains zero and the modal grows naturally.
-        self.scroll_state.scroll_to(Pixels::new(f32::MAX));
-        ctx.notify();
-    }
-
-    fn remove_model(&mut self, index: usize, ctx: &mut ViewContext<Self>) {
-        if index < self.model_rows.len() {
-            let _row = self.model_rows.remove(index);
-            ctx.notify();
-        }
-    }
-
-    fn is_valid(&self, app: &AppContext) -> bool {
-        let name = self.endpoint_name_editor.as_ref(app).buffer_text(app);
-        let url = self.endpoint_url_editor.as_ref(app).buffer_text(app);
-        let api_key = self.api_key_editor.as_ref(app).buffer_text(app);
-        let has_models = self.model_rows.iter().any(|row| {
-            !row.name_editor
-                .as_ref(app)
-                .buffer_text(app)
-                .trim()
-                .is_empty()
-        });
-        is_endpoint_form_valid(&name, &url, &api_key, has_models)
-    }
-
-    fn focus_editor(&self, editor: &ViewHandle<EditorView>, ctx: &mut ViewContext<Self>) {
-        ctx.focus(editor);
-        let position_id = if self.endpoint_name_editor == *editor {
-            Some(ENDPOINT_NAME_SCROLL_POSITION_ID.to_string())
-        } else if self.endpoint_url_editor == *editor {
-            Some(ENDPOINT_URL_SCROLL_POSITION_ID.to_string())
-        } else if self.api_key_editor == *editor {
-            Some(API_KEY_SCROLL_POSITION_ID.to_string())
-        } else {
-            self.model_rows
-                .iter()
-                .position(|row| row.name_editor == *editor || row.alias_editor == *editor)
-                .map(model_row_scroll_position_id)
-        };
-        if let Some(position_id) = position_id {
-            self.scroll_state.scroll_to_position(ScrollTarget {
-                position_id,
-                mode: ScrollToPositionMode::FullyIntoView,
-            });
-            ctx.notify();
-        }
-    }
-
-    fn focus_next_editor(&self, current: &ViewHandle<EditorView>, ctx: &mut ViewContext<Self>) {
-        let mut editors: Vec<&ViewHandle<EditorView>> = vec![
-            &self.endpoint_name_editor,
-            &self.endpoint_url_editor,
-            &self.api_key_editor,
-        ];
-        for row in &self.model_rows {
-            editors.push(&row.name_editor);
-            editors.push(&row.alias_editor);
-        }
-        if let Some(pos) = editors.iter().position(|e| *e == current) {
-            let next = (pos + 1) % editors.len();
-            self.focus_editor(editors[next], ctx);
-        }
-    }
-
-    fn focus_prev_editor(&self, current: &ViewHandle<EditorView>, ctx: &mut ViewContext<Self>) {
-        let mut editors: Vec<&ViewHandle<EditorView>> = vec![
-            &self.endpoint_name_editor,
-            &self.endpoint_url_editor,
-            &self.api_key_editor,
-        ];
-        for row in &self.model_rows {
-            editors.push(&row.name_editor);
-            editors.push(&row.alias_editor);
-        }
-        if let Some(pos) = editors.iter().position(|e| *e == current) {
-            let prev = if pos == 0 { editors.len() - 1 } else { pos - 1 };
-            self.focus_editor(editors[prev], ctx);
-        }
-    }
-
-    fn handle_endpoint_name_event(&mut self, event: &EditorEvent, ctx: &mut ViewContext<Self>) {
-        match event {
-            EditorEvent::Navigate(NavigationKey::Tab) => {
-                self.focus_editor(&self.endpoint_url_editor, ctx);
-            }
-            EditorEvent::Navigate(NavigationKey::ShiftTab) => {
-                self.focus_prev_editor(&self.endpoint_name_editor, ctx);
-            }
-            EditorEvent::Enter => {
-                self.focus_editor(&self.endpoint_url_editor, ctx);
-            }
-            EditorEvent::Escape => {
-                self.cancel(ctx);
-            }
-            EditorEvent::Edited(_) => {
-                ctx.notify();
-            }
-            _ => {}
-        }
-    }
-
-    fn handle_endpoint_url_event(&mut self, event: &EditorEvent, ctx: &mut ViewContext<Self>) {
-        match event {
-            EditorEvent::Navigate(NavigationKey::Tab) => {
-                self.validate_url_field(ctx);
-                self.focus_editor(&self.api_key_editor, ctx);
-            }
-            EditorEvent::Navigate(NavigationKey::ShiftTab) => {
-                self.validate_url_field(ctx);
-                self.focus_editor(&self.endpoint_name_editor, ctx);
-            }
-            EditorEvent::Enter => {
-                self.validate_url_field(ctx);
-                self.focus_editor(&self.api_key_editor, ctx);
-            }
-            EditorEvent::Escape => {
-                self.cancel(ctx);
-            }
-            EditorEvent::Edited(_) if !self.validate_url_field(ctx) => {
-                ctx.notify();
-            }
-            _ => {}
-        }
-    }
-
-    fn validate_url_field(&mut self, ctx: &mut ViewContext<Self>) -> bool {
-        let url = self.endpoint_url_editor.as_ref(ctx).buffer_text(ctx);
-        let had_error = self.url_has_error;
-        self.url_has_error = !url.trim().is_empty() && validate_url(&url).is_err();
-        let changed = self.url_has_error != had_error;
-        if changed {
-            ctx.notify();
-        }
-        changed
-    }
-
-    fn handle_api_key_event(&mut self, event: &EditorEvent, ctx: &mut ViewContext<Self>) {
-        match event {
-            EditorEvent::Navigate(NavigationKey::Tab) => {
-                if let Some(first_row) = self.model_rows.first() {
-                    self.focus_editor(&first_row.name_editor, ctx);
-                }
-            }
-            EditorEvent::Navigate(NavigationKey::ShiftTab) => {
-                self.focus_editor(&self.endpoint_url_editor, ctx);
-            }
-            EditorEvent::Enter => {
-                if let Some(first_row) = self.model_rows.first() {
-                    self.focus_editor(&first_row.name_editor, ctx);
-                }
-            }
-            EditorEvent::Escape => {
-                self.cancel(ctx);
-            }
-            EditorEvent::Edited(_) => {
-                ctx.notify();
-            }
-            _ => {}
-        }
-    }
-
-    fn handle_model_editor_event(
-        &mut self,
-        editor: &ViewHandle<EditorView>,
-        event: &EditorEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            EditorEvent::Navigate(NavigationKey::Tab) | EditorEvent::Enter => {
-                self.focus_next_editor(editor, ctx);
-            }
-            EditorEvent::Navigate(NavigationKey::ShiftTab) => {
-                self.focus_prev_editor(editor, ctx);
-            }
-            EditorEvent::Escape => {
-                self.cancel(ctx);
-            }
-            EditorEvent::Edited(_) => {
-                ctx.notify();
-            }
-            _ => {}
-        }
-    }
-}
-
-impl Entity for CustomEndpointModal {
-    type Event = CustomEndpointModalEvent;
-}
-
-impl View for CustomEndpointModal {
-    fn ui_name() -> &'static str {
-        "CustomEndpointModal"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let theme = appearance.theme();
-
-        let is_valid = self.is_valid(app);
-        let is_editing = self.editing_index.is_some();
-
-        let label_font_family = appearance.ui_font_family();
-        let label_text_color = theme.active_ui_text_color().into();
-        let label = move |text: &'static str| {
-            Text::new(text, label_font_family, LABEL_FONT_SIZE)
-                .with_color(label_text_color)
-                .finish()
-        };
-
-        let input_style = UiComponentStyles {
-            width: Some(INPUT_WIDTH),
-            ..Default::default()
-        };
-        let button_style = UiComponentStyles {
-            font_size: Some(14.),
-            padding: Some(Coords::uniform(8.).left(12.).right(12.)),
-            ..Default::default()
-        };
-
-        let mut column = Flex::column();
-
-        // Description
-        column.add_child(
-            Container::new(
-                Text::new(
-                    "Provide your endpoint details below. You can add as many models from the endpoint as you'd like and can also provide aliases for the model picker in your input.",
-                    appearance.ui_font_family(),
-                    LABEL_FONT_SIZE,
-                )
-                .with_color(theme.nonactive_ui_text_color().into())
-                .soft_wrap(true)
-                .finish(),
-            )
-            .with_margin_bottom(16.)
-            .finish(),
-        );
-
-        // Endpoint name
-        column.add_child(
-            Container::new(label("Endpoint name"))
-                .with_margin_bottom(4.)
-                .finish(),
-        );
-        column.add_child(
-            SavePosition::new(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .text_input(self.endpoint_name_editor.clone())
-                        .with_style(input_style)
-                        .build()
-                        .finish(),
-                )
-                .with_margin_bottom(16.)
-                .finish(),
-                ENDPOINT_NAME_SCROLL_POSITION_ID,
-            )
-            .finish(),
-        );
-
-        // Endpoint URL
-        column.add_child(
-            Container::new(label("Endpoint URL"))
-                .with_margin_bottom(4.)
-                .finish(),
-        );
-        let url_border_fill = if self.url_has_error {
-            theme.ui_error_color().into()
-        } else {
-            theme.outline()
-        };
-        column.add_child(
-            SavePosition::new(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .text_input(self.endpoint_url_editor.clone())
-                        .with_style(input_style)
-                        .build()
-                        .finish(),
-                )
-                .with_border(Border::all(1.).with_border_fill(url_border_fill))
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-                .with_margin_bottom(16.)
-                .finish(),
-                ENDPOINT_URL_SCROLL_POSITION_ID,
-            )
-            .finish(),
-        );
-
-        // API key
-        column.add_child(
-            Container::new(label("API key"))
-                .with_margin_bottom(4.)
-                .finish(),
-        );
-        column.add_child(
-            SavePosition::new(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .text_input(self.api_key_editor.clone())
-                        .with_style(input_style)
-                        .build()
-                        .finish(),
-                )
-                .with_margin_bottom(16.)
-                .finish(),
-                API_KEY_SCROLL_POSITION_ID,
-            )
-            .finish(),
-        );
-
-        // Model rows
-        let has_remove_model_button = self.model_rows.len() > 1;
-        let mut model_labels = Flex::row()
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_spacing(REMOVE_MODEL_BUTTON_SPACING)
-            .with_child(
-                Flex::row()
-                    .with_spacing(MODEL_ROW_SPACING)
-                    .with_child(
-                        ConstrainedBox::new(label("Model name"))
-                            .with_width(MODEL_INPUT_WIDTH)
-                            .finish(),
-                    )
-                    .with_child(
-                        ConstrainedBox::new(label("Model alias (optional)"))
-                            .with_width(MODEL_INPUT_WIDTH)
-                            .finish(),
-                    )
-                    .finish(),
-            );
-        if has_remove_model_button {
-            model_labels.add_child(
-                ConstrainedBox::new(Empty::new().finish())
-                    .with_width(REMOVE_MODEL_BUTTON_COL_WIDTH)
-                    .finish(),
-            );
-        }
-
-        // Model column labels
-        column.add_child(
-            Container::new(model_labels.finish())
-                .with_margin_bottom(4.)
-                .finish(),
-        );
-
-        for (i, row) in self.model_rows.iter().enumerate() {
-            let name_input = appearance
-                .ui_builder()
-                .text_input(row.name_editor.clone())
-                .with_style(UiComponentStyles {
-                    width: Some(MODEL_INPUT_WIDTH),
-                    ..Default::default()
-                })
-                .build()
-                .finish();
-
-            let alias_input = appearance
-                .ui_builder()
-                .text_input(row.alias_editor.clone())
-                .with_style(UiComponentStyles {
-                    width: Some(MODEL_INPUT_WIDTH),
-                    ..Default::default()
-                })
-                .build()
-                .finish();
-
-            let remove_button = if self.model_rows.len() > 1 {
-                appearance
-                    .ui_builder()
-                    .close_button(20., row.remove_mouse_state.clone())
-                    .build()
-                    .on_click(move |ctx, _, _| {
-                        ctx.dispatch_typed_action(CustomEndpointModalAction::RemoveModel(i));
-                    })
-                    .finish()
-            } else {
-                Empty::new().finish()
-            };
-            let model_inputs = Flex::row()
-                .with_spacing(MODEL_ROW_SPACING)
-                .with_child(name_input)
-                .with_child(alias_input)
-                .finish();
-
-            let mut row = Flex::row()
-                .with_main_axis_size(MainAxisSize::Max)
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_spacing(REMOVE_MODEL_BUTTON_SPACING)
-                .with_child(model_inputs);
-            if has_remove_model_button {
-                row.add_child(
-                    ConstrainedBox::new(remove_button)
-                        .with_width(REMOVE_MODEL_BUTTON_COL_WIDTH)
-                        .finish(),
-                );
-            }
-            let row = row.finish();
-
-            column.add_child(
-                SavePosition::new(
-                    Container::new(row).with_margin_bottom(12.).finish(),
-                    &model_row_scroll_position_id(i),
-                )
-                .finish(),
-            );
-        }
-
-        let add_model_button = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Secondary,
-                self.add_model_button_mouse_state.clone(),
-            )
-            .with_text_label("+ Add model".to_string())
-            .with_style(UiComponentStyles {
-                font_size: Some(14.),
-                padding: Some(Coords::uniform(6.).left(8.).right(8.)),
-                ..Default::default()
-            })
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(CustomEndpointModalAction::AddModel);
-            })
-            .finish();
-
-        column.add_child(
-            Container::new(add_model_button)
-                .with_margin_bottom(24.)
-                .finish(),
-        );
-
-        // Bottom buttons row
-        let mut buttons_row = Flex::row()
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center);
-
-        // Remove button (only when editing)
-        if is_editing {
-            buttons_row.add_child(ChildView::new(&self.remove_endpoint_button).finish());
-        }
-
-        buttons_row.add_child(Expanded::new(1., Empty::new().finish()).finish());
-
-        buttons_row.add_child(
-            appearance
-                .ui_builder()
-                .button(
-                    ButtonVariant::Secondary,
-                    self.cancel_button_mouse_state.clone(),
-                )
-                .with_text_label("Cancel".to_string())
-                .with_style(button_style)
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(CustomEndpointModalAction::Cancel);
-                })
-                .finish(),
-        );
-
-        let mut save_button = appearance
-            .ui_builder()
-            .button(ButtonVariant::Accent, self.save_button_mouse_state.clone())
-            .with_text_label(if is_editing {
-                "Save".to_string()
-            } else {
-                "Add endpoint".to_string()
-            })
-            .with_style(button_style);
-        if !is_valid {
-            save_button = save_button.disabled();
-        }
-
-        buttons_row.add_child(
-            Container::new(
-                save_button
-                    .build()
-                    .on_click(move |ctx, _, _| {
-                        ctx.dispatch_typed_action(CustomEndpointModalAction::Save);
-                    })
-                    .finish(),
-            )
-            .with_margin_left(12.)
-            .finish(),
-        );
-
-        let scrollable_content = ClippedScrollable::vertical(
-            self.scroll_state.clone(),
-            Container::new(column.finish())
-                .with_margin_right(SCROLL_CONTENT_RIGHT_MARGIN)
-                .finish(),
-            ScrollbarWidth::Custom(MODAL_SCROLLBAR_WIDTH),
-            theme.nonactive_ui_text_color().into(),
-            theme.active_ui_text_color().into(),
-            warpui::elements::Fill::None,
-        )
-        .with_overlayed_scrollbar()
-        .with_padding_start(0.)
-        .with_padding_end(0.)
-        .finish();
-        let buttons_row = SavePosition::new(
-            Container::new(buttons_row.finish())
-                .with_margin_right(SCROLL_CONTENT_RIGHT_MARGIN)
-                .finish(),
-            ACTIONS_POSITION_ID,
-        )
-        .for_single_frame()
-        .finish();
-
-        Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_child(Shrinkable::new(1., scrollable_content).finish())
-            .with_child(buttons_row)
-            .finish()
-    }
-}
-
-fn validate_url(url: &str) -> Result<(), &'static str> {
-    if url.trim().is_empty() {
-        return Ok(());
-    }
-    let parsed = Url::parse(url).map_err(|_| "Invalid URL")?;
-    if parsed.scheme() != "https" {
-        return Err("URL must use HTTPS");
-    }
-    let Some(host) = parsed.host_str().filter(|h| !h.is_empty()) else {
-        return Err("URL must include a host");
-    };
-    if is_restricted_host(host) {
-        return Err("URL must not use a local or private host");
-    }
-    Ok(())
-}
-
-fn is_endpoint_form_valid(name: &str, url: &str, api_key: &str, has_models: bool) -> bool {
-    !name.trim().is_empty()
-        && !url.trim().is_empty()
-        && !api_key.trim().is_empty()
-        && has_models
-        && validate_url(url).is_ok()
-}
-
-fn is_restricted_host(host: &str) -> bool {
-    let host = host
-        .strip_prefix('[')
-        .and_then(|host| host.strip_suffix(']'))
-        .unwrap_or(host);
-    if host.eq_ignore_ascii_case("localhost") {
-        return true;
-    }
-    host.parse::<IpAddr>().is_ok_and(is_restricted_ip)
-}
-
-fn is_restricted_ip(ip: IpAddr) -> bool {
-    match ip {
-        IpAddr::V4(ip) => is_restricted_ipv4(ip),
-        IpAddr::V6(ip) => is_restricted_ipv6(ip),
-    }
-}
-
-fn is_restricted_ipv4(ip: Ipv4Addr) -> bool {
-    ip.is_loopback() || ip.is_unspecified() || ip.is_private() || ip.is_link_local()
-}
-
-fn is_restricted_ipv6(ip: Ipv6Addr) -> bool {
-    if ip.is_loopback() || ip.is_unspecified() || is_ipv6_unique_local(ip) || is_ipv6_link_local(ip)
-    {
-        return true;
-    }
-    if let Some(ipv4) = ip.to_ipv4_mapped() {
-        return is_restricted_ipv4(ipv4);
-    }
-    false
-}
-
-fn is_ipv6_unique_local(ip: Ipv6Addr) -> bool {
-    ip.segments()[0] & 0xfe00 == 0xfc00
-}
-
-fn is_ipv6_link_local(ip: Ipv6Addr) -> bool {
-    ip.segments()[0] & 0xffc0 == 0xfe80
-}
-impl TypedActionView for CustomEndpointModal {
-    type Action = CustomEndpointModalAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            CustomEndpointModalAction::Cancel => self.cancel(ctx),
-            CustomEndpointModalAction::Save => self.save(ctx),
-            CustomEndpointModalAction::AddModel => self.add_model(ctx),
-            CustomEndpointModalAction::RemoveModel(index) => self.remove_model(*index, ctx),
-            CustomEndpointModalAction::RemoveEndpoint => {
-                if let Some(index) = self.editing_index {
-                    ctx.emit(CustomEndpointModalEvent::RemoveEndpoint { index });
-                }
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-#[path = "custom_inference_modal_tests.rs"]
-mod tests;
-
-pub struct CustomEndpointModalViewState {
-    state: ModalViewState<Modal<CustomEndpointModal>>,
-}
-
-impl CustomEndpointModalViewState {
-    pub fn new(state: ModalViewState<Modal<CustomEndpointModal>>) -> Self {
-        Self { state }
-    }
-
-    pub fn is_open(&self) -> bool {
-        self.state.is_open()
-    }
-
-    pub fn render(&self) -> Box<dyn Element> {
-        self.state.render()
-    }
-
-    pub fn set_title<T: View>(&mut self, title: Option<String>, ctx: &mut ViewContext<T>) {
-        self.state.view.update(ctx, |modal, ctx| {
-            modal.set_title(title);
-            ctx.notify();
-        });
-    }
-
-    pub fn prefill<T: View>(
-        &mut self,
-        endpoint: Option<&CustomEndpoint>,
-        editing_index: Option<usize>,
-        ctx: &mut ViewContext<T>,
-    ) {
-        self.state.view.update(ctx, |modal, ctx| {
-            modal.body().update(ctx, |body, ctx| {
-                body.prefill(endpoint, editing_index, ctx);
-            });
-        });
-    }
-
-    pub fn open<T: View>(&mut self, ctx: &mut ViewContext<T>) {
-        self.state.open();
-        self.state.view.update(ctx, |modal, ctx| {
-            modal.body().update(ctx, |body, ctx| {
-                body.on_open(ctx);
-            });
-        });
-    }
-
-    pub fn close<T: View>(&mut self, ctx: &mut ViewContext<T>) {
-        self.state.close();
-        self.state.view.update(ctx, |modal, ctx| {
-            modal.body().update(ctx, |body, ctx| {
-                body.on_close(ctx);
-            });
-        });
-    }
-}
diff --git a/app/src/settings_view/custom_inference_modal_tests.rs b/app/src/settings_view/custom_inference_modal_tests.rs
deleted file mode 100644
index 4c1cadde..00000000
--- a/app/src/settings_view/custom_inference_modal_tests.rs
+++ /dev/null
@@ -1,401 +0,0 @@
-use ai::api_keys::CustomEndpointModel;
-use pathfinder_geometry::vector::vec2f;
-use warpui::platform::WindowStyle;
-use warpui::scene::Scene;
-use warpui::units::Pixels;
-use warpui::{App, EntityIdSet, Presenter, WindowInvalidation};
-
-use super::*;
-use crate::test_util::terminal::initialize_app_for_terminal_view;
-
-fn endpoint_with_models(model_count: usize) -> CustomEndpoint {
-    CustomEndpoint {
-        name: "Test endpoint".to_string(),
-        url: "https://api.example.com/v1".to_string(),
-        api_key: "key".to_string(),
-        models: (0..model_count)
-            .map(|index| CustomEndpointModel {
-                name: format!("model-{index}"),
-                alias: None,
-                config_key: format!("config-{index}"),
-            })
-            .collect(),
-    }
-}
-
-fn init_modal_test_models(app: &mut App) {
-    initialize_app_for_terminal_view(app);
-}
-fn custom_endpoint_modal_height(scene: &Scene) -> f32 {
-    let rects = scene
-        .layers()
-        .flat_map(|layer| &layer.rects)
-        .map(|rect| (rect.bounds.width(), rect.bounds.height(), rect.border.width))
-        .collect::<Vec<_>>();
-    rects
-        .iter()
-        .filter(|(width, _, _)| *width > INPUT_WIDTH && *width <= 560.)
-        .map(|(_, height, _)| *height)
-        .max_by(f32::total_cmp)
-        .unwrap_or_else(|| panic!("custom endpoint modal rect should exist: {rects:?}"))
-}
-
-#[test]
-fn modal_resizes_with_window_and_added_models() {
-    App::test((), |mut app| async move {
-        init_modal_test_models(&mut app);
-        let endpoint = endpoint_with_models(1);
-        let (window_id, modal) = app.add_window(WindowStyle::NotStealFocus, move |ctx| {
-            let body = ctx.add_typed_action_view(|ctx| {
-                CustomEndpointModal::new(Some(&endpoint), Some(0), ctx)
-            });
-            Modal::new(Some("Edit custom endpoint".to_string()), body, ctx)
-                .with_modal_style(UiComponentStyles {
-                    width: Some(560.),
-                    ..Default::default()
-                })
-                .with_max_height_percentage(0.8)
-        });
-        let body = modal.read(&app, |modal, _| modal.body().clone());
-        let mut presenter = Presenter::new(window_id);
-        let invalidation = WindowInvalidation {
-            updated: EntityIdSet::from_iter([
-                app.root_view_id(window_id).expect("root view should exist"),
-                body.id(),
-            ]),
-            ..Default::default()
-        };
-
-        app.update(move |ctx| {
-            presenter.invalidate(invalidation.clone(), ctx);
-            let initial_modal_height = {
-                let scene = presenter.build_scene(vec2f(800., 1000.), 1., None, ctx);
-                custom_endpoint_modal_height(&scene)
-            };
-            body.update(ctx, |body, ctx| {
-                for _ in 0..20 {
-                    body.add_model(ctx);
-                }
-            });
-            presenter.invalidate(invalidation, ctx);
-            let expanded_modal_height = {
-                let scene = presenter.build_scene(vec2f(800., 1000.), 1., None, ctx);
-                custom_endpoint_modal_height(&scene)
-            };
-            let small_window_height = {
-                let scene = presenter.build_scene(vec2f(800., 500.), 1., None, ctx);
-                custom_endpoint_modal_height(&scene)
-            };
-
-            assert!(
-                expanded_modal_height > initial_modal_height,
-                "expanded modal height {expanded_modal_height} should be greater than initial modal height {initial_modal_height}"
-            );
-            assert!(
-                (expanded_modal_height - 765.).abs() < 0.1,
-                "expanded modal height {expanded_modal_height} should reach the 80% window-height cap"
-            );
-            assert!(
-                small_window_height < expanded_modal_height,
-                "small modal height {small_window_height} should be less than expanded modal height {expanded_modal_height}"
-            );
-            assert!(
-                (small_window_height - 365.).abs() < 0.1,
-                "small modal height {small_window_height} should reach the 80% window-height cap"
-            );
-        });
-    })
-}
-
-#[test]
-fn modal_with_many_models_lays_out() {
-    App::test((), |mut app| async move {
-        init_modal_test_models(&mut app);
-        let endpoint = endpoint_with_models(20);
-        let (window_id, modal) = app.add_window(WindowStyle::NotStealFocus, move |ctx| {
-            CustomEndpointModal::new(Some(&endpoint), Some(0), ctx)
-        });
-
-        app.update(|ctx| {
-            ctx.presenter(window_id)
-                .expect("presenter should exist")
-                .borrow_mut()
-                .build_scene(vec2f(560., 600.), 1., None, ctx);
-
-            assert_eq!(modal.as_ref(ctx).model_rows.len(), 20);
-        });
-    })
-}
-
-#[test]
-fn model_row_inputs_align_and_controls_fit_gutter() {
-    assert_eq!(MODEL_INPUT_WIDTH * 2. + MODEL_ROW_SPACING, INPUT_WIDTH);
-    // SCROLL_CONTENT_RIGHT_MARGIN already includes MODAL_SCROLLBAR_WIDTH, so the
-    // right gutter (button spacing + remove-button column + content right margin)
-    // is 56 without adding the scrollbar width again.
-    assert_eq!(
-        REMOVE_MODEL_BUTTON_SPACING + REMOVE_MODEL_BUTTON_COL_WIDTH + SCROLL_CONTENT_RIGHT_MARGIN,
-        56.
-    );
-}
-
-#[test]
-fn action_row_remains_fixed_when_form_scrolls() {
-    App::test((), |mut app| async move {
-        init_modal_test_models(&mut app);
-        let endpoint = endpoint_with_models(20);
-        let (window_id, modal) = app.add_window(WindowStyle::NotStealFocus, move |ctx| {
-            let body = ctx.add_typed_action_view(|ctx| {
-                CustomEndpointModal::new(Some(&endpoint), Some(0), ctx)
-            });
-            Modal::new(Some("Edit custom endpoint".to_string()), body, ctx)
-                .with_modal_style(UiComponentStyles {
-                    width: Some(560.),
-                    ..Default::default()
-                })
-                .with_max_height_percentage(0.8)
-        });
-        let body = modal.read(&app, |modal, _| modal.body().clone());
-        let invalidation = WindowInvalidation {
-            updated: EntityIdSet::from_iter([
-                app.root_view_id(window_id).expect("root view should exist"),
-                body.id(),
-            ]),
-            ..Default::default()
-        };
-
-        let action_row_position = app.update(|ctx| {
-            let presenter = ctx.presenter(window_id).expect("presenter should exist");
-            let mut presenter = presenter.borrow_mut();
-            presenter.invalidate(invalidation.clone(), ctx);
-            presenter.build_scene(vec2f(560., 600.), 1., None, ctx);
-            presenter
-                .position_cache()
-                .get_position(ACTIONS_POSITION_ID)
-                .expect("action row position should exist")
-        });
-        body.update(&mut app, |body, ctx| {
-            body.scroll_state.scroll_to(Pixels::new(f32::MAX));
-            ctx.notify();
-        });
-
-        let scrolled_action_row_position = app.update(|ctx| {
-            let presenter = ctx.presenter(window_id).expect("presenter should exist");
-            let mut presenter = presenter.borrow_mut();
-            presenter.invalidate(invalidation, ctx);
-            presenter.build_scene(vec2f(560., 600.), 1., None, ctx);
-            presenter
-                .position_cache()
-                .get_position(ACTIONS_POSITION_ID)
-                .expect("action row position should exist")
-        });
-        assert!(body.read(&app, |body, _| body.scroll_state.scroll_start()) > Pixels::zero());
-        assert_eq!(
-            action_row_position, scrolled_action_row_position,
-            "action row should remain fixed while form content scrolls"
-        );
-    })
-}
-#[test]
-fn focus_editor_scrolls_whole_form_to_field() {
-    App::test((), |mut app| async move {
-        init_modal_test_models(&mut app);
-        let endpoint = endpoint_with_models(20);
-        let (window_id, modal) = app.add_window(WindowStyle::NotStealFocus, move |ctx| {
-            CustomEndpointModal::new(Some(&endpoint), Some(0), ctx)
-        });
-
-        app.update(|ctx| {
-            ctx.presenter(window_id)
-                .expect("presenter should exist")
-                .borrow_mut()
-                .build_scene(vec2f(560., 600.), 1., None, ctx);
-        });
-        modal.update(&mut app, |modal, ctx| {
-            let editor = modal
-                .model_rows
-                .last()
-                .expect("model row should exist")
-                .name_editor
-                .clone();
-            modal.focus_editor(&editor, ctx);
-        });
-        app.update(|ctx| {
-            ctx.presenter(window_id)
-                .expect("presenter should exist")
-                .borrow_mut()
-                .build_scene(vec2f(560., 600.), 1., None, ctx);
-            assert!(modal.as_ref(ctx).scroll_state.scroll_start() > Pixels::zero());
-        });
-        let model_scroll_start = modal.read(&app, |modal, _| modal.scroll_state.scroll_start());
-        modal.update(&mut app, |modal, ctx| {
-            modal.focus_editor(&modal.endpoint_name_editor.clone(), ctx);
-        });
-        app.update(|ctx| {
-            ctx.presenter(window_id)
-                .expect("presenter should exist")
-                .borrow_mut()
-                .build_scene(vec2f(560., 600.), 1., None, ctx);
-            assert!(modal.as_ref(ctx).scroll_state.scroll_start() < model_scroll_start);
-        });
-    })
-}
-
-#[test]
-fn add_model_scrolls_only_after_form_is_full() {
-    App::test((), |mut app| async move {
-        init_modal_test_models(&mut app);
-        let endpoint = endpoint_with_models(1);
-        let (window_id, modal) = app.add_window(WindowStyle::NotStealFocus, move |ctx| {
-            CustomEndpointModal::new(Some(&endpoint), Some(0), ctx)
-        });
-
-        modal.update(&mut app, |modal, ctx| modal.add_model(ctx));
-        app.update(|ctx| {
-            ctx.presenter(window_id)
-                .expect("presenter should exist")
-                .borrow_mut()
-                .build_scene(vec2f(560., 600.), 1., None, ctx);
-
-            assert_eq!(
-                modal.as_ref(ctx).scroll_state.scroll_start(),
-                Pixels::zero()
-            );
-        });
-
-        modal.update(&mut app, |modal, ctx| {
-            for _ in 0..20 {
-                modal.add_model(ctx);
-            }
-            assert_eq!(modal.scroll_state.scroll_start(), Pixels::new(f32::MAX));
-        });
-        app.update(|ctx| {
-            ctx.presenter(window_id)
-                .expect("presenter should exist")
-                .borrow_mut()
-                .build_scene(vec2f(560., 600.), 1., None, ctx);
-            let scroll_start = modal.as_ref(ctx).scroll_state.scroll_start();
-            assert!(scroll_start > Pixels::zero());
-            assert!(scroll_start < Pixels::new(f32::MAX));
-        });
-    })
-}
-
-#[test]
-fn prefill_resets_form_scroll_position() {
-    App::test((), |mut app| async move {
-        init_modal_test_models(&mut app);
-        let endpoint = endpoint_with_models(20);
-        let (_window_id, modal) = app.add_window(WindowStyle::NotStealFocus, move |ctx| {
-            CustomEndpointModal::new(Some(&endpoint), Some(0), ctx)
-        });
-
-        modal.update(&mut app, |modal, ctx| {
-            modal.scroll_state.scroll_to(Pixels::new(100.));
-            assert_eq!(modal.scroll_state.scroll_start(), Pixels::new(100.));
-
-            modal.prefill(None, None, ctx);
-
-            assert_eq!(modal.scroll_state.scroll_start(), Pixels::zero());
-        });
-    })
-}
-
-#[test]
-fn validate_url_accepts_https_with_host() {
-    assert!(validate_url("https://api.example.com/v1").is_ok());
-    assert!(validate_url("https://example.com").is_ok());
-    assert!(validate_url("https://8.8.8.8/v1").is_ok());
-}
-
-#[test]
-fn validate_url_rejects_http() {
-    assert_eq!(
-        validate_url("http://api.example.com/v1"),
-        Err("URL must use HTTPS")
-    );
-    assert_eq!(
-        validate_url("http://example.com"),
-        Err("URL must use HTTPS")
-    );
-}
-
-#[test]
-fn validate_url_rejects_ftp_and_other_schemes() {
-    assert_eq!(
-        validate_url("ftp://files.example.com"),
-        Err("URL must use HTTPS")
-    );
-    assert_eq!(
-        validate_url("file:///etc/passwd"),
-        Err("URL must use HTTPS")
-    );
-    assert_eq!(
-        validate_url("ws://socket.example.com"),
-        Err("URL must use HTTPS")
-    );
-}
-
-#[test]
-fn validate_url_rejects_malformed_strings() {
-    assert_eq!(validate_url("not a url"), Err("Invalid URL"));
-    assert_eq!(validate_url("https://"), Err("Invalid URL"));
-}
-
-#[test]
-fn validate_url_rejects_empty_host() {
-    assert_eq!(validate_url("https://?query=1"), Err("Invalid URL"));
-}
-
-#[test]
-fn validate_url_allows_empty_string() {
-    assert!(validate_url("").is_ok());
-}
-
-#[test]
-fn validate_url_allows_whitespace_only() {
-    assert!(validate_url("   ").is_ok());
-}
-
-#[test]
-fn validate_url_rejects_localhost_and_private_ips() {
-    let error = Err("URL must not use a local or private host");
-    assert_eq!(validate_url("https://localhost:8080"), error);
-    assert_eq!(validate_url("https://127.0.0.1/v1"), error);
-    assert_eq!(validate_url("https://0.0.0.0/v1"), error);
-    assert_eq!(validate_url("https://10.0.0.1/v1"), error);
-    assert_eq!(validate_url("https://172.16.0.1/v1"), error);
-    assert_eq!(validate_url("https://192.168.0.1/v1"), error);
-    assert_eq!(validate_url("https://169.254.0.1/v1"), error);
-    assert_eq!(validate_url("https://[::1]/v1"), error);
-    assert_eq!(validate_url("https://[::]/v1"), error);
-    assert_eq!(validate_url("https://[fc00::1]/v1"), error);
-    assert_eq!(validate_url("https://[fe80::1]/v1"), error);
-    assert_eq!(validate_url("https://[::ffff:192.168.0.1]/v1"), error);
-}
-
-#[test]
-fn endpoint_form_valid_rejects_invalid_current_url() {
-    assert!(!is_endpoint_form_valid(
-        "Endpoint",
-        "http://api.example.com/v1",
-        "key",
-        true
-    ));
-}
-
-#[test]
-fn endpoint_form_valid_requires_non_empty_url() {
-    assert!(!is_endpoint_form_valid("Endpoint", "", "key", true));
-    assert!(!is_endpoint_form_valid("Endpoint", "   ", "key", true));
-}
-
-#[test]
-fn endpoint_form_valid_accepts_complete_valid_form() {
-    assert!(is_endpoint_form_valid(
-        "Endpoint",
-        "https://api.example.com/v1",
-        "key",
-        true
-    ));
-}
diff --git a/app/src/settings_view/delete_environment_confirmation_dialog.rs b/app/src/settings_view/delete_environment_confirmation_dialog.rs
deleted file mode 100644
index 31f7a742..00000000
--- a/app/src/settings_view/delete_environment_confirmation_dialog.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-use galaxyui::elements::{ChildView, Container, Dismiss, Empty};
-use galaxyui::ui_components::components::UiComponent;
-use galaxyui::{
-    AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
-};
-
-use crate::appearance::Appearance;
-use crate::server::ids::SyncId;
-use crate::ui_components::dialog::{dialog_styles, Dialog};
-use crate::view_components::action_button::{ActionButton, DangerPrimaryTheme, NakedTheme};
-
-const DIALOG_WIDTH: f32 = 450.;
-
-pub enum DeleteEnvironmentConfirmationDialogEvent {
-    Cancel,
-    Confirm(SyncId),
-}
-
-#[derive(Debug)]
-pub enum DeleteEnvironmentConfirmationDialogAction {
-    Cancel,
-    Confirm,
-}
-
-pub struct DeleteEnvironmentConfirmationDialog {
-    pub(crate) visible: bool,
-    pub(crate) env_id: Option<SyncId>,
-    pub(crate) env_name: String,
-    cancel_button: ViewHandle<ActionButton>,
-    confirm_button: ViewHandle<ActionButton>,
-}
-
-impl DeleteEnvironmentConfirmationDialog {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        let cancel_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new("Cancel", NakedTheme).on_click(|ctx| {
-                ctx.dispatch_typed_action(DeleteEnvironmentConfirmationDialogAction::Cancel);
-            })
-        });
-
-        let confirm_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new("Delete environment", DangerPrimaryTheme).on_click(|ctx| {
-                ctx.dispatch_typed_action(DeleteEnvironmentConfirmationDialogAction::Confirm);
-            })
-        });
-
-        Self {
-            visible: false,
-            env_id: None,
-            env_name: String::new(),
-            cancel_button,
-            confirm_button,
-        }
-    }
-
-    pub fn show(&mut self, env_id: SyncId, env_name: String, ctx: &mut ViewContext<Self>) {
-        self.env_id = Some(env_id);
-        self.env_name = env_name;
-        self.visible = true;
-        ctx.notify();
-    }
-
-    pub fn hide(&mut self, ctx: &mut ViewContext<Self>) {
-        self.visible = false;
-        ctx.notify();
-    }
-}
-
-impl Entity for DeleteEnvironmentConfirmationDialog {
-    type Event = DeleteEnvironmentConfirmationDialogEvent;
-}
-
-impl View for DeleteEnvironmentConfirmationDialog {
-    fn ui_name() -> &'static str {
-        "DeleteEnvironmentConfirmationDialog"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        if !self.visible {
-            return Empty::new().finish();
-        }
-
-        let appearance = Appearance::as_ref(app);
-
-        let description = format!(
-            "Are you sure you want to remove the {} environment?",
-            self.env_name
-        );
-
-        let dialog = Dialog::new(
-            "Delete environment?".to_string(),
-            Some(description),
-            dialog_styles(appearance),
-        )
-        .with_bottom_row_child(ChildView::new(&self.cancel_button).finish())
-        .with_bottom_row_child(
-            Container::new(ChildView::new(&self.confirm_button).finish())
-                .with_margin_left(12.)
-                .finish(),
-        )
-        .with_width(DIALOG_WIDTH)
-        .build()
-        .finish();
-
-        Dismiss::new(dialog)
-            .prevent_interaction_with_other_elements()
-            .on_dismiss(|ctx, _app| {
-                ctx.dispatch_typed_action(DeleteEnvironmentConfirmationDialogAction::Cancel)
-            })
-            .finish()
-    }
-}
-
-impl TypedActionView for DeleteEnvironmentConfirmationDialog {
-    type Action = DeleteEnvironmentConfirmationDialogAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            DeleteEnvironmentConfirmationDialogAction::Cancel => {
-                ctx.emit(DeleteEnvironmentConfirmationDialogEvent::Cancel)
-            }
-            DeleteEnvironmentConfirmationDialogAction::Confirm => {
-                if let Some(env_id) = self.env_id {
-                    ctx.emit(DeleteEnvironmentConfirmationDialogEvent::Confirm(env_id));
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/settings_view/environments_page.rs b/app/src/settings_view/environments_page.rs
deleted file mode 100644
index b73b95ed..00000000
--- a/app/src/settings_view/environments_page.rs
+++ /dev/null
@@ -1,2093 +0,0 @@
-use std::collections::HashMap;
-
-use galaxy_core::ui::color::blend::Blend;
-use galaxy_core::ui::theme::color::internal_colors;
-use galaxy_editor::editor::NavigationKey;
-use galaxy_graphql::scalars::time::ServerTimestamp;
-use galaxyui::elements::{
-    Align, Border, ChildAnchor, Clipped, ConstrainedBox, Container, CornerRadius,
-    CrossAxisAlignment, Element, Empty, Expanded, Flex, Hoverable, MainAxisAlignment, MainAxisSize,
-    MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds, Radius,
-    Shrinkable, SizeConstraintCondition, SizeConstraintSwitch, Stack, Text,
-};
-use galaxyui::fonts::{Properties, Weight};
-use galaxyui::prelude::ChildView;
-use galaxyui::ui_components::button::ButtonVariant;
-use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
-use galaxyui::windowing::state::ApplicationStage;
-use galaxyui::windowing::{self, WindowManager};
-use galaxyui::{
-    AppContext, Entity, FocusContext, ModelHandle, SingletonEntity, TypedActionView, View,
-    ViewContext, ViewHandle,
-};
-use instant::Instant;
-use pathfinder_geometry::vector::vec2f;
-
-use super::agent_assisted_environment_modal::{
-    AgentAssistedEnvironmentModal, AgentAssistedEnvironmentModalEvent,
-};
-use super::delete_environment_confirmation_dialog::{
-    DeleteEnvironmentConfirmationDialog, DeleteEnvironmentConfirmationDialogEvent,
-};
-use super::settings_page::{
-    MatchData, PageType, SettingsPageEvent, SettingsPageMeta, SettingsPageViewHandle,
-    SettingsWidget, CONTENT_FONT_SIZE,
-};
-use super::update_environment_form::{
-    EnvironmentFormInitArgs, EnvironmentFormValues, UpdateEnvironmentForm,
-    UpdateEnvironmentFormEvent,
-};
-use super::{editor_text_colors, SettingsSection};
-use crate::ai::ambient_agents::github_auth_url::GithubAuthRedirectTarget;
-use crate::ai::cloud_environments::{self, CloudAmbientAgentEnvironment};
-use crate::appearance::Appearance;
-use crate::cloud_object::model::persistence::{CloudModel, CloudModelEvent};
-use crate::cloud_object::{
-    CloudObjectLocation, CloudObjectLookup as _, GenericStringObjectFormat, JsonObjectType, Owner,
-    Space,
-};
-use crate::drive::CloudObjectTypeAndId;
-use crate::editor::{
-    EditorView, PropagateAndNoOpNavigationKeys, SingleLineEditorOptions, TextOptions,
-};
-use crate::root_view::CreateEnvironmentArg;
-use crate::server::cloud_objects::update_manager::{
-    ObjectOperation, OperationSuccessType, UpdateManager, UpdateManagerEvent,
-};
-use crate::server::ids::{ClientId, ServerId, SyncId};
-use crate::terminal::view::init_environment::mode_selector::{
-    EnvironmentSetupMode, EnvironmentSetupModeSelector, EnvironmentSetupModeSelectorEvent,
-};
-use crate::themes::theme::Fill as ThemeFill;
-use crate::ui_components::blended_colors;
-use crate::ui_components::buttons::icon_button_with_color;
-use crate::ui_components::icons::Icon;
-use crate::util::time_format::format_approx_duration_from_now_utc;
-use crate::view_components::{
-    render_copyable_text_field, CopyButtonPlacement, CopyableTextFieldConfig, DismissibleToast,
-    COPY_FEEDBACK_DURATION,
-};
-use crate::workspace::{ToastStack, WorkspaceAction};
-use crate::workspaces::user_workspaces::UserWorkspaces;
-
-mod new_environment_button;
-use new_environment_button::NewEnvironmentButtonView;
-#[cfg(not(target_family = "wasm"))]
-#[allow(unused_imports)] // IntegrationsClient trait is used in fetch_github_repos
-use {
-    crate::server::server_api::{integrations::IntegrationsClient, ServerApiProvider},
-    galaxy_graphql::queries::user_github_info::UserGithubInfoResult,
-};
-
-const PAGE_TITLE_TEXT: &str = "Environments";
-const PAGE_DESCRIPTION_TEXT: &str = "Environments define where your ambient agents run. Set one up in minutes via GitHub (recommended), Warp-assisted setup, or manual configuration.";
-const CARD_BORDER_WIDTH: f32 = 1.;
-const CARD_PADDING: f32 = 16.;
-const CARD_SPACING: f32 = 12.;
-const SECTION_SPACING: f32 = 16.;
-const TITLE_DESCRIPTION_SPACING: f32 = 6.;
-// Match the settings page MAX_PAGE_WIDTH (800px) for consistent alignment
-const DROPDOWN_MAX_WIDTH: f32 = 800.;
-const EMPTY_STATE_MAX_WIDTH_RATIO: f32 = 0.7;
-const EMPTY_STATE_MIN_HEIGHT: f32 = 420.;
-const EMPTY_STATE_ROW_VERTICAL_LAYOUT_THRESHOLD: f32 = 360.;
-const TOOLBAR_SEARCH_MAX_WIDTH: f32 = 420.;
-
-struct EmptyStateRowConfig {
-    icon: Icon,
-    title: &'static str,
-    badge: Option<&'static str>,
-    subtitle: &'static str,
-    action_button: Box<dyn Element>,
-    compact_action_button: Box<dyn Element>,
-    icon_size: f32,
-}
-
-#[derive(Debug, Default, Clone, PartialEq)]
-pub enum EnvironmentsPage {
-    #[default]
-    List,
-    Edit {
-        env_id: SyncId,
-    },
-    Create,
-}
-
-/// A view-friendly representation of a cloud environment.
-#[derive(Clone, Debug)]
-struct EnvironmentDisplayData {
-    id: SyncId,
-    name: String,
-    description: Option<String>,
-    docker_image: String,
-    github_repos: Vec<(String, String)>, // (owner, repo)
-    setup_commands: Vec<String>,
-    last_edited_ts: Option<ServerTimestamp>,
-    last_used_ts: Option<ServerTimestamp>,
-}
-
-impl EnvironmentDisplayData {
-    fn from_cloud_environment(env: &CloudAmbientAgentEnvironment) -> Self {
-        let model = &env.model().string_model;
-
-        // For environments, the server revision timestamp reflects the last successful edit.
-        // We prefer it over `metadata_last_updated_ts` because the latter may not be refreshed
-        // locally immediately after an update.
-        let last_edited_ts = env
-            .metadata
-            .revision
-            .clone()
-            .map(ServerTimestamp::from)
-            .or(env.metadata.metadata_last_updated_ts);
-
-        Self {
-            id: env.id,
-            name: model.name.clone(),
-            description: model.description.clone(),
-            docker_image: model.base_image.to_string(),
-            github_repos: model
-                .github_repos
-                .iter()
-                .map(|r| (r.owner.clone(), r.repo.clone()))
-                .collect(),
-            setup_commands: model.setup_commands.clone(),
-            last_edited_ts,
-            last_used_ts: env.metadata.last_task_run_ts,
-        }
-    }
-
-    fn matches_search_query(&self, query: &str) -> bool {
-        let query = query.trim();
-        if query.is_empty() {
-            return true;
-        }
-
-        let needle = query.to_lowercase();
-
-        let haystacks = [
-            self.id.to_string(),
-            self.name.clone(),
-            self.description.clone().unwrap_or_default(),
-            self.docker_image.clone(),
-        ];
-
-        if haystacks
-            .into_iter()
-            .any(|field| field.to_lowercase().contains(&needle))
-        {
-            return true;
-        }
-
-        self.github_repos.iter().any(|(owner, repo)| {
-            let entry = format!("{owner}/{repo}");
-            entry.to_lowercase().contains(&needle)
-        })
-    }
-
-    /// Format the timestamp text showing last edited and last used times.
-    fn format_timestamp_text(&self) -> String {
-        let last_edited_part = self.last_edited_ts.map(|ts| {
-            format!(
-                "Last edited: {}",
-                format_approx_duration_from_now_utc(ts.utc())
-            )
-        });
-        let last_used_part = match self.last_used_ts {
-            Some(ts) => format!(
-                "Last used: {}",
-                format_approx_duration_from_now_utc(ts.utc())
-            ),
-            None => "Last used: never".to_string(),
-        };
-        match last_edited_part {
-            Some(edited) => format!("{} · {}", edited, last_used_part),
-            None => last_used_part,
-        }
-    }
-}
-
-pub struct EnvironmentsPageView {
-    page: PageType<Self>,
-    current_page: EnvironmentsPage,
-    copy_button_mouse_states: HashMap<SyncId, MouseStateHandle>,
-    edit_button_mouse_states: HashMap<SyncId, MouseStateHandle>,
-    share_button_mouse_states: HashMap<SyncId, MouseStateHandle>,
-    card_hover_mouse_states: HashMap<SyncId, MouseStateHandle>,
-    view_runs_link_mouse_states: HashMap<SyncId, MouseStateHandle>,
-    /// Tracks when each env ID was last copied, for showing checkmark feedback
-    copy_feedback_times: HashMap<SyncId, Instant>,
-    // List page search state
-    search_query: String,
-    search_editor: ViewHandle<EditorView>,
-    empty_state_github_repos_button_mouse_state: MouseStateHandle,
-    empty_state_local_repos_button_mouse_state: MouseStateHandle,
-    // Track pending save to show success toast when complete
-    pending_save_env_id: Option<SyncId>,
-    // Track pending create to show success toast when complete
-    pending_create_client_id: Option<ClientId>,
-    // Track pending delete to show success toast when complete
-    pending_delete_env_id: Option<SyncId>,
-    // Track pending share (personal -> team) to show error toast on failure
-    pending_share_server_id: Option<ServerId>,
-    // Delete confirmation dialog
-    delete_confirmation_dialog: ViewHandle<DeleteEnvironmentConfirmationDialog>,
-    // Agent-assisted environment creation modal
-    agent_assisted_environment_modal: ViewHandle<AgentAssistedEnvironmentModal>,
-    // New environment button (search -> tab focus target)
-    new_env_button: ViewHandle<NewEnvironmentButtonView>,
-    // Mode selector modal for new environment setup
-    environment_setup_mode_selector: ViewHandle<EnvironmentSetupModeSelector>,
-    is_environment_setup_mode_selector_open: bool,
-    // Environment form
-    environment_form: ViewHandle<UpdateEnvironmentForm>,
-    // Pane configuration for BackingView support
-    pane_configuration: ModelHandle<crate::pane_group::pane::PaneConfiguration>,
-    // Focus handle for BackingView support
-    focus_handle: Option<crate::pane_group::focus_state::PaneFocusHandle>,
-}
-
-impl EnvironmentsPageView {
-    fn ensure_environment_mouse_states(&mut self, ctx: &mut ViewContext<Self>) {
-        let environments = CloudAmbientAgentEnvironment::get_all(ctx);
-        for env in &environments {
-            self.copy_button_mouse_states.entry(env.id).or_default();
-            self.edit_button_mouse_states.entry(env.id).or_default();
-            self.share_button_mouse_states.entry(env.id).or_default();
-            self.card_hover_mouse_states.entry(env.id).or_default();
-            self.view_runs_link_mouse_states.entry(env.id).or_default();
-        }
-    }
-    pub fn update_page(&mut self, page: EnvironmentsPage, ctx: &mut ViewContext<Self>) {
-        self.current_page = page.clone();
-
-        // Update the environment form component based on the page
-        match &page {
-            EnvironmentsPage::Edit { env_id } => {
-                // Extract environment data for edit mode
-                let env_data = CloudAmbientAgentEnvironment::get_by_id(env_id, ctx).map(|env| {
-                    let model = &env.model().string_model;
-                    EnvironmentFormValues {
-                        name: model.name.clone(),
-                        description: model.description.clone().unwrap_or_default(),
-                        selected_repos: model.github_repos.clone(),
-                        docker_image: model.base_image.to_string(),
-                        setup_commands: model.setup_commands.clone(),
-                    }
-                });
-
-                if let Some(initial_values) = env_data {
-                    self.environment_form.update(ctx, |form, ctx| {
-                        form.set_mode(
-                            EnvironmentFormInitArgs::Edit {
-                                env_id: *env_id,
-                                initial_values: Box::new(initial_values),
-                            },
-                            ctx,
-                        );
-                    });
-                }
-            }
-            EnvironmentsPage::Create => {
-                // Update form mode to Create
-                self.environment_form.update(ctx, |form, ctx| {
-                    form.set_mode(EnvironmentFormInitArgs::Create, ctx);
-                });
-            }
-            EnvironmentsPage::List => {
-                self.ensure_environment_mouse_states(ctx);
-            }
-        }
-
-        self.focus(ctx);
-        ctx.notify();
-    }
-
-    fn create_single_line_editor(
-        placeholder: &'static str,
-        ctx: &mut ViewContext<Self>,
-    ) -> ViewHandle<EditorView> {
-        let editor = ctx.add_typed_action_view(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let options = SingleLineEditorOptions {
-                text: TextOptions {
-                    font_size_override: Some(appearance.ui_font_size()),
-                    font_family_override: Some(appearance.ui_font_family()),
-                    text_colors_override: Some(editor_text_colors(appearance)),
-                    ..Default::default()
-                },
-                propagate_and_no_op_vertical_navigation_keys:
-                    PropagateAndNoOpNavigationKeys::Always,
-                ..Default::default()
-            };
-            let mut editor = EditorView::single_line(options, ctx);
-            editor.set_placeholder_text(placeholder, ctx);
-            editor
-        });
-        editor
-    }
-
-    fn update_search_editor_text_colors(&mut self, ctx: &mut ViewContext<Self>) {
-        let appearance = Appearance::as_ref(ctx);
-        let text_colors = editor_text_colors(appearance);
-        self.search_editor.update(ctx, |editor, ctx| {
-            editor.set_text_colors(text_colors, ctx);
-        });
-    }
-
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        ctx.subscribe_to_model(&Appearance::handle(ctx), |view, _, _, ctx| {
-            view.update_search_editor_text_colors(ctx);
-        });
-        // Subscribe to CloudModel to refresh when environments change.
-        // Per-object events are suppressed during the initial load at the source,
-        // so only runtime changes and InitialLoadCompleted arrive here.
-        ctx.subscribe_to_model(&CloudModel::handle(ctx), |view, _, event, ctx| {
-            match event {
-                // Events that can add/remove environments: refresh mouse states.
-                CloudModelEvent::ObjectCreated { .. }
-                | CloudModelEvent::ObjectDeleted { .. }
-                | CloudModelEvent::ObjectUntrashed { .. }
-                | CloudModelEvent::ObjectTrashed { .. }
-                | CloudModelEvent::InitialLoadCompleted => {
-                    view.ensure_environment_mouse_states(ctx);
-                }
-                // Events that can change environment content (name, config, etc.)
-                // don't need mouse state refresh, but the view should re-render.
-                CloudModelEvent::ObjectUpdated { .. }
-                | CloudModelEvent::ObjectMoved { .. }
-                | CloudModelEvent::ObjectPermissionsUpdated { .. }
-                | CloudModelEvent::ObjectSynced { .. } => {}
-                // Events that never affect environments — skip entirely.
-                CloudModelEvent::NotebookEditorChangedFromServer { .. }
-                | CloudModelEvent::ObjectForceExpanded { .. } => return,
-            }
-            ctx.notify();
-        });
-
-        // Subscribe to UpdateManager to show success toast when environment update completes
-        ctx.subscribe_to_model(&UpdateManager::handle(ctx), |view, _, event, ctx| {
-            view.handle_update_manager_event(event, ctx);
-        });
-
-        // Create search editor for list page
-        let search_editor = Self::create_single_line_editor("Search environments...", ctx);
-        ctx.subscribe_to_view(&search_editor, |me, _, event, ctx| match event {
-            crate::editor::Event::Edited(_) => {
-                me.search_query = me.search_editor.as_ref(ctx).buffer_text(ctx);
-                ctx.notify();
-            }
-            crate::editor::Event::Escape => {
-                me.search_query.clear();
-                me.search_editor.update(ctx, |editor, ctx| {
-                    editor.clear_buffer_and_reset_undo_stack(ctx);
-                });
-                ctx.notify();
-            }
-            crate::editor::Event::Navigate(NavigationKey::Tab) => {
-                ctx.focus(&me.new_env_button);
-            }
-            _ => {}
-        });
-
-        let new_env_button = ctx
-            .add_typed_action_view(|ctx| NewEnvironmentButtonView::new(search_editor.clone(), ctx));
-
-        let delete_confirmation_dialog =
-            ctx.add_typed_action_view(DeleteEnvironmentConfirmationDialog::new);
-        ctx.subscribe_to_view(&delete_confirmation_dialog, |me, _, event, ctx| {
-            me.handle_delete_confirmation_event(event, ctx);
-        });
-
-        let agent_assisted_environment_modal =
-            ctx.add_typed_action_view(AgentAssistedEnvironmentModal::new);
-        ctx.subscribe_to_view(
-            &agent_assisted_environment_modal,
-            |me, _, event, ctx| match event {
-                AgentAssistedEnvironmentModalEvent::Cancelled => {
-                    me.agent_assisted_environment_modal
-                        .update(ctx, |modal, ctx| {
-                            modal.hide(ctx);
-                        });
-                    ctx.emit(SettingsPageEvent::AgentAssistedEnvironmentModalToggled {
-                        is_open: false,
-                    });
-                    ctx.notify();
-                }
-                AgentAssistedEnvironmentModalEvent::Confirmed { repo_paths } => {
-                    me.agent_assisted_environment_modal
-                        .update(ctx, |modal, ctx| {
-                            modal.hide(ctx);
-                        });
-                    ctx.emit(SettingsPageEvent::AgentAssistedEnvironmentModalToggled {
-                        is_open: false,
-                    });
-
-                    let arg = CreateEnvironmentArg {
-                        repos: repo_paths.clone(),
-                    };
-
-                    let window_id = ctx.window_id();
-                    let primary_window_and_view = ctx
-                        .root_view_id(window_id)
-                        .map(|view_id| (window_id, view_id));
-
-                    if let Some((primary_window_id, root_view_id)) = primary_window_and_view {
-                        ctx.dispatch_action(
-                            primary_window_id,
-                            &[root_view_id],
-                            "root_view:create_environment_in_existing_window_and_run",
-                            &arg,
-                            log::Level::Info,
-                        );
-                    } else {
-                        ctx.dispatch_global_action("root_view:create_environment_and_run", arg);
-                    }
-
-                    ctx.notify();
-                }
-            },
-        );
-
-        let environment_setup_mode_selector =
-            ctx.add_typed_action_view(EnvironmentSetupModeSelector::new);
-        ctx.subscribe_to_view(&environment_setup_mode_selector, |me, _, event, ctx| {
-            me.handle_environment_setup_mode_selector_event(event, ctx);
-        });
-
-        // Create the environment form (starts in Create mode)
-        let environment_form = ctx.add_typed_action_view(|ctx| {
-            UpdateEnvironmentForm::new(EnvironmentFormInitArgs::Create, ctx)
-        });
-        ctx.subscribe_to_view(&environment_form, |me, _, event, ctx| {
-            me.handle_environment_form_event(event, ctx);
-        });
-
-        // Refetch GitHub repos when the app regains focus, in case the user
-        // just completed the OAuth flow in the browser.
-        ctx.subscribe_to_model(&WindowManager::handle(ctx), |me, _, evt, ctx| {
-            let windowing::StateEvent::ValueChanged { current, previous } = evt;
-            if previous.stage == ApplicationStage::Inactive
-                && current.stage == ApplicationStage::Active
-                && me
-                    .environment_form
-                    .as_ref(ctx)
-                    .github_dropdown_state()
-                    .auth_url
-                    .is_some()
-            {
-                me.environment_form.update(ctx, |form, ctx| {
-                    form.fetch_github_repos(ctx);
-                });
-            }
-        });
-
-        // Initialize mouse states for existing environments
-        let mut copy_button_mouse_states = HashMap::new();
-        let mut edit_button_mouse_states = HashMap::new();
-        let mut share_button_mouse_states = HashMap::new();
-        let mut card_hover_mouse_states = HashMap::new();
-        let mut view_runs_link_mouse_states = HashMap::new();
-        for env in CloudAmbientAgentEnvironment::get_all(ctx) {
-            copy_button_mouse_states
-                .entry(env.id)
-                .or_insert_with(MouseStateHandle::default);
-            edit_button_mouse_states
-                .entry(env.id)
-                .or_insert_with(MouseStateHandle::default);
-            share_button_mouse_states
-                .entry(env.id)
-                .or_insert_with(MouseStateHandle::default);
-            card_hover_mouse_states
-                .entry(env.id)
-                .or_insert_with(MouseStateHandle::default);
-            view_runs_link_mouse_states
-                .entry(env.id)
-                .or_insert_with(MouseStateHandle::default);
-        }
-
-        // Create pane configuration for BackingView support
-        let pane_configuration =
-            ctx.add_model(|_| crate::pane_group::pane::PaneConfiguration::new("Environments"));
-
-        let mut view = Self {
-            page: PageType::new_monolith(
-                EnvironmentsPageWidget,
-                None, // Title rendered conditionally in widget
-                true, /* is_dual_scrollable */
-            ),
-            current_page: EnvironmentsPage::default(),
-            copy_button_mouse_states,
-            edit_button_mouse_states,
-            share_button_mouse_states,
-            card_hover_mouse_states,
-            view_runs_link_mouse_states,
-            copy_feedback_times: HashMap::new(),
-            search_query: String::new(),
-            search_editor,
-            empty_state_github_repos_button_mouse_state: MouseStateHandle::default(),
-            empty_state_local_repos_button_mouse_state: MouseStateHandle::default(),
-            pending_save_env_id: None,
-            pending_create_client_id: None,
-            pending_delete_env_id: None,
-            pending_share_server_id: None,
-            delete_confirmation_dialog,
-            agent_assisted_environment_modal,
-            new_env_button,
-            environment_setup_mode_selector,
-            is_environment_setup_mode_selector_open: false,
-            environment_form,
-            pane_configuration,
-            focus_handle: None,
-        };
-
-        view.ensure_environment_mouse_states(ctx);
-        view.update_search_editor_text_colors(ctx);
-
-        view
-    }
-
-    /// Returns the current page/mode of the environments view.
-    pub fn current_page(&self) -> &EnvironmentsPage {
-        &self.current_page
-    }
-
-    /// Returns the environment setup mode selector view handle for tab-level rendering.
-    pub fn environment_setup_mode_selector_handle(
-        &self,
-    ) -> Option<&ViewHandle<EnvironmentSetupModeSelector>> {
-        self.is_environment_setup_mode_selector_open
-            .then_some(&self.environment_setup_mode_selector)
-    }
-
-    /// Returns the agent-assisted environment modal view handle for tab-level rendering.
-    pub fn agent_assisted_environment_modal_handle(
-        &self,
-        app: &AppContext,
-    ) -> Option<&ViewHandle<AgentAssistedEnvironmentModal>> {
-        self.agent_assisted_environment_modal
-            .as_ref(app)
-            .is_visible()
-            .then_some(&self.agent_assisted_environment_modal)
-    }
-
-    /// Returns the pane configuration for BackingView support.
-    pub fn pane_configuration(&self) -> ModelHandle<crate::pane_group::pane::PaneConfiguration> {
-        self.pane_configuration.clone()
-    }
-    pub fn set_github_auth_redirect_target(
-        &mut self,
-        target: GithubAuthRedirectTarget,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.environment_form
-            .update(ctx, |form, _| form.set_github_auth_redirect_target(target));
-    }
-
-    /// Focus the environments page view.
-    pub fn focus(&mut self, ctx: &mut ViewContext<Self>) {
-        // Focus the search editor when on the list page, otherwise focus the form
-        match &self.current_page {
-            EnvironmentsPage::List => {
-                ctx.focus(&self.search_editor);
-            }
-            EnvironmentsPage::Create | EnvironmentsPage::Edit { .. } => {
-                ctx.focus(&self.environment_form);
-            }
-        }
-    }
-
-    fn show_error_toast(&self, message: String, ctx: &mut ViewContext<Self>) {
-        let window_id = ctx.window_id();
-        ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
-            toast_stack.add_ephemeral_toast(DismissibleToast::error(message), window_id, ctx);
-        });
-    }
-
-    fn show_success_toast(&self, message: String, ctx: &mut ViewContext<Self>) {
-        let window_id = ctx.window_id();
-        ToastStack::handle(ctx).update(ctx, |toast_stack, ctx| {
-            toast_stack.add_ephemeral_toast(DismissibleToast::success(message), window_id, ctx);
-        });
-    }
-
-    fn handle_update_manager_event(
-        &mut self,
-        event: &UpdateManagerEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        let UpdateManagerEvent::ObjectOperationComplete { result } = event else {
-            return;
-        };
-
-        // Check if this is a successful update for our pending save
-        if let (ObjectOperation::Update, OperationSuccessType::Success) =
-            (&result.operation, &result.success_type)
-        {
-            let Some(server_id) = &result.server_id else {
-                return;
-            };
-
-            let should_handle = self
-                .pending_save_env_id
-                .is_some_and(|pending_env_id| server_id.uid() == pending_env_id.uid());
-
-            if should_handle {
-                self.pending_save_env_id = None;
-                self.show_success_toast("Successfully updated environment".to_string(), ctx);
-
-                // No need to force a global cloud-object refresh here: on update success the
-                // sync pipeline updates this environment's `revision_ts` (used for "Last edited")
-                // in-memory via `CloudModel::set_latest_revision_and_editor`.
-                ctx.notify();
-            }
-        }
-
-        // Check if this is a successful create for our pending create
-        if let (ObjectOperation::Create { .. }, OperationSuccessType::Success) =
-            (&result.operation, &result.success_type)
-        {
-            if let Some(pending_client_id) = self.pending_create_client_id.take() {
-                // Check if the client_id in the result matches our pending client_id
-                if let Some(result_client_id) = &result.client_id {
-                    if *result_client_id == pending_client_id {
-                        self.show_success_toast(
-                            "Successfully created environment".to_string(),
-                            ctx,
-                        );
-                    }
-                }
-            }
-        }
-
-        // Check if this is a successful delete for our pending delete
-        if let (ObjectOperation::Delete { .. }, OperationSuccessType::Success) =
-            (&result.operation, &result.success_type)
-        {
-            if let Some(pending_env_id) = self.pending_delete_env_id.take() {
-                // Check if the server_id matches our pending environment
-                if let Some(server_id) = &result.server_id {
-                    if server_id.uid() == pending_env_id.uid() {
-                        self.show_success_toast(
-                            "Environment deleted successfully".to_string(),
-                            ctx,
-                        );
-                    }
-                }
-            }
-        }
-
-        // Check if this is a completion event for our pending share (personal -> team)
-        if matches!(&result.operation, ObjectOperation::MoveToDrive) {
-            let (Some(pending_server_id), Some(result_server_id)) =
-                (self.pending_share_server_id, result.server_id)
-            else {
-                return;
-            };
-
-            if pending_server_id != result_server_id {
-                return;
-            }
-
-            self.pending_share_server_id = None;
-
-            if matches!(result.success_type, OperationSuccessType::Success) {
-                self.show_success_toast("Successfully shared environment".to_string(), ctx);
-            } else {
-                self.show_error_toast("Failed to share environment with team".to_string(), ctx);
-            }
-
-            ctx.notify();
-        }
-    }
-
-    fn delete_environment(&mut self, env_id: SyncId, ctx: &mut ViewContext<Self>) {
-        // Track the pending delete to show success toast when complete
-        self.pending_delete_env_id = Some(env_id);
-
-        // Delete via UpdateManager
-        UpdateManager::handle(ctx).update(ctx, |update_manager, ctx| {
-            update_manager.delete_object_by_user(
-                CloudObjectTypeAndId::GenericStringObject {
-                    object_type: GenericStringObjectFormat::Json(JsonObjectType::CloudEnvironment),
-                    id: env_id,
-                },
-                ctx,
-            );
-        });
-
-        // Navigate back to list
-        self.update_page(EnvironmentsPage::List, ctx);
-    }
-
-    fn handle_delete_confirmation_event(
-        &mut self,
-        event: &DeleteEnvironmentConfirmationDialogEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            DeleteEnvironmentConfirmationDialogEvent::Cancel => {
-                self.delete_confirmation_dialog.update(ctx, |dialog, ctx| {
-                    dialog.hide(ctx);
-                });
-                ctx.notify();
-            }
-            DeleteEnvironmentConfirmationDialogEvent::Confirm(env_id) => {
-                let env_id = *env_id;
-                self.delete_confirmation_dialog.update(ctx, |dialog, ctx| {
-                    dialog.hide(ctx);
-                });
-                self.delete_environment(env_id, ctx);
-            }
-        }
-    }
-
-    fn handle_environment_form_event(
-        &mut self,
-        event: &UpdateEnvironmentFormEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            UpdateEnvironmentFormEvent::Created {
-                environment,
-                share_with_team,
-            } => {
-                // Generate a client ID for tracking the create operation
-                let client_id = ClientId::default();
-                self.pending_create_client_id = Some(client_id);
-
-                let owner = if *share_with_team {
-                    cloud_environments::owner_for_new_environment(ctx)
-                } else {
-                    cloud_environments::owner_for_new_personal_environment(ctx)
-                };
-
-                let Some(owner) = owner else {
-                    self.show_error_toast(
-                        "Unable to create environment: not logged in.".to_string(),
-                        ctx,
-                    );
-                    return;
-                };
-
-                // Create via UpdateManager
-                UpdateManager::handle(ctx).update(ctx, |update_manager, ctx| {
-                    update_manager.create_ambient_agent_environment(
-                        environment.clone(),
-                        client_id,
-                        owner,
-                        ctx,
-                    );
-                });
-
-                // Navigate back to list
-                self.update_page(EnvironmentsPage::List, ctx);
-            }
-            UpdateEnvironmentFormEvent::Updated {
-                env_id,
-                environment,
-            } => {
-                // Verify the environment still exists
-                let Some(existing_env) = CloudAmbientAgentEnvironment::get_by_id(env_id, ctx)
-                else {
-                    self.show_error_toast(
-                        "Unable to save: environment no longer exists.".to_string(),
-                        ctx,
-                    );
-                    return;
-                };
-
-                // Get the revision from the existing environment
-                let revision = existing_env.metadata.revision.clone();
-
-                // Track the pending save to show success toast when complete
-                self.pending_save_env_id = Some(*env_id);
-
-                // Update via UpdateManager
-                UpdateManager::handle(ctx).update(ctx, |update_manager, ctx| {
-                    update_manager.update_ambient_agent_environment(
-                        environment.clone(),
-                        *env_id,
-                        revision,
-                        ctx,
-                    );
-                });
-
-                // Navigate back to list
-                self.update_page(EnvironmentsPage::List, ctx);
-            }
-            UpdateEnvironmentFormEvent::DeleteRequested { env_id } => {
-                // Get the environment name for the confirmation dialog
-                if let Some(env) = CloudAmbientAgentEnvironment::get_by_id(env_id, ctx) {
-                    let env_name = env.model().string_model.name.clone();
-                    self.delete_confirmation_dialog.update(ctx, |dialog, ctx| {
-                        dialog.show(*env_id, env_name, ctx);
-                    });
-                    ctx.notify();
-                }
-            }
-            UpdateEnvironmentFormEvent::Cancelled => {
-                // Navigate back to list
-                self.update_page(EnvironmentsPage::List, ctx);
-            }
-        }
-    }
-
-    fn open_agent_assisted_environment_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        self.agent_assisted_environment_modal
-            .update(ctx, |modal, ctx| {
-                modal.show(ctx);
-            });
-        ctx.emit(SettingsPageEvent::AgentAssistedEnvironmentModalToggled { is_open: true });
-        ctx.notify();
-    }
-
-    fn open_environment_setup_mode_selector(&mut self, ctx: &mut ViewContext<Self>) {
-        if self.is_environment_setup_mode_selector_open {
-            return;
-        }
-
-        self.is_environment_setup_mode_selector_open = true;
-        ctx.focus(&self.environment_setup_mode_selector);
-        ctx.emit(SettingsPageEvent::EnvironmentSetupModeSelectorToggled { is_open: true });
-        ctx.notify();
-    }
-
-    fn close_environment_setup_mode_selector(&mut self, ctx: &mut ViewContext<Self>) {
-        if !self.is_environment_setup_mode_selector_open {
-            return;
-        }
-
-        self.is_environment_setup_mode_selector_open = false;
-        ctx.emit(SettingsPageEvent::EnvironmentSetupModeSelectorToggled { is_open: false });
-        ctx.notify();
-    }
-
-    fn handle_environment_setup_mode_selector_event(
-        &mut self,
-        event: &EnvironmentSetupModeSelectorEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            EnvironmentSetupModeSelectorEvent::Selected(mode) => {
-                self.close_environment_setup_mode_selector(ctx);
-
-                match mode {
-                    EnvironmentSetupMode::RemoteGitHub => {
-                        self.update_page(EnvironmentsPage::Create, ctx);
-                    }
-                    EnvironmentSetupMode::LocalRepositories => {
-                        self.open_agent_assisted_environment_modal(ctx);
-                    }
-                }
-            }
-            EnvironmentSetupModeSelectorEvent::Dismissed => {
-                self.close_environment_setup_mode_selector(ctx);
-                self.focus(ctx);
-            }
-        }
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum EnvironmentsPageAction {
-    OpenEditPage(SyncId),
-    RetryFetchGithubRepos,
-    OpenUrl(String),
-    StartGithubAuth,
-    CopyEnvId(SyncId, String),
-    OpenCreatePage,
-    OpenAgentAssistedCreateModal,
-    OpenEnvironmentSetupModeSelector,
-    ShareToTeam(SyncId),
-}
-impl Entity for EnvironmentsPageView {
-    type Event = SettingsPageEvent;
-}
-
-impl TypedActionView for EnvironmentsPageView {
-    type Action = EnvironmentsPageAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            EnvironmentsPageAction::OpenEditPage(env_id) => {
-                self.update_page(EnvironmentsPage::Edit { env_id: *env_id }, ctx);
-            }
-            EnvironmentsPageAction::RetryFetchGithubRepos => {
-                self.environment_form.update(ctx, |form, ctx| {
-                    form.fetch_github_repos(ctx);
-                });
-            }
-            EnvironmentsPageAction::OpenUrl(url) => {
-                ctx.open_url(url);
-            }
-            EnvironmentsPageAction::StartGithubAuth => {
-                self.environment_form.update(ctx, |form, ctx| {
-                    form.start_github_auth(ctx);
-                });
-            }
-            EnvironmentsPageAction::CopyEnvId(sync_id, env_id_string) => {
-                ctx.clipboard()
-                    .write(galaxyui::clipboard::ClipboardContent::plain_text(
-                        env_id_string.clone(),
-                    ));
-                // Track when this was copied for feedback
-                self.copy_feedback_times.insert(*sync_id, Instant::now());
-                // Schedule a re-render after the feedback duration to clear the checkmark
-                let duration = COPY_FEEDBACK_DURATION;
-                ctx.spawn(
-                    async move {
-                        galaxyui::r#async::Timer::after(duration).await;
-                    },
-                    |me, _, ctx| {
-                        ctx.notify();
-                        // Clean up old entries
-                        me.copy_feedback_times
-                            .retain(|_, time| time.elapsed() < COPY_FEEDBACK_DURATION);
-                    },
-                );
-                ctx.notify();
-            }
-            EnvironmentsPageAction::OpenCreatePage => {
-                self.update_page(EnvironmentsPage::Create, ctx);
-            }
-            EnvironmentsPageAction::OpenAgentAssistedCreateModal => {
-                self.open_agent_assisted_environment_modal(ctx);
-            }
-            EnvironmentsPageAction::OpenEnvironmentSetupModeSelector => {
-                self.open_environment_setup_mode_selector(ctx);
-            }
-            EnvironmentsPageAction::ShareToTeam(env_id) => {
-                let Some(team_uid) = UserWorkspaces::as_ref(ctx).current_team_uid() else {
-                    self.show_error_toast(
-                        "Unable to share environment: you are not currently on a team.".to_string(),
-                        ctx,
-                    );
-                    return;
-                };
-
-                let SyncId::ServerId(server_id) = *env_id else {
-                    self.show_error_toast(
-                        "Unable to share environment: environment is not yet synced.".to_string(),
-                        ctx,
-                    );
-                    return;
-                };
-
-                self.pending_share_server_id = Some(server_id);
-
-                UpdateManager::handle(ctx).update(ctx, |update_manager, ctx| {
-                    update_manager.move_object_to_location(
-                        CloudObjectTypeAndId::GenericStringObject {
-                            object_type: GenericStringObjectFormat::Json(
-                                JsonObjectType::CloudEnvironment,
-                            ),
-                            id: *env_id,
-                        },
-                        CloudObjectLocation::Space(Space::Team { team_uid }),
-                        ctx,
-                    );
-                });
-
-                ctx.notify();
-            }
-        }
-    }
-
-    fn action_accessibility_contents(
-        &mut self,
-        _action: &Self::Action,
-        _ctx: &mut ViewContext<Self>,
-    ) -> galaxyui::accessibility::ActionAccessibilityContent {
-        galaxyui::accessibility::ActionAccessibilityContent::default()
-    }
-}
-
-impl View for EnvironmentsPageView {
-    fn ui_name() -> &'static str {
-        "EnvironmentsPage"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        self.page.render(self, app)
-    }
-
-    fn on_focus(&mut self, focus_ctx: &FocusContext, ctx: &mut ViewContext<Self>) {
-        if focus_ctx.is_self_focused() {
-            self.focus(ctx);
-        }
-    }
-}
-
-struct EnvironmentsPageWidget;
-
-struct EnvironmentCardRenderState<'a> {
-    copy_button_mouse_states: &'a HashMap<SyncId, MouseStateHandle>,
-    edit_button_mouse_states: &'a HashMap<SyncId, MouseStateHandle>,
-    share_button_mouse_states: &'a HashMap<SyncId, MouseStateHandle>,
-    card_hover_mouse_states: &'a HashMap<SyncId, MouseStateHandle>,
-    view_runs_link_mouse_states: &'a HashMap<SyncId, MouseStateHandle>,
-    copy_feedback_times: &'a HashMap<SyncId, Instant>,
-}
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-enum EnvironmentListScope {
-    Personal,
-    Team,
-}
-
-impl SettingsWidget for EnvironmentsPageWidget {
-    type View = EnvironmentsPageView;
-
-    fn search_terms(&self) -> &str {
-        "environments environment ambient agents github warp assisted manual configuration"
-    }
-
-    fn render(
-        &self,
-        view: &Self::View,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        match &view.current_page {
-            EnvironmentsPage::List => Self::render_list_page(view, appearance, app),
-            EnvironmentsPage::Edit { .. } => Self::render_edit_page(view),
-            EnvironmentsPage::Create => Self::render_create_page(view),
-        }
-    }
-}
-
-impl EnvironmentsPageWidget {
-    fn render_list_page(
-        view: &EnvironmentsPageView,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let mut page = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_main_axis_size(MainAxisSize::Min)
-            .with_spacing(SECTION_SPACING);
-
-        // Page title + description
-        let title = Text::new(
-            PAGE_TITLE_TEXT,
-            appearance.ui_font_family(),
-            appearance.ui_font_size() * 1.5,
-        )
-        .with_style(Properties::default().weight(Weight::Bold))
-        .with_color(theme.active_ui_text_color().into())
-        .finish();
-
-        let description = appearance
-            .ui_builder()
-            .paragraph(PAGE_DESCRIPTION_TEXT)
-            .with_style(UiComponentStyles {
-                font_color: Some(appearance.theme().nonactive_ui_text_color().into()),
-                font_size: Some(CONTENT_FONT_SIZE),
-                ..Default::default()
-            })
-            .build()
-            .finish();
-
-        let header = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .with_spacing(TITLE_DESCRIPTION_SPACING)
-            .with_child(title)
-            .with_child(description)
-            .finish();
-
-        page.add_child(header);
-
-        // Get environments from CloudModel.
-        //
-        // We keep the owner alongside the display data so we can partition the list into Personal
-        // vs Team scoped sections.
-        let mut environments: Vec<(Owner, EnvironmentDisplayData)> =
-            CloudAmbientAgentEnvironment::get_all(app)
-                .iter()
-                .map(|env| {
-                    (
-                        env.permissions.owner,
-                        EnvironmentDisplayData::from_cloud_environment(env),
-                    )
-                })
-                .collect();
-
-        let has_any_environments = !environments.is_empty();
-
-        if !view.search_query.trim().is_empty() {
-            environments.retain(|(_, env)| env.matches_search_query(&view.search_query));
-        }
-
-        if !has_any_environments {
-            page.add_child(Self::render_empty_state(view, appearance, app));
-        } else {
-            // Toolbar row with search (left) and New environment button (right)
-            let toolbar_row = Self::render_toolbar_row(view, appearance);
-            page.add_child(toolbar_row);
-
-            if environments.is_empty() {
-                page.add_child(Self::render_no_matches_state(appearance));
-            } else {
-                let mut personal_environments = Vec::new();
-                let mut team_environments = Vec::new();
-
-                for (owner, env) in environments {
-                    match owner {
-                        Owner::User { .. } => personal_environments.push(env),
-                        Owner::Team { .. } => team_environments.push(env),
-                    }
-                }
-
-                let sort_by_last_edited_desc = |envs: &mut Vec<EnvironmentDisplayData>| {
-                    envs.sort_by(|a, b| match (a.last_edited_ts, b.last_edited_ts) {
-                        (Some(a_ts), Some(b_ts)) => b_ts.cmp(&a_ts),
-                        (Some(_), None) => std::cmp::Ordering::Less,
-                        (None, Some(_)) => std::cmp::Ordering::Greater,
-                        (None, None) => std::cmp::Ordering::Equal,
-                    });
-                };
-
-                sort_by_last_edited_desc(&mut personal_environments);
-                sort_by_last_edited_desc(&mut team_environments);
-
-                let is_user_on_team = UserWorkspaces::as_ref(app).current_team_uid().is_some();
-
-                let card_render_state = EnvironmentCardRenderState {
-                    copy_button_mouse_states: &view.copy_button_mouse_states,
-                    edit_button_mouse_states: &view.edit_button_mouse_states,
-                    share_button_mouse_states: &view.share_button_mouse_states,
-                    card_hover_mouse_states: &view.card_hover_mouse_states,
-                    view_runs_link_mouse_states: &view.view_runs_link_mouse_states,
-                    copy_feedback_times: &view.copy_feedback_times,
-                };
-
-                if !personal_environments.is_empty() && !team_environments.is_empty() {
-                    let sections = Flex::column()
-                        .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-                        .with_spacing(SECTION_SPACING)
-                        .with_child(Self::render_scoped_section(
-                            &personal_environments,
-                            &card_render_state,
-                            appearance,
-                            app,
-                            EnvironmentListScope::Personal,
-                            is_user_on_team,
-                        ))
-                        .with_child(Self::render_section_divider(appearance))
-                        .with_child(Self::render_scoped_section(
-                            &team_environments,
-                            &card_render_state,
-                            appearance,
-                            app,
-                            EnvironmentListScope::Team,
-                            is_user_on_team,
-                        ))
-                        .finish();
-                    page.add_child(sections);
-                } else if !personal_environments.is_empty() {
-                    page.add_child(Self::render_scoped_section(
-                        &personal_environments,
-                        &card_render_state,
-                        appearance,
-                        app,
-                        EnvironmentListScope::Personal,
-                        is_user_on_team,
-                    ));
-                } else {
-                    page.add_child(Self::render_scoped_section(
-                        &team_environments,
-                        &card_render_state,
-                        appearance,
-                        app,
-                        EnvironmentListScope::Team,
-                        is_user_on_team,
-                    ));
-                }
-            }
-        }
-
-        page.finish()
-    }
-
-    fn render_toolbar_row(
-        view: &EnvironmentsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        // Main toolbar row: search (left), button (right)
-        //
-        // Make the search bar flexible so it can shrink when the window gets narrow.
-        // Without this, the search bar is laid out with an unbounded width constraint in a row,
-        // so it happily takes its max width and can overflow/overlap on small screens.
-        Flex::row()
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_main_axis_alignment(MainAxisAlignment::SpaceBetween)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_spacing(CARD_SPACING)
-            .with_child(Shrinkable::new(1., Self::render_search_bar(view, appearance)).finish())
-            .with_child(ChildView::new(&view.new_env_button).finish())
-            .finish()
-    }
-
-    fn render_search_bar(view: &EnvironmentsPageView, appearance: &Appearance) -> Box<dyn Element> {
-        let theme = appearance.theme();
-
-        // Match the "New environment" button height, which is roughly:
-        // ui_font_size + (2 * vertical_padding)
-        let toolbar_height = appearance.ui_font_size() + 12.;
-        let icon_size = appearance.ui_font_size();
-
-        let search_icon = ConstrainedBox::new(
-            Icon::Search
-                .to_galaxyui_icon(blended_colors::text_sub(theme, theme.surface_2()).into())
-                .finish(),
-        )
-        .with_width(icon_size)
-        .with_height(icon_size)
-        .finish();
-
-        let editor =
-            Container::new(Clipped::new(ChildView::new(&view.search_editor).finish()).finish())
-                .finish();
-
-        let input_contents = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_spacing(8.)
-            .with_child(search_icon)
-            .with_child(Expanded::new(1., editor).finish())
-            .finish();
-
-        // Use a fixed height + vertical centering so the icon and text stay aligned.
-        let centered_contents = Flex::column()
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_main_axis_alignment(MainAxisAlignment::Center)
-            .with_child(input_contents)
-            .finish();
-
-        ConstrainedBox::new(
-            Container::new(
-                ConstrainedBox::new(centered_contents)
-                    .with_height(toolbar_height)
-                    .finish(),
-            )
-            .with_horizontal_padding(12.)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-            .with_border(Border::all(CARD_BORDER_WIDTH).with_border_fill(theme.outline()))
-            .with_background(theme.surface_2())
-            .finish(),
-        )
-        .with_max_width(TOOLBAR_SEARCH_MAX_WIDTH)
-        .finish()
-    }
-
-    fn render_no_matches_state(appearance: &Appearance) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        Container::new(
-            Text::new(
-                "No environments match your search.",
-                appearance.ui_font_family(),
-                appearance.ui_font_size(),
-            )
-            .with_color(theme.nonactive_ui_text_color().into())
-            .finish(),
-        )
-        .with_uniform_padding(12.)
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-        .with_border(Border::all(CARD_BORDER_WIDTH).with_border_fill(theme.outline()))
-        .with_background(theme.surface_2())
-        .finish()
-    }
-
-    fn render_scoped_section(
-        environments: &[EnvironmentDisplayData],
-        card_render_state: &EnvironmentCardRenderState<'_>,
-        appearance: &Appearance,
-        app: &AppContext,
-        list_scope: EnvironmentListScope,
-        is_user_on_team: bool,
-    ) -> Box<dyn Element> {
-        // Keep header-to-card spacing smaller than the overall page/section spacing.
-        const HEADER_TO_LIST_SPACING: f32 = 8.;
-
-        let header = match list_scope {
-            EnvironmentListScope::Personal => Self::render_overline_header("Personal", appearance),
-            EnvironmentListScope::Team => {
-                let shared_by_text = UserWorkspaces::as_ref(app)
-                    .current_team()
-                    .map(|team| format!("Shared by Warp and {}", team.name))
-                    .unwrap_or_else(|| "Shared by Warp and your team".to_string());
-                Self::render_overline_header(&shared_by_text, appearance)
-            }
-        };
-
-        Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_spacing(HEADER_TO_LIST_SPACING)
-            .with_child(header)
-            .with_child(Self::render_environments_list(
-                environments,
-                card_render_state,
-                appearance,
-                app,
-                list_scope,
-                is_user_on_team,
-            ))
-            .finish()
-    }
-
-    fn render_overline_header(text: &str, appearance: &Appearance) -> Box<dyn Element> {
-        Text::new(
-            text.to_uppercase(),
-            appearance.overline_font_family(),
-            appearance.overline_font_size(),
-        )
-        .with_color(blended_colors::text_sub(
-            appearance.theme(),
-            appearance.theme().surface_2(),
-        ))
-        .finish()
-    }
-
-    fn render_section_divider(appearance: &Appearance) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        Container::new(
-            Container::new(Empty::new().finish())
-                .with_border(Border::bottom(1.).with_border_fill(theme.outline()))
-                .finish(),
-        )
-        .finish()
-    }
-
-    fn render_edit_page(view: &EnvironmentsPageView) -> Box<dyn Element> {
-        // Wrap the form in a Stack to overlay the confirmation dialog
-        let mut stack = Stack::new();
-        stack.add_child(ChildView::new(&view.environment_form).finish());
-        stack.add_positioned_overlay_child(
-            ChildView::new(&view.delete_confirmation_dialog).finish(),
-            OffsetPositioning::offset_from_parent(
-                vec2f(0., 0.),
-                ParentOffsetBounds::WindowByPosition,
-                ParentAnchor::Center,
-                ChildAnchor::Center,
-            ),
-        );
-        Clipped::new(stack.finish()).finish()
-    }
-
-    fn render_create_page(view: &EnvironmentsPageView) -> Box<dyn Element> {
-        Clipped::new(ChildView::new(&view.environment_form).finish()).finish()
-    }
-
-    fn render_empty_state(
-        view: &EnvironmentsPageView,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let icon_size = appearance.ui_font_size() * 1.3;
-
-        let dropdown_state = view.environment_form.as_ref(app).github_dropdown_state();
-
-        let github_button_action = if dropdown_state.is_loading {
-            None
-        } else if dropdown_state.load_error_message.is_some() {
-            Some(EnvironmentsPageAction::RetryFetchGithubRepos)
-        } else if dropdown_state.auth_url.is_some() {
-            Some(EnvironmentsPageAction::StartGithubAuth)
-        } else {
-            Some(EnvironmentsPageAction::OpenCreatePage)
-        };
-
-        let (github_button_label, github_button_enabled) = if dropdown_state.is_loading {
-            ("Loading...", false)
-        } else if dropdown_state.load_error_message.is_some() {
-            ("Retry", true)
-        } else if dropdown_state.auth_url.is_some() {
-            ("Authorize", true)
-        } else {
-            ("Get started", true)
-        };
-
-        let github_button = Self::render_empty_state_button(
-            appearance,
-            github_button_label,
-            ButtonVariant::Accent,
-            view.empty_state_github_repos_button_mouse_state.clone(),
-            github_button_enabled,
-            github_button_action.clone(),
-        );
-        let github_button_compact = Self::render_empty_state_button(
-            appearance,
-            github_button_label,
-            ButtonVariant::Accent,
-            view.empty_state_github_repos_button_mouse_state.clone(),
-            github_button_enabled,
-            github_button_action,
-        );
-
-        let local_repos_button = Self::render_empty_state_button(
-            appearance,
-            "Launch agent",
-            ButtonVariant::Secondary,
-            view.empty_state_local_repos_button_mouse_state.clone(),
-            true,
-            Some(EnvironmentsPageAction::OpenAgentAssistedCreateModal),
-        );
-        let local_repos_button_compact = Self::render_empty_state_button(
-            appearance,
-            "Launch agent",
-            ButtonVariant::Secondary,
-            view.empty_state_local_repos_button_mouse_state.clone(),
-            true,
-            Some(EnvironmentsPageAction::OpenAgentAssistedCreateModal),
-        );
-
-        let github_row = Self::render_empty_state_row(
-            appearance,
-            EmptyStateRowConfig {
-                icon: Icon::Github,
-                title: "Quick setup",
-                badge: Some("Suggested"),
-                subtitle:
-                    "Select the GitHub repositories you’d like to work with and we’ll suggest a base image and config",
-                action_button: github_button,
-                compact_action_button: github_button_compact,
-                icon_size,
-            },
-        );
-
-        let local_repos_row = Self::render_empty_state_row(
-            appearance,
-            EmptyStateRowConfig {
-                icon: Icon::Terminal,
-                title: "Use the agent",
-                badge: None,
-                subtitle:
-                    "Choose a locally set up project and we’ll help you set up an environment based on it",
-                action_button: local_repos_button,
-                compact_action_button: local_repos_button_compact,
-                icon_size,
-            },
-        );
-
-        let rows = ConstrainedBox::new(
-            Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-                .with_spacing(8.)
-                .with_child(github_row)
-                .with_child(local_repos_row)
-                .finish(),
-        )
-        .with_max_width(DROPDOWN_MAX_WIDTH * EMPTY_STATE_MAX_WIDTH_RATIO)
-        .finish();
-
-        let header = Text::new(
-            "You haven’t set up any environments yet.",
-            appearance.ui_font_family(),
-            appearance.ui_font_size() * 1.1,
-        )
-        .with_style(Properties::default().weight(Weight::Semibold))
-        .with_color(theme.active_ui_text_color().into())
-        .finish();
-
-        let subheader = Text::new(
-            "Choose how you’d like to set up your environment:",
-            appearance.ui_font_family(),
-            appearance.ui_font_size() * 0.95,
-        )
-        .with_color(theme.nonactive_ui_text_color().into())
-        .soft_wrap(true)
-        .finish();
-
-        let constrained_subheader = ConstrainedBox::new(subheader)
-            .with_max_width(DROPDOWN_MAX_WIDTH * EMPTY_STATE_MAX_WIDTH_RATIO)
-            .finish();
-
-        let content = Flex::column()
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_main_axis_alignment(MainAxisAlignment::Center)
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_spacing(4.)
-            .with_child(header)
-            .with_child(constrained_subheader)
-            .with_child(Container::new(rows).with_margin_top(8.).finish())
-            .finish();
-
-        ConstrainedBox::new(
-            Container::new(content)
-                .with_uniform_padding(24.)
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_border(Border::all(CARD_BORDER_WIDTH).with_border_fill(theme.outline()))
-                .with_background(theme.surface_2())
-                .finish(),
-        )
-        .with_height(EMPTY_STATE_MIN_HEIGHT)
-        .finish()
-    }
-
-    fn render_empty_state_row(
-        appearance: &Appearance,
-        config: EmptyStateRowConfig,
-    ) -> Box<dyn Element> {
-        let EmptyStateRowConfig {
-            icon,
-            title,
-            badge,
-            subtitle,
-            action_button,
-            compact_action_button,
-            icon_size,
-        } = config;
-        let theme = appearance.theme();
-        let build_icon = || {
-            Container::new(
-                ConstrainedBox::new(icon.to_galaxyui_icon(theme.active_ui_text_color()).finish())
-                    .with_width(icon_size)
-                    .with_height(icon_size)
-                    .finish(),
-            )
-            .with_uniform_padding(8.)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-            .with_background(theme.surface_3())
-            .finish()
-        };
-
-        let build_text_column = || {
-            let mut title_row = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_spacing(6.)
-                .with_child(
-                    Text::new(
-                        title,
-                        appearance.ui_font_family(),
-                        appearance.ui_font_size(),
-                    )
-                    .with_style(Properties::default().weight(Weight::Semibold))
-                    .with_color(theme.active_ui_text_color().into())
-                    .finish(),
-                );
-
-            if let Some(badge) = badge {
-                let badge = Container::new(
-                    Text::new(
-                        badge,
-                        appearance.ui_font_family(),
-                        appearance.ui_font_size() * 0.85,
-                    )
-                    .with_color(theme.nonactive_ui_text_color().into())
-                    .finish(),
-                )
-                .with_horizontal_padding(6.)
-                .with_vertical_padding(2.)
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(10.)))
-                .with_background(theme.surface_3())
-                .finish();
-                title_row.add_child(badge);
-            }
-
-            Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                .with_spacing(2.)
-                .with_child(title_row.finish())
-                .with_child(
-                    Text::new(
-                        subtitle,
-                        appearance.ui_font_family(),
-                        appearance.ui_font_size() * 0.9,
-                    )
-                    .with_color(theme.nonactive_ui_text_color().into())
-                    .soft_wrap(true)
-                    .finish(),
-                )
-                .finish()
-        };
-
-        let row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_main_axis_alignment(MainAxisAlignment::Start)
-            .with_main_axis_size(MainAxisSize::Max)
-            .with_spacing(12.)
-            .with_child(build_icon())
-            .with_child(Expanded::new(1., build_text_column()).finish())
-            .with_child(action_button)
-            .finish();
-
-        let horizontal = Container::new(row)
-            .with_uniform_padding(12.)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-            .with_border(Border::all(CARD_BORDER_WIDTH).with_border_fill(theme.outline()))
-            .with_background(theme.surface_3())
-            .finish();
-
-        let compact_row = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_spacing(8.)
-            .with_child(Align::new(build_icon()).finish())
-            .with_child(build_text_column())
-            .with_child(Align::new(compact_action_button).finish())
-            .finish();
-
-        let vertical = Container::new(compact_row)
-            .with_uniform_padding(12.)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-            .with_border(Border::all(CARD_BORDER_WIDTH).with_border_fill(theme.outline()))
-            .with_background(theme.surface_3())
-            .finish();
-
-        SizeConstraintSwitch::new(
-            horizontal,
-            vec![(
-                SizeConstraintCondition::WidthLessThan(EMPTY_STATE_ROW_VERTICAL_LAYOUT_THRESHOLD),
-                vertical,
-            )],
-        )
-        .finish()
-    }
-
-    fn render_empty_state_button(
-        appearance: &Appearance,
-        label: &str,
-        variant: ButtonVariant,
-        mouse_state: MouseStateHandle,
-        enabled: bool,
-        action: Option<EnvironmentsPageAction>,
-    ) -> Box<dyn Element> {
-        let mut button = appearance
-            .ui_builder()
-            .button(variant, mouse_state)
-            .with_centered_text_label(label.to_string())
-            .build();
-
-        if !enabled {
-            button = button.disable();
-            return button.finish();
-        }
-
-        if let Some(action) = action {
-            return button
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(action.clone());
-                })
-                .finish();
-        }
-
-        button.finish()
-    }
-
-    fn render_environments_list(
-        environments: &[EnvironmentDisplayData],
-        card_render_state: &EnvironmentCardRenderState<'_>,
-        appearance: &Appearance,
-        app: &AppContext,
-        list_scope: EnvironmentListScope,
-        is_user_on_team: bool,
-    ) -> Box<dyn Element> {
-        let mut list = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_spacing(CARD_SPACING);
-
-        for environment in environments {
-            list.add_child(Self::render_environment_card(
-                environment,
-                card_render_state,
-                appearance,
-                app,
-                list_scope,
-                is_user_on_team,
-            ));
-        }
-
-        list.finish()
-    }
-
-    fn render_environment_card(
-        environment: &EnvironmentDisplayData,
-        card_render_state: &EnvironmentCardRenderState<'_>,
-        appearance: &Appearance,
-        app: &AppContext,
-        list_scope: EnvironmentListScope,
-        is_user_on_team: bool,
-    ) -> Box<dyn Element> {
-        let theme = appearance.theme();
-        let env_id = environment.id;
-
-        // Get card hover state
-        let card_hover_mouse_state = card_render_state
-            .card_hover_mouse_states
-            .get(&env_id)
-            .cloned()
-            .unwrap_or_else(MouseStateHandle::default);
-
-        // Clone data needed for the closure
-        let env_name = environment.name.clone();
-        let env_description = environment.description.clone();
-        let env_docker_image = environment.docker_image.clone();
-        let env_github_repos = environment.github_repos.clone();
-        let env_setup_commands = environment.setup_commands.clone();
-        let timestamp_text = environment.format_timestamp_text();
-        let env_id_str = env_id.to_string();
-        let copy_button_mouse_state = card_render_state
-            .copy_button_mouse_states
-            .get(&env_id)
-            .cloned()
-            .unwrap_or_else(MouseStateHandle::default);
-        let edit_button_mouse_state = card_render_state
-            .edit_button_mouse_states
-            .get(&env_id)
-            .cloned()
-            .unwrap_or_else(MouseStateHandle::default);
-
-        let share_button_mouse_state = card_render_state
-            .share_button_mouse_states
-            .get(&env_id)
-            .cloned()
-            .unwrap_or_else(MouseStateHandle::default);
-
-        let view_runs_link_mouse_state = card_render_state
-            .view_runs_link_mouse_states
-            .get(&env_id)
-            .cloned()
-            .unwrap_or_else(MouseStateHandle::default);
-
-        let last_copied_at = card_render_state.copy_feedback_times.get(&env_id).copied();
-
-        Hoverable::new(card_hover_mouse_state, move |state| {
-            // Render the Env ID row with copy button - must be inside the closure
-            // since it returns a Box<dyn Element> that can only be consumed once
-            let env_id_str_copy = env_id_str.clone();
-            let env_id_with_copy = render_copyable_text_field(
-                CopyableTextFieldConfig::new(format!("Env ID: {}", env_id_str.clone()))
-                    .with_font_size(appearance.ui_font_size() * 0.9)
-                    .with_text_color(blended_colors::text_sub(theme, theme.surface_1()))
-                    .with_icon_size(12.)
-                    .with_mouse_state(copy_button_mouse_state.clone())
-                    .with_last_copied_at(last_copied_at.as_ref())
-                    .with_copy_button_placement(CopyButtonPlacement::NextToText),
-                move |ctx| {
-                    ctx.dispatch_typed_action(EnvironmentsPageAction::CopyEnvId(
-                        env_id,
-                        env_id_str_copy.clone(),
-                    ));
-                },
-                app,
-            );
-            // Content column with all the card information
-            let mut content_column = Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-                .with_spacing(8.);
-
-            // Name (title) - selectable
-            content_column.add_child(
-                Text::new_inline(
-                    env_name.clone(),
-                    appearance.ui_font_family(),
-                    appearance.ui_font_size(),
-                )
-                .with_style(Properties::default().weight(Weight::Semibold))
-                .with_color(theme.active_ui_text_color().into())
-                .with_selectable(true)
-                .finish(),
-            );
-
-            // Description (if present) - lighter than other details
-            if let Some(description) = &env_description {
-                if !description.is_empty() {
-                    content_column.add_child(
-                        Text::new(
-                            description.clone(),
-                            appearance.ui_font_family(),
-                            appearance.ui_font_size(),
-                        )
-                        .soft_wrap(true)
-                        .with_color(
-                            theme
-                                .background()
-                                .blend(&theme.foreground().with_opacity(80))
-                                .into(),
-                        )
-                        .with_selectable(true)
-                        .finish(),
-                    );
-                }
-            }
-
-            let mut details_parts = vec![format!("Image: {}", env_docker_image)];
-
-            if !env_github_repos.is_empty() {
-                let repos_text = env_github_repos
-                    .iter()
-                    .map(|(owner, repo)| format!("{}/{}", owner, repo))
-                    .collect::<Vec<_>>()
-                    .join(", ");
-                details_parts.push(format!("Repos: {}", repos_text));
-            }
-
-            if !env_setup_commands.is_empty() {
-                let commands_text = env_setup_commands.join(", ");
-                details_parts.push(format!("Setup commands: {}", commands_text));
-            }
-
-            // Create details section with Env ID on first line and other details below
-            let mut details_section = Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-                .with_spacing(4.);
-
-            // Add Env ID with copy button
-            details_section.add_child(env_id_with_copy);
-
-            // Add other details on a new line - selectable
-            let details_text = details_parts.join(" · ");
-            details_section.add_child(
-                Text::new(
-                    details_text,
-                    appearance.ui_font_family(),
-                    appearance.ui_font_size() * 0.9,
-                )
-                .soft_wrap(true)
-                .with_color(blended_colors::text_sub(theme, theme.surface_1()))
-                .with_selectable(true)
-                .finish(),
-            );
-
-            let timestamp_color = blended_colors::text_sub(theme, theme.surface_1());
-
-            // Add "Last edited" and "Last used" text with a "View my runs" link.
-            let view_runs_env_id = env_id_str.clone();
-            let view_runs_link = appearance
-                .ui_builder()
-                .link(
-                    "View my runs".to_string(),
-                    None,
-                    Some(Box::new(move |ctx| {
-                        ctx.dispatch_typed_action(WorkspaceAction::ViewAgentRunsForEnvironment {
-                            environment_id: view_runs_env_id.clone(),
-                        });
-                    })),
-                    view_runs_link_mouse_state.clone(),
-                )
-                .soft_wrap(false)
-                .with_style(UiComponentStyles {
-                    font_family_id: Some(appearance.ui_font_family()),
-                    font_size: Some(appearance.ui_font_size() * 0.9),
-                    font_weight: Some(Weight::Normal),
-                    ..Default::default()
-                })
-                .build()
-                .finish();
-
-            let timestamp_row = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .with_child(
-                    Text::new_inline(
-                        timestamp_text,
-                        appearance.ui_font_family(),
-                        appearance.ui_font_size() * 0.9,
-                    )
-                    .with_color(timestamp_color)
-                    .with_selectable(true)
-                    .finish(),
-                )
-                .with_child(
-                    Text::new_inline(
-                        " · ",
-                        appearance.ui_font_family(),
-                        appearance.ui_font_size() * 0.9,
-                    )
-                    .with_color(timestamp_color)
-                    .finish(),
-                )
-                .with_child(view_runs_link)
-                .finish();
-
-            details_section.add_child(timestamp_row);
-
-            content_column.add_child(details_section.finish());
-
-            // Main card row with content on left and edit button on right
-            let mut card_row = Flex::row()
-                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                .with_spacing(12.);
-
-            // Use Expanded to make content take available space, pushing button to the right
-            card_row.add_child(Expanded::new(1., content_column.finish()).finish());
-
-            // Action buttons - always rendered to maintain consistent layout,
-            // but use transparent color when not hovering
-            let is_card_hovered = state.is_hovered();
-            let icon_color: ThemeFill = if is_card_hovered {
-                theme.foreground()
-            } else {
-                ThemeFill::Solid(galaxyui::color::ColorU::transparent_black())
-            };
-
-            let should_render_share_button = list_scope == EnvironmentListScope::Personal
-                && is_user_on_team
-                && matches!(env_id, SyncId::ServerId(_));
-
-            if should_render_share_button {
-                let share_ui_builder = appearance.ui_builder().clone();
-                let share_button_element = if is_card_hovered {
-                    icon_button_with_color(
-                        appearance,
-                        Icon::Share,
-                        false,
-                        share_button_mouse_state.clone(),
-                        icon_color,
-                    )
-                    .with_tooltip(move || {
-                        share_ui_builder
-                            .tool_tip("Share".to_string())
-                            .build()
-                            .finish()
-                    })
-                    .build()
-                    .on_click(move |ctx, _, _| {
-                        ctx.dispatch_typed_action(EnvironmentsPageAction::ShareToTeam(env_id));
-                    })
-                    .finish()
-                } else {
-                    icon_button_with_color(
-                        appearance,
-                        Icon::Share,
-                        false,
-                        share_button_mouse_state.clone(),
-                        icon_color,
-                    )
-                    .build()
-                    .finish()
-                };
-
-                card_row.add_child(share_button_element);
-            }
-
-            let edit_ui_builder = appearance.ui_builder().clone();
-            let mut edit_button = icon_button_with_color(
-                appearance,
-                Icon::Pencil,
-                false,
-                edit_button_mouse_state.clone(),
-                icon_color,
-            );
-            // Only show tooltip when card is hovered
-            if is_card_hovered {
-                edit_button = edit_button.with_tooltip(move || {
-                    edit_ui_builder
-                        .tool_tip("Edit".to_string())
-                        .build()
-                        .finish()
-                });
-            }
-            let edit_button_element = edit_button
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(EnvironmentsPageAction::OpenEditPage(env_id));
-                })
-                .finish();
-            card_row.add_child(edit_button_element);
-
-            // Use translucent foreground overlays so the background shows through at rest and on hover.
-            let background = if state.is_hovered() {
-                internal_colors::fg_overlay_2(theme)
-            } else {
-                internal_colors::fg_overlay_1(theme)
-            };
-
-            Container::new(card_row.finish())
-                .with_uniform_padding(CARD_PADDING)
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(8.)))
-                .with_background(background)
-                .with_border(
-                    Border::all(CARD_BORDER_WIDTH)
-                        .with_border_fill(internal_colors::fg_overlay_3(theme)),
-                )
-                .finish()
-        })
-        .finish()
-    }
-}
-
-impl SettingsPageMeta for EnvironmentsPageView {
-    fn section() -> SettingsSection {
-        SettingsSection::CloudEnvironments
-    }
-    fn on_page_selected(&mut self, _allow_steal_focus: bool, ctx: &mut ViewContext<Self>) {
-        self.environment_form.update(ctx, |form, ctx| {
-            form.fetch_github_repos(ctx);
-        });
-        // Refresh cloud objects so the environments list reflects recent changes (e.g. a newly
-        // created environment from the terminal flow) without waiting for the next poll.
-        #[cfg(not(any(test, feature = "integration_tests")))]
-        UpdateManager::handle(ctx).update(ctx, |manager, ctx| {
-            manager.refresh_updated_objects(ctx);
-        });
-    }
-
-    fn should_render(&self, _ctx: &AppContext) -> bool {
-        true
-    }
-
-    fn update_filter(&mut self, query: &str, ctx: &mut ViewContext<Self>) -> MatchData {
-        self.page.update_filter(query, ctx)
-    }
-
-    fn scroll_to_widget(&mut self, widget_id: &'static str) {
-        self.page.scroll_to_widget(widget_id)
-    }
-
-    fn clear_highlighted_widget(&mut self) {
-        self.page.clear_highlighted_widget();
-    }
-}
-
-use crate::pane_group::focus_state::PaneFocusHandle;
-use crate::pane_group::pane::view::{HeaderContent, HeaderRenderContext};
-use crate::pane_group::pane::BackingView;
-
-impl BackingView for EnvironmentsPageView {
-    type PaneHeaderOverflowMenuAction = EnvironmentsPageAction;
-    type CustomAction = ();
-    type AssociatedData = ();
-
-    fn handle_pane_header_overflow_menu_action(
-        &mut self,
-        action: &Self::PaneHeaderOverflowMenuAction,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.handle_action(action, ctx);
-    }
-
-    fn close(&mut self, ctx: &mut ViewContext<Self>) {
-        ctx.emit(SettingsPageEvent::Pane(
-            super::settings_page::PaneEventWrapper::Close,
-        ));
-    }
-
-    fn focus_contents(&mut self, ctx: &mut ViewContext<Self>) {
-        self.focus(ctx);
-    }
-
-    fn render_header_content(
-        &self,
-        _ctx: &HeaderRenderContext<'_>,
-        _app: &AppContext,
-    ) -> HeaderContent {
-        HeaderContent::simple("Environments")
-    }
-
-    fn set_focus_handle(&mut self, focus_handle: PaneFocusHandle, _ctx: &mut ViewContext<Self>) {
-        self.focus_handle = Some(focus_handle);
-        // Use a lower minimum width when used as a pane to allow narrow layouts.
-        // This affects when the SettingsPage switches into horizontal-scroll mode.
-        self.page.set_min_page_width(260.);
-    }
-}
-
-impl From<ViewHandle<EnvironmentsPageView>> for SettingsPageViewHandle {
-    fn from(view_handle: ViewHandle<EnvironmentsPageView>) -> Self {
-        SettingsPageViewHandle::CloudEnvironments(view_handle)
-    }
-}
-
-#[cfg(test)]
-#[path = "environments_page_tests.rs"]
-mod tests;
diff --git a/app/src/settings_view/environments_page/new_environment_button.rs b/app/src/settings_view/environments_page/new_environment_button.rs
deleted file mode 100644
index 8b67057c..00000000
--- a/app/src/settings_view/environments_page/new_environment_button.rs
+++ /dev/null
@@ -1,141 +0,0 @@
-use galaxy_core::ui::appearance::Appearance;
-use galaxyui::elements::{
-    Border, Container, CornerRadius, DispatchEventResult, EventHandler, Flex, MainAxisAlignment,
-    MouseStateHandle, ParentElement as _, Radius, Text,
-};
-use galaxyui::fonts::{Properties, Weight};
-use galaxyui::platform::Cursor;
-use galaxyui::{
-    AppContext, BlurContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View,
-    ViewContext, ViewHandle, WeakViewHandle,
-};
-
-use super::EnvironmentsPageAction;
-use crate::editor::EditorView;
-
-pub struct NewEnvironmentButtonView {
-    trigger_mouse_state: MouseStateHandle,
-    search_editor: ViewHandle<EditorView>,
-    self_handle: WeakViewHandle<Self>,
-}
-#[derive(Debug, Clone)]
-pub enum NewEnvironmentButtonAction {
-    OpenSelector,
-    FocusSearch,
-}
-
-impl NewEnvironmentButtonView {
-    pub fn new(search_editor: ViewHandle<EditorView>, ctx: &mut ViewContext<Self>) -> Self {
-        Self {
-            trigger_mouse_state: Default::default(),
-            search_editor,
-            self_handle: ctx.handle(),
-        }
-    }
-
-    fn is_focused(&self, app: &AppContext) -> bool {
-        self.self_handle
-            .upgrade(app)
-            .is_some_and(|v| v.is_focused(app))
-    }
-}
-
-impl Entity for NewEnvironmentButtonView {
-    type Event = ();
-}
-impl TypedActionView for NewEnvironmentButtonView {
-    type Action = NewEnvironmentButtonAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            NewEnvironmentButtonAction::OpenSelector => {
-                ctx.dispatch_typed_action(
-                    &EnvironmentsPageAction::OpenEnvironmentSetupModeSelector,
-                );
-            }
-            NewEnvironmentButtonAction::FocusSearch => {
-                ctx.focus(&self.search_editor);
-            }
-        }
-    }
-}
-
-impl View for NewEnvironmentButtonView {
-    fn ui_name() -> &'static str {
-        "NewEnvironmentButton"
-    }
-
-    fn on_focus(&mut self, focus_ctx: &FocusContext, ctx: &mut ViewContext<Self>) {
-        if focus_ctx.is_self_focused() {
-            ctx.notify();
-        }
-    }
-
-    fn on_blur(&mut self, blur_ctx: &BlurContext, ctx: &mut ViewContext<Self>) {
-        if blur_ctx.is_self_blurred() {
-            ctx.notify();
-        }
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let theme = appearance.theme();
-        let is_focused = self.is_focused(app);
-
-        let trigger = {
-            galaxyui::elements::Hoverable::new(self.trigger_mouse_state.clone(), move |s| {
-                let is_hovered = s.is_hovered();
-                let background = if is_hovered || is_focused {
-                    Some(theme.surface_3())
-                } else {
-                    None
-                };
-
-                let row = Flex::row()
-                    .with_main_axis_alignment(MainAxisAlignment::Center)
-                    .with_spacing(4.)
-                    .with_child(
-                        Text::new(
-                            "New environment",
-                            appearance.ui_font_family(),
-                            appearance.ui_font_size(),
-                        )
-                        .with_style(Properties::default().weight(Weight::Medium))
-                        .with_color(theme.active_ui_text_color().into())
-                        .finish(),
-                    );
-
-                let mut container = Container::new(row.finish())
-                    .with_horizontal_padding(12.)
-                    .with_vertical_padding(6.)
-                    .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-                    .with_border(Border::all(1.).with_border_fill(theme.surface_3()));
-
-                if let Some(bg) = background {
-                    container = container.with_background(bg);
-                }
-
-                container.finish()
-            })
-            .with_cursor(Cursor::PointingHand)
-            .on_click(|ctx, _, _| {
-                ctx.dispatch_typed_action(NewEnvironmentButtonAction::OpenSelector);
-            })
-            .finish()
-        };
-
-        EventHandler::new(trigger)
-            .on_keydown(move |ctx, _app, keystroke| {
-                if keystroke.is_shift_tab() {
-                    ctx.dispatch_typed_action(NewEnvironmentButtonAction::FocusSearch);
-                    DispatchEventResult::StopPropagation
-                } else if keystroke.is_unmodified_enter() {
-                    ctx.dispatch_typed_action(NewEnvironmentButtonAction::OpenSelector);
-                    DispatchEventResult::StopPropagation
-                } else {
-                    DispatchEventResult::PropagateToParent
-                }
-            })
-            .finish()
-    }
-}
diff --git a/app/src/settings_view/environments_page_tests.rs b/app/src/settings_view/environments_page_tests.rs
deleted file mode 100644
index 9b3ee071..00000000
--- a/app/src/settings_view/environments_page_tests.rs
+++ /dev/null
@@ -1,1476 +0,0 @@
-use std::collections::HashMap;
-use std::sync::{Arc, Mutex};
-
-use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
-use chrono::{Duration, Utc};
-use galaxy_core::ui::appearance::Appearance;
-use instant::Instant;
-use warpui::elements::Empty;
-use warpui::platform::WindowStyle;
-use warpui::{App, AppContext, Element, Entity, TypedActionView, View, WindowId};
-
-use super::*;
-use crate::ai::ambient_agents::github_auth_notifier::GitHubAuthNotifier;
-use crate::ai::cloud_environments::{
-    AmbientAgentEnvironment, CloudAmbientAgentEnvironmentModel, GithubRepo,
-};
-use crate::auth::AuthStateProvider;
-use crate::network::NetworkStatus;
-use crate::root_view::CreateEnvironmentArg;
-use crate::server::cloud_objects::update_manager::UpdateManager;
-use crate::server::ids::{ClientId, ServerId, SyncId};
-use crate::server::server_api::ServerApiProvider;
-use crate::server::sync_queue::SyncQueue;
-use crate::settings::PrivacySettings;
-use crate::settings_view::keybindings::KeybindingChangedNotifier;
-use crate::terminal::view::init_environment::mode_selector::EnvironmentSetupModeSelector;
-use crate::test_util::settings::initialize_settings_for_tests;
-use crate::workspaces::team_tester::TeamTesterStatus;
-use crate::workspaces::user_workspaces::UserWorkspaces;
-
-fn make_test_environment(
-    name: &str,
-    docker_image: &str,
-    github_repos: Vec<(String, String)>,
-    setup_commands: Vec<String>,
-) -> EnvironmentDisplayData {
-    make_test_environment_with_timestamps(
-        name,
-        docker_image,
-        github_repos,
-        setup_commands,
-        None,
-        None,
-    )
-}
-
-fn make_test_environment_with_timestamps(
-    name: &str,
-    docker_image: &str,
-    github_repos: Vec<(String, String)>,
-    setup_commands: Vec<String>,
-    last_edited_ts: Option<galaxy_graphql::scalars::time::ServerTimestamp>,
-    last_used_ts: Option<galaxy_graphql::scalars::time::ServerTimestamp>,
-) -> EnvironmentDisplayData {
-    EnvironmentDisplayData {
-        id: SyncId::ClientId(ClientId::new()),
-        name: name.to_string(),
-        description: None,
-        docker_image: docker_image.to_string(),
-        github_repos,
-        setup_commands,
-        last_edited_ts,
-        last_used_ts,
-    }
-}
-
-#[derive(Default)]
-struct TestRootView;
-
-impl Entity for TestRootView {
-    type Event = ();
-}
-
-impl View for TestRootView {
-    fn ui_name() -> &'static str {
-        "TestRootView"
-    }
-
-    fn render(&self, _: &AppContext) -> Box<dyn Element> {
-        Empty::new().finish()
-    }
-}
-
-impl TypedActionView for TestRootView {
-    type Action = ();
-}
-
-fn create_test_window(app: &mut App) -> WindowId {
-    let (window_id, _root_view) = app.add_window(WindowStyle::NotStealFocus, |_| TestRootView);
-    window_id
-}
-
-fn init_env_page_view_test_models(app: &mut App) {
-    initialize_settings_for_tests(app);
-
-    // Most Settings views assume these singleton models exist.
-    app.add_singleton_model(|_ctx| ServerApiProvider::new_for_test());
-    app.add_singleton_model(|_| AuthStateProvider::new_for_test());
-    app.add_singleton_model(|_| Appearance::mock());
-    app.add_singleton_model(CloudModel::mock);
-
-    // Some Environments page code paths consult org/user settings (e.g. codebase context enablement),
-    // even if the specific test isn't exercising them directly.
-    app.add_singleton_model(UserWorkspaces::default_mock);
-    app.add_singleton_model(PrivacySettings::mock);
-
-    app.add_singleton_model(|_| NetworkStatus::new());
-    app.add_singleton_model(TeamTesterStatus::mock);
-    app.add_singleton_model(SyncQueue::mock);
-    app.add_singleton_model(UpdateManager::mock);
-    app.add_singleton_model(|_| KeybindingChangedNotifier::new());
-    app.add_singleton_model(|_| GitHubAuthNotifier::new());
-
-    // The agent-assisted modal reads locally indexed repos via CodebaseIndexManager.
-    // We register a test instance to avoid singleton lookup panics in unit tests.
-    app.add_singleton_model(|ctx| {
-        CodebaseIndexManager::new_for_test(ServerApiProvider::as_ref(ctx).get(), ctx)
-    });
-}
-
-type EmptyMouseStates = (
-    HashMap<SyncId, MouseStateHandle>,
-    HashMap<SyncId, MouseStateHandle>,
-    HashMap<SyncId, MouseStateHandle>,
-    HashMap<SyncId, MouseStateHandle>,
-    HashMap<SyncId, MouseStateHandle>,
-    HashMap<SyncId, Instant>,
-);
-
-fn empty_card_mouse_states() -> EmptyMouseStates {
-    (
-        HashMap::new(),
-        HashMap::new(),
-        HashMap::new(),
-        HashMap::new(),
-        HashMap::new(),
-        HashMap::new(),
-    )
-}
-
-#[test]
-fn test_render_environments_list_with_single_environment() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environment =
-                make_test_environment("Test Environment", "ubuntu:latest", vec![], vec![]);
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environments_list(
-                &[environment],
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Test Environment"),
-                "Expected environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("ubuntu:latest"),
-                "Expected docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environments_list_with_multiple_environments() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environments = vec![
-                make_test_environment("Environment 1", "ubuntu:latest", vec![], vec![]),
-                make_test_environment("Environment 2", "debian:latest", vec![], vec![]),
-            ];
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environments_list(
-                &environments,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Environment 1"),
-                "Expected first environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("Environment 2"),
-                "Expected second environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("ubuntu:latest"),
-                "Expected first docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("debian:latest"),
-                "Expected second docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environment_card_with_minimal_config() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environment =
-                make_test_environment("Minimal Environment", "alpine:latest", vec![], vec![]);
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Minimal Environment"),
-                "Expected environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("alpine:latest"),
-                "Expected docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environment_card_with_github_repos() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environment = make_test_environment(
-                "Environment with Repos",
-                "ubuntu:latest",
-                vec![
-                    ("owner1".to_string(), "repo1".to_string()),
-                    ("owner2".to_string(), "repo2".to_string()),
-                ],
-                vec![],
-            );
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Environment with Repos"),
-                "Expected environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("owner1/repo1"),
-                "Expected first repo in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("owner2/repo2"),
-                "Expected second repo in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environment_card_with_setup_commands() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environment = make_test_environment(
-                "Environment with Setup",
-                "node:18",
-                vec![],
-                vec!["npm install".to_string(), "npm run build".to_string()],
-            );
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Environment with Setup"),
-                "Expected environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("node:18"),
-                "Expected docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("npm install"),
-                "Expected first setup command in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("npm run build"),
-                "Expected second setup command in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environment_card_with_all_features() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environment = make_test_environment(
-                "Full Environment",
-                "python:3.11",
-                vec![
-                    ("company".to_string(), "frontend".to_string()),
-                    ("company".to_string(), "backend".to_string()),
-                ],
-                vec![
-                    "pip install -r requirements.txt".to_string(),
-                    "python setup.py".to_string(),
-                ],
-            );
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Full Environment"),
-                "Expected environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("python:3.11"),
-                "Expected docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("company/frontend"),
-                "Expected first repo in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("company/backend"),
-                "Expected second repo in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("pip install -r requirements.txt"),
-                "Expected first setup command in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("python setup.py"),
-                "Expected second setup command in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environment_card_with_empty_setup_commands() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-            let environment = make_test_environment(
-                "Environment with Empty Commands",
-                "ubuntu:latest",
-                vec![],
-                vec![],
-            );
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Environment with Empty Commands"),
-                "Expected environment name in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("ubuntu:latest"),
-                "Expected docker image in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_environments_page_widget_search_terms() {
-    let widget = EnvironmentsPageWidget;
-    let search_terms = widget.search_terms();
-
-    assert!(search_terms.contains("environments"));
-    assert!(search_terms.contains("environment"));
-    assert!(search_terms.contains("ambient"));
-    assert!(search_terms.contains("agents"));
-    assert!(search_terms.contains("github"));
-}
-
-// ============================================================================
-// Empty State vs List State Tests
-// ============================================================================
-
-#[test]
-fn test_render_list_page_with_no_environments_shows_empty_state() {
-    // Test that when there are no environments, the empty state is rendered
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-
-            // CloudModel mock should have no environments by default
-            let environments = CloudAmbientAgentEnvironment::get_all(ctx);
-            assert_eq!(
-                environments.len(),
-                0,
-                "Test should start with no environments"
-            );
-
-            let view = view_handle.as_ref(ctx);
-            let element = EnvironmentsPageWidget::render_list_page(view, appearance, ctx);
-            // Element is created successfully - just verify it doesn't panic
-            drop(element);
-        });
-    })
-}
-
-#[test]
-fn test_render_list_page_with_environments_shows_list() {
-    // Test that when there are environments, the list is rendered (not empty state)
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            // Create test environment in CloudModel
-            let environment = AmbientAgentEnvironment::new(
-                "Test Environment".to_string(),
-                Some("Test description".to_string()),
-                vec![GithubRepo::new("owner".to_string(), "repo".to_string())],
-                "ubuntu:latest".to_string(),
-                vec!["npm install".to_string()],
-            );
-
-            let sync_id = SyncId::ClientId(ClientId::new());
-            let object = CloudAmbientAgentEnvironment::new(
-                sync_id,
-                CloudAmbientAgentEnvironmentModel::new(environment),
-                crate::cloud_object::CloudObjectMetadata::mock(),
-                crate::cloud_object::CloudObjectPermissions::mock_personal(),
-            );
-
-            CloudModel::handle(ctx).update(ctx, |model, ctx| {
-                model.create_object(sync_id, object, ctx);
-            });
-            let environments = CloudAmbientAgentEnvironment::get_all(ctx);
-            assert_eq!(
-                environments.len(),
-                1,
-                "Should have one environment after insert"
-            );
-
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_list_page(view, appearance, ctx);
-            // Element is created successfully - just verify it doesn't panic
-            drop(element);
-        });
-    })
-}
-
-#[test]
-fn test_render_list_page_with_personal_and_team_environments_shows_section_headers() {
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            // Ensure UserWorkspaces has a current team name so the "Team" section renders with the
-            // shared header copy ("Shared by Warp and <team>").
-            UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                user_workspaces.setup_test_workspace(ctx);
-                user_workspaces.update_current_workspace(
-                    |workspace| {
-                        if let Some(team) = workspace.teams.first_mut() {
-                            team.name = "Katarina's team".to_string();
-                        }
-                    },
-                    ctx,
-                );
-            });
-
-            let personal_env = AmbientAgentEnvironment::new(
-                "Personal Env".to_string(),
-                None,
-                vec![],
-                "ubuntu:latest".to_string(),
-                vec![],
-            );
-
-            let team_env = AmbientAgentEnvironment::new(
-                "Team Env".to_string(),
-                None,
-                vec![],
-                "ubuntu:latest".to_string(),
-                vec![],
-            );
-
-            let personal_id = SyncId::ClientId(ClientId::new());
-            let personal_object = CloudAmbientAgentEnvironment::new(
-                personal_id,
-                CloudAmbientAgentEnvironmentModel::new(personal_env),
-                crate::cloud_object::CloudObjectMetadata::mock(),
-                crate::cloud_object::CloudObjectPermissions::mock_personal(),
-            );
-
-            let team_id = SyncId::ClientId(ClientId::new());
-            let mut team_permissions = crate::cloud_object::CloudObjectPermissions::mock_personal();
-            team_permissions.owner = Owner::Team {
-                team_uid: ServerId::from(789),
-            };
-            let team_object = CloudAmbientAgentEnvironment::new(
-                team_id,
-                CloudAmbientAgentEnvironmentModel::new(team_env),
-                crate::cloud_object::CloudObjectMetadata::mock(),
-                team_permissions,
-            );
-
-            CloudModel::handle(ctx).update(ctx, |model, ctx| {
-                model.create_object(personal_id, personal_object, ctx);
-                model.create_object(team_id, team_object, ctx);
-            });
-
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_list_page(view, appearance, ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            assert!(
-                text_content.contains("PERSONAL"),
-                "Expected 'Personal' section header in rendered content: {text_content}"
-            );
-            assert!(
-                text_content.contains("SHARED BY WARP AND KATARINA'S TEAM"),
-                "Expected shared section header in rendered content: {text_content}"
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_list_page_with_only_personal_environments_shows_personal_header() {
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let personal_env = AmbientAgentEnvironment::new(
-                "Personal Env".to_string(),
-                None,
-                vec![],
-                "ubuntu:latest".to_string(),
-                vec![],
-            );
-
-            let personal_id = SyncId::ClientId(ClientId::new());
-            let personal_object = CloudAmbientAgentEnvironment::new(
-                personal_id,
-                CloudAmbientAgentEnvironmentModel::new(personal_env),
-                crate::cloud_object::CloudObjectMetadata::mock(),
-                crate::cloud_object::CloudObjectPermissions::mock_personal(),
-            );
-
-            CloudModel::handle(ctx).update(ctx, |model, ctx| {
-                model.create_object(personal_id, personal_object, ctx);
-            });
-
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_list_page(view, appearance, ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            assert!(
-                text_content.contains("PERSONAL"),
-                "Expected 'Personal' header in rendered content: {text_content}"
-            );
-        });
-    })
-}
-
-#[test]
-fn test_set_github_auth_redirect_target_updates_form() {
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        let mut view_handle = None;
-        app.update(|ctx| {
-            view_handle = Some(ctx.add_typed_action_view(window_id, EnvironmentsPageView::new));
-        });
-        let view_handle = view_handle.expect("EnvironmentsPageView handle should be created");
-
-        app.update(|ctx| {
-            let view = view_handle.as_ref(ctx);
-            let target = view.environment_form.read(ctx, |form, _ctx| {
-                form.github_auth_redirect_target_for_test()
-            });
-            assert_eq!(target, GithubAuthRedirectTarget::SettingsEnvironments);
-        });
-
-        app.update(|ctx| {
-            view_handle.update(ctx, |view, ctx| {
-                view.set_github_auth_redirect_target(GithubAuthRedirectTarget::FocusCloudMode, ctx);
-            });
-        });
-
-        app.update(|ctx| {
-            let view = view_handle.as_ref(ctx);
-            let target = view.environment_form.read(ctx, |form, _ctx| {
-                form.github_auth_redirect_target_for_test()
-            });
-            assert_eq!(target, GithubAuthRedirectTarget::FocusCloudMode);
-        });
-    })
-}
-
-#[test]
-fn test_render_empty_state_shows_github_remote_and_local_rows() {
-    // Empty-state UI should include GitHub-remote (suggested) and agent-assisted local repos paths.
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_empty_state(view, appearance, ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            assert!(
-                text_content.contains("Quick setup"),
-                "Expected quick setup row title in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("Suggested"),
-                "Expected 'Suggested' badge text in rendered content: {}",
-                text_content
-            );
-            // GitHub button text depends on async auth state, so just check that one of the
-            // expected states is present (Loading, Get started, Authorize, or Retry)
-            let has_github_button = text_content.contains("Get started")
-                || text_content.contains("Authorize")
-                || text_content.contains("Loading...")
-                || text_content.contains("Retry");
-            assert!(
-                has_github_button,
-                "Expected GitHub button text in rendered content: {}",
-                text_content
-            );
-
-            assert!(
-                text_content.contains("Use the agent"),
-                "Expected 'Use the agent' row title in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("Launch agent"),
-                "Expected 'Launch agent' button text in rendered content: {}",
-                text_content
-            );
-
-            assert!(
-                !text_content.contains("Manually create an environment"),
-                "Did not expect old manual-create empty-state row title in rendered content: {}",
-                text_content
-            );
-
-            // Basic ordering: GitHub row should appear above local repos row.
-            let github_pos = text_content.find("Quick setup").unwrap_or(usize::MAX);
-            let local_pos = text_content
-                .find("Use the agent")
-                .unwrap_or(usize::MAX);
-            assert!(
-                github_pos < local_pos,
-                "Expected GitHub row to appear before local row (github_pos={github_pos}, local_pos={local_pos}): {text_content}"
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_empty_state_github_card_loading_state() {
-    // This test verifies that the empty state renders without crashing.
-    // The specific GitHub auth state (Loading, Authed, etc.) is asynchronous
-    // and can't be reliably controlled in unit tests.
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_empty_state(view, appearance, ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            // Just verify the empty state renders the key components
-            assert!(
-                text_content.contains("Quick setup"),
-                "Expected quick setup row in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_empty_state_github_card_error_state_shows_retry() {
-    // This test verifies that the empty state renders without crashing.
-    // The specific GitHub auth state (error, loading, etc.) is asynchronous
-    // and can't be reliably controlled in unit tests.
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_empty_state(view, appearance, ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            // Just verify the empty state renders the key components
-            assert!(
-                text_content.contains("Quick setup"),
-                "Expected quick setup row in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_empty_state_github_card_unauthed_state_shows_authorize() {
-    // This test verifies that the empty state renders without crashing.
-    // The specific GitHub auth state (unauthed, authed, etc.) is asynchronous
-    // and can't be reliably controlled in unit tests.
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let view_handle = ctx.add_typed_action_view(window_id, EnvironmentsPageView::new);
-            let appearance = Appearance::as_ref(ctx);
-            let view = view_handle.as_ref(ctx);
-
-            let element = EnvironmentsPageWidget::render_empty_state(view, appearance, ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            // Just verify the empty state renders the key components
-            assert!(
-                text_content.contains("Quick setup"),
-                "Expected quick setup row in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-// ============================================================================
-// Toolbar + Agent-assisted Flow Tests
-// ============================================================================
-
-#[test]
-fn test_environment_setup_mode_selector_renders_options() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-        let window_id = create_test_window(&mut app);
-
-        app.update(|ctx| {
-            let selector = ctx.add_typed_action_view(window_id, EnvironmentSetupModeSelector::new);
-            let element = selector.as_ref(ctx).render(ctx);
-            let text_content = element.debug_text_content().unwrap_or_default();
-
-            assert!(
-                text_content.contains("Quick setup"),
-                "Expected Quick setup option in rendered content: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("Use the agent"),
-                "Expected Use the agent option in rendered content: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_agent_assisted_modal_open_and_cancel_renders_and_hides() {
-    // Verifies the Environments page wires up the modal visibility and cancel event correctly.
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-        let window_id = create_test_window(&mut app);
-
-        let mut view_handle = None;
-        app.update(|ctx| {
-            view_handle = Some(ctx.add_typed_action_view(window_id, EnvironmentsPageView::new));
-        });
-        let view_handle = view_handle.expect("EnvironmentsPageView handle should be created");
-
-        // Open the modal.
-        app.update(|ctx| {
-            view_handle.update(ctx, |view, ctx| {
-                view.handle_action(&EnvironmentsPageAction::OpenAgentAssistedCreateModal, ctx);
-            });
-        });
-
-        // Verify the modal is visible.
-        // We assert against `is_visible()` rather than `debug_text_content()` of the full dialog,
-        // because dialog/icon rendering can be asset-provider-dependent in unit tests.
-        app.update(|ctx| {
-            let view = view_handle.as_ref(ctx);
-            let modal = view.agent_assisted_environment_modal.clone();
-            let is_visible = modal.read(ctx, |modal, _ctx| modal.is_visible());
-            assert!(is_visible, "Expected modal to be visible after open action");
-        });
-
-        // Cancel via modal event.
-        app.update(|ctx| {
-            view_handle.update(ctx, |view, ctx| {
-                view.agent_assisted_environment_modal
-                    .update(ctx, |_modal, ctx| {
-                        ctx.emit(AgentAssistedEnvironmentModalEvent::Cancelled);
-                    });
-            });
-        });
-
-        // Verify modal is hidden.
-        app.update(|ctx| {
-            let view = view_handle.as_ref(ctx);
-            let modal = view.agent_assisted_environment_modal.clone();
-            let is_visible = modal.read(ctx, |modal, _ctx| modal.is_visible());
-            assert!(
-                !is_visible,
-                "Expected modal to be hidden after cancel event"
-            );
-        });
-    })
-}
-
-#[test]
-fn test_agent_assisted_modal_confirm_dispatches_root_view_action_and_hides_modal() {
-    // We treat the RootView action dispatch as the contract that a terminal tab + setup flow will start.
-    // (The deeper terminal-tab assertions are better suited to integration tests.)
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-
-        // Capture the CreateEnvironmentArg passed through the RootView action boundary.
-        let dispatched_repo_paths: Arc<Mutex<Vec<Vec<String>>>> = Arc::new(Mutex::new(Vec::new()));
-        let dispatched_repo_paths_clone = dispatched_repo_paths.clone();
-
-        app.update(|ctx| {
-            ctx.add_global_action(
-                "root_view:create_environment_in_existing_window_and_run",
-                move |arg: &CreateEnvironmentArg, _ctx| {
-                    dispatched_repo_paths_clone
-                        .lock()
-                        .expect("mutex should not be poisoned")
-                        .push(arg.repos.clone());
-                },
-            );
-        });
-
-        let window_id = create_test_window(&mut app);
-
-        let mut view_handle = None;
-        app.update(|ctx| {
-            view_handle = Some(ctx.add_typed_action_view(window_id, EnvironmentsPageView::new));
-        });
-        let view_handle = view_handle.expect("EnvironmentsPageView handle should be created");
-
-        // Open the modal.
-        app.update(|ctx| {
-            view_handle.update(ctx, |view, ctx| {
-                view.handle_action(&EnvironmentsPageAction::OpenAgentAssistedCreateModal, ctx);
-            });
-        });
-
-        // Confirm via modal event.
-        let repo_paths = vec!["/tmp/repo-a".to_string(), "/tmp/repo-b".to_string()];
-        app.update(|ctx| {
-            view_handle.update(ctx, |view, ctx| {
-                view.agent_assisted_environment_modal
-                    .update(ctx, |_modal, ctx| {
-                        ctx.emit(AgentAssistedEnvironmentModalEvent::Confirmed {
-                            repo_paths: repo_paths.clone(),
-                        });
-                    });
-            });
-        });
-
-        // Verify global action was dispatched with repos.
-        let dispatched = dispatched_repo_paths
-            .lock()
-            .expect("mutex should not be poisoned")
-            .clone();
-        assert_eq!(
-            dispatched,
-            vec![repo_paths],
-            "Expected root view action to be dispatched with repo paths"
-        );
-
-        // Verify modal is hidden after confirm.
-        app.update(|ctx| {
-            let view = view_handle.as_ref(ctx);
-            let modal = view.agent_assisted_environment_modal.clone();
-            let is_visible = modal.read(ctx, |modal, _ctx| modal.is_visible());
-            assert!(
-                !is_visible,
-                "Expected modal to be hidden after confirm event"
-            );
-        });
-    })
-}
-
-// ============================================================================
-// Note: Form-related tests (repos field, docker image field, form state, etc.)
-// have been moved to update_environment_form_tests.rs since the form component
-// was extracted into UpdateEnvironmentForm.
-// ============================================================================
-
-// ============================================================================
-// Environments Page Enum Tests
-// ============================================================================
-
-#[test]
-fn test_environments_page_default_is_list() {
-    let page = EnvironmentsPage::default();
-    assert!(matches!(page, EnvironmentsPage::List));
-}
-
-#[test]
-fn test_environments_page_edit_variant() {
-    let env_id = SyncId::ClientId(ClientId::new());
-    let page = EnvironmentsPage::Edit { env_id };
-
-    if let EnvironmentsPage::Edit { env_id: id } = page {
-        assert_eq!(id, env_id);
-    } else {
-        panic!("Expected Edit variant");
-    }
-}
-
-// ============================================================================
-// GithubRepo Tests
-// ============================================================================
-
-#[test]
-fn test_github_repo_new() {
-    let repo = GithubRepo::new("warpdotdev".to_string(), "warp-internal".to_string());
-    assert_eq!(repo.owner, "warpdotdev");
-    assert_eq!(repo.repo, "warp-internal");
-}
-
-#[test]
-fn test_github_repo_display() {
-    let repo = GithubRepo::new("warpdotdev".to_string(), "warp-internal".to_string());
-    assert_eq!(repo.to_string(), "warpdotdev/warp-internal");
-}
-
-#[test]
-fn test_github_repo_equality() {
-    let repo1 = GithubRepo::new("owner".to_string(), "repo".to_string());
-    let repo2 = GithubRepo::new("owner".to_string(), "repo".to_string());
-    let repo3 = GithubRepo::new("other".to_string(), "repo".to_string());
-
-    assert_eq!(repo1, repo2);
-    assert_ne!(repo1, repo3);
-}
-
-// ============================================================================
-// Environments List Search Tests
-// ============================================================================
-
-#[test]
-fn test_environment_matches_search_query_empty_query_matches_all() {
-    let environment = make_test_environment(
-        "Searchable Environment",
-        "ubuntu:latest",
-        vec![("warpdotdev".to_string(), "warp-internal".to_string())],
-        vec![],
-    );
-
-    assert!(environment.matches_search_query(""));
-    assert!(environment.matches_search_query("   "));
-}
-
-#[test]
-fn test_environment_matches_search_query_name_description_image_repos() {
-    let mut environment = make_test_environment(
-        "Warp Env",
-        "node:20-alpine",
-        vec![("warpdotdev".to_string(), "warp-internal".to_string())],
-        vec![],
-    );
-    environment.description = Some("Front end focused agents".to_string());
-
-    assert!(environment.matches_search_query("warp"));
-    assert!(environment.matches_search_query("Front end"));
-    assert!(environment.matches_search_query("node:20"));
-    assert!(environment.matches_search_query("warp-internal"));
-    assert!(environment.matches_search_query("warpdotdev"));
-    assert!(environment.matches_search_query("warpdotdev/warp"));
-
-    assert!(!environment.matches_search_query("definitely-not-present"));
-}
-
-#[test]
-fn test_environment_matches_search_query_env_id_substring() {
-    let environment = make_test_environment("Any", "ubuntu:latest", vec![], vec![]);
-
-    let id_str = environment.id.to_string();
-    let needle_len = id_str.chars().take(6).collect::<String>().len();
-    let prefix = &id_str[..needle_len];
-
-    assert!(environment.matches_search_query(prefix));
-}
-
-#[test]
-fn test_environment_matches_search_query_is_case_insensitive() {
-    let mut environment = make_test_environment(
-        "warp-env",
-        "ubuntu:latest",
-        vec![("WarpDotDev".to_string(), "Warp-Internal".to_string())],
-        vec![],
-    );
-    environment.description = Some("Some Description".to_string());
-
-    assert!(environment.matches_search_query("WARP"));
-    assert!(environment.matches_search_query("description"));
-    assert!(environment.matches_search_query("warp-internal"));
-}
-
-#[test]
-fn test_toolbar_renders_search_editor_view() {
-    use pathfinder_geometry::vector::vec2f;
-
-    App::test((), |mut app| async move {
-        init_env_page_view_test_models(&mut app);
-
-        // Seed at least one environment so the list page renders the toolbar.
-        app.update(|ctx| {
-            let environment = AmbientAgentEnvironment::new(
-                "Test Environment".to_string(),
-                Some("Test description".to_string()),
-                vec![],
-                "ubuntu:latest".to_string(),
-                vec![],
-            );
-
-            let sync_id = SyncId::ClientId(ClientId::new());
-            let object = CloudAmbientAgentEnvironment::new(
-                sync_id,
-                CloudAmbientAgentEnvironmentModel::new(environment),
-                crate::cloud_object::CloudObjectMetadata::mock(),
-                crate::cloud_object::CloudObjectPermissions::mock_personal(),
-            );
-
-            CloudModel::handle(ctx).update(ctx, |model, ctx| {
-                model.create_object(sync_id, object, ctx);
-            });
-        });
-
-        // Make EnvironmentsPageView the root view so it gets laid out by the Presenter.
-        let (window_id, env_page_handle) =
-            app.add_window(WindowStyle::NotStealFocus, EnvironmentsPageView::new);
-
-        app.update(|ctx| {
-            // Render a frame so layout runs and parent relationships are computed.
-            // We use a large window size to avoid edge cases where layout is skipped.
-            let presenter = ctx.presenter(window_id).expect("presenter should exist");
-            presenter
-                .borrow_mut()
-                .build_scene(vec2f(1000., 700.), 1., None, ctx);
-
-            let env_page = env_page_handle.as_ref(ctx);
-            let env_page_id = env_page_handle.id();
-            let search_editor_id = env_page.search_editor.id();
-
-            let chain = ctx.view_ancestors(window_id, search_editor_id);
-            assert!(
-                chain.len() >= 2,
-                "Expected search editor to be laid out as a child view; got ancestors={chain:?}"
-            );
-            assert_eq!(
-                chain.first().copied(),
-                Some(env_page_id),
-                "Expected search editor root to be EnvironmentsPageView"
-            );
-            assert_eq!(chain.last().copied(), Some(search_editor_id));
-        });
-    })
-}
-// ============================================================================
-// Environment Last Used Timestamp Tests
-// ============================================================================
-
-#[test]
-fn test_render_environment_card_with_last_used_never() {
-    use chrono::{Duration, Utc};
-    use galaxy_graphql::scalars::time::ServerTimestamp;
-
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-
-            // Create environment with no last-used timestamp
-            let one_day_ago = Utc::now() - Duration::days(1);
-            let environment = make_test_environment_with_timestamps(
-                "Never Used Environment",
-                "ubuntu:latest",
-                vec![],
-                vec![],
-                Some(ServerTimestamp::from(one_day_ago)),
-                None,
-            );
-
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-
-            // Render the card
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            // Use debug_text_content to verify the rendered text
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Last used: never"),
-                "Expected 'Last used: never' in rendered text: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("Last edited:"),
-                "Expected 'Last edited:' in rendered text: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered text: {}",
-                text_content
-            );
-        });
-    })
-}
-
-#[test]
-fn test_render_environment_card_with_last_used_timestamp() {
-    App::test((), |mut app| async move {
-        app.add_singleton_model(|_| Appearance::mock());
-
-        app.update(|ctx| {
-            let appearance = Appearance::as_ref(ctx);
-
-            // Create environment with a last-used timestamp from 2 hours ago
-            let one_day_ago = Utc::now() - Duration::days(1);
-            let two_hours_ago = Utc::now() - Duration::hours(2);
-            let environment = make_test_environment_with_timestamps(
-                "Recently Used Environment",
-                "python:3.11",
-                vec![],
-                vec![],
-                Some(ServerTimestamp::from(one_day_ago)),
-                Some(ServerTimestamp::from(two_hours_ago)),
-            );
-
-            let (
-                copy_mouse_states,
-                edit_mouse_states,
-                share_mouse_states,
-                card_hover_states,
-                view_runs_link_mouse_states,
-                copy_feedback_times,
-            ) = empty_card_mouse_states();
-
-            // Render the card
-            let card_render_state = EnvironmentCardRenderState {
-                copy_button_mouse_states: &copy_mouse_states,
-                edit_button_mouse_states: &edit_mouse_states,
-                share_button_mouse_states: &share_mouse_states,
-                card_hover_mouse_states: &card_hover_states,
-                view_runs_link_mouse_states: &view_runs_link_mouse_states,
-                copy_feedback_times: &copy_feedback_times,
-            };
-
-            let element = EnvironmentsPageWidget::render_environment_card(
-                &environment,
-                &card_render_state,
-                appearance,
-                ctx,
-                EnvironmentListScope::Personal,
-                false,
-            );
-
-            // Use debug_text_content to verify the rendered text
-            let text_content = element.debug_text_content().unwrap_or_default();
-            assert!(
-                text_content.contains("Last edited:"),
-                "Expected 'Last edited:' in rendered text: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("Last used:"),
-                "Expected 'Last used:' in rendered text: {}",
-                text_content
-            );
-            assert!(
-                !text_content.contains("never"),
-                "Did not expect 'never' in rendered text: {}",
-                text_content
-            );
-            assert!(
-                text_content.contains("View my runs"),
-                "Expected 'View my runs' link in rendered text: {}",
-                text_content
-            );
-        });
-    })
-}
diff --git a/app/src/settings_view/handoff_environment_creation_modal.rs b/app/src/settings_view/handoff_environment_creation_modal.rs
deleted file mode 100644
index 42d52981..00000000
--- a/app/src/settings_view/handoff_environment_creation_modal.rs
+++ /dev/null
@@ -1,251 +0,0 @@
-use pathfinder_color::ColorU;
-use warpui::elements::{
-    Align, ChildView, ClippedScrollStateHandle, ClippedScrollable, CrossAxisAlignment, Dismiss,
-    Element, Flex, MouseStateHandle, ParentElement, ScrollbarWidth,
-};
-use warpui::ui_components::components::UiComponent;
-use warpui::{
-    AppContext, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
-    ViewHandle,
-};
-
-use crate::ai::ambient_agents::github_auth_url::{AuthSource, GithubAuthRedirectTarget};
-use crate::ai::cloud_environments;
-use crate::appearance::Appearance;
-use crate::modal::MODAL_BACKDROP_OPACITY;
-use crate::server::cloud_objects::update_manager::UpdateManager;
-use crate::server::ids::{ClientId, SyncId};
-use crate::settings_view::update_environment_form::{
-    EnvironmentFormInitArgs, UpdateEnvironmentForm, UpdateEnvironmentFormEvent,
-};
-use crate::ui_components::buttons::icon_button;
-use crate::ui_components::dialog::{dialog_styles, Dialog};
-use crate::ui_components::icons::Icon;
-
-const DIALOG_WIDTH: f32 = 600.;
-
-#[derive(Clone, Copy, Debug)]
-enum HandoffEnvironmentCreationModalContext {
-    Handoff,
-    Orchestration,
-}
-
-#[derive(Debug, Clone)]
-pub(crate) enum HandoffEnvironmentCreationModalEvent {
-    Created { env_id: SyncId },
-    Cancelled,
-    CreationFailed { error_message: String },
-}
-
-#[derive(Debug, Clone)]
-pub(crate) enum HandoffEnvironmentCreationModalAction {
-    Cancel,
-}
-
-pub(crate) struct HandoffEnvironmentCreationModal {
-    environment_form: ViewHandle<UpdateEnvironmentForm>,
-    close_button_mouse_state: MouseStateHandle,
-    scroll_state: ClippedScrollStateHandle,
-}
-
-impl HandoffEnvironmentCreationModal {
-    pub(crate) fn new(ctx: &mut ViewContext<Self>) -> Self {
-        Self::new_impl(HandoffEnvironmentCreationModalContext::Handoff, ctx)
-    }
-
-    pub(crate) fn new_for_orchestration(ctx: &mut ViewContext<Self>) -> Self {
-        Self::new_impl(HandoffEnvironmentCreationModalContext::Orchestration, ctx)
-    }
-
-    fn new_impl(
-        context: HandoffEnvironmentCreationModalContext,
-        ctx: &mut ViewContext<Self>,
-    ) -> Self {
-        let environment_form = ctx.add_typed_action_view(move |ctx| {
-            let mut form = UpdateEnvironmentForm::new(EnvironmentFormInitArgs::Create, ctx);
-            form.set_github_auth_redirect_target(GithubAuthRedirectTarget::FocusCloudMode);
-            form.set_show_header(false, ctx);
-            form.set_should_handle_escape_from_editor(true);
-            form.set_auth_source(AuthSource::CloudSetup);
-            match context {
-                HandoffEnvironmentCreationModalContext::Handoff => {}
-                HandoffEnvironmentCreationModalContext::Orchestration => {
-                    form.configure_for_orchestration_modal(ctx);
-                }
-            }
-            form
-        });
-
-        ctx.subscribe_to_view(&environment_form, |me, _, event, ctx| {
-            me.handle_environment_form_event(event, ctx);
-        });
-
-        Self {
-            environment_form,
-            close_button_mouse_state: MouseStateHandle::default(),
-            scroll_state: ClippedScrollStateHandle::default(),
-        }
-    }
-
-    pub(crate) fn show(&mut self, ctx: &mut ViewContext<Self>) {
-        self.scroll_state = ClippedScrollStateHandle::default();
-        self.environment_form.update(ctx, |form, ctx| {
-            form.set_mode(EnvironmentFormInitArgs::Create, ctx);
-            form.focus(ctx);
-        });
-        ctx.notify();
-    }
-
-    fn handle_environment_form_event(
-        &mut self,
-        event: &UpdateEnvironmentFormEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            UpdateEnvironmentFormEvent::Created {
-                environment,
-                share_with_team,
-            } => {
-                let owner = if *share_with_team {
-                    cloud_environments::owner_for_new_environment(ctx)
-                } else {
-                    cloud_environments::owner_for_new_personal_environment(ctx)
-                };
-
-                let Some(owner) = owner else {
-                    log::error!("Unable to create environment: not logged in");
-                    ctx.emit(HandoffEnvironmentCreationModalEvent::CreationFailed {
-                        error_message: "Not logged in".to_string(),
-                    });
-                    return;
-                };
-
-                let client_id = ClientId::default();
-                let create_future =
-                    UpdateManager::handle(ctx).update(ctx, |update_manager, ctx| {
-                        update_manager.create_ambient_agent_environment_online(
-                            environment.clone(),
-                            client_id,
-                            owner,
-                            ctx,
-                        )
-                    });
-
-                ctx.spawn(create_future, |_me, result, ctx| match result {
-                    Ok(server_id) => {
-                        let env_id = SyncId::ServerId(server_id);
-                        ctx.emit(HandoffEnvironmentCreationModalEvent::Created { env_id });
-                    }
-                    Err(err) => {
-                        log::error!("Failed to create environment for handoff: {err:#}");
-                        ctx.emit(HandoffEnvironmentCreationModalEvent::CreationFailed {
-                            error_message: err.to_string(),
-                        });
-                    }
-                });
-            }
-            UpdateEnvironmentFormEvent::Cancelled => {
-                ctx.emit(HandoffEnvironmentCreationModalEvent::Cancelled);
-            }
-            UpdateEnvironmentFormEvent::Updated { .. }
-            | UpdateEnvironmentFormEvent::DeleteRequested { .. } => {}
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn uses_orchestration_form_configuration_for_test(&self, app: &AppContext) -> bool {
-        self.environment_form
-            .as_ref(app)
-            .uses_orchestration_modal_configuration_for_test()
-    }
-
-    fn render_dialog(&self, appearance: &Appearance, app: &AppContext) -> Box<dyn Element> {
-        let theme = appearance.theme();
-
-        let close_button = icon_button(
-            appearance,
-            Icon::X,
-            false,
-            self.close_button_mouse_state.clone(),
-        )
-        .build()
-        .on_click(|ctx, _, _| {
-            ctx.dispatch_typed_action(HandoffEnvironmentCreationModalAction::Cancel);
-        })
-        .finish();
-
-        let form_content = Flex::column()
-            .with_cross_axis_alignment(CrossAxisAlignment::Stretch)
-            .with_child(ChildView::new(&self.environment_form).finish())
-            .finish();
-
-        let scrollable_form = ClippedScrollable::vertical(
-            self.scroll_state.clone(),
-            form_content,
-            ScrollbarWidth::Auto,
-            theme.nonactive_ui_text_color().into(),
-            theme.active_ui_text_color().into(),
-            warpui::elements::Fill::None,
-        )
-        .finish();
-
-        let padded_form = warpui::elements::Container::new(scrollable_form)
-            .with_uniform_padding(8.)
-            .finish();
-
-        let dialog = Dialog::new(
-            "Create environment".to_string(),
-            None,
-            dialog_styles(appearance),
-        )
-        .with_close_button(close_button)
-        .with_child(padded_form)
-        .with_width(DIALOG_WIDTH)
-        .build();
-
-        let dialog = Dismiss::new(dialog.finish())
-            .prevent_interaction_with_other_elements()
-            .on_dismiss(|ctx, _app| {
-                ctx.dispatch_typed_action(HandoffEnvironmentCreationModalAction::Cancel);
-            })
-            .finish();
-
-        warpui::elements::Container::new(Align::new(dialog).finish())
-            .with_background_color(ColorU::new(0, 0, 0, MODAL_BACKDROP_OPACITY))
-            .with_corner_radius(app.windows().window_corner_radius())
-            .finish()
-    }
-}
-
-impl Entity for HandoffEnvironmentCreationModal {
-    type Event = HandoffEnvironmentCreationModalEvent;
-}
-
-impl TypedActionView for HandoffEnvironmentCreationModal {
-    type Action = HandoffEnvironmentCreationModalAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            HandoffEnvironmentCreationModalAction::Cancel => {
-                ctx.emit(HandoffEnvironmentCreationModalEvent::Cancelled);
-            }
-        }
-    }
-}
-
-impl View for HandoffEnvironmentCreationModal {
-    fn ui_name() -> &'static str {
-        "HandoffEnvironmentCreationModal"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        self.render_dialog(appearance, app)
-    }
-
-    fn on_focus(&mut self, focus_ctx: &FocusContext, ctx: &mut ViewContext<Self>) {
-        if focus_ctx.is_self_focused() {
-            ctx.focus(&self.environment_form);
-        }
-    }
-}
diff --git a/app/src/settings_view/main_page.rs b/app/src/settings_view/main_page.rs
deleted file mode 100644
index cf640db5..00000000
--- a/app/src/settings_view/main_page.rs
+++ /dev/null
@@ -1,1253 +0,0 @@
-use std::sync::{Arc, Mutex};
-
-use ::settings::{Setting, ToggleableSetting};
-use galaxy_core::channel::ChannelState;
-use galaxy_core::context_flag::ContextFlag;
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::ui::icons::Icon;
-#[cfg(not(target_family = "wasm"))]
-use galaxy_server_client::iap::{IapCredentialsState, IapManager, IapManagerEvent};
-use galaxyui::assets::asset_cache::AssetSource;
-use galaxyui::elements::{
-    Align, Border, CacheOption, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
-    Element, Empty, Flex, Image, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement,
-    Radius, Shrinkable, Text,
-};
-use galaxyui::fonts::Weight;
-use galaxyui::keymap::ContextPredicate;
-use galaxyui::platform::Cursor;
-use galaxyui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
-use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use galaxyui::ui_components::switch::SwitchStateHandle;
-use galaxyui::{
-    id, Action, AppContext, Entity, ModelHandle, SingletonEntity, TypedActionView, View,
-    ViewContext, ViewHandle,
-};
-use lazy_static::lazy_static;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-
-use super::settings_page::{
-    render_body_item, render_customer_type_badge, AdditionalInfo, LocalOnlyIconState, MatchData,
-    PageType, SettingsPageMeta, SettingsPageViewHandle, SettingsWidget, ToggleState,
-    HEADER_PADDING,
-};
-use super::{flags, SettingsAction, SettingsSection, ToggleSettingActionPair};
-use crate::appearance::Appearance;
-use crate::auth::auth_manager::{AuthManager, LoginGatedFeature};
-use crate::auth::auth_state::AuthState;
-use crate::auth::auth_view_modal::AuthViewVariant;
-use crate::auth::{AuthStateProvider, UserUid};
-use crate::autoupdate::{self, AutoupdateStage, AutoupdateState};
-use crate::server::ids::ServerId;
-use crate::settings::cloud_preferences::CloudPreferencesSettings;
-use crate::workspace::WorkspaceAction;
-use crate::workspaces::update_manager::TeamUpdateManager;
-use crate::workspaces::user_workspaces::UserWorkspaces;
-use crate::workspaces::workspace::CustomerType;
-use crate::{report_if_error, send_telemetry_from_ctx, TelemetryEvent};
-
-const PHOTO_SIZE: f32 = 40.;
-const REFERRAL_CTA: &str = "Earn rewards by sharing Warp with friends & colleagues";
-const REGULAR_TEXT_FONT_SIZE: f32 = 12.;
-const VERTICAL_MARGIN: f32 = 24.;
-const LOG_OUT_TEXT: &str = "Log out";
-lazy_static! {
-    static ref SETTINGS_SYNC_BINDINGS_ADDED: Arc<Mutex<bool>> = Default::default();
-}
-
-pub fn init_actions_from_parent_view<T: Action + Clone>(
-    app: &mut AppContext,
-    context: &ContextPredicate,
-    builder: fn(SettingsAction) -> T,
-) {
-    let mut toggle_binding_pairs = Vec::new();
-    maybe_add_settings_sync_toggle_binding(app, context, builder, &mut toggle_binding_pairs);
-
-    // Add other bindings here in the future.
-
-    ToggleSettingActionPair::add_toggle_setting_action_pairs_as_bindings(toggle_binding_pairs, app);
-}
-
-fn maybe_add_settings_sync_toggle_binding<T: Action + Clone>(
-    app: &mut AppContext,
-    context: &ContextPredicate,
-    builder: fn(SettingsAction) -> T,
-    toggle_binding_pairs: &mut Vec<ToggleSettingActionPair<T>>,
-) {
-    let mut lock = SETTINGS_SYNC_BINDINGS_ADDED
-        .lock()
-        .expect("settings sync bindings lock poisoned");
-    if !*lock {
-        *lock = true;
-        toggle_binding_pairs.push(
-            ToggleSettingActionPair::new(
-                "settings sync",
-                builder(SettingsAction::MainPageToggle(
-                    MainPageAction::ToggleSettingsSync,
-                )),
-                context,
-                flags::SETTINGS_SYNC_FLAG,
-            )
-            .is_supported_on_current_platform(
-                CloudPreferencesSettings::as_ref(app)
-                    .settings_sync_enabled
-                    .is_supported_on_current_platform(),
-            ),
-        );
-    }
-}
-
-pub fn handle_experiment_change(app: &mut AppContext) {
-    let mut toggle_binding_pairs: Vec<ToggleSettingActionPair<WorkspaceAction>> = Vec::new();
-    maybe_add_settings_sync_toggle_binding(
-        app,
-        &id!("Workspace"),
-        WorkspaceAction::DispatchToSettingsTab,
-        &mut toggle_binding_pairs,
-    );
-    ToggleSettingActionPair::add_toggle_setting_action_pairs_as_bindings(toggle_binding_pairs, app);
-}
-
-#[derive(Debug, Clone)]
-pub enum MainPageAction {
-    Relaunch,
-    DownloadUpdate,
-    CheckForUpdate,
-    ToggleSettingsSync,
-    Upgrade {
-        team_uid: Option<ServerId>,
-        user_id: UserUid,
-    },
-    GenerateStripeBillingPortalLink {
-        team_uid: ServerId,
-    },
-    SignupAnonymousUser,
-    OpenUrl(String),
-    #[cfg(not(target_family = "wasm"))]
-    RefreshIapCredentials,
-}
-
-impl MainPageAction {
-    fn blocked_for_anonymous_user(&self) -> bool {
-        use MainPageAction::*;
-        matches!(
-            self,
-            Upgrade { .. } | GenerateStripeBillingPortalLink { .. } | ToggleSettingsSync,
-        )
-    }
-}
-
-impl From<&MainPageAction> for LoginGatedFeature {
-    fn from(val: &MainPageAction) -> LoginGatedFeature {
-        match val {
-            MainPageAction::Upgrade { .. } => "Upgrade Plan",
-            MainPageAction::GenerateStripeBillingPortalLink { .. } => {
-                "Generate Stripe Billing Portal Link"
-            }
-            MainPageAction::ToggleSettingsSync => "Toggle Settings Sync",
-            _ => "Unknown reason",
-        }
-    }
-}
-
-#[derive(Clone, Copy)]
-pub enum MainSettingsPageEvent {
-    CheckForUpdate,
-    #[allow(dead_code)]
-    OpenGalaxyDrive,
-    SignupAnonymousUser,
-}
-
-pub struct MainSettingsPageView {
-    page: PageType<Self>,
-    auth_state: Arc<AuthState>,
-}
-
-impl Entity for MainSettingsPageView {
-    type Event = MainSettingsPageEvent;
-}
-
-impl TypedActionView for MainSettingsPageView {
-    type Action = MainPageAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        // Block anonymous users from upgrading
-        if AuthStateProvider::as_ref(ctx)
-            .get()
-            .is_anonymous_or_logged_out()
-            && action.blocked_for_anonymous_user()
-        {
-            AuthManager::handle(ctx).update(ctx, |auth_manager, ctx| {
-                auth_manager.attempt_login_gated_feature(
-                    action.into(),
-                    AuthViewVariant::RequireLoginCloseable,
-                    ctx,
-                )
-            });
-            return;
-        }
-
-        match action {
-            MainPageAction::Relaunch => {
-                autoupdate::initiate_relaunch_for_update(ctx);
-            }
-            MainPageAction::DownloadUpdate => {
-                autoupdate::manually_download_new_version(ctx);
-            }
-            MainPageAction::CheckForUpdate => {
-                ctx.emit(MainSettingsPageEvent::CheckForUpdate);
-                ctx.notify();
-            }
-            MainPageAction::ToggleSettingsSync => {
-                let new_value =
-                    CloudPreferencesSettings::handle(ctx).update(ctx, |prefs_settings, ctx| {
-                        report_if_error!(prefs_settings
-                            .settings_sync_enabled
-                            .toggle_and_save_value(ctx));
-                        *prefs_settings.settings_sync_enabled
-                    });
-                send_telemetry_from_ctx!(
-                    TelemetryEvent::ToggleSettingsSync {
-                        is_settings_sync_enabled: new_value,
-                    },
-                    ctx
-                );
-                ctx.notify();
-            }
-            MainPageAction::Upgrade { team_uid, user_id } => match team_uid {
-                Some(team_uid) => {
-                    ctx.open_url(&UserWorkspaces::upgrade_link_for_team(*team_uid));
-                }
-                None => {
-                    ctx.open_url(&UserWorkspaces::upgrade_link(*user_id));
-                }
-            },
-            MainPageAction::GenerateStripeBillingPortalLink { team_uid } => {
-                UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
-                    user_workspaces.generate_stripe_billing_portal_link(*team_uid, ctx);
-                });
-            }
-            MainPageAction::SignupAnonymousUser => {
-                ctx.emit(MainSettingsPageEvent::SignupAnonymousUser);
-            }
-            MainPageAction::OpenUrl(url) => {
-                ctx.open_url(url);
-            }
-            #[cfg(not(target_family = "wasm"))]
-            MainPageAction::RefreshIapCredentials => {
-                IapManager::handle(ctx).update(ctx, |manager, ctx| manager.start_refresh(ctx));
-                ctx.notify();
-            }
-        }
-    }
-}
-
-impl View for MainSettingsPageView {
-    fn ui_name() -> &'static str {
-        "MainSettingsPage"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        self.page.render(self, app)
-    }
-}
-
-impl MainSettingsPageView {
-    pub fn new(ctx: &mut ViewContext<MainSettingsPageView>) -> Self {
-        let auth_state = AuthStateProvider::as_ref(ctx).get().clone();
-
-        let autoupdate_state_handle = AutoupdateState::handle(ctx);
-        ctx.observe(
-            &autoupdate_state_handle,
-            Self::handle_autoupdate_state_change,
-        );
-
-        ctx.subscribe_to_model(&CloudPreferencesSettings::handle(ctx), |_, _, _, ctx| {
-            ctx.notify();
-        });
-
-        let auth_manager_handle = AuthManager::handle(ctx);
-        ctx.subscribe_to_model(&auth_manager_handle, |_, _, _, ctx| {
-            ctx.notify();
-        });
-
-        let mut widgets: Vec<Box<dyn SettingsWidget<View = Self>>> = vec![
-            Box::new(AccountWidget::default()),
-            Box::new(DividerWidget {}),
-        ];
-
-        widgets.push(Box::new(SettingsSyncWidget::default()));
-
-        widgets.push(Box::new(EarnRewardsWidget::default()));
-
-        #[cfg(not(target_family = "wasm"))]
-        if IapManager::as_ref(ctx).is_enabled() {
-            widgets.push(Box::new(IapCredentialsWidget::default()));
-            let iap_manager_handle = IapManager::handle(ctx);
-            ctx.subscribe_to_model(&iap_manager_handle, |_, _, e, ctx| {
-                if matches!(e, IapManagerEvent::StateChanged) {
-                    ctx.notify();
-                }
-            })
-        }
-
-        if ChannelState::app_version().is_some() {
-            widgets.push(Box::new(VersionInfoWidget::default()));
-        }
-
-        widgets.push(Box::new(LogoutWidget::default()));
-
-        let page = PageType::new_uncategorized(widgets, Some("Account"));
-
-        MainSettingsPageView { page, auth_state }
-    }
-
-    fn handle_autoupdate_state_change(
-        &mut self,
-        _: ModelHandle<AutoupdateState>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        ctx.notify();
-    }
-}
-
-#[derive(Default)]
-struct AccountWidgetStateHandles {
-    upgrade_link: MouseStateHandle,
-    anonymous_user_sign_up_button: MouseStateHandle,
-    enterprise_contact_us_link: MouseStateHandle,
-    stripe_billing_portal_link: MouseStateHandle,
-}
-
-#[derive(Default)]
-struct AccountWidget {
-    ui_state_handles: AccountWidgetStateHandles,
-}
-
-impl AccountWidget {
-    fn render_anonymous_account_info(
-        &self,
-        auth_state: &AuthState,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let button_styles = UiComponentStyles {
-            font_size: Some(14.),
-            font_weight: Some(Weight::Semibold),
-            border_radius: Some(CornerRadius::with_all(Radius::Pixels(4.))),
-            padding: Some(Coords {
-                top: 12.,
-                bottom: 12.,
-                left: 40.,
-                right: 40.,
-            }),
-            ..Default::default()
-        };
-
-        let user_info = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Accent,
-                self.ui_state_handles.anonymous_user_sign_up_button.clone(),
-            )
-            .with_style(button_styles)
-            .with_text_label("Sign up".to_owned())
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(MainPageAction::SignupAnonymousUser);
-            })
-            .finish();
-
-        let mut plan_info = Flex::column()
-            .with_main_axis_alignment(MainAxisAlignment::SpaceEvenly)
-            .with_cross_axis_alignment(CrossAxisAlignment::End);
-        let current_user_id = auth_state.user_id().unwrap_or_default();
-
-        plan_info.add_child(render_customer_type_badge(appearance, "Free".into()));
-        plan_info.add_child(
-            Container::new(
-                appearance
-                    .ui_builder()
-                    .button(
-                        ButtonVariant::Link,
-                        self.ui_state_handles.upgrade_link.clone(),
-                    )
-                    .with_text_and_icon_label(
-                        TextAndIcon::new(
-                            TextAndIconAlignment::IconFirst,
-                            "Compare plans",
-                            Icon::CoinsStacked.to_galaxyui_icon(appearance.theme().accent()),
-                            MainAxisSize::Min,
-                            MainAxisAlignment::Center,
-                            vec2f(14., 14.),
-                        )
-                        .with_inner_padding(4.),
-                    )
-                    .build()
-                    .on_click(move |ctx, _, _| {
-                        ctx.dispatch_typed_action(MainPageAction::Upgrade {
-                            team_uid: None,
-                            user_id: current_user_id,
-                        });
-                    })
-                    .finish(),
-            )
-            .with_margin_top(8.)
-            .finish(),
-        );
-
-        Flex::row()
-            .with_child(
-                Shrinkable::new(
-                    1.0,
-                    Flex::row()
-                        .with_child(user_info)
-                        .with_main_axis_alignment(MainAxisAlignment::Start)
-                        .with_main_axis_size(MainAxisSize::Max)
-                        .finish(),
-                )
-                .finish(),
-            )
-            .with_child(Align::new(plan_info.finish()).right().finish())
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .finish()
-    }
-
-    fn render_account_info(
-        &self,
-        profile_image_source: Option<&AssetSource>,
-        auth_state: &AuthState,
-        app: &AppContext,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let mut user_info = Flex::row().with_cross_axis_alignment(CrossAxisAlignment::Center);
-        if let Some(profile_image_source) = profile_image_source {
-            // Only continue if profile_image_source is a source with a non empty url/path
-            if matches!(profile_image_source, AssetSource::Async { ref id, .. } if !id.key().is_empty())
-                || matches!(profile_image_source, AssetSource::Bundled { path, .. } if !path.is_empty())
-                || matches!(profile_image_source, AssetSource::LocalFile { path, .. } if !path.is_empty())
-            {
-                let photo = Image::new(profile_image_source.clone(), CacheOption::BySize)
-                    .with_corner_radius(CornerRadius::with_all(Radius::Percentage(50.)));
-                user_info.add_child(
-                    Container::new(
-                        ConstrainedBox::new(photo.finish())
-                            .with_height(PHOTO_SIZE)
-                            .with_width(PHOTO_SIZE)
-                            .finish(),
-                    )
-                    .with_margin_right(HEADER_PADDING)
-                    .finish(),
-                );
-            }
-        }
-
-        let display_name = auth_state.username_for_display().map(|screen_name| {
-            let email = auth_state.user_email();
-            match email {
-                Some(email) => {
-                    if !screen_name.is_empty() && screen_name != email {
-                        Flex::column()
-                            .with_main_axis_alignment(MainAxisAlignment::SpaceEvenly)
-                            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                            .with_child(
-                                Text::new_inline(screen_name, appearance.ui_font_family(), 16.)
-                                    .with_color(appearance.theme().active_ui_text_color().into())
-                                    .finish(),
-                            )
-                            .with_child(
-                                appearance
-                                    .ui_builder()
-                                    .paragraph(email)
-                                    .with_style(UiComponentStyles {
-                                        font_color: Some(
-                                            appearance
-                                                .theme()
-                                                .active_ui_text_color()
-                                                .with_opacity(60)
-                                                .into(),
-                                        ),
-                                        font_size: Some(REGULAR_TEXT_FONT_SIZE),
-                                        ..Default::default()
-                                    })
-                                    .build()
-                                    .finish(),
-                            )
-                            .finish()
-                    } else {
-                        Text::new_inline(email, appearance.ui_font_family(), 16.)
-                            .with_color(appearance.theme().active_ui_text_color().into())
-                            .finish()
-                    }
-                }
-                _ => Text::new_inline(screen_name, appearance.ui_font_family(), 16.)
-                    .with_color(appearance.theme().active_ui_text_color().into())
-                    .finish(),
-            }
-        });
-
-        if let Some(display_name) = display_name {
-            user_info.add_child(display_name);
-        }
-
-        let mut plan_info = Flex::column()
-            .with_main_axis_alignment(MainAxisAlignment::SpaceEvenly)
-            .with_cross_axis_alignment(CrossAxisAlignment::End);
-        let current_user_id = auth_state.user_id().unwrap_or_default();
-        let workspaces = UserWorkspaces::as_ref(app);
-        if let Some(team) = workspaces.current_team() {
-            if team.billing_metadata.customer_type != CustomerType::Unknown {
-                plan_info.add_child(render_customer_type_badge(
-                    appearance,
-                    team.billing_metadata.customer_type.to_display_string(),
-                ));
-            }
-
-            let current_user_email = auth_state.user_email().unwrap_or_default();
-            let has_admin_permissions = team.has_admin_permissions(&current_user_email);
-            if has_admin_permissions {
-                if team.billing_metadata.customer_type == CustomerType::Enterprise {
-                    plan_info.add_child(
-                        appearance
-                            .ui_builder()
-                            .link(
-                                "Contact support".into(),
-                                Some("mailto:support@warp.dev".into()),
-                                None,
-                                self.ui_state_handles.enterprise_contact_us_link.clone(),
-                            )
-                            .soft_wrap(false)
-                            .build()
-                            .with_margin_top(8.)
-                            .finish(),
-                    );
-                } else {
-                    if team.has_billing_history {
-                        let team_uid = team.uid;
-                        plan_info.add_child(
-                            appearance
-                                .ui_builder()
-                                .link(
-                                    "Manage billing".into(),
-                                    None,
-                                    Some(Box::new(move |ctx| {
-                                        ctx.dispatch_typed_action(
-                                            MainPageAction::GenerateStripeBillingPortalLink {
-                                                team_uid,
-                                            },
-                                        );
-                                    })),
-                                    self.ui_state_handles.stripe_billing_portal_link.clone(),
-                                )
-                                .soft_wrap(false)
-                                .build()
-                                .with_margin_top(8.)
-                                .finish(),
-                        );
-                    }
-
-                    // If the team is upgradeable to self-serve tier, show them the upgrade link.
-                    if team.billing_metadata.can_upgrade_to_higher_tier_plan() {
-                        let description = match team.billing_metadata.customer_type {
-                            CustomerType::Prosumer => "Upgrade to Turbo plan",
-                            CustomerType::Turbo => "Upgrade to Lightspeed plan",
-                            _ => "Compare plans",
-                        };
-                        let team_uid = team.uid;
-                        plan_info.add_child(
-                            appearance
-                                .ui_builder()
-                                .link(
-                                    description.into(),
-                                    None,
-                                    Some(Box::new(move |ctx| {
-                                        ctx.dispatch_typed_action(MainPageAction::Upgrade {
-                                            team_uid: Some(team_uid),
-                                            user_id: current_user_id,
-                                        });
-                                    })),
-                                    self.ui_state_handles.upgrade_link.clone(),
-                                )
-                                .soft_wrap(false)
-                                .build()
-                                .with_margin_top(8.)
-                                .finish(),
-                        );
-                    }
-                }
-            }
-        } else {
-            let plan_badge_child = render_customer_type_badge(appearance, "Free".into());
-            plan_info.add_child(plan_badge_child);
-
-            plan_info.add_child(
-                appearance
-                    .ui_builder()
-                    .link(
-                        "Compare plans".into(),
-                        None,
-                        Some(Box::new(move |ctx| {
-                            ctx.dispatch_typed_action(MainPageAction::Upgrade {
-                                team_uid: None,
-                                user_id: current_user_id,
-                            });
-                        })),
-                        self.ui_state_handles.upgrade_link.clone(),
-                    )
-                    .soft_wrap(false)
-                    .build()
-                    .with_margin_top(8.)
-                    .finish(),
-            );
-        }
-
-        let mut row = Flex::row()
-            .with_child(
-                Shrinkable::new(1.0, Align::new(user_info.finish()).left().finish()).finish(),
-            )
-            .with_cross_axis_alignment(CrossAxisAlignment::Start);
-
-        if !FeatureFlag::UsageBasedPricing.is_enabled() {
-            row.add_child(Align::new(plan_info.finish()).right().finish());
-        }
-
-        row.finish()
-    }
-}
-
-impl SettingsWidget for AccountWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        "account sign up"
-    }
-
-    fn render(
-        &self,
-        view: &Self::View,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let account_info = if view.auth_state.is_anonymous_or_logged_out() {
-            self.render_anonymous_account_info(view.auth_state.as_ref(), appearance)
-        } else {
-            let profile_image_source = view.auth_state.user_photo_url().map(|url| {
-                asset_cache::url_source_with_persistence(url, &galaxy_core::paths::cache_dir())
-            });
-            self.render_account_info(
-                profile_image_source.as_ref(),
-                view.auth_state.as_ref(),
-                app,
-                appearance,
-            )
-        };
-
-        Flex::column()
-            .with_child(
-                Container::new(account_info)
-                    .with_margin_top(VERTICAL_MARGIN)
-                    .finish(),
-            )
-            .finish()
-    }
-}
-
-struct DividerWidget {}
-
-impl SettingsWidget for DividerWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        ""
-    }
-
-    fn render(
-        &self,
-        _view: &Self::View,
-        appearance: &Appearance,
-        _app: &AppContext,
-    ) -> Box<dyn Element> {
-        Container::new(
-            Container::new(Empty::new().finish())
-                .with_border(Border::bottom(1.).with_border_fill(appearance.theme().outline()))
-                .finish(),
-        )
-        .with_margin_top(VERTICAL_MARGIN)
-        .finish()
-    }
-}
-
-#[derive(Default)]
-struct SettingsSyncWidget {
-    tooltip_state: MouseStateHandle,
-    switch_state: SwitchStateHandle,
-}
-
-impl SettingsWidget for SettingsSyncWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        "settings sync"
-    }
-
-    fn should_render(&self, app: &AppContext) -> bool {
-        !AuthStateProvider::as_ref(app)
-            .get()
-            .is_anonymous_or_logged_out()
-    }
-
-    fn render(
-        &self,
-        _view: &Self::View,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let preferences_settings = CloudPreferencesSettings::as_ref(app);
-
-        let label_info = AdditionalInfo {
-            mouse_state: self.tooltip_state.clone(),
-            on_click_action: Some(MainPageAction::OpenUrl(
-                "https://docs.warp.dev/terminal/more-features/settings-sync".into(),
-            )),
-            secondary_text: None,
-            tooltip_override_text: None,
-        };
-
-        Container::new(render_body_item::<MainPageAction>(
-            "Settings sync".to_string(),
-            Some(label_info),
-            // Cloud prefs are always synced, so no need to show the local-only icon.
-            LocalOnlyIconState::Hidden,
-            ToggleState::Enabled,
-            appearance,
-            appearance
-                .ui_builder()
-                .switch(self.switch_state.clone())
-                .check(*preferences_settings.settings_sync_enabled.value())
-                .build()
-                .on_click(move |ctx, _, _| {
-                    ctx.dispatch_typed_action(MainPageAction::ToggleSettingsSync)
-                })
-                .finish(),
-            None,
-        ))
-        .with_margin_top(VERTICAL_MARGIN)
-        .finish()
-    }
-}
-
-#[derive(Default)]
-struct EarnRewardsWidget {
-    refer_link_mouse_handle: MouseStateHandle,
-}
-
-impl EarnRewardsWidget {
-    fn render_row(
-        &self,
-        appearance: &Appearance,
-        label: &str,
-        right_child: Box<dyn Element>,
-    ) -> Box<dyn Element> {
-        Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .with_child(
-                Shrinkable::new(
-                    1.0,
-                    Align::new(
-                        Text::new_inline(
-                            label.to_string(),
-                            appearance.ui_font_family(),
-                            REGULAR_TEXT_FONT_SIZE,
-                        )
-                        .with_color(appearance.theme().active_ui_text_color().into())
-                        .finish(),
-                    )
-                    .left()
-                    .finish(),
-                )
-                .finish(),
-            )
-            .with_child(right_child)
-            .finish()
-    }
-}
-
-impl SettingsWidget for EarnRewardsWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        "earn rewards referral share friends"
-    }
-
-    fn should_render(&self, app: &AppContext) -> bool {
-        !AuthStateProvider::as_ref(app)
-            .get()
-            .is_anonymous_or_logged_out()
-    }
-
-    fn render(
-        &self,
-        _view: &Self::View,
-        appearance: &Appearance,
-        _app: &AppContext,
-    ) -> Box<dyn Element> {
-        Container::new(
-            self.render_row(
-                appearance,
-                REFERRAL_CTA,
-                appearance
-                    .ui_builder()
-                    .link(
-                        "Refer a friend".into(),
-                        None,
-                        Some(Box::new(move |ctx| {
-                            ctx.dispatch_typed_action(WorkspaceAction::ShowReferralSettingsPage);
-                        })),
-                        self.refer_link_mouse_handle.clone(),
-                    )
-                    .soft_wrap(false)
-                    .build()
-                    .finish(),
-            ),
-        )
-        .with_margin_top(VERTICAL_MARGIN)
-        .finish()
-    }
-}
-
-#[derive(Default)]
-struct VersionInfoWidget {
-    copy_version_button_mouse_state: MouseStateHandle,
-    version_info_cta_link_mouse_state: MouseStateHandle,
-}
-
-impl VersionInfoWidget {
-    fn render_version_info(
-        &self,
-        version: &'static str,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let faded_text_color = appearance
-            .theme()
-            .active_ui_text_color()
-            .with_opacity(60)
-            .into();
-        struct StatusContent {
-            text: &'static str,
-            color: ColorU,
-        }
-        struct CallToActionContent {
-            text: &'static str,
-            action: MainPageAction,
-        }
-
-        let (status_content, call_to_action_content) =
-            if ContextFlag::PromptForVersionUpdates.is_enabled() {
-                let ansi_red: ColorU = appearance.theme().terminal_colors().bright.red.into();
-                match autoupdate::get_update_state(app) {
-                    AutoupdateStage::NoUpdateAvailable => (
-                        Some(StatusContent {
-                            text: "Up to date",
-                            color: faded_text_color,
-                        }),
-                        Some(CallToActionContent {
-                            text: "Check for updates",
-                            action: MainPageAction::CheckForUpdate,
-                        }),
-                    ),
-                    AutoupdateStage::CheckingForUpdate => (
-                        Some(StatusContent {
-                            text: "checking for update...",
-                            color: faded_text_color,
-                        }),
-                        None,
-                    ),
-                    AutoupdateStage::DownloadingUpdate => (
-                        Some(StatusContent {
-                            text: "downloading update...",
-                            color: faded_text_color,
-                        }),
-                        None,
-                    ),
-                    AutoupdateStage::UpdateReady { .. } => (
-                        Some(StatusContent {
-                            text: "Update available",
-                            color: ansi_red,
-                        }),
-                        Some(CallToActionContent {
-                            text: "Relaunch Warp",
-                            action: MainPageAction::Relaunch,
-                        }),
-                    ),
-                    AutoupdateStage::Updating { .. } => (
-                        Some(StatusContent {
-                            text: "Updating...",
-                            color: faded_text_color,
-                        }),
-                        None,
-                    ),
-                    AutoupdateStage::UpdatedPendingRestart { .. } => (
-                        Some(StatusContent {
-                            text: "Installed update",
-                            color: faded_text_color,
-                        }),
-                        Some(CallToActionContent {
-                            text: "Relaunch Warp",
-                            action: MainPageAction::Relaunch,
-                        }),
-                    ),
-                    AutoupdateStage::UnableToUpdateToNewVersion { .. } => (
-                        Some(StatusContent {
-                            text: "A new version of Warp is available but can't be installed",
-                            color: ansi_red,
-                        }),
-                        Some(CallToActionContent {
-                            text: "Update Warp manually",
-                            // note: the handler for this action is a no-op
-                            action: MainPageAction::DownloadUpdate,
-                        }),
-                    ),
-                    AutoupdateStage::UnableToLaunchNewVersion { .. } => (
-                        Some(StatusContent {
-                            text: "A new version of Warp is installed but can't be launched.",
-                            color: ansi_red,
-                        }),
-                        Some(CallToActionContent {
-                            text: "Update Warp manually",
-                            // note: the handler for this action is a no-op
-                            action: MainPageAction::DownloadUpdate,
-                        }),
-                    ),
-                }
-            } else {
-                (None, None)
-            };
-
-        let mut first_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .with_child(
-                Shrinkable::new(
-                    1.0,
-                    Align::new(
-                        Text::new_inline(
-                            "Version".to_string(),
-                            appearance.ui_font_family(),
-                            REGULAR_TEXT_FONT_SIZE,
-                        )
-                        .with_color(faded_text_color)
-                        .finish(),
-                    )
-                    .left()
-                    .finish(),
-                )
-                .finish(),
-            );
-        if let Some(call_to_action_content) = call_to_action_content {
-            first_row.add_child(
-                appearance
-                    .ui_builder()
-                    .link(
-                        call_to_action_content.text.into(),
-                        None,
-                        Some(Box::new(move |ctx| {
-                            ctx.dispatch_typed_action(call_to_action_content.action.clone());
-                        })),
-                        self.version_info_cta_link_mouse_state.clone(),
-                    )
-                    .soft_wrap(false)
-                    .build()
-                    .finish(),
-            );
-        }
-
-        let mut second_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-            .with_child(
-                Shrinkable::new(
-                    1.0,
-                    Align::new(
-                        Flex::row()
-                            .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                            .with_child(
-                                appearance
-                                    .ui_builder()
-                                    .copy_button(16., self.copy_version_button_mouse_state.clone())
-                                    .build()
-                                    .with_cursor(Cursor::PointingHand)
-                                    .on_click(move |ctx, _, _| {
-                                        ctx.dispatch_typed_action(WorkspaceAction::CopyVersion(
-                                            version,
-                                        ));
-                                    })
-                                    .finish(),
-                            )
-                            .with_child(
-                                Container::new(
-                                    Text::new_inline(
-                                        version.to_string(),
-                                        appearance.ui_font_family(),
-                                        REGULAR_TEXT_FONT_SIZE,
-                                    )
-                                    .with_color(appearance.theme().active_ui_text_color().into())
-                                    .finish(),
-                                )
-                                .with_margin_left(8.)
-                                .finish(),
-                            )
-                            .finish(),
-                    )
-                    .left()
-                    .finish(),
-                )
-                .finish(),
-            );
-        if let Some(status_content) = status_content {
-            second_row.add_child(
-                Text::new_inline(
-                    status_content.text.to_string(),
-                    appearance.ui_font_family(),
-                    REGULAR_TEXT_FONT_SIZE,
-                )
-                .with_color(status_content.color)
-                .finish(),
-            );
-        }
-
-        let mut version_info = Flex::column();
-        version_info.add_child(first_row.finish());
-        version_info.add_child(
-            Container::new(second_row.finish())
-                .with_margin_top(5.)
-                .finish(),
-        );
-        version_info.finish()
-    }
-}
-
-impl SettingsWidget for VersionInfoWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        "version update"
-    }
-
-    fn render(
-        &self,
-        _view: &Self::View,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        if let Some(version) = ChannelState::app_version() {
-            Container::new(self.render_version_info(version, appearance, app))
-                .with_margin_top(VERTICAL_MARGIN)
-                .finish()
-        } else {
-            log::error!("Shouldn't render VersionInfoWidget without GIT_RELEASE_TAG");
-            Empty::new().finish()
-        }
-    }
-}
-
-#[derive(Default)]
-struct LogoutWidget {
-    mouse_state: MouseStateHandle,
-}
-
-impl LogoutWidget {
-    fn render_logout_button(&self, appearance: &Appearance) -> Box<dyn Element> {
-        appearance
-            .ui_builder()
-            .button(ButtonVariant::Secondary, self.mouse_state.clone())
-            .with_text_label(LOG_OUT_TEXT.into())
-            .with_style(UiComponentStyles {
-                font_size: Some(14.),
-                padding: Some(Coords::uniform(8.).left(32.).right(32.)),
-                ..Default::default()
-            })
-            .build()
-            .on_click(|ctx, _, _| {
-                ctx.dispatch_typed_action(WorkspaceAction::LogOut);
-            })
-            .finish()
-    }
-}
-
-/// Widget displaying IAP credential state and a refresh button. Only
-/// visible on staging channels where IAP is active.
-#[cfg(not(target_family = "wasm"))]
-#[derive(Default)]
-struct IapCredentialsWidget {
-    refresh_button_mouse_state: MouseStateHandle,
-}
-
-#[cfg(not(target_family = "wasm"))]
-impl SettingsWidget for IapCredentialsWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        "iap staging gcloud proxy credentials"
-    }
-
-    fn render(
-        &self,
-        _view: &Self::View,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        // `is_enabled()` gates widget registration in `MainSettingsPageView::new`,
-        // so `state()` should be `Some` here; bail out defensively though.
-        let Some(state) = IapManager::as_ref(app).state() else {
-            return Empty::new().finish();
-        };
-        let ansi_red: ColorU = appearance.theme().terminal_colors().bright.red.into();
-        let disabled: ColorU = appearance.theme().disabled_ui_text_color().into();
-        let active: ColorU = appearance.theme().active_ui_text_color().into();
-        let (status_text, status_color): (String, ColorU) = match &state {
-            IapCredentialsState::Missing => ("Not yet loaded".to_string(), disabled),
-            IapCredentialsState::Refreshing { .. } => ("Refreshing…".to_string(), active),
-            IapCredentialsState::Loaded(cached) => {
-                let remaining = cached
-                    .expires_at
-                    .saturating_duration_since(instant::Instant::now());
-                let mins = remaining.as_secs() / 60;
-                (format!("Loaded (refreshes in ~{mins}m)"), active)
-            }
-            IapCredentialsState::Failed { message, .. } => (format!("Failed: {message}"), ansi_red),
-            IapCredentialsState::EnvInjected { .. } => {
-                ("Using injected token (WARP_IAP_TOKEN)".to_string(), active)
-            }
-        };
-
-        let is_refreshing = matches!(state, IapCredentialsState::Refreshing { .. });
-
-        let label = Align::new(
-            Text::new_inline(
-                "Staging IAP credentials".to_string(),
-                appearance.ui_font_family(),
-                REGULAR_TEXT_FONT_SIZE,
-            )
-            .with_color(appearance.theme().active_ui_text_color().into())
-            .finish(),
-        )
-        .left()
-        .finish();
-
-        let status = Container::new(
-            appearance
-                .ui_builder()
-                .paragraph(status_text)
-                .with_style(UiComponentStyles {
-                    font_color: Some(status_color),
-                    font_size: Some(REGULAR_TEXT_FONT_SIZE),
-                    ..Default::default()
-                })
-                .build()
-                .finish(),
-        )
-        .with_margin_top(4.)
-        .finish();
-
-        let refresh_button = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Secondary,
-                self.refresh_button_mouse_state.clone(),
-            )
-            .with_text_label(if is_refreshing {
-                "Refreshing…".into()
-            } else {
-                "Refresh".into()
-            })
-            .with_style(UiComponentStyles {
-                font_size: Some(12.),
-                padding: Some(Coords::uniform(6.).left(16.).right(16.)),
-                ..Default::default()
-            })
-            .build()
-            .on_click(|ctx, _, _| {
-                ctx.dispatch_typed_action(MainPageAction::RefreshIapCredentials);
-            })
-            .finish();
-
-        let button_row = Container::new(Align::new(refresh_button).left().finish())
-            .with_margin_top(8.)
-            .finish();
-
-        Container::new(
-            Flex::column()
-                .with_cross_axis_alignment(CrossAxisAlignment::Start)
-                .with_child(label)
-                .with_child(status)
-                .with_child(button_row)
-                .finish(),
-        )
-        .with_margin_top(VERTICAL_MARGIN)
-        .finish()
-    }
-}
-
-impl SettingsWidget for LogoutWidget {
-    type View = MainSettingsPageView;
-
-    fn search_terms(&self) -> &str {
-        "sign out log out logout"
-    }
-
-    fn should_render(&self, app: &AppContext) -> bool {
-        !AuthStateProvider::as_ref(app)
-            .get()
-            .is_anonymous_or_logged_out()
-    }
-
-    fn render(
-        &self,
-        _view: &Self::View,
-        appearance: &Appearance,
-        _app: &AppContext,
-    ) -> Box<dyn Element> {
-        Container::new(
-            Align::new(self.render_logout_button(appearance))
-                .left()
-                .finish(),
-        )
-        .with_margin_top(VERTICAL_MARGIN)
-        .finish()
-    }
-}
-
-impl SettingsPageMeta for MainSettingsPageView {
-    fn section() -> SettingsSection {
-        SettingsSection::Account
-    }
-
-    fn should_render(&self, _ctx: &AppContext) -> bool {
-        true
-    }
-
-    fn on_page_selected(&mut self, _: bool, ctx: &mut ViewContext<Self>) {
-        // We want to immediately see if the user is part of a workspace rather than wait for the next poll.
-        std::mem::drop(
-            TeamUpdateManager::handle(ctx)
-                .update(ctx, |manager, ctx| manager.refresh_workspace_metadata(ctx)),
-        );
-    }
-
-    fn update_filter(&mut self, query: &str, ctx: &mut ViewContext<Self>) -> MatchData {
-        self.page.update_filter(query, ctx)
-    }
-
-    fn scroll_to_widget(&mut self, widget_id: &'static str) {
-        self.page.scroll_to_widget(widget_id)
-    }
-
-    fn clear_highlighted_widget(&mut self) {
-        self.page.clear_highlighted_widget();
-    }
-}
-
-impl From<ViewHandle<MainSettingsPageView>> for SettingsPageViewHandle {
-    fn from(view_handle: ViewHandle<MainSettingsPageView>) -> Self {
-        SettingsPageViewHandle::Main(view_handle)
-    }
-}
diff --git a/app/src/settings_view/mod.rs b/app/src/settings_view/mod.rs
index cb467711..207589d3 100644
--- a/app/src/settings_view/mod.rs
+++ b/app/src/settings_view/mod.rs
@@ -5,10 +5,7 @@ use std::str::FromStr;
 use about_page::AboutPageView;
 use ai_page::{AISettingsPageAction, AISettingsPageEvent, AISettingsPageView, AISubpage};
 use appearance_page::{AppearancePageAction, AppearanceSettingsPageView};
-use billing_and_usage_dispatch::BillingAndUsageDispatchView;
-use billing_and_usage_page::BillingAndUsagePageEvent;
 use code_page::{CodeSettingsPageAction, CodeSettingsPageEvent, CodeSubpage};
-use environments_page::EnvironmentsPageView;
 use features_page::{FeaturesPageView, FeaturesSettingsPageEvent};
 use galaxy_core::channel::ChannelState;
 use galaxy_core::context_flag::ContextFlag;
@@ -32,19 +29,16 @@ use galaxyui::{
 };
 use itertools::Itertools as _;
 use keybindings::KeybindingsView;
-use main_page::{MainPageAction, MainSettingsPageEvent, MainSettingsPageView};
 use mcp_servers_page::MCPServersSettingsPageView;
 use nav::{SettingsNavItem, SettingsUmbrella};
 use pathfinder_geometry::vector::Vector2F;
 use privacy_page::{PrivacyPageView, PrivacyPageViewEvent};
-use referrals_page::{ReferralsPageEvent, ReferralsPageView};
 use scripting_page::ScriptingSettingsPageView;
 use settings_file_footer::{render_footer, SettingsFooterKind, SettingsFooterMouseStates};
 use settings_page::{
     MatchData, SettingsPage, SettingsPageEvent, SettingsPageMeta, SettingsPageViewHandle,
     HEADER_PADDING,
 };
-use show_blocks_view::{ShowBlocksEvent, ShowBlocksView};
 use teams_page::{TeamsPageView, TeamsPageViewEvent};
 use warpify_page::{WarpifyPageAction, WarpifyPageView};
 
@@ -77,22 +71,13 @@ mod admin_actions;
 mod agent_assisted_environment_modal;
 mod ai_page;
 mod appearance_page;
-mod billing_and_usage;
-mod billing_and_usage_dispatch;
-mod billing_and_usage_page;
-mod billing_and_usage_page_v2;
 mod code_page;
-pub(crate) mod custom_inference_modal;
 mod custom_router_view;
-mod delete_environment_confirmation_dialog;
 mod directory_color_add_picker;
-pub(crate) mod environments_page;
 mod execution_profile_view;
 mod features;
 mod features_page;
-pub(crate) mod handoff_environment_creation_modal;
 pub mod keybindings;
-mod main_page;
 pub mod mcp_servers;
 pub mod mcp_servers_page;
 mod nav;
@@ -101,17 +86,13 @@ mod platform;
 mod platform_page;
 mod privacy;
 mod privacy_page;
-mod referrals_page;
-mod remove_custom_endpoint_confirmation_dialog;
 mod scripting_page;
 mod set_default_model_modal;
 mod settings_file_footer;
 pub(crate) mod settings_page;
-mod show_blocks_view;
 mod tab_menu;
 mod teams_page;
 mod telemetry;
-mod transfer_ownership_confirmation_modal;
 pub mod update_environment_form;
 mod warp_drive_page;
 mod warpify_page;
@@ -119,10 +100,8 @@ mod warpify_page;
 #[cfg(not(target_family = "wasm"))]
 pub(crate) use ai_page::cli_agent_settings_widget_id;
 pub(crate) use ai_page::custom_model_routers_widget_id;
-pub use billing_and_usage_page::create_discount_badge;
 pub use code_page::CodeSettingsPageView;
 pub use features_page::FeaturesPageAction;
-pub use main_page::handle_experiment_change;
 pub use privacy_page::PrivacyPageAction;
 pub use settings_page::{
     render_body_item_label, render_info_icon, render_input_list, render_separator, AdditionalInfo,
@@ -245,17 +224,13 @@ pub enum SettingsViewEvent {
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
 pub enum SettingsSection {
     About,
-    Account,
     MCPServers,
-    BillingAndUsage,
     #[default]
     Appearance,
     Features,
     Keybindings,
     Privacy,
-    Referrals,
     Scripting,
-    SharedBlocks,
     Teams,
     WarpDrive,
     Warpify,
@@ -280,11 +255,6 @@ pub enum SettingsSection {
     // ── Code umbrella subpages ──
     CodeIndexing,
     EditorAndCodeReview,
-    // Dead variants — pages removed from nav but files still reference these
-    #[allow(dead_code)]
-    CloudEnvironments,
-    #[allow(dead_code)]
-    OzCloudAPIKeys,
 }
 
 use std::fmt::{self, Display};
@@ -294,7 +264,6 @@ use crate::util::bindings::custom_tag_to_keystroke;
 impl Display for SettingsSection {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            SettingsSection::BillingAndUsage => write!(f, "Billing and usage"),
             SettingsSection::Keybindings => write!(f, "Keyboard shortcuts"),
             SettingsSection::MCPServers => write!(f, "MCP Servers"),
             SettingsSection::Scripting => write!(f, "Scripting"),
@@ -378,22 +347,17 @@ impl FromStr for SettingsSection {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
             "About" => Ok(Self::About),
-            "Account" => Ok(Self::Account),
             "AI" => Ok(Self::AI),
             "MCP Servers" => Ok(Self::MCPServers),
-            "Billing and usage" => Ok(Self::BillingAndUsage),
             "Appearance" => Ok(Self::Appearance),
             "Code" => Ok(Self::Code),
             "Features" => Ok(Self::Features),
             "Keyboard shortcuts" => Ok(Self::Keybindings),
             "Privacy" => Ok(Self::Privacy),
-            "Referrals" => Ok(Self::Referrals),
             "Scripting" => Ok(Self::Scripting),
-            "Shared blocks" => Ok(Self::SharedBlocks),
             "Teams" => Ok(Self::Teams),
             "Warpify" => Ok(Self::Warpify),
             "WarpDrive" | "Galaxy Drive" => Ok(Self::WarpDrive),
-            // This page was called "Oz" at one point, keep for backward compatibility.
             "Oz" | "Warp Agent" | "Galaxy Agent" => Ok(Self::WarpAgent),
             "Profiles" | "AgentProfiles" => Ok(Self::AgentProfiles),
             "MCP servers" | "AgentMCPServers" => Ok(Self::AgentMCPServers),
@@ -402,9 +366,6 @@ impl FromStr for SettingsSection {
             "AWS Bedrock" | "Bedrock" => Ok(Self::Bedrock),
             "Indexing and projects" | "CodeIndexing" => Ok(Self::CodeIndexing),
             "Editor and Code Review" | "EditorAndCodeReview" => Ok(Self::EditorAndCodeReview),
-            "CloudEnvironments" | "Environments" => Ok(Self::CloudEnvironments),
-            "OzCloudAPIKeys" => Ok(Self::OzCloudAPIKeys),
-            "SharedBlocks" | "Shared Blocks" => Ok(Self::SharedBlocks),
             _ => Err(()),
         }
     }
@@ -636,7 +597,6 @@ pub fn init_actions_from_parent_view<T: Action + Clone>(
     context: &ContextPredicate,
     builder: fn(SettingsAction) -> T,
 ) {
-    main_page::init_actions_from_parent_view(app, context, builder);
     appearance_page::init_actions_from_parent_view(app, context, builder);
     features_page::init_actions_from_parent_view(app, context, builder);
     warpify_page::init_actions_from_parent_view(app, context, builder);
@@ -941,7 +901,6 @@ pub enum DebugSettingsAction {
 pub enum SettingsAction {
     SelectAndRefresh(SettingsSection),
     ToggleUmbrella(usize),
-    MainPageToggle(MainPageAction),
     AppearancePageToggle(AppearancePageAction),
     FeaturesPageToggle(FeaturesPageAction),
     PrivacyPageToggle(PrivacyPageAction),
@@ -1088,24 +1047,19 @@ fn next_stop_index(current: usize, len: usize, direction: CycleDirection) -> usi
 macro_rules! update_page {
     ($handle:expr, $update:expr, $ctx:expr) => {
         match $handle {
-            SettingsPageViewHandle::Main(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Appearance(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Features(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Keybindings(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Warpify(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Privacy(handle) => $ctx.update_view(handle, $update),
-            SettingsPageViewHandle::Referrals(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Scripting(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::AI(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::About(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Code(handle) => $ctx.update_view(handle, $update),
-            SettingsPageViewHandle::BillingAndUsage(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::MCPServers(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::WarpDrive(handle) => $ctx.update_view(handle, $update),
-            SettingsPageViewHandle::CloudEnvironments(handle) => $ctx.update_view(handle, $update),
-            SettingsPageViewHandle::OzCloudAPIKeys(handle) => $ctx.update_view(handle, $update),
             SettingsPageViewHandle::Teams(handle) => $ctx.update_view(handle, $update),
-            SettingsPageViewHandle::SharedBlocks(handle) => $ctx.update_view(handle, $update),
+            SettingsPageViewHandle::Platform(handle) => $ctx.update_view(handle, $update),
         }
     };
 }
@@ -1147,11 +1101,6 @@ impl SettingsView {
         let pane_configuration = ctx.add_model(|_ctx| PaneConfiguration::new("Settings"));
 
         let global_resource_handles = GlobalResourceHandlesProvider::as_ref(ctx).get().clone();
-        // Main settings page with accounts info
-        let main_page_handle = ctx.add_typed_action_view(MainSettingsPageView::new);
-        ctx.subscribe_to_view(&main_page_handle, |me, _, event, ctx| {
-            me.handle_main_page_event(event, ctx);
-        });
 
         // Appearance & themes page
         let appearance_page_handle = ctx.add_typed_action_view(AppearanceSettingsPageView::new);
@@ -1178,13 +1127,6 @@ impl SettingsView {
             me.handle_ai_page_event(event, ctx);
         });
 
-        // Billing & Usage page (internally, this routes to the v1 or v2 version. Depending on FFs and current plan).
-        let billing_and_usage_handle = ctx.add_view(BillingAndUsageDispatchView::new);
-        ctx.subscribe_to_view(&billing_and_usage_handle, |me, _, event, ctx| {
-            me.handle_billing_and_usage_page_event(event, ctx);
-        });
-        let billing_and_usage_page = SettingsPage::new(billing_and_usage_handle);
-
         // Keybindings page
         let keybindings_handle = ctx.add_typed_action_view(KeybindingsView::new);
 
@@ -1259,9 +1201,7 @@ impl SettingsView {
         });
 
         let mut settings_pages = vec![
-            SettingsPage::new(main_page_handle),
             SettingsPage::new(ai_page_handle),
-            billing_and_usage_page,
             SettingsPage::new(code_page_handle),
             SettingsPage::new(appearance_page_handle),
             SettingsPage::new(features_page_handle),
@@ -1305,16 +1245,7 @@ impl SettingsView {
         ];
 
         if FeatureFlag::WarpControlCli.is_enabled() {
-            let shared_blocks_index = nav_items
-                .iter()
-                .position(|item| {
-                    matches!(item, SettingsNavItem::Page(SettingsSection::SharedBlocks))
-                })
-                .unwrap_or(nav_items.len());
-            nav_items.insert(
-                shared_blocks_index,
-                SettingsNavItem::Page(SettingsSection::Scripting),
-            );
+            nav_items.push(SettingsNavItem::Page(SettingsSection::Scripting));
         }
 
         // Resolve the initial page: map internal backing-page sections to their default subpage.
@@ -1322,7 +1253,7 @@ impl SettingsView {
             Some(SettingsSection::AI) => SettingsSection::WarpAgent,
             Some(SettingsSection::Code) => SettingsSection::CodeIndexing,
             Some(SettingsSection::Scripting) if !FeatureFlag::WarpControlCli.is_enabled() => {
-                SettingsSection::Account
+                SettingsSection::About
             }
             Some(section) if section.is_subpage() => section,
             other => other.unwrap_or_default(),
@@ -1686,40 +1617,6 @@ impl SettingsView {
             .collect();
     }
 
-    fn handle_main_page_event(
-        &mut self,
-        event: &MainSettingsPageEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            MainSettingsPageEvent::CheckForUpdate => ctx.emit(SettingsViewEvent::CheckForUpdate),
-            MainSettingsPageEvent::SignupAnonymousUser => {
-                ctx.emit(SettingsViewEvent::SignupAnonymousUser)
-            }
-            _ => (),
-        }
-    }
-
-    fn handle_billing_and_usage_page_event(
-        &mut self,
-        event: &BillingAndUsagePageEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            BillingAndUsagePageEvent::SignupAnonymousUser => {
-                ctx.emit(SettingsViewEvent::SignupAnonymousUser)
-            }
-            BillingAndUsagePageEvent::ShowToast { message, flavor } => {
-                ctx.emit(SettingsViewEvent::ShowToast {
-                    message: message.clone(),
-                    flavor: *flavor,
-                })
-            }
-            BillingAndUsagePageEvent::ShowModal => ctx.notify(),
-            BillingAndUsagePageEvent::HideModal => ctx.notify(),
-        }
-    }
-
     fn handle_appearance_page_event(
         &mut self,
         event: &SettingsPageEvent,
@@ -2021,20 +1918,18 @@ impl SettingsView {
 
     fn should_render_page(&self, settings_page: &SettingsPage, app: &AppContext) -> bool {
         match &settings_page.view_handle {
-            SettingsPageViewHandle::Main(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Keybindings(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Features(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Appearance(v) => v.as_ref(app).should_render(app),
-            SettingsPageViewHandle::BillingAndUsage(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::About(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Privacy(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Warpify(v) => v.as_ref(app).should_render(app),
-            SettingsPageViewHandle::Referrals(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Scripting(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::AI(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::MCPServers(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::Code(v) => v.as_ref(app).should_render(app),
             SettingsPageViewHandle::WarpDrive(v) => v.as_ref(app).should_render(app),
+            SettingsPageViewHandle::Platform(v) => v.as_ref(app).should_render(app),
             _ => true,
         }
     }
@@ -2222,9 +2117,6 @@ impl SettingsView {
         app: &AppContext,
     ) -> Option<Box<dyn Element>> {
         match page_handle {
-            SettingsPageViewHandle::BillingAndUsage(view) => {
-                view.read(app, |view, _| view.get_modal_content(app))
-            }
             SettingsPageViewHandle::Privacy(view) => {
                 view.read(app, |view, _| view.get_modal_content())
             }
@@ -2560,15 +2452,6 @@ impl TypedActionView for SettingsView {
                     ctx.notify();
                 }
             }
-            SettingsAction::MainPageToggle(main_page_action) => {
-                if let Some(main_page) = self.settings_page(SettingsSection::Account) {
-                    if let SettingsPageViewHandle::Main(view) = &main_page.view_handle {
-                        view.update(ctx, |view, ctx| {
-                            view.handle_action(main_page_action, ctx);
-                        })
-                    }
-                }
-            }
             SettingsAction::AppearancePageToggle(appearance_action) => {
                 if let Some(appearance_page) = self.settings_page(SettingsSection::Appearance) {
                     if let SettingsPageViewHandle::Appearance(view) = &appearance_page.view_handle {
diff --git a/app/src/settings_view/platform_page.rs b/app/src/settings_view/platform_page.rs
index cdda5bcd..ebe16fb4 100644
--- a/app/src/settings_view/platform_page.rs
+++ b/app/src/settings_view/platform_page.rs
@@ -910,7 +910,7 @@ impl PlatformPageWidget {
 
 impl SettingsPageMeta for PlatformPageView {
     fn section() -> SettingsSection {
-        SettingsSection::OzCloudAPIKeys
+        SettingsSection::About
     }
 
     fn should_render(&self, ctx: &AppContext) -> bool {
@@ -941,7 +941,7 @@ impl SettingsPageMeta for PlatformPageView {
 
 impl From<ViewHandle<PlatformPageView>> for SettingsPageViewHandle {
     fn from(view_handle: ViewHandle<PlatformPageView>) -> Self {
-        SettingsPageViewHandle::OzCloudAPIKeys(view_handle)
+        SettingsPageViewHandle::Platform(view_handle)
     }
 }
 
diff --git a/app/src/settings_view/referrals_page.rs b/app/src/settings_view/referrals_page.rs
deleted file mode 100644
index ced75a07..00000000
--- a/app/src/settings_view/referrals_page.rs
+++ /dev/null
@@ -1,1128 +0,0 @@
-#![allow(dead_code)]
-
-use std::ops::Deref;
-use std::sync::Arc;
-
-use galaxyui::fonts::Weight;
-use galaxyui::ui_components::button::ButtonVariant;
-use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use galaxyui::{
-    AppContext, Entity, EventContext, FocusContext, SingletonEntity, TypedActionView, View,
-    ViewContext, ViewHandle,
-};
-use lazy_static::lazy_static;
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::Vector2F;
-use thiserror::Error;
-use validator::ValidateEmail;
-use warpui::clipboard::ClipboardContent;
-use warpui::elements::{
-    Align, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Element, Fill,
-    Flex, FormattedTextElement, HighlightedHyperlink, Icon, MainAxisSize, MouseStateHandle,
-    ParentElement, Radius, Rect, Shrinkable,
-};
-
-use super::settings_page::{
-    MatchData, PageType, SettingsPageMeta, SettingsPageViewHandle, SettingsWidget, PAGE_PADDING,
-};
-use super::SettingsSection;
-use crate::appearance::Appearance;
-use crate::auth::AuthStateProvider;
-use crate::editor::{EditorView, Event as EditorEvent, SingleLineEditorOptions, TextOptions};
-use crate::server::server_api::referral::{ReferralInfo, ReferralsClient};
-use crate::server::telemetry::TelemetryEvent;
-use crate::ui_components::blended_colors;
-use crate::view_components::ToastFlavor;
-use crate::{safe_info, send_telemetry_from_ctx};
-
-const HEADER_FONT_SIZE: f32 = 18.;
-const HEADER_MARGIN_BOTTOM: f32 = 32.;
-const HEADER_TEXT: &str = "Invite a friend to Warp";
-const ANONYMOUS_USER_HEADER_TEXT: &str = "Sign up to participate in Warp's referral program";
-
-const INVITE_FIELD_LABEL_BOTTOM_MARGIN: f32 = 8.;
-
-const LINK_BOTTOM_MARGIN: f32 = 12.;
-const LINK_TEXT_PADDING: f32 = 10.;
-const LINK_CORNER_RADIUS: Radius = Radius::Pixels(4.);
-const LINK_ERROR_TEXT: &str = "Failed to load referral code.";
-
-const BUTTON_WIDTH: f32 = 98.;
-const BUTTON_HEIGHT: f32 = 36.;
-const BUTTON_LEFT_MARGIN: f32 = 8.;
-const BUTTON_FONT_SIZE: f32 = 12.;
-const LINK_BUTTON_TEXT: &str = "Copy link";
-const EMAIL_BUTTON_TEXT: &str = "Send";
-const EMAIL_BUTTON_SENDING_TEXT: &str = "Sending...";
-const LOADING_TEXT: &str = "Loading...";
-
-const LINK_COPIED_TOAST: &str = "Link copied.";
-const EMAIL_SUCCESS_TOAST: &str = "Successfully sent emails.";
-const EMAIL_FAILURE_TOAST: &str = "Failed to send emails. Please try again.";
-
-const REWARD_INTRO: &str = "Get exclusive Warp goodies when you refer someone*";
-const REWARD_INTRO_FONT_SIZE: f32 = 14.;
-const REWARD_SECTION_VERTICAL_SPACING: f32 = 24.;
-
-const REFERRAL_ICON_BOX_VERTICAL_SPACING: f32 = 8.;
-const REWARD_ICON_BOX_HEIGHT: f32 = 60.;
-const REWARD_ICON_BOX_WIDTH: f32 = 80.;
-const REWARD_ICON_BORDER_CORNER_RADIUS: Radius = Radius::Pixels(8.);
-const REWARD_ICON_BOX_DESCRIPTION_HORIZONTAL_SPACING: f32 = 12.;
-const REWARD_ICON_BOX_BORDER_WIDTH: f32 = 1.;
-
-const METER_LEVEL_BORDER_WIDTH: f32 = 2.;
-const METER_LEVEL_CIRCLE_HEIGHT: f32 = 28.;
-const METER_LEVEL_FONT_SIZE: f32 = 11.;
-const METER_LINE_WIDTH: f32 = 2.;
-const METER_LINE_HEIGHT: f32 = 26.;
-const METER_ICON_SEPARATOR_VERTICAL_MARGIN: f32 = 7.;
-const METER_DOT_SPACING: f32 = 2.;
-const METER_TOP_MARGIN: f32 = 16.;
-const METER_RIGHT_MARGIN: f32 = 12.;
-
-const CLAIMED_REFERRALS_LABEL_HORIZONTAL_SPACING: f32 = 4.;
-const CLAIMED_REFERRALS_COUNT_LABEL_SINGULAR: &str = "Current referral";
-const CLAIMED_REFERRALS_COUNT_LABEL_PLURAL: &str = "Current referrals";
-const CLAIMED_REFERRALS_LABEL_WIDTH: f32 = 52.;
-const CLAIMED_REFERRALS_LABEL_FONT_SIZE: f32 = 14.;
-const CLAIMED_REFERRALS_COUNT_FONT_SIZE: f32 = 48.;
-const CLAIMED_REFERRAL_COUNT_LEFT_MARGIN: f32 = 40.;
-
-const CLAIMED_REFERRAL_CLIP: usize = 999;
-
-const TERMS_LINK_TEXT: &str = "Certain restrictions apply.";
-const TERMS_URL: &str =
-    "https://docs.warp.dev/support-and-community/community/refer-a-friend#referral-program-terms-and-conditions";
-const TERMS_CONTACT_TEXT: &str =
-    " If you have any questions about the referral program, please contact referrals@warp.dev.";
-
-enum ApiState {
-    Loading,
-    Ready {
-        referral_info: ReferralInfo,
-        email_state: SendEmailState,
-    },
-    Failed,
-}
-
-#[derive(Debug)]
-pub enum ReferralsPageAction {
-    CopyLink,
-    SendEmailInvite,
-    SignupAnonymousUser,
-}
-
-pub enum ReferralsPageEvent {
-    SignupAnonymousUser,
-    FocusModal,
-    ShowToast {
-        message: String,
-        flavor: ToastFlavor,
-    },
-}
-
-enum SendEmailState {
-    Idle,
-    Sending,
-}
-
-pub struct ReferralsPageView {
-    page: PageType<Self>,
-    email_editor: ViewHandle<EditorView>,
-    referrals_client: Arc<dyn ReferralsClient>,
-    api_state: ApiState,
-}
-
-#[derive(Clone)]
-struct Reward {
-    required_referral_count: usize,
-    icon_path: &'static str,
-    icon_height: f32,
-    icon_width: f32,
-    label: String,
-}
-
-lazy_static! {
-    static ref REWARDS: Vec<Reward> = vec![
-        Reward {
-            required_referral_count: 1,
-            icon_path: "bundled/svg/referral-theme.svg",
-            icon_width: 64.,
-            icon_height: 64.,
-            label: "Exclusive theme".to_owned(),
-        },
-        Reward {
-            required_referral_count: 5,
-            icon_path: "bundled/svg/referral-keycaps.svg",
-            icon_width: 56.,
-            icon_height: 56.,
-            label: "Keycaps + stickers".to_owned(),
-        },
-        Reward {
-            required_referral_count: 10,
-            icon_path: "bundled/svg/referral-tshirt.svg",
-            icon_width: 64.,
-            icon_height: 64.,
-            label: "T-shirt".to_owned(),
-        },
-        Reward {
-            required_referral_count: 20,
-            icon_path: "bundled/svg/referral-notebook.svg",
-            icon_width: 64.,
-            icon_height: 64.,
-            label: "Notebook".to_owned(),
-        },
-        Reward {
-            required_referral_count: 35,
-            icon_path: "bundled/svg/referral-hat.svg",
-            icon_width: 64.,
-            icon_height: 64.,
-            label: "Baseball cap".to_owned(),
-        },
-        Reward {
-            required_referral_count: 50,
-            icon_path: "bundled/svg/referral-hoodie.svg",
-            icon_width: 64.,
-            icon_height: 64.,
-            label: "Hoodie".to_owned(),
-        },
-        Reward {
-            required_referral_count: 75,
-            icon_path: "bundled/svg/referral-hydroflask.svg",
-            icon_width: 48.,
-            icon_height: 48.,
-            label: "Premium Hydro Flask".to_owned(),
-        },
-        Reward {
-            required_referral_count: 100,
-            icon_path: "bundled/svg/referral-backpack.svg",
-            icon_width: 50.,
-            icon_height: 50.,
-            label: "Backpack".to_owned(),
-        },
-    ];
-}
-
-impl ReferralsPageView {
-    pub fn new(referrals_client: Arc<dyn ReferralsClient>, ctx: &mut ViewContext<Self>) -> Self {
-        let email_editor = ctx.add_typed_action_view(|ctx| {
-            let options = SingleLineEditorOptions {
-                text: TextOptions::ui_font_size(Appearance::as_ref(ctx)),
-                ..Default::default()
-            };
-            EditorView::single_line(options, ctx)
-        });
-
-        ctx.subscribe_to_view(&email_editor, |me, _, event, ctx| {
-            me.handle_editor_event(event, ctx);
-        });
-
-        let page = PageType::new_monolith(ReferralsWidget::default(), Some(HEADER_TEXT), true);
-        Self {
-            page,
-            referrals_client,
-            api_state: ApiState::Loading,
-            email_editor,
-        }
-    }
-
-    /// Make a request to get the referral status
-    ///
-    /// If the status has already been fetched, the information will be kept while the request
-    /// is in flight.
-    fn fetch_referral_status(&mut self, ctx: &mut ViewContext<Self>) {
-        // If we already have data, we fire another request to make sure it is up-to-date,
-        // however, we don't want to update the state and lose the existing data until the
-        // request completes.
-        if matches!(self.api_state, ApiState::Failed) {
-            self.api_state = ApiState::Loading;
-        }
-
-        let referrals_client = self.referrals_client.clone();
-        let _ = ctx.spawn(
-            async move { referrals_client.get_referral_info().await },
-            Self::handle_referral_status_response,
-        );
-    }
-
-    fn handle_referral_status_response(
-        &mut self,
-        response: anyhow::Result<ReferralInfo>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match response {
-            Ok(info) => match &mut self.api_state {
-                state @ ApiState::Loading | state @ ApiState::Failed => {
-                    *state = ApiState::Ready {
-                        referral_info: info,
-                        email_state: SendEmailState::Idle,
-                    };
-                }
-                ApiState::Ready { referral_info, .. } => {
-                    *referral_info = info;
-                }
-            },
-            Err(err) => {
-                self.api_state = ApiState::Failed;
-                log::warn!("Error loading referral info from server: {err}");
-            }
-        }
-        ctx.notify();
-    }
-
-    fn copy_link(&mut self, ctx: &mut ViewContext<Self>) {
-        match &self.api_state {
-            ApiState::Loading | ApiState::Failed => {
-                // Shouldn't happen as the buttons will be disabled
-                log::warn!("Attempting to copy link before API request is complete");
-            }
-            ApiState::Ready { referral_info, .. } => {
-                send_telemetry_from_ctx!(TelemetryEvent::CopyInviteLink, ctx);
-                ctx.clipboard()
-                    .write(ClipboardContent::plain_text(referral_info.url.to_string()));
-                ctx.emit(ReferralsPageEvent::ShowToast {
-                    message: LINK_COPIED_TOAST.to_owned(),
-                    flavor: ToastFlavor::Default,
-                });
-            }
-        }
-    }
-
-    fn send_email_invite(&mut self, ctx: &mut ViewContext<Self>) {
-        let emails = self.recipient_emails_from_editor(ctx);
-        match &mut self.api_state {
-            ApiState::Ready {
-                email_state: state @ SendEmailState::Idle,
-                ..
-            } => match emails.iter().map(Deref::deref).try_for_each(validate_email) {
-                Ok(_) => {
-                    *state = SendEmailState::Sending;
-                    let referrals_client = self.referrals_client.clone();
-                    let _ = ctx.spawn(
-                        async move { referrals_client.send_invite(emails).await },
-                        Self::handle_send_email_invite_response,
-                    );
-                }
-                Err(error) => {
-                    ctx.emit(ReferralsPageEvent::ShowToast {
-                        message: error.ui_message(),
-                        flavor: ToastFlavor::Error,
-                    });
-                    log::warn!("Emails entered are invalid: {error}");
-                }
-            },
-            _ => {
-                // Shouldn't happen as the buttons will be disabled
-                log::warn!("Attempting to send email referrals before API is available");
-            }
-        }
-    }
-
-    fn handle_send_email_invite_response(
-        &mut self,
-        response: anyhow::Result<Vec<String>>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match response {
-            Ok(successful) => {
-                self.email_editor.update(ctx, |view, ctx| {
-                    view.clear_buffer_and_reset_undo_stack(ctx);
-                    ctx.notify();
-                });
-                safe_info!(
-                    safe: ("Successfully sent {} invites", successful.len()),
-                    full: ("Successfully sent invites to: {:?}", successful)
-                );
-                ctx.emit(ReferralsPageEvent::ShowToast {
-                    message: EMAIL_SUCCESS_TOAST.to_owned(),
-                    flavor: ToastFlavor::Success,
-                });
-            }
-            Err(err) => {
-                log::error!("Error sending referral emails: {err}");
-                ctx.emit(ReferralsPageEvent::ShowToast {
-                    message: EMAIL_FAILURE_TOAST.to_owned(),
-                    flavor: ToastFlavor::Error,
-                });
-            }
-        }
-
-        if let ApiState::Ready { email_state, .. } = &mut self.api_state {
-            *email_state = SendEmailState::Idle;
-        }
-        ctx.notify();
-    }
-
-    fn recipient_emails_from_editor(&self, ctx: &mut ViewContext<Self>) -> Vec<String> {
-        let editor_text = self.email_editor.as_ref(ctx).buffer_text(ctx);
-        editor_text
-            .split(',')
-            .map(|email| email.trim().to_string())
-            .collect()
-    }
-
-    fn handle_editor_event(&mut self, event: &EditorEvent, ctx: &mut ViewContext<Self>) {
-        match event {
-            EditorEvent::Enter => {
-                self.send_email_invite(ctx);
-            }
-            EditorEvent::Escape => ctx.emit(ReferralsPageEvent::FocusModal),
-            _ => (),
-        }
-    }
-
-    fn referral_claimed_count(&self) -> Option<usize> {
-        match &self.api_state {
-            ApiState::Ready { referral_info, .. } => Some(referral_info.number_claimed),
-            _ => None,
-        }
-    }
-}
-
-impl Entity for ReferralsPageView {
-    type Event = ReferralsPageEvent;
-}
-
-impl View for ReferralsPageView {
-    fn ui_name() -> &'static str {
-        "ReferralsPageView"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        self.page.render(self, app)
-    }
-
-    fn on_focus(&mut self, focus_ctx: &FocusContext, ctx: &mut ViewContext<Self>) {
-        if focus_ctx.is_self_focused() {
-            self.fetch_referral_status(ctx);
-        }
-    }
-}
-
-impl SettingsPageMeta for ReferralsPageView {
-    fn section() -> SettingsSection {
-        SettingsSection::Referrals
-    }
-
-    fn should_render(&self, _ctx: &AppContext) -> bool {
-        true
-    }
-
-    fn on_page_selected(&mut self, _: bool, ctx: &mut ViewContext<Self>) {
-        self.fetch_referral_status(ctx);
-    }
-
-    fn update_filter(&mut self, query: &str, ctx: &mut ViewContext<Self>) -> MatchData {
-        self.page.update_filter(query, ctx)
-    }
-
-    fn scroll_to_widget(&mut self, widget_id: &'static str) {
-        self.page.scroll_to_widget(widget_id)
-    }
-
-    fn clear_highlighted_widget(&mut self) {
-        self.page.clear_highlighted_widget();
-    }
-}
-
-impl TypedActionView for ReferralsPageView {
-    type Action = ReferralsPageAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            ReferralsPageAction::CopyLink => self.copy_link(ctx),
-            ReferralsPageAction::SendEmailInvite => self.send_email_invite(ctx),
-            ReferralsPageAction::SignupAnonymousUser => {
-                ctx.emit(ReferralsPageEvent::SignupAnonymousUser)
-            }
-        }
-    }
-}
-
-impl From<ViewHandle<ReferralsPageView>> for SettingsPageViewHandle {
-    fn from(view_handle: ViewHandle<ReferralsPageView>) -> Self {
-        SettingsPageViewHandle::Referrals(view_handle)
-    }
-}
-#[derive(Error, Debug)]
-enum EmailValidationError {
-    #[error("Email is empty")]
-    Empty,
-    #[error("Email is invalid: {0}")]
-    Invalid(String),
-}
-
-impl EmailValidationError {
-    /// The user-readable error descriptions.
-    fn ui_message(&self) -> String {
-        match self {
-            EmailValidationError::Empty => "Please enter an email.".to_owned(),
-            EmailValidationError::Invalid(invalid_email) => {
-                format!("Please ensure the following email is valid: {invalid_email}")
-            }
-        }
-    }
-}
-
-fn validate_email(email: &str) -> anyhow::Result<(), EmailValidationError> {
-    if email.is_empty() {
-        Err(EmailValidationError::Empty)
-    } else if !email.validate_email() {
-        Err(EmailValidationError::Invalid(email.to_owned()))
-    } else {
-        Ok(())
-    }
-}
-
-#[derive(Default)]
-struct ReferralsWidget {
-    copy_link_mouse_state: MouseStateHandle,
-    send_email_mouse_state: MouseStateHandle,
-    sign_up_button_mouse_state: MouseStateHandle,
-    term_docs_highlighted_hyperlink: HighlightedHyperlink,
-}
-
-impl ReferralsWidget {
-    fn render_page_body(
-        &self,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        let is_anonymous = AuthStateProvider::as_ref(app)
-            .get()
-            .is_anonymous_or_logged_out();
-
-        let invite_or_signup_section = if is_anonymous {
-            self.render_signup_section(appearance)
-        } else {
-            self.render_send_invite_section(view, appearance)
-        };
-
-        Flex::column()
-            .with_child(
-                Container::new(invite_or_signup_section)
-                    .with_padding_bottom(PAGE_PADDING)
-                    .finish(),
-            )
-            .with_child(
-                Container::new(self.render_rewards_section(is_anonymous, view, appearance))
-                    .with_padding_bottom(PAGE_PADDING)
-                    .finish(),
-            )
-            .finish()
-    }
-
-    fn render_link_row(
-        &self,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let (link_text, button_enabled) = match &view.api_state {
-            ApiState::Ready { referral_info, .. } => (referral_info.url.clone(), true),
-            ApiState::Loading => (LOADING_TEXT.into(), false),
-            ApiState::Failed => (LINK_ERROR_TEXT.into(), false),
-        };
-        let theme = appearance.theme();
-
-        Container::new(
-            Flex::row()
-                .with_child(
-                    Shrinkable::new(
-                        1.0,
-                        Container::new(
-                            Align::new(
-                                appearance
-                                    .ui_builder()
-                                    .span(link_text)
-                                    .with_style(UiComponentStyles {
-                                        font_color: Some(
-                                            theme.main_text_color(theme.background()).into_solid(),
-                                        ),
-                                        ..Default::default()
-                                    })
-                                    .build()
-                                    .finish(),
-                            )
-                            .left()
-                            .finish(),
-                        )
-                        .with_background(theme.background())
-                        .with_uniform_padding(LINK_TEXT_PADDING)
-                        .with_corner_radius(CornerRadius::with_all(LINK_CORNER_RADIUS))
-                        .with_border(Border::all(1.).with_border_fill(theme.outline()))
-                        .finish(),
-                    )
-                    .finish(),
-                )
-                .with_child(self.render_button(
-                    button_enabled,
-                    LINK_BUTTON_TEXT,
-                    self.copy_link_mouse_state.clone(),
-                    |ctx, _, _| ctx.dispatch_typed_action(ReferralsPageAction::CopyLink),
-                    appearance,
-                ))
-                .with_main_axis_size(MainAxisSize::Max)
-                .finish(),
-        )
-        .with_margin_bottom(LINK_BOTTOM_MARGIN)
-        .finish()
-    }
-
-    fn render_email_row(
-        &self,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let (button_text, button_enabled) = match &view.api_state {
-            ApiState::Ready {
-                email_state: SendEmailState::Idle,
-                ..
-            } => (EMAIL_BUTTON_TEXT, true),
-            ApiState::Ready {
-                email_state: SendEmailState::Sending,
-                ..
-            } => (EMAIL_BUTTON_SENDING_TEXT, false),
-            _ => (EMAIL_BUTTON_TEXT, false),
-        };
-
-        Flex::row()
-            .with_child(
-                Shrinkable::new(
-                    1.0,
-                    Align::new(
-                        appearance
-                            .ui_builder()
-                            .text_input(view.email_editor.clone())
-                            .with_style(UiComponentStyles::default())
-                            .build()
-                            .finish(),
-                    )
-                    .left()
-                    .finish(),
-                )
-                .finish(),
-            )
-            .with_child(self.render_button(
-                button_enabled,
-                button_text,
-                self.send_email_mouse_state.clone(),
-                |ctx, _, _| ctx.dispatch_typed_action(ReferralsPageAction::SendEmailInvite),
-                appearance,
-            ))
-            .finish()
-    }
-
-    fn render_send_invite_section(
-        &self,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        Flex::column()
-            .with_child(
-                Container::new(self.render_label("Link", appearance))
-                    .with_padding_top(PAGE_PADDING)
-                    .finish(),
-            )
-            .with_child(self.render_link_row(view, appearance))
-            .with_child(self.render_label("Email", appearance))
-            .with_child(self.render_email_row(view, appearance))
-            .finish()
-    }
-
-    fn render_signup_section(&self, appearance: &Appearance) -> Box<dyn Element> {
-        let button_styles = UiComponentStyles {
-            font_size: Some(14.),
-            font_weight: Some(Weight::Semibold),
-            border_radius: Some(CornerRadius::with_all(Radius::Pixels(4.))),
-            padding: Some(Coords {
-                top: 12.,
-                bottom: 12.,
-                left: 40.,
-                right: 40.,
-            }),
-            ..Default::default()
-        };
-
-        let sign_up_button = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Accent,
-                self.sign_up_button_mouse_state.clone(),
-            )
-            .with_style(button_styles)
-            .with_text_label("Sign up".to_owned())
-            .build()
-            .on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(ReferralsPageAction::SignupAnonymousUser);
-            })
-            .finish();
-
-        Flex::column()
-            .with_child(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .span(ANONYMOUS_USER_HEADER_TEXT)
-                        .with_style(UiComponentStyles {
-                            font_size: Some(HEADER_FONT_SIZE),
-                            ..Default::default()
-                        })
-                        .build()
-                        .finish(),
-                )
-                .with_margin_bottom(HEADER_MARGIN_BOTTOM)
-                .finish(),
-            )
-            .with_child(Flex::row().with_child(sign_up_button).finish())
-            .finish()
-    }
-
-    /// Render submit buttons for the email and link fields.
-    fn render_button<F>(
-        &self,
-        button_enabled: bool,
-        button_text: &str,
-        mouse_state_handle: MouseStateHandle,
-        on_click: F,
-        appearance: &Appearance,
-    ) -> Box<dyn Element>
-    where
-        F: 'static + FnMut(&mut EventContext, &AppContext, Vector2F),
-    {
-        let button = appearance
-            .ui_builder()
-            .button(ButtonVariant::Accent, mouse_state_handle)
-            .with_centered_text_label(button_text.to_owned())
-            .with_style(UiComponentStyles {
-                font_size: Some(BUTTON_FONT_SIZE),
-                font_weight: Some(Weight::Semibold),
-                width: Some(BUTTON_WIDTH),
-                height: Some(BUTTON_HEIGHT),
-                ..Default::default()
-            });
-
-        Container::new({
-            if button_enabled {
-                button.build().on_click(on_click).finish()
-            } else {
-                button.disabled().build().finish()
-            }
-        })
-        .with_margin_left(BUTTON_LEFT_MARGIN)
-        .finish()
-    }
-
-    /// Render text labels for the email and link fields.
-    fn render_label<S>(&self, text: S, appearance: &Appearance) -> Box<dyn Element>
-    where
-        S: Into<String>,
-    {
-        Container::new(appearance.ui_builder().span(text.into()).build().finish())
-            .with_margin_bottom(INVITE_FIELD_LABEL_BOTTOM_MARGIN)
-            .finish()
-    }
-
-    fn render_rewards_section(
-        &self,
-        is_anonymous: bool,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let mut rewards_section = Flex::column();
-
-        rewards_section.add_child(
-            Container::new(
-                appearance
-                    .ui_builder()
-                    .span(REWARD_INTRO)
-                    .with_style(UiComponentStyles {
-                        font_size: Some(REWARD_INTRO_FONT_SIZE),
-                        ..Default::default()
-                    })
-                    .build()
-                    .finish(),
-            )
-            .with_margin_bottom(REWARD_SECTION_VERTICAL_SPACING)
-            .finish(),
-        );
-
-        let mut reward_status_row = Flex::row()
-            .with_child(
-                Container::new(self.render_meter(view, appearance))
-                    .with_margin_top(METER_TOP_MARGIN)
-                    .with_margin_bottom(METER_TOP_MARGIN)
-                    .with_margin_right(METER_RIGHT_MARGIN)
-                    .finish(),
-            )
-            .with_child(self.render_rewards_list(view, appearance));
-
-        if !is_anonymous {
-            if let Some(count) = self.render_claimed_referrals_count(view, appearance) {
-                reward_status_row.add_child(
-                    Container::new(count)
-                        .with_margin_left(CLAIMED_REFERRAL_COUNT_LEFT_MARGIN)
-                        .finish(),
-                );
-            }
-        };
-
-        rewards_section.add_child(reward_status_row.finish());
-
-        rewards_section.add_child(
-            Container::new(
-                Align::new(
-                    FormattedTextElement::new(
-                        FormattedText::new([FormattedTextLine::Line(vec![
-                            FormattedTextFragment::plain_text("*"),
-                            FormattedTextFragment::hyperlink(TERMS_LINK_TEXT, TERMS_URL),
-                            FormattedTextFragment::plain_text(TERMS_CONTACT_TEXT),
-                        ])]),
-                        12.,
-                        appearance.ui_font_family(),
-                        appearance.ui_font_family(),
-                        blended_colors::text_sub(
-                            appearance.theme(),
-                            appearance.theme().surface_1(),
-                        ),
-                        self.term_docs_highlighted_hyperlink.clone(),
-                    )
-                    .with_hyperlink_font_color(appearance.theme().accent().into_solid())
-                    .register_default_click_handlers(|url, _, ctx| {
-                        ctx.open_url(&url.url);
-                    })
-                    .finish(),
-                )
-                .left()
-                .finish(),
-            )
-            .with_margin_top(REWARD_SECTION_VERTICAL_SPACING)
-            .finish(),
-        );
-
-        rewards_section.finish()
-    }
-
-    fn render_rewards_list(
-        &self,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        Container::new(
-            Flex::column()
-                .with_children(REWARDS.iter().map(|reward| {
-                    Container::new(self.render_reward(reward, view, appearance))
-                        .with_margin_bottom(REFERRAL_ICON_BOX_VERTICAL_SPACING)
-                        .finish()
-                }))
-                .finish(),
-        )
-        .finish()
-    }
-
-    fn render_reward(
-        &self,
-        reward: &Reward,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let (icon_color, label_color, label_font_weight): (ColorU, ColorU, Option<Weight>) =
-            match view.referral_claimed_count() {
-                Some(claimed_referrals) if claimed_referrals >= reward.required_referral_count => (
-                    blended_colors::accent(appearance.theme()).into(),
-                    blended_colors::text_main(appearance.theme(), appearance.theme().background()),
-                    Some(Weight::Bold),
-                ),
-
-                _ => (
-                    blended_colors::text_sub(appearance.theme(), appearance.theme().background()),
-                    blended_colors::text_sub(appearance.theme(), appearance.theme().background()),
-                    None,
-                ),
-            };
-
-        Flex::row()
-            .with_child(
-                ConstrainedBox::new(
-                    Container::new(
-                        Align::new(
-                            ConstrainedBox::new(Icon::new(reward.icon_path, icon_color).finish())
-                                .with_height(reward.icon_height)
-                                .with_width(reward.icon_width)
-                                .finish(),
-                        )
-                        .finish(),
-                    )
-                    .with_corner_radius(CornerRadius::with_all(REWARD_ICON_BORDER_CORNER_RADIUS))
-                    .with_border(
-                        Border::all(REWARD_ICON_BOX_BORDER_WIDTH)
-                            .with_border_color(appearance.theme().surface_3().into()),
-                    )
-                    .finish(),
-                )
-                .with_width(REWARD_ICON_BOX_WIDTH)
-                .with_height(REWARD_ICON_BOX_HEIGHT)
-                .finish(),
-            )
-            .with_child(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .span(reward.label.clone())
-                        .with_style(UiComponentStyles {
-                            font_color: Some(label_color),
-                            font_weight: label_font_weight,
-                            ..Default::default()
-                        })
-                        .build()
-                        .finish(),
-                )
-                .with_margin_left(REWARD_ICON_BOX_DESCRIPTION_HORIZONTAL_SPACING)
-                .finish(),
-            )
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .finish()
-    }
-
-    /// Render the meter tracking how many claimed referrals the user has sent.
-    fn render_meter(&self, view: &ReferralsPageView, appearance: &Appearance) -> Box<dyn Element> {
-        let referral_count = view.referral_claimed_count().unwrap_or_default();
-
-        let mut column = Flex::column().with_cross_axis_alignment(CrossAxisAlignment::Center);
-
-        for (index, reward) in REWARDS.iter().enumerate() {
-            let lower_threshold = reward.required_referral_count;
-
-            let count_indicator =
-                self.render_referral_meter_count(lower_threshold, referral_count, appearance);
-
-            if index < (REWARDS.len() - 1) {
-                column.add_child(
-                    Container::new(count_indicator)
-                        .with_margin_bottom(METER_ICON_SEPARATOR_VERTICAL_MARGIN)
-                        .finish(),
-                );
-
-                let higher_threshold = REWARDS[index + 1].required_referral_count;
-
-                column.add_child(
-                    Container::new(self.render_meter_separator(
-                        lower_threshold,
-                        higher_threshold,
-                        referral_count,
-                        appearance,
-                    ))
-                    .with_margin_bottom(METER_ICON_SEPARATOR_VERTICAL_MARGIN)
-                    .finish(),
-                )
-            } else {
-                column.add_child(Container::new(count_indicator).finish());
-            }
-        }
-
-        column.finish()
-    }
-
-    /// For the reward meter, render the count needed for a reward or an
-    /// indicator that the user has met the required count.
-    fn render_referral_meter_count(
-        &self,
-        required_referral_count: usize,
-        referral_count: usize,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        if referral_count >= required_referral_count {
-            ConstrainedBox::new(
-                Icon::new(
-                    "bundled/svg/check-circle-broken.svg",
-                    appearance.theme().accent(),
-                )
-                .finish(),
-            )
-            .with_height(METER_LEVEL_CIRCLE_HEIGHT)
-            .with_width(METER_LEVEL_CIRCLE_HEIGHT)
-            .finish()
-        } else {
-            let gray: ColorU =
-                blended_colors::text_sub(appearance.theme(), appearance.theme().background());
-
-            Container::new(
-                ConstrainedBox::new(
-                    Align::new(
-                        appearance
-                            .ui_builder()
-                            .span(required_referral_count.to_string())
-                            .with_style(UiComponentStyles {
-                                font_size: Some(METER_LEVEL_FONT_SIZE),
-                                font_color: Some(gray),
-                                font_weight: Some(Weight::Bold),
-                                ..Default::default()
-                            })
-                            .build()
-                            .finish(),
-                    )
-                    .finish(),
-                )
-                .with_height(METER_LEVEL_CIRCLE_HEIGHT)
-                .with_width(METER_LEVEL_CIRCLE_HEIGHT)
-                .finish(),
-            )
-            .with_border(Border::all(METER_LEVEL_BORDER_WIDTH).with_border_color(gray))
-            .with_corner_radius(CornerRadius::with_all(Radius::Percentage(50.)))
-            .finish()
-        }
-    }
-
-    /// Render the solid or dotted lines that indicate completed or partial progress towards a reward's referral requirements.
-    fn render_meter_separator(
-        &self,
-        lower_count: usize,
-        higher_count: usize,
-        current_count: usize,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let completed_color = blended_colors::accent(appearance.theme());
-
-        let dot_color = if current_count > lower_count {
-            completed_color
-        } else {
-            blended_colors::text_sub(appearance.theme(), appearance.theme().background()).into()
-        };
-
-        let line = ConstrainedBox::new(
-            Rect::new()
-                .with_corner_radius(CornerRadius::with_all(Radius::Percentage(50.)))
-                .with_background(completed_color)
-                .finish(),
-        )
-        .with_width(METER_LINE_WIDTH)
-        .with_height(METER_LINE_HEIGHT)
-        .finish();
-
-        if current_count > higher_count {
-            line
-        } else {
-            self.render_meter_dotted_line(dot_color)
-        }
-    }
-
-    fn render_meter_dotted_line<F>(&self, color: F) -> Box<dyn Element>
-    where
-        F: Into<Fill> + Clone,
-    {
-        let mut dot_column = Flex::column();
-
-        for _ in 0..5 {
-            dot_column.add_child(
-                Container::new(
-                    ConstrainedBox::new(
-                        Rect::new()
-                            .with_corner_radius(CornerRadius::with_all(Radius::Percentage(50.)))
-                            .with_background(color.clone())
-                            .finish(),
-                    )
-                    .with_width(METER_LINE_WIDTH)
-                    .with_height(METER_LINE_WIDTH)
-                    .finish(),
-                )
-                .with_margin_bottom(METER_DOT_SPACING)
-                .finish(),
-            );
-        }
-        dot_column.add_child(
-            ConstrainedBox::new(
-                Rect::new()
-                    .with_corner_radius(CornerRadius::with_all(Radius::Percentage(50.)))
-                    .with_background(color)
-                    .finish(),
-            )
-            .with_width(METER_LINE_WIDTH)
-            .with_height(METER_LINE_WIDTH)
-            .finish(),
-        );
-
-        dot_column.finish()
-    }
-
-    fn render_claimed_referrals_count(
-        &self,
-        view: &ReferralsPageView,
-        appearance: &Appearance,
-    ) -> Option<Box<dyn Element>> {
-        let claimed_count = view.referral_claimed_count()?;
-
-        let claimed_count_text = if claimed_count <= CLAIMED_REFERRAL_CLIP {
-            claimed_count.to_string()
-        } else {
-            format!("{claimed_count}+")
-        };
-
-        let current_referrals_label = match claimed_count {
-            1 => CLAIMED_REFERRALS_COUNT_LABEL_SINGULAR,
-            _ => CLAIMED_REFERRALS_COUNT_LABEL_PLURAL,
-        };
-
-        Some(
-            Flex::row()
-                .with_child(
-                    Container::new(
-                        appearance
-                            .ui_builder()
-                            .span(claimed_count_text)
-                            .with_style(UiComponentStyles {
-                                font_size: Some(CLAIMED_REFERRALS_COUNT_FONT_SIZE),
-                                font_color: Some(blended_colors::text_sub(
-                                    appearance.theme(),
-                                    appearance.theme().background(),
-                                )),
-                                ..Default::default()
-                            })
-                            .build()
-                            .finish(),
-                    )
-                    .with_margin_right(CLAIMED_REFERRALS_LABEL_HORIZONTAL_SPACING)
-                    .finish(),
-                )
-                .with_child(
-                    ConstrainedBox::new(
-                        appearance
-                            .ui_builder()
-                            .wrappable_text(current_referrals_label.to_string(), true)
-                            .with_style(UiComponentStyles {
-                                font_size: Some(CLAIMED_REFERRALS_LABEL_FONT_SIZE),
-                                font_color: Some(blended_colors::text_sub(
-                                    appearance.theme(),
-                                    appearance.theme().background(),
-                                )),
-                                ..Default::default()
-                            })
-                            .build()
-                            .finish(),
-                    )
-                    .with_width(CLAIMED_REFERRALS_LABEL_WIDTH)
-                    .finish(),
-                )
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .finish(),
-        )
-    }
-}
-
-impl SettingsWidget for ReferralsWidget {
-    type View = ReferralsPageView;
-
-    fn search_terms(&self) -> &str {
-        "referrals invites"
-    }
-
-    fn render(
-        &self,
-        view: &Self::View,
-        appearance: &Appearance,
-        app: &AppContext,
-    ) -> Box<dyn Element> {
-        self.render_page_body(view, appearance, app)
-    }
-}
diff --git a/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs b/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs
deleted file mode 100644
index a902ba89..00000000
--- a/app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs
+++ /dev/null
@@ -1,172 +0,0 @@
-use galaxy_core::ui::theme::color::internal_colors;
-use warpui::elements::{
-    Border, ChildView, Container, CornerRadius, Dismiss, Empty, Flex, ParentElement, Radius, Text,
-};
-use warpui::fonts::{Properties, Weight};
-use warpui::ui_components::components::UiComponent;
-use warpui::{
-    AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
-};
-
-use crate::appearance::Appearance;
-use crate::ui_components::dialog::{dialog_styles, Dialog};
-use crate::view_components::action_button::{ActionButton, DangerPrimaryTheme, NakedTheme};
-
-const DIALOG_WIDTH: f32 = 450.;
-
-pub enum RemoveCustomEndpointConfirmationDialogEvent {
-    Cancel,
-    Confirm(usize),
-}
-
-#[derive(Debug)]
-pub enum RemoveCustomEndpointConfirmationDialogAction {
-    Cancel,
-    Confirm,
-}
-
-pub struct RemoveCustomEndpointConfirmationDialog {
-    visible: bool,
-    endpoint_index: Option<usize>,
-    endpoint_name: String,
-    model_labels: Vec<String>,
-    cancel_button: ViewHandle<ActionButton>,
-    confirm_button: ViewHandle<ActionButton>,
-}
-
-impl RemoveCustomEndpointConfirmationDialog {
-    pub fn new(ctx: &mut ViewContext<Self>) -> Self {
-        let cancel_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new("Cancel", NakedTheme).on_click(|ctx| {
-                ctx.dispatch_typed_action(RemoveCustomEndpointConfirmationDialogAction::Cancel);
-            })
-        });
-
-        let confirm_button = ctx.add_typed_action_view(|_| {
-            ActionButton::new("Remove endpoint", DangerPrimaryTheme).on_click(|ctx| {
-                ctx.dispatch_typed_action(RemoveCustomEndpointConfirmationDialogAction::Confirm);
-            })
-        });
-
-        Self {
-            visible: false,
-            endpoint_index: None,
-            endpoint_name: String::new(),
-            model_labels: Vec::new(),
-            cancel_button,
-            confirm_button,
-        }
-    }
-
-    pub fn show(
-        &mut self,
-        endpoint_index: usize,
-        endpoint_name: String,
-        model_labels: Vec<String>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.endpoint_index = Some(endpoint_index);
-        self.endpoint_name = endpoint_name;
-        self.model_labels = model_labels;
-        self.visible = true;
-        ctx.notify();
-    }
-
-    pub fn hide(&mut self, ctx: &mut ViewContext<Self>) {
-        self.visible = false;
-        ctx.notify();
-    }
-
-    pub fn is_visible(&self) -> bool {
-        self.visible
-    }
-}
-
-impl Entity for RemoveCustomEndpointConfirmationDialog {
-    type Event = RemoveCustomEndpointConfirmationDialogEvent;
-}
-
-impl View for RemoveCustomEndpointConfirmationDialog {
-    fn ui_name() -> &'static str {
-        "RemoveCustomEndpointConfirmationDialog"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        if !self.visible {
-            return Empty::new().finish();
-        }
-
-        let appearance = Appearance::as_ref(app);
-        let theme = appearance.theme();
-
-        let description = "Are you sure you want to remove this endpoint? You won't be able to use its models in your agent sessions moving forward.".to_string();
-
-        let endpoint_title = Text::new_inline(
-            self.endpoint_name.clone(),
-            appearance.ui_font_family(),
-            appearance.ui_font_size(),
-        )
-        .with_style(Properties::default().weight(Weight::Semibold))
-        .with_color(theme.active_ui_text_color().into())
-        .finish();
-
-        let chip_border = internal_colors::fg_overlay_3(theme);
-        let chip_text = theme.active_ui_text_color();
-
-        let chips =
-            super::render_model_chips(self.model_labels.iter().cloned(), appearance, chip_text);
-
-        let endpoint_card = Container::new(
-            Flex::column()
-                .with_spacing(8.)
-                .with_child(endpoint_title)
-                .with_child(chips)
-                .finish(),
-        )
-        .with_uniform_padding(12.)
-        .with_background(internal_colors::fg_overlay_1(theme))
-        .with_border(Border::all(1.).with_border_fill(chip_border))
-        .with_corner_radius(CornerRadius::with_all(Radius::Pixels(6.)))
-        .finish();
-
-        let dialog = Dialog::new(
-            "Remove endpoint?".to_string(),
-            Some(description),
-            dialog_styles(appearance),
-        )
-        .with_child(endpoint_card)
-        .with_bottom_row_child(ChildView::new(&self.cancel_button).finish())
-        .with_bottom_row_child(
-            Container::new(ChildView::new(&self.confirm_button).finish())
-                .with_margin_left(12.)
-                .finish(),
-        )
-        .with_width(DIALOG_WIDTH)
-        .build()
-        .finish();
-
-        Dismiss::new(dialog)
-            .prevent_interaction_with_other_elements()
-            .on_dismiss(|ctx, _app| {
-                ctx.dispatch_typed_action(RemoveCustomEndpointConfirmationDialogAction::Cancel)
-            })
-            .finish()
-    }
-}
-
-impl TypedActionView for RemoveCustomEndpointConfirmationDialog {
-    type Action = RemoveCustomEndpointConfirmationDialogAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        match action {
-            RemoveCustomEndpointConfirmationDialogAction::Cancel => {
-                ctx.emit(RemoveCustomEndpointConfirmationDialogEvent::Cancel)
-            }
-            RemoveCustomEndpointConfirmationDialogAction::Confirm => {
-                if let Some(index) = self.endpoint_index {
-                    ctx.emit(RemoveCustomEndpointConfirmationDialogEvent::Confirm(index));
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/settings_view/settings_page.rs b/app/src/settings_view/settings_page.rs
index 5b54c414..c80fbf35 100644
--- a/app/src/settings_view/settings_page.rs
+++ b/app/src/settings_view/settings_page.rs
@@ -29,17 +29,12 @@ use settings::Setting;
 use super::about_page::AboutPageView;
 use super::ai_page::{AISettingsPageAction, AISettingsPageView};
 use super::appearance_page::AppearanceSettingsPageView;
-use super::billing_and_usage_dispatch::BillingAndUsageDispatchView;
 use super::code_page::CodeSettingsPageView;
-use super::environments_page::EnvironmentsPageView;
 use super::features_page::FeaturesPageView;
 use super::keybindings::KeybindingsView;
-use super::main_page::MainSettingsPageView;
 use super::mcp_servers_page::MCPServersSettingsPageView;
 use super::privacy_page::PrivacyPageView;
-use super::referrals_page::ReferralsPageView;
 use super::scripting_page::ScriptingSettingsPageView;
-use super::show_blocks_view::ShowBlocksView;
 use super::teams_page::TeamsPageView;
 use super::warp_drive_page::WarpDriveSettingsPageView;
 use super::warpify_page::WarpifyPageView;
@@ -100,7 +95,6 @@ pub trait SettingsPageMeta {
 /// It is required to allow for SettingsPage struct be put in the collection (ie. vector).
 #[derive(Clone)]
 pub enum SettingsPageViewHandle {
-    Main(ViewHandle<MainSettingsPageView>),
     Appearance(ViewHandle<AppearanceSettingsPageView>),
     Features(ViewHandle<FeaturesPageView>),
     Keybindings(ViewHandle<KeybindingsView>),
@@ -108,23 +102,18 @@ pub enum SettingsPageViewHandle {
     Code(ViewHandle<CodeSettingsPageView>),
     Privacy(ViewHandle<PrivacyPageView>),
     Warpify(ViewHandle<WarpifyPageView>),
-    Referrals(ViewHandle<ReferralsPageView>),
     Scripting(ViewHandle<ScriptingSettingsPageView>),
     AI(ViewHandle<AISettingsPageView>),
-    CloudEnvironments(ViewHandle<EnvironmentsPageView>),
-    BillingAndUsage(ViewHandle<BillingAndUsageDispatchView>),
     MCPServers(ViewHandle<MCPServersSettingsPageView>),
     WarpDrive(ViewHandle<WarpDriveSettingsPageView>),
-    OzCloudAPIKeys(ViewHandle<super::platform_page::PlatformPageView>),
-    Teams(ViewHandle<super::teams_page::TeamsPageView>),
-    SharedBlocks(ViewHandle<ShowBlocksView>),
+    Teams(ViewHandle<TeamsPageView>),
+    Platform(ViewHandle<super::platform_page::PlatformPageView>),
 }
 
 impl SettingsPageViewHandle {
     pub fn child_view(&self) -> Box<dyn Element> {
         use SettingsPageViewHandle::*;
         match self {
-            Main(view_handle) => ChildView::new(view_handle).finish(),
             Appearance(view_handle) => ChildView::new(view_handle).finish(),
             Features(view_handle) => ChildView::new(view_handle).finish(),
             Keybindings(view_handle) => ChildView::new(view_handle).finish(),
@@ -132,16 +121,12 @@ impl SettingsPageViewHandle {
             Code(view_handle) => ChildView::new(view_handle).finish(),
             Privacy(view_handle) => ChildView::new(view_handle).finish(),
             Warpify(view_handle) => ChildView::new(view_handle).finish(),
-            Referrals(view_handle) => ChildView::new(view_handle).finish(),
             Scripting(view_handle) => ChildView::new(view_handle).finish(),
             AI(view_handle) => ChildView::new(view_handle).finish(),
-            BillingAndUsage(view_handle) => ChildView::new(view_handle).finish(),
             MCPServers(view_handle) => ChildView::new(view_handle).finish(),
             WarpDrive(view_handle) => ChildView::new(view_handle).finish(),
-            CloudEnvironments(view_handle) => ChildView::new(view_handle).finish(),
-            OzCloudAPIKeys(view_handle) => ChildView::new(view_handle).finish(),
             Teams(view_handle) => ChildView::new(view_handle).finish(),
-            SharedBlocks(view_handle) => ChildView::new(view_handle).finish(),
+            Platform(view_handle) => ChildView::new(view_handle).finish(),
         }
     }
 }
diff --git a/app/src/settings_view/show_blocks_view.rs b/app/src/settings_view/show_blocks_view.rs
deleted file mode 100644
index b9a703dc..00000000
--- a/app/src/settings_view/show_blocks_view.rs
+++ /dev/null
@@ -1,811 +0,0 @@
-#![allow(dead_code)]
-
-use std::sync::Arc;
-
-use anyhow::Result;
-use chrono::{DateTime, FixedOffset, Local};
-use galaxy_core::ui::theme::color::internal_colors;
-use galaxyui::clipboard::ClipboardContent;
-use galaxyui::color::ColorU;
-use galaxyui::elements::{
-    Align, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
-    Dismiss, Expanded, Fill, Flex, Hoverable, Icon, MouseStateHandle, OffsetPositioning,
-    ParentAnchor, ParentElement, ParentOffsetBounds, PositionedElementAnchor,
-    PositionedElementOffsetBounds, Radius, SavePosition, ScrollStateHandle, Scrollable,
-    ScrollableElement, ScrollbarWidth, Shrinkable, Stack, UniformList, UniformListState,
-};
-use galaxyui::fonts::Weight;
-use galaxyui::ui_components::button::ButtonVariant;
-use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
-use galaxyui::{
-    AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
-};
-use pathfinder_geometry::vector::vec2f;
-
-use super::settings_page::{
-    render_page_title, MatchData, PageType, SettingsPageMeta, SettingsPageViewHandle,
-    SettingsWidget, HEADER_FONT_SIZE, PAGE_PADDING,
-};
-use super::SettingsSection;
-use crate::appearance::Appearance;
-use crate::auth::AuthStateProvider;
-use crate::channel::{Channel, ChannelState};
-use crate::menu::{Event as MenuEvent, Event, Menu, MenuItem, MenuItemFields};
-use crate::server::block::Block;
-use crate::server::server_api::block::BlockClient;
-use crate::view_components::ToastFlavor;
-
-const SCROLLBAR_WIDTH: ScrollbarWidth = ScrollbarWidth::Auto;
-
-const UNSHARE_BLOCK_CONFIRMATION_DIALOG_TEXT: &str =
-    "Are you sure you want to unshare this block?\n\
-\nIt will no longer be accessible by link and will be permanently deleted from Warp servers.";
-
-#[derive(Clone, Debug)]
-struct UserOwnedBlock {
-    id: String,
-    command: String,
-    link_mouse_state_handle: MouseStateHandle,
-    copy_button_mouse_state_handle: MouseStateHandle,
-    overflow_button_mouse_state_handle: MouseStateHandle,
-    unshare_request_status: UnshareBlockRequestState,
-    time_started: DateTime<FixedOffset>,
-}
-
-impl From<Block> for UserOwnedBlock {
-    fn from(block: Block) -> Self {
-        UserOwnedBlock::new(
-            block.id.unwrap_or_default(),
-            block.command.unwrap_or_default(),
-            block.time_started_term,
-        )
-    }
-}
-
-impl UserOwnedBlock {
-    fn new(
-        id: impl Into<String>,
-        command: impl Into<String>,
-        time_started: DateTime<FixedOffset>,
-    ) -> Self {
-        Self {
-            id: id.into(),
-            command: command.into(),
-            unshare_request_status: UnshareBlockRequestState::NotStarted,
-            link_mouse_state_handle: Default::default(),
-            copy_button_mouse_state_handle: Default::default(),
-            overflow_button_mouse_state_handle: Default::default(),
-            time_started,
-        }
-    }
-
-    fn is_shared(&self) -> bool {
-        !matches!(self.unshare_request_status, UnshareBlockRequestState::Done)
-    }
-
-    fn block_url(&self) -> String {
-        // New block IDs are 22 characters long and are accessible at /block/{id}, whereas as old
-        // (hashId) block IDs are 6 characters long and are accessible at /{id}.
-        let mut url = if self.id.len() == 22 {
-            format!(
-                "{}/block/{}",
-                ChannelState::server_root_url(),
-                self.id.as_str()
-            )
-        } else {
-            format!("{}/{}", ChannelState::server_root_url(), self.id.as_str())
-        };
-
-        // If this is a preview build, ensure the link routes to a preview build.
-        if matches!(ChannelState::channel(), Channel::Preview) {
-            url.push_str("?preview=true");
-        }
-        url
-    }
-
-    fn render_overflow_icon(&self, appearance: &Appearance, index: usize) -> Box<dyn Element> {
-        let mut hoverable =
-            Hoverable::new(self.overflow_button_mouse_state_handle.clone(), |state| {
-                let container = Container::new(
-                    ConstrainedBox::new(
-                        Icon::new("bundled/svg/overflow.svg", ColorU::new(179, 186, 184, 255))
-                            .finish(),
-                    )
-                    .with_height(20.)
-                    .with_width(20.)
-                    .finish(),
-                )
-                .with_uniform_padding(4.)
-                .with_corner_radius(CornerRadius::with_all(Radius::Pixels(5.)));
-
-                let container = if state.is_clicked() || state.is_hovered() {
-                    container.with_background(appearance.theme().surface_2())
-                } else {
-                    container
-                };
-                container.finish()
-            });
-
-        // Disable the overflow button if the request is in flight since the user shouldn't be able
-        // to unshare it again.
-        if self.unshare_request_status == UnshareBlockRequestState::InFlight {
-            hoverable = hoverable.disable();
-        } else {
-            hoverable = hoverable.on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(ShowBlocksAction::OverflowClick(index));
-            });
-        };
-
-        SavePosition::new(
-            hoverable.finish(),
-            format!("show_blocks_view:overflow_{index}").as_str(),
-        )
-        .finish()
-    }
-
-    fn copy_link_button(&self, appearance: &Appearance, block_url: String) -> Box<dyn Element> {
-        let button = appearance
-            .ui_builder()
-            .button(
-                ButtonVariant::Basic,
-                self.copy_button_mouse_state_handle.clone(),
-            )
-            .with_text_label("Copy link".into());
-
-        let button = if self.unshare_request_status == UnshareBlockRequestState::InFlight {
-            button.disabled().build()
-        } else {
-            button.build().on_click(move |ctx, _, _| {
-                ctx.dispatch_typed_action(ShowBlocksAction::CopyUrl(block_url.clone()));
-            })
-        };
-
-        button.finish()
-    }
-
-    fn link_text(&self, appearance: &Appearance, block_url: String) -> Box<dyn Element> {
-        if self.unshare_request_status == UnshareBlockRequestState::InFlight {
-            appearance
-                .ui_builder()
-                .label("Deleting...")
-                .with_style(
-                    UiComponentStyles::default()
-                        .set_font_family_id(appearance.monospace_font_family())
-                        .set_font_size(14.),
-                )
-                .build()
-                .finish()
-        } else {
-            appearance
-                .ui_builder()
-                .link(
-                    block_url.clone(),
-                    Some(block_url),
-                    None,
-                    self.link_mouse_state_handle.clone(),
-                )
-                .soft_wrap(false)
-                .with_style(UiComponentStyles::default().set_font_size(14.))
-                .build()
-                .finish()
-        }
-    }
-
-    fn render(&self, appearance: &Appearance, index: usize) -> Box<dyn Element> {
-        let block_url = self.block_url();
-        let command = appearance
-            .ui_builder()
-            .label(self.command.clone())
-            .with_style(UiComponentStyles {
-                font_size: Some(14.),
-                font_family_id: Some(appearance.monospace_font_family()),
-                font_weight: Some(Weight::Bold),
-                ..Default::default()
-            })
-            .build()
-            .finish();
-        let command_row = Container::new(
-            Flex::row()
-                .with_child(Shrinkable::new(1., Align::new(command).left().finish()).finish())
-                .with_child(
-                    Container::new(self.render_overflow_icon(appearance, index))
-                        .with_padding_left(15.)
-                        .finish(),
-                )
-                .finish(),
-        )
-        .finish();
-        let url_row = Container::new(
-            Flex::row()
-                .with_child(
-                    Shrinkable::new(
-                        1.,
-                        Container::new(self.link_text(appearance, block_url.clone())).finish(),
-                    )
-                    .finish(),
-                )
-                .with_child(
-                    Shrinkable::new(
-                        0.3,
-                        Container::new(
-                            Align::new(self.copy_link_button(appearance, block_url))
-                                .right()
-                                .finish(),
-                        )
-                        .finish(),
-                    )
-                    .finish(),
-                )
-                .with_cross_axis_alignment(CrossAxisAlignment::Center)
-                .finish(),
-        )
-        .finish();
-        let timestamp_row = Container::new(
-            appearance
-                .ui_builder()
-                .label(format!(
-                    "Executed on: {}",
-                    self.time_started
-                        .with_timezone(&Local)
-                        .format("%a, %b %-d %Y at %-I:%M %p")
-                ))
-                .with_style(
-                    UiComponentStyles::default()
-                        .set_font_color(
-                            appearance
-                                .theme()
-                                .hint_text_color(appearance.theme().surface_2())
-                                .into(),
-                        )
-                        // make it slightly smaller than the url text
-                        .set_font_size(appearance.ui_builder().ui_font_size() - 2.),
-                )
-                .build()
-                .finish(),
-        )
-        .finish();
-
-        Container::new(
-            ConstrainedBox::new(
-                Flex::column()
-                    .with_child(Shrinkable::new(1.0, command_row).finish())
-                    .with_child(Shrinkable::new(1., url_row).finish())
-                    .with_child(timestamp_row)
-                    .finish(),
-            )
-            .with_max_height(90.)
-            .finish(),
-        )
-        .finish()
-    }
-}
-
-/// Status for the request to fetch the blocks owned by the current user.
-#[derive(Debug)]
-enum GetBlocksForUserRequestState {
-    NotStarted,
-    InFlight,
-    Failed,
-    Done(Vec<UserOwnedBlock>),
-}
-
-fn pad(element: Box<dyn Element>) -> Box<dyn Element> {
-    Container::new(element)
-        .with_uniform_padding(PAGE_PADDING)
-        .finish()
-}
-
-impl GetBlocksForUserRequestState {
-    fn render(
-        &self,
-        appearance: &Appearance,
-        list_state: UniformListState,
-        scroll_state_handle: ScrollStateHandle,
-    ) -> Box<dyn Element> {
-        let ui_builder = appearance.ui_builder();
-        match self {
-            GetBlocksForUserRequestState::NotStarted => pad(ui_builder
-                .label("You don't have any shared blocks yet.")
-                .build()
-                .finish()),
-            GetBlocksForUserRequestState::InFlight => {
-                pad(ui_builder.label("Getting blocks...").build().finish())
-            }
-            GetBlocksForUserRequestState::Failed => pad(ui_builder
-                .label("Failed to load blocks. Please try again.")
-                .build()
-                .finish()),
-            GetBlocksForUserRequestState::Done(user_blocks) => {
-                let user_blocks = user_blocks.clone();
-                // Only consider the unshared blocks when rendering. We don't remove them from the
-                // list of blocks so that the indexing is consistent for the lifetime of the app.
-                let num_visible_blocks =
-                    user_blocks.iter().filter(|block| block.is_shared()).count();
-
-                if num_visible_blocks > 0 {
-                    let list =
-                        UniformList::new(list_state, num_visible_blocks, move |range, app| {
-                            let appearance = Appearance::as_ref(app);
-                            user_blocks
-                                .iter()
-                                .enumerate()
-                                .filter(|(_, block)| block.is_shared())
-                                .skip(range.start)
-                                .take(range.end - range.start)
-                                .enumerate()
-                                .map(|(visible_index, (index, user_block))| {
-                                    let user_block_element =
-                                        Container::new(user_block.render(appearance, index))
-                                            .with_uniform_padding(10.);
-
-                                    // Add a background on alternating blocks.
-                                    if visible_index % 2 == 0 {
-                                        user_block_element
-                                            .with_background(internal_colors::fg_overlay_1(
-                                                appearance.theme(),
-                                            ))
-                                            .finish()
-                                    } else {
-                                        user_block_element.finish()
-                                    }
-                                })
-                                .collect::<Vec<_>>()
-                                .into_iter()
-                        });
-
-                    Scrollable::vertical(
-                        scroll_state_handle,
-                        list.finish_scrollable(),
-                        SCROLLBAR_WIDTH,
-                        Fill::Solid(appearance.theme().nonactive_ui_detail().into_solid()),
-                        Fill::Solid(appearance.theme().active_ui_detail().into_solid()),
-                        Fill::None, // Leave the background transparent
-                    )
-                    .with_padding_start(5.)
-                    .finish()
-                } else {
-                    pad(ui_builder
-                        .label("You don't have any shared blocks yet.")
-                        .build()
-                        .finish())
-                }
-            }
-        }
-    }
-}
-
-/// Status for the request to unshare a block.
-#[derive(Debug, Clone, PartialEq)]
-enum UnshareBlockRequestState {
-    NotStarted,
-    InFlight,
-    Failed,
-    Done,
-}
-
-#[derive(Default)]
-struct StateHandles {
-    scroll_state_handle: ScrollStateHandle,
-    confirm_dialog_handle: MouseStateHandle,
-    cancel_dialog_handle: MouseStateHandle,
-}
-
-/// A view that lists all the blocks owned by the user.
-pub struct ShowBlocksView {
-    page: PageType<Self>,
-    list_state: UniformListState,
-    overflow_menu: ViewHandle<Menu<ShowBlocksAction>>,
-    overflow_menu_index: Option<usize>,
-    get_blocks_for_user_status: GetBlocksForUserRequestState,
-    pending_unshared_block_index: Option<usize>,
-    block_client: Arc<dyn BlockClient>,
-    state_handles: StateHandles,
-}
-
-#[derive(Debug, Clone)]
-pub enum ShowBlocksAction {
-    CopyUrl(String),
-    OverflowClick(usize),
-    Unshare,
-    ConfirmUnshare,
-    CancelUnshare,
-}
-
-#[derive(Debug, Clone)]
-pub enum ShowBlocksEvent {
-    ShowToast {
-        message: String,
-        flavor: ToastFlavor,
-    },
-}
-
-impl ShowBlocksView {
-    pub fn new(block_client: Arc<dyn BlockClient>, ctx: &mut ViewContext<Self>) -> Self {
-        let menu = ctx.add_typed_action_view(|ctx| {
-            let mut menu = Menu::new().prevent_interaction_with_other_elements();
-
-            menu.set_items(
-                vec![MenuItem::Item(
-                    MenuItemFields::new("Unshare").with_on_select_action(ShowBlocksAction::Unshare),
-                )],
-                ctx,
-            );
-
-            menu
-        });
-
-        ctx.subscribe_to_view(&menu, move |me, _, event, ctx| {
-            me.handle_overflow_menu_event(event, ctx);
-        });
-
-        let page = PageType::new_monolith(ShowBlocksWidget::default(), None, false);
-        Self {
-            page,
-            list_state: Default::default(),
-            state_handles: Default::default(),
-            overflow_menu: menu,
-            overflow_menu_index: None,
-            get_blocks_for_user_status: GetBlocksForUserRequestState::NotStarted,
-            block_client,
-            pending_unshared_block_index: None,
-        }
-    }
-
-    fn load_blocks(&mut self, ctx: &mut ViewContext<Self>) {
-        if !matches!(
-            self.get_blocks_for_user_status,
-            GetBlocksForUserRequestState::InFlight
-        ) {
-            let block_client = self.block_client.clone();
-            self.get_blocks_for_user_status = GetBlocksForUserRequestState::InFlight;
-            let _ = ctx.spawn(
-                async move {
-                    block_client
-                        .blocks_owned_by_user()
-                        .await
-                        .map(|blocks| blocks.into_iter().map(Into::into).collect())
-                },
-                Self::on_load_complete,
-            );
-        }
-    }
-
-    fn on_load_complete(
-        &mut self,
-        result: Result<Vec<UserOwnedBlock>>,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match result {
-            Ok(mut blocks) => {
-                blocks.sort_by_key(|b| std::cmp::Reverse(b.time_started));
-
-                self.get_blocks_for_user_status = GetBlocksForUserRequestState::Done(blocks)
-            }
-            Err(_) => {
-                log::info!("Failed to fetch blocks owned by user from server");
-                self.get_blocks_for_user_status = GetBlocksForUserRequestState::Failed;
-            }
-        }
-        ctx.notify()
-    }
-
-    pub fn copy_url(&mut self, block_url: &str, ctx: &mut ViewContext<Self>) {
-        ctx.clipboard()
-            .write(ClipboardContent::plain_text(block_url.to_string()));
-        ctx.emit(ShowBlocksEvent::ShowToast {
-            message: "Link copied.".to_string(),
-            flavor: ToastFlavor::Default,
-        })
-    }
-
-    pub fn overflow_click(&mut self, index: usize, ctx: &mut ViewContext<Self>) {
-        self.overflow_menu_index = Some(index);
-        ctx.notify();
-    }
-
-    pub fn cancel_unshare(&mut self, ctx: &mut ViewContext<Self>) {
-        self.pending_unshared_block_index = None;
-        ctx.notify();
-    }
-
-    pub fn confirm_unshare(&mut self, ctx: &mut ViewContext<Self>) {
-        if let Some(selected_index) = self.pending_unshared_block_index.take() {
-            if let GetBlocksForUserRequestState::Done(blocks) = &mut self.get_blocks_for_user_status
-            {
-                // Only attempt to unshare if there isn't already an inflight request to unshare
-                // the block.
-                let user_block = &mut blocks[selected_index];
-                if !matches!(
-                    user_block.unshare_request_status,
-                    UnshareBlockRequestState::InFlight
-                ) {
-                    user_block.unshare_request_status = UnshareBlockRequestState::InFlight;
-
-                    let block_client = self.block_client.clone();
-                    let block_id = user_block.id.clone();
-                    let _ = ctx.spawn(
-                        async move { (block_client.unshare_block(block_id).await, selected_index) },
-                        Self::on_block_unshare_complete,
-                    );
-                }
-            }
-        }
-        ctx.notify();
-    }
-
-    pub fn unshare_button_click(&mut self, ctx: &mut ViewContext<Self>) {
-        self.pending_unshared_block_index = self.overflow_menu_index.take();
-        ctx.notify();
-    }
-
-    fn on_block_unshare_complete(
-        &mut self,
-        (request_result, block_index): (Result<()>, usize),
-        ctx: &mut ViewContext<Self>,
-    ) {
-        log::info!(
-            "on_block_unshare_complete with result {:?}",
-            &request_result
-        );
-        if let GetBlocksForUserRequestState::Done(blocks) = &mut self.get_blocks_for_user_status {
-            let user_block = &mut blocks[block_index];
-            match request_result {
-                Ok(_) => {
-                    ctx.emit(ShowBlocksEvent::ShowToast {
-                        message: "Block was successfully unshared.".to_string(),
-                        flavor: ToastFlavor::Success,
-                    });
-                    user_block.unshare_request_status = UnshareBlockRequestState::Done;
-                }
-                Err(_) => {
-                    ctx.emit(ShowBlocksEvent::ShowToast {
-                        message: "Failed to unshare block. Please try again.".to_string(),
-                        flavor: ToastFlavor::Error,
-                    });
-                    user_block.unshare_request_status = UnshareBlockRequestState::Failed;
-                }
-            }
-
-            ctx.notify();
-        }
-    }
-
-    fn handle_overflow_menu_event(&mut self, event: &MenuEvent, ctx: &mut ViewContext<Self>) {
-        if let Event::Close { via_select_item: _ } = event {
-            self.overflow_menu_index = None;
-            ctx.notify();
-        }
-    }
-}
-
-impl Entity for ShowBlocksView {
-    type Event = ShowBlocksEvent;
-}
-
-impl TypedActionView for ShowBlocksView {
-    type Action = ShowBlocksAction;
-
-    fn handle_action(&mut self, action: &Self::Action, ctx: &mut ViewContext<Self>) {
-        use ShowBlocksAction::*;
-        match action {
-            CopyUrl(url) => self.copy_url(url, ctx),
-            OverflowClick(index) => self.overflow_click(*index, ctx),
-            Unshare => self.unshare_button_click(ctx),
-            ConfirmUnshare => self.confirm_unshare(ctx),
-            CancelUnshare => self.cancel_unshare(ctx),
-        }
-    }
-}
-
-impl View for ShowBlocksView {
-    fn ui_name() -> &'static str {
-        "ShowBlockView"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        self.page.render(self, app)
-    }
-}
-
-impl SettingsPageMeta for ShowBlocksView {
-    fn section() -> SettingsSection {
-        SettingsSection::SharedBlocks
-    }
-
-    fn should_render(&self, ctx: &AppContext) -> bool {
-        let is_anonymous = AuthStateProvider::as_ref(ctx)
-            .get()
-            .is_anonymous_or_logged_out();
-
-        !is_anonymous
-    }
-
-    fn on_page_selected(&mut self, _: bool, ctx: &mut ViewContext<Self>) {
-        self.load_blocks(ctx);
-    }
-
-    fn update_filter(&mut self, query: &str, ctx: &mut ViewContext<Self>) -> MatchData {
-        self.page.update_filter(query, ctx)
-    }
-
-    fn scroll_to_widget(&mut self, widget_id: &'static str) {
-        self.page.scroll_to_widget(widget_id)
-    }
-
-    fn clear_highlighted_widget(&mut self) {
-        self.page.clear_highlighted_widget();
-    }
-}
-
-impl From<ViewHandle<ShowBlocksView>> for SettingsPageViewHandle {
-    fn from(view_handle: ViewHandle<ShowBlocksView>) -> Self {
-        SettingsPageViewHandle::SharedBlocks(view_handle)
-    }
-}
-
-#[derive(Default)]
-struct ShowBlocksWidget {}
-
-impl ShowBlocksWidget {
-    fn render_confirm_delete_block_dialog(
-        &self,
-        view: &ShowBlocksView,
-        appearance: &Appearance,
-    ) -> Box<dyn Element> {
-        let ui_builder = appearance.ui_builder();
-        ConstrainedBox::new(
-            Container::new(
-                Flex::column()
-                    .with_child(
-                        Align::new(
-                            ui_builder
-                                .label("Unshare block")
-                                .with_style(UiComponentStyles {
-                                    font_size: Some(appearance.header_font_size()),
-                                    ..Default::default()
-                                })
-                                .build()
-                                .finish(),
-                        )
-                        .top_center()
-                        .finish(),
-                    )
-                    .with_child(
-                        Container::new(
-                            ui_builder
-                                .paragraph(UNSHARE_BLOCK_CONFIRMATION_DIALOG_TEXT)
-                                .with_style(UiComponentStyles {
-                                    font_size: Some(appearance.ui_font_size() * 1.16),
-                                    ..Default::default()
-                                })
-                                .build()
-                                .finish(),
-                        )
-                        .with_padding_top(9.)
-                        .finish(),
-                    )
-                    .with_child(
-                        Container::new(
-                            Align::new(
-                                Flex::row()
-                                    .with_child(
-                                        ui_builder
-                                            .button(
-                                                ButtonVariant::Basic,
-                                                view.state_handles.cancel_dialog_handle.clone(),
-                                            )
-                                            .with_text_label("Cancel".into())
-                                            .build()
-                                            .on_click(|ctx, _, _| {
-                                                ctx.dispatch_typed_action(
-                                                    ShowBlocksAction::CancelUnshare,
-                                                );
-                                            })
-                                            .finish(),
-                                    )
-                                    .with_child(
-                                        Container::new(
-                                            ui_builder
-                                                .button(
-                                                    ButtonVariant::Accent,
-                                                    view.state_handles
-                                                        .confirm_dialog_handle
-                                                        .clone(),
-                                                )
-                                                .with_text_label("Unshare".into())
-                                                .build()
-                                                .on_click(|ctx, _, _| {
-                                                    ctx.dispatch_typed_action(
-                                                        ShowBlocksAction::ConfirmUnshare,
-                                                    );
-                                                })
-                                                .finish(),
-                                        )
-                                        .with_padding_left(10.)
-                                        .finish(),
-                                    )
-                                    .finish(),
-                            )
-                            .top_center()
-                            .finish(),
-                        )
-                        .with_padding_top(20.)
-                        .finish(),
-                    )
-                    .finish(),
-            )
-            .with_background(appearance.theme().surface_2())
-            .with_uniform_padding(20.)
-            .with_corner_radius(CornerRadius::with_all(Radius::Pixels(4.)))
-            .finish(),
-        )
-        .with_height(220.)
-        .with_width(300.)
-        .finish()
-    }
-}
-
-impl SettingsWidget for ShowBlocksWidget {
-    type View = ShowBlocksView;
-
-    fn search_terms(&self) -> &str {
-        "shared blocks"
-    }
-
-    fn render(
-        &self,
-        view: &Self::View,
-        appearance: &Appearance,
-        _app: &AppContext,
-    ) -> Box<dyn Element> {
-        let element_for_state = view.get_blocks_for_user_status.render(
-            appearance,
-            view.list_state.clone(),
-            view.state_handles.scroll_state_handle.clone(),
-        );
-
-        let inner_container = SavePosition::new(
-            Container::new(element_for_state).finish(),
-            "show_blocks_view:modal",
-        )
-        .finish();
-
-        let mut stack = Stack::new().with_child(inner_container);
-
-        if let Some(menu_index) = view.overflow_menu_index {
-            stack.add_positioned_overlay_child(
-                ChildView::new(&view.overflow_menu).finish(),
-                OffsetPositioning::offset_from_save_position_element(
-                    format!("show_blocks_view:overflow_{menu_index}").as_str(),
-                    vec2f(0., 2.),
-                    PositionedElementOffsetBounds::Unbounded,
-                    PositionedElementAnchor::BottomLeft,
-                    ChildAnchor::TopLeft,
-                ),
-            );
-        }
-
-        if view.pending_unshared_block_index.is_some() {
-            stack.add_positioned_child(
-                Dismiss::new(
-                    Align::new(self.render_confirm_delete_block_dialog(view, appearance)).finish(),
-                )
-                .on_dismiss(|ctx, _app| ctx.dispatch_typed_action(ShowBlocksAction::CancelUnshare))
-                .finish(),
-                OffsetPositioning::offset_from_parent(
-                    vec2f(0., 0.),
-                    ParentOffsetBounds::ParentByPosition,
-                    ParentAnchor::Center,
-                    ChildAnchor::Center,
-                ),
-            );
-        }
-
-        let header = render_page_title("Shared blocks", HEADER_FONT_SIZE, appearance);
-        let col = Flex::column()
-            .with_child(Container::new(header).with_margin_bottom(24.).finish())
-            .with_child(Expanded::new(1., stack.finish()).finish());
-
-        col.finish()
-    }
-}
diff --git a/app/src/settings_view/teams_page.rs b/app/src/settings_view/teams_page.rs
index 44b4f85c..3d602c57 100644
--- a/app/src/settings_view/teams_page.rs
+++ b/app/src/settings_view/teams_page.rs
@@ -39,9 +39,6 @@ use super::settings_page::{
     SettingsPageMeta, SettingsPageViewHandle, SettingsWidget,
 };
 use super::tab_menu::Tabs;
-use super::transfer_ownership_confirmation_modal::{
-    TransferOwnershipConfirmationEvent, TransferOwnershipConfirmationModal,
-};
 use super::SettingsSection;
 use crate::ai::AIRequestUsageModel;
 use crate::appearance::Appearance;
@@ -475,7 +472,6 @@ pub struct TeamsPageView {
     team_action_confirmation_dialog: ViewHandle<CloudActionConfirmationDialog>,
     show_team_action_confirmation_dialog: bool,
     pending_team_action_confirmation: Option<TeamActionConfirmationTarget>,
-    transfer_ownership_modal_state: ModalViewState<Modal<TransferOwnershipConfirmationModal>>,
     clipped_scroll_state: ClippedScrollStateHandle,
     discoverable_teams_states: Vec<DiscoverableTeamState>,
     rename_team_editor: ViewHandle<ClickableTextInput>,
@@ -605,18 +601,7 @@ impl TypedActionView for TeamsPageView {
                 self.join_team_with_team_discovery(*team_uid, ctx);
                 ctx.notify();
             }
-            TeamsPageAction::ShowTransferOwnershipModal {
-                new_owner_email,
-                new_owner_uid,
-                team_uid,
-            } => {
-                self.show_transfer_ownership_modal(
-                    new_owner_email.clone(),
-                    *new_owner_uid,
-                    *team_uid,
-                    ctx,
-                );
-            }
+            TeamsPageAction::ShowTransferOwnershipModal { .. } => {}
             TeamsPageAction::ToggleTeamDiscoverabilityBeforeCreation => {
                 self.checkbox_value = !self.checkbox_value;
             }
@@ -796,35 +781,6 @@ impl TeamsPageView {
             me.handle_cloud_action_confirmation_dialog_event(event, ctx);
         });
 
-        let transfer_ownership_modal_body =
-            ctx.add_typed_action_view(|_| TransferOwnershipConfirmationModal::new());
-        ctx.subscribe_to_view(&transfer_ownership_modal_body, |me, _, event, ctx| {
-            me.handle_transfer_ownership_modal_event(event, ctx);
-        });
-        let transfer_ownership_modal = ctx.add_typed_action_view(|ctx| {
-            Modal::new(
-                Some("Transfer team ownership?".to_string()),
-                transfer_ownership_modal_body,
-                ctx,
-            )
-            .with_modal_style(UiComponentStyles {
-                height: Some(220.),
-                ..Default::default()
-            })
-            .with_header_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).bottom(16.)),
-                ..Default::default()
-            })
-            .with_body_style(UiComponentStyles {
-                padding: Some(Coords::uniform(24.).top(0.).bottom(12.)),
-                height: Some(150.),
-                ..Default::default()
-            })
-        });
-        ctx.subscribe_to_view(&transfer_ownership_modal, |me, _, event, ctx| {
-            me.handle_transfer_ownership_modal_close_event(event, ctx);
-        });
-
         let member_actions_menu = ctx.add_typed_action_view(|_| Menu::new().with_drop_shadow());
         ctx.subscribe_to_view(&member_actions_menu, |me, _, event, ctx| {
             if let menu::Event::Close { .. } = event {
@@ -861,7 +817,6 @@ impl TeamsPageView {
             team_action_confirmation_dialog,
             show_team_action_confirmation_dialog: false,
             pending_team_action_confirmation: None,
-            transfer_ownership_modal_state: ModalViewState::new(transfer_ownership_modal),
             discoverable_teams_states: Vec::new(),
             rename_team_editor,
             checkbox_value: true,
@@ -1183,59 +1138,6 @@ impl TeamsPageView {
         }
     }
 
-    fn handle_transfer_ownership_modal_event(
-        &mut self,
-        event: &TransferOwnershipConfirmationEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            TransferOwnershipConfirmationEvent::Confirm {
-                new_owner_uid,
-                team_uid,
-            } => {
-                self.set_team_member_role(*new_owner_uid, *team_uid, MembershipRole::Owner, ctx);
-                self.transfer_ownership_modal_state.close();
-                ctx.notify();
-            }
-            TransferOwnershipConfirmationEvent::Cancel => {
-                self.transfer_ownership_modal_state.close();
-                ctx.notify();
-            }
-        }
-    }
-
-    fn handle_transfer_ownership_modal_close_event(
-        &mut self,
-        event: &ModalEvent,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ModalEvent::Close => {
-                self.transfer_ownership_modal_state.close();
-                ctx.notify();
-            }
-        }
-    }
-
-    fn show_transfer_ownership_modal(
-        &mut self,
-        new_owner_email: String,
-        new_owner_uid: UserUid,
-        team_uid: ServerId,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        self.transfer_ownership_modal_state
-            .view
-            .update(ctx, |modal, ctx| {
-                modal.body().update(ctx, |body, ctx| {
-                    body.set_new_owner(new_owner_email, new_owner_uid, team_uid);
-                    ctx.notify();
-                });
-            });
-        self.transfer_ownership_modal_state.open();
-        ctx.notify();
-    }
-
     fn handle_approve_domains_block_editor_event(
         &mut self,
         event: &WordBlockEditorViewEvent,
@@ -4396,17 +4298,6 @@ impl SettingsWidget for TeamsWidget {
         let mut stack = Stack::new();
         stack.add_child(Flex::column().with_child(content).finish());
 
-        if view.transfer_ownership_modal_state.is_open() {
-            stack.add_positioned_overlay_child(
-                view.transfer_ownership_modal_state.render(),
-                OffsetPositioning::offset_from_parent(
-                    vec2f(0., 0.),
-                    ParentOffsetBounds::WindowByPosition,
-                    ParentAnchor::Center,
-                    ChildAnchor::Center,
-                ),
-            );
-        }
         if view.should_show_remove_user_from_team_confirmation_dialog() {
             stack.add_positioned_overlay_child(
                 ChildView::new(&view.team_action_confirmation_dialog).finish(),
diff --git a/app/src/settings_view/transfer_ownership_confirmation_modal.rs b/app/src/settings_view/transfer_ownership_confirmation_modal.rs
deleted file mode 100644
index 942fb30a..00000000
--- a/app/src/settings_view/transfer_ownership_confirmation_modal.rs
+++ /dev/null
@@ -1,154 +0,0 @@
-#![allow(dead_code)]
-
-use galaxyui::elements::{
-    Align, Container, CrossAxisAlignment, Flex, MouseStateHandle, ParentElement, Text,
-};
-use warpui::ui_components::button::ButtonVariant;
-use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use warpui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
-
-use crate::appearance::Appearance;
-use crate::auth::UserUid;
-use crate::server::ids::ServerId;
-
-pub struct TransferOwnershipConfirmationModal {
-    cancel_mouse_state: MouseStateHandle,
-    confirm_mouse_state: MouseStateHandle,
-    new_owner_email: Option<String>,
-    new_owner_uid: Option<UserUid>,
-    team_uid: Option<ServerId>,
-}
-
-impl TransferOwnershipConfirmationModal {
-    pub fn new() -> Self {
-        Self {
-            cancel_mouse_state: Default::default(),
-            confirm_mouse_state: Default::default(),
-            new_owner_email: None,
-            new_owner_uid: None,
-            team_uid: None,
-        }
-    }
-
-    pub fn set_new_owner(&mut self, email: String, user_uid: UserUid, team_uid: ServerId) {
-        self.new_owner_email = Some(email);
-        self.new_owner_uid = Some(user_uid);
-        self.team_uid = Some(team_uid);
-    }
-}
-
-impl Entity for TransferOwnershipConfirmationModal {
-    type Event = TransferOwnershipConfirmationEvent;
-}
-
-impl View for TransferOwnershipConfirmationModal {
-    fn ui_name() -> &'static str {
-        "TransferOwnershipConfirmationModal"
-    }
-
-    fn render(&self, app: &AppContext) -> Box<dyn Element> {
-        let appearance = Appearance::as_ref(app);
-        let theme = appearance.theme();
-
-        let email = self.new_owner_email.as_deref().unwrap_or_default();
-
-        let description_text = Text::new(
-            format!(
-                "Are you sure you want to transfer team ownership to {}? You will no longer be the owner and will not be able to take any administrative actions for this team.",
-                email
-            ),
-            appearance.ui_font_family(),
-            14.,
-        )
-        .with_color(theme.sub_text_color(theme.surface_2()).into())
-        .finish();
-
-        let button_style = UiComponentStyles {
-            font_size: Some(14.),
-            padding: Some(Coords::uniform(8.).left(12.).right(12.)),
-            ..Default::default()
-        };
-
-        let buttons_row = Flex::row()
-            .with_cross_axis_alignment(CrossAxisAlignment::Center)
-            .with_child(
-                appearance
-                    .ui_builder()
-                    .button(ButtonVariant::Secondary, self.cancel_mouse_state.clone())
-                    .with_text_label("Cancel".to_string())
-                    .with_style(button_style)
-                    .build()
-                    .on_click(|ctx, _, _| {
-                        ctx.dispatch_typed_action(TransferOwnershipConfirmationAction::Cancel);
-                    })
-                    .finish(),
-            )
-            .with_child(
-                Container::new(
-                    appearance
-                        .ui_builder()
-                        .button(ButtonVariant::Accent, self.confirm_mouse_state.clone())
-                        .with_text_label("Transfer".to_string())
-                        .with_style(button_style)
-                        .build()
-                        .on_click(|ctx, _, _| {
-                            ctx.dispatch_typed_action(TransferOwnershipConfirmationAction::Confirm);
-                        })
-                        .finish(),
-                )
-                .with_margin_left(12.)
-                .finish(),
-            )
-            .finish();
-
-        Flex::column()
-            .with_child(
-                Container::new(description_text)
-                    .with_margin_bottom(24.)
-                    .finish(),
-            )
-            .with_child(Align::new(buttons_row).right().finish())
-            .finish()
-    }
-}
-
-pub enum TransferOwnershipConfirmationEvent {
-    Confirm {
-        new_owner_uid: UserUid,
-        team_uid: ServerId,
-    },
-    Cancel,
-}
-
-#[derive(Debug)]
-pub enum TransferOwnershipConfirmationAction {
-    Confirm,
-    Cancel,
-}
-
-impl TypedActionView for TransferOwnershipConfirmationModal {
-    type Action = TransferOwnershipConfirmationAction;
-
-    fn handle_action(
-        &mut self,
-        action: &TransferOwnershipConfirmationAction,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        match action {
-            TransferOwnershipConfirmationAction::Confirm => {
-                let (Some(new_owner_uid), Some(team_uid)) = (self.new_owner_uid, self.team_uid)
-                else {
-                    log::error!("Transfer ownership confirm button pressed with no new owner set");
-                    return;
-                };
-                ctx.emit(TransferOwnershipConfirmationEvent::Confirm {
-                    new_owner_uid,
-                    team_uid,
-                });
-            }
-            TransferOwnershipConfirmationAction::Cancel => {
-                ctx.emit(TransferOwnershipConfirmationEvent::Cancel);
-            }
-        }
-    }
-}
diff --git a/app/src/terminal/buy_credits_banner.rs b/app/src/terminal/buy_credits_banner.rs
index 4e4928c2..b884356b 100644
--- a/app/src/terminal/buy_credits_banner.rs
+++ b/app/src/terminal/buy_credits_banner.rs
@@ -7,7 +7,7 @@ use galaxy_graphql::billing::AddonCreditsOption;
 use galaxy_graphql::error::BudgetExceededError;
 use galaxyui::elements::{
     Align, Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,
-    CrossAxisAlignment, DropShadow, Expanded, Flex, FormattedTextElement, HighlightedHyperlink,
+    CrossAxisAlignment, DropShadow, Empty, Expanded, Flex, FormattedTextElement, HighlightedHyperlink,
     Hoverable, Icon as WarpUiIcon, MainAxisAlignment, MainAxisSize, MouseStateHandle,
     OffsetPositioning, ParentAnchor, ParentElement as _, ParentOffsetBounds, Radius, Shrinkable,
     SizeConstraintCondition, SizeConstraintSwitch, Stack, Text,
@@ -31,7 +31,6 @@ use crate::pricing::{PricingInfoModel, PricingInfoModelEvent};
 use crate::send_telemetry_from_ctx;
 use crate::server::ids::ServerId;
 use crate::server::telemetry::{OutOfCreditsBannerAction, TelemetryEvent};
-use crate::settings_view::create_discount_badge;
 use crate::view_components::{Dropdown, DropdownAction};
 use crate::workspaces::user_workspaces::{UserWorkspaces, UserWorkspacesEvent};
 
@@ -356,7 +355,7 @@ impl BuyCreditsBanner {
                             .with_color(text_color.into())
                             .finish();
 
-                            let discount_badge = create_discount_badge(discount_percent, appearance);
+                            let discount_badge = Empty::new().finish();
 
                             Flex::row()
                                 .with_cross_axis_alignment(CrossAxisAlignment::Center)
diff --git a/app/src/terminal/enable_auto_reload_modal.rs b/app/src/terminal/enable_auto_reload_modal.rs
index 8a706f6d..a186ba90 100644
--- a/app/src/terminal/enable_auto_reload_modal.rs
+++ b/app/src/terminal/enable_auto_reload_modal.rs
@@ -20,7 +20,6 @@ use crate::modal::{Modal, ModalEvent, MODAL_PADDING, MODAL_WIDTH};
 use crate::pricing::{PricingInfoModel, PricingInfoModelEvent};
 use crate::send_telemetry_from_ctx;
 use crate::server::telemetry::{AutoReloadModalAction, TelemetryEvent};
-use crate::settings_view::create_discount_badge;
 use crate::ui_components::blended_colors;
 use crate::view_components::{Dropdown, DropdownAction, ToastFlavor};
 use crate::workspaces::user_workspaces::{UserWorkspaces, UserWorkspacesEvent};
@@ -182,7 +181,7 @@ impl EnableAutoReloadModalBody {
                             .with_color(text_color.into())
                             .finish();
 
-                            let discount_badge = create_discount_badge(discount_percent, appearance);
+                            let discount_badge = Empty::new().finish();
 
                             Flex::row()
                                 .with_cross_axis_alignment(CrossAxisAlignment::Center)
diff --git a/app/src/terminal/input.rs b/app/src/terminal/input.rs
index f501577c..8455a148 100644
--- a/app/src/terminal/input.rs
+++ b/app/src/terminal/input.rs
@@ -3563,7 +3563,7 @@ impl Input {
         let buy_credits_banner = ctx.add_typed_action_view(BuyCreditsBanner::new);
         ctx.subscribe_to_view(&buy_credits_banner, |me, _, event, ctx| match event {
             BuyCreditsBannerEvent::OpenBillingAndUsage => {
-                ctx.emit(Event::OpenSettings(SettingsSection::BillingAndUsage));
+                ctx.emit(Event::OpenSettings(SettingsSection::About));
             }
             BuyCreditsBannerEvent::RefocusInput => {
                 ctx.focus(&me.editor);
@@ -6397,7 +6397,7 @@ impl Input {
                 });
             }
             PromptAlertEvent::OpenBillingAndUsagePage => {
-                ctx.emit(Event::OpenSettings(SettingsSection::BillingAndUsage));
+                ctx.emit(Event::OpenSettings(SettingsSection::About));
             }
             PromptAlertEvent::OpenBillingPortal { team_uid } => {
                 UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
@@ -15685,7 +15685,7 @@ impl Input {
                 entrypoint: AnonymousUserSignupEntrypoint::SignUpAIPrompt,
             }),
             PromptSuggestionsEvent::OpenBillingAndUsagePage => {
-                ctx.emit(Event::OpenSettings(SettingsSection::BillingAndUsage))
+                ctx.emit(Event::OpenSettings(SettingsSection::About))
             }
             PromptSuggestionsEvent::OpenBillingPortal { team_uid } => {
                 UserWorkspaces::handle(ctx).update(ctx, |user_workspaces, ctx| {
diff --git a/app/src/terminal/share_block_modal.rs b/app/src/terminal/share_block_modal.rs
index 4cfdd22e..28db2cec 100644
--- a/app/src/terminal/share_block_modal.rs
+++ b/app/src/terminal/share_block_modal.rs
@@ -780,7 +780,7 @@ impl ShareBlockModal {
             .on_click(|ctx, _, _| {
                 ctx.dispatch_typed_action(ShareBlockModalAction::Close);
                 ctx.dispatch_typed_action(WorkspaceAction::ShowSettingsPage(
-                    SettingsSection::SharedBlocks,
+                    SettingsSection::About,
                 ));
             });
         if matches!(self.request_state, ShareRequestState::Pending(_)) {
diff --git a/app/src/terminal/view.rs b/app/src/terminal/view.rs
index a308594f..b3823cc7 100644
--- a/app/src/terminal/view.rs
+++ b/app/src/terminal/view.rs
@@ -27165,7 +27165,7 @@ impl TypedActionView for TerminalView {
                 });
             }
             OpenBillingAndUsagePane => {
-                ctx.emit(Event::OpenSettings(SettingsSection::BillingAndUsage));
+                ctx.emit(Event::OpenSettings(SettingsSection::About));
             }
             OpenAddRulePane => {
                 ctx.emit(Event::OpenAddRulePane);
diff --git a/app/src/tracing.rs b/app/src/tracing.rs
index 18099cc7..59fcdb6d 100644
--- a/app/src/tracing.rs
+++ b/app/src/tracing.rs
@@ -1,102 +1,30 @@
-#[cfg(not(target_family = "wasm"))]
-use std::time::Duration;
-
 use tracing::subscriber;
 
-#[cfg(not(target_family = "wasm"))]
-mod cloud_agent_auth;
-#[cfg(not(target_family = "wasm"))]
-mod native;
-
-#[cfg(not(target_family = "wasm"))]
-const DEFAULT_EXPORT_TIMEOUT: Duration = Duration::from_secs(10);
-
 pub fn init() -> anyhow::Result<Initialization> {
-    #[cfg(target_family = "wasm")]
-    {
-        install_no_subscriber()?;
-        Ok(Initialization::default())
-    }
-
-    #[cfg(not(target_family = "wasm"))]
-    native::init()
+    subscriber::set_global_default(subscriber::NoSubscriber::new())?;
+    Ok(Initialization::default())
 }
 
 #[cfg(not(target_family = "wasm"))]
-/// Starts cloud-agent trace credential refresh after authenticated application services exist.
-///
-/// The exporter and dispatch credential are initialized earlier by [`init`]. This later lifecycle
-/// hook supplies the authenticated managed-secrets client needed to mint replacements without
-/// broadening tracing initialization to ordinary application processes.
 pub fn start_auth_refresh(
-    client: std::sync::Arc<dyn warp_managed_secrets::client::ManagedSecretsClient>,
-    ctx: &mut warpui::AppContext,
+    _client: std::sync::Arc<dyn warp_managed_secrets::client::ManagedSecretsClient>,
+    _ctx: &mut warpui::AppContext,
 ) {
-    native::start_auth_refresh(client, ctx);
 }
 
-fn install_no_subscriber() -> anyhow::Result<()> {
-    // Configure the global tracing subscriber to not care about any spans or
-    // events.
-    //
-    // This is done so that we prevent the `tracing` crate from writing out log
-    // lines for spans and trace events.
-    subscriber::set_global_default(subscriber::NoSubscriber::new())?;
-    Ok(())
-}
-
-#[cfg_attr(target_family = "wasm", derive(Default))]
+#[derive(Default)]
 pub struct Initialization {
     initialization_warning: Option<anyhow::Error>,
-    #[cfg(not(target_family = "wasm"))]
-    active_spans: Option<native::ActiveSpanRegistry>,
-    #[cfg(not(target_family = "wasm"))]
-    provider: Option<opentelemetry_sdk::trace::SdkTracerProvider>,
-    #[cfg(not(target_family = "wasm"))]
-    shutdown_timeout: std::time::Duration,
-}
-
-#[cfg(not(target_family = "wasm"))]
-impl Default for Initialization {
-    fn default() -> Self {
-        Self {
-            initialization_warning: None,
-            active_spans: None,
-            provider: None,
-            shutdown_timeout: DEFAULT_EXPORT_TIMEOUT,
-        }
-    }
 }
 
 impl Initialization {
     pub fn log_initialization_warning(&mut self) {
         if let Some(err) = self.initialization_warning.take() {
-            log::warn!("Failed to initialize cloud-agent OpenTelemetry exporting: {err:#}");
+            log::warn!("Tracing initialization warning: {err:#}");
         }
     }
 
-    pub(crate) fn shutdown(&mut self) {
-        #[cfg(not(target_family = "wasm"))]
-        {
-            match (self.active_spans.take(), self.provider.take()) {
-                (Some(active_spans), Some(provider)) => {
-                    if let Err(err) = active_spans.shutdown(&provider, self.shutdown_timeout) {
-                        log::warn!(
-                            "Failed to shut down cloud-agent OpenTelemetry exporting: {err}"
-                        );
-                    }
-                }
-                (None, Some(provider)) => {
-                    if let Err(err) = provider.shutdown_with_timeout(self.shutdown_timeout) {
-                        log::warn!(
-                            "Failed to shut down cloud-agent OpenTelemetry exporting: {err}"
-                        );
-                    }
-                }
-                (Some(_), None) | (None, None) => {}
-            }
-        }
-    }
+    pub(crate) fn shutdown(&mut self) {}
 }
 
 impl Drop for Initialization {
diff --git a/app/src/tracing/cloud_agent_auth.rs b/app/src/tracing/cloud_agent_auth.rs
deleted file mode 100644
index 355b7ccc..00000000
--- a/app/src/tracing/cloud_agent_auth.rs
+++ /dev/null
@@ -1,546 +0,0 @@
-//! Provides authenticated OTLP trace transport and credential refresh for opted-in cloud agents.
-//!
-//! Dispatch bootstraps tracing with a bearer token and expiry in the process environment. The
-//! exporter is built once around [`AuthenticatedHttpClient`], which reads a shared token snapshot
-//! immediately before every request so refresh never requires rebuilding the exporter. Processes
-//! without the endpoint switch or a currently valid dispatch credential never initialize this
-//! module.
-//!
-//! Refresh begins only after the application has an authenticated managed-secrets client. A
-//! successful mint replaces the dispatch credential only after the returned JWT's unverified
-//! payload contains a string `run_id` exactly matching the immutable startup `OZ_RUN_ID`. This
-//! payload inspection is only a rejection gate; the collector remains responsible for verifying
-//! the token's signature, audience, expiry, and trusted trace resource attributes. Every refresh
-//! failure preserves the last valid credential and enters bounded jittered backoff.
-//!
-//! Tokens must never appear in diagnostics or formatted values. Cached authorization headers are
-//! marked sensitive, manual `Debug` implementations omit secrets, and token-store locks are always
-//! released before network I/O.
-use std::fmt;
-use std::sync::{Arc, Mutex, RwLock};
-use std::time::Duration;
-
-use anyhow::{anyhow, Context as _};
-use async_channel::{Receiver, Sender};
-use async_compat::Compat;
-use async_trait::async_trait;
-use base64::Engine as _;
-use chrono::{DateTime, Utc};
-use futures_util::stream::AbortHandle;
-use http::header::{HeaderValue, AUTHORIZATION};
-use instant::Instant;
-use opentelemetry_http::{Bytes, HttpClient, HttpError, Request, Response};
-use warp_managed_secrets::client::{IdentityTokenOptions, ManagedSecretsClient, TaskIdentityToken};
-use warpui::r#async::{FutureExt as _, Timer};
-use warpui::{AppContext, Entity, ModelContext, SingletonEntity};
-
-/// The environment variables form the immutable dispatch-time authentication bootstrap.
-const CLOUD_AGENT_OTLP_TOKEN: &str = "WARP_CLOUD_AGENT_OTLP_TOKEN";
-const CLOUD_AGENT_OTLP_TOKEN_EXPIRES_AT: &str = "WARP_CLOUD_AGENT_OTLP_TOKEN_EXPIRES_AT";
-const OZ_RUN_ID: &str = "OZ_RUN_ID";
-/// The collector audience and requested lifetime are fixed by the cloud-agent trace contract.
-const COLLECTOR_AUDIENCE: &str = "warp-cloud-agent-otel";
-const REFRESHED_TOKEN_DURATION: Duration = Duration::from_secs(60 * 60);
-/// Proactive refresh starts roughly twenty minutes before expiry, with jitter to spread load.
-const PROACTIVE_REFRESH_BUFFER: Duration = Duration::from_secs(20 * 60);
-const PROACTIVE_REFRESH_JITTER: Duration = Duration::from_secs(2 * 60);
-const MIN_PROACTIVE_REFRESH_DELAY: Duration = Duration::from_secs(1);
-/// Failed refreshes use bounded full-jitter exponential backoff and rate-limited diagnostics.
-const INITIAL_FAILURE_BACKOFF: Duration = Duration::from_secs(1);
-const MAX_FAILURE_BACKOFF: Duration = Duration::from_secs(5 * 60);
-const FAILURE_LOG_INTERVAL: Duration = Duration::from_secs(60);
-/// A stalled identity-token request must release the single in-flight refresh slot.
-const REFRESH_REQUEST_TIMEOUT: Duration = Duration::from_secs(30);
-
-/// Shared dispatch authentication state between the exporter and the later refresh coordinator.
-///
-/// The optional expected run ID intentionally does not gate initial tracing: a valid dispatch
-/// credential remains usable when `OZ_RUN_ID` is missing or empty, but every refreshed credential
-/// is rejected until an immutable expected run ID is available to the replacement gate.
-#[derive(Clone)]
-pub(super) struct AuthContext {
-    token_store: TokenStore,
-    expected_run_id: Option<Arc<str>>,
-    refresh_hint_sender: Sender<()>,
-    refresh_hint_receiver: Arc<Mutex<Option<Receiver<()>>>>,
-}
-
-impl AuthContext {
-    /// Seeds authentication from a currently valid dispatch credential in the environment.
-    ///
-    /// The caller treats failure as an opt-out so normal processes and partially rolled-out cloud
-    /// agents retain no-op tracing behavior.
-    pub(super) fn from_environment() -> anyhow::Result<Self> {
-        let token =
-            std::env::var(CLOUD_AGENT_OTLP_TOKEN).context("Cloud-agent OTLP token is missing")?;
-        // Remove the bootstrap secret as soon as it is owned so child processes cannot inherit it.
-        std::env::remove_var(CLOUD_AGENT_OTLP_TOKEN);
-        let token = token.trim().to_owned();
-        anyhow::ensure!(!token.is_empty(), "Cloud-agent OTLP token is empty");
-
-        let expires_at = std::env::var(CLOUD_AGENT_OTLP_TOKEN_EXPIRES_AT)
-            .context("Cloud-agent OTLP token expiry is missing")?;
-        let expires_at = DateTime::parse_from_rfc3339(expires_at.trim())
-            .context("Cloud-agent OTLP token expiry is not valid RFC3339")?;
-        anyhow::ensure!(
-            expires_at.offset().local_minus_utc() == 0,
-            "Cloud-agent OTLP token expiry is not UTC"
-        );
-        let expires_at = expires_at.with_timezone(&Utc);
-        anyhow::ensure!(
-            expires_at > Utc::now(),
-            "Cloud-agent OTLP token is already expired"
-        );
-        let expected_run_id = std::env::var(OZ_RUN_ID)
-            .ok()
-            .filter(|run_id| !run_id.trim().is_empty());
-
-        let token_store = TokenStore::new(token, expires_at)?;
-        let (refresh_hint_sender, refresh_hint_receiver) = async_channel::bounded(1);
-        Ok(Self {
-            token_store,
-            expected_run_id: expected_run_id.map(Into::into),
-            refresh_hint_sender,
-            refresh_hint_receiver: Arc::new(Mutex::new(Some(refresh_hint_receiver))),
-        })
-    }
-
-    /// Creates a transport sharing the latest credential while leaving the exporter itself stable.
-    pub(super) fn http_client(&self) -> AuthenticatedHttpClient {
-        AuthenticatedHttpClient {
-            inner: reqwest::Client::new(),
-            token_store: self.token_store.clone(),
-            refresh_hint_sender: self.refresh_hint_sender.clone(),
-        }
-    }
-
-    /// Transfers the bounded refresh-hint receiver to the one allowed coordinator.
-    fn take_refresh_hint_receiver(&self) -> Option<Receiver<()>> {
-        self.refresh_hint_receiver
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .take()
-    }
-}
-
-impl fmt::Debug for AuthContext {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter
-            .debug_struct("AuthContext")
-            .field("token_store", &self.token_store)
-            .finish_non_exhaustive()
-    }
-}
-
-/// A snapshot of the latest credential, stored behind a short-lived reader/writer lock.
-///
-/// Readers clone only the sensitive authorization header, and no caller holds this lock during
-/// network I/O. Replacement constructs and validates a complete snapshot before taking the write
-/// lock so failures preserve the last valid credential.
-#[derive(Clone)]
-struct TokenStore {
-    inner: Arc<RwLock<TokenSnapshot>>,
-}
-
-impl TokenStore {
-    /// Creates the initial store from the validated dispatch credential.
-    fn new(token: String, expires_at: DateTime<Utc>) -> anyhow::Result<Self> {
-        Ok(Self {
-            inner: Arc::new(RwLock::new(TokenSnapshot::new(token, expires_at)?)),
-        })
-    }
-
-    /// Returns a cloned sensitive header only while the current credential remains unexpired.
-    fn valid_authorization_header(&self) -> Option<HeaderValue> {
-        let snapshot = self.inner.read().unwrap_or_else(|err| err.into_inner());
-        (snapshot.expires_at > Utc::now()).then(|| snapshot.authorization_header.clone())
-    }
-
-    /// Atomically replaces the current snapshot only with a usable unexpired credential.
-    fn replace(&self, token: String, expires_at: DateTime<Utc>) -> anyhow::Result<()> {
-        anyhow::ensure!(
-            expires_at > Utc::now(),
-            "Refreshed cloud-agent OTLP token is already expired"
-        );
-        let snapshot = TokenSnapshot::new(token, expires_at)?;
-        *self.inner.write().unwrap_or_else(|err| err.into_inner()) = snapshot;
-        Ok(())
-    }
-
-    /// Applies the exact-run rejection gate before allowing a refreshed credential to replace the
-    /// dispatch or previous refresh credential.
-    fn replace_refreshed(
-        &self,
-        token: String,
-        expires_at: DateTime<Utc>,
-        expected_run_id: Option<&str>,
-    ) -> anyhow::Result<()> {
-        validate_refreshed_token_run_id(&token, expected_run_id)?;
-        self.replace(token, expires_at)
-    }
-}
-
-impl fmt::Debug for TokenStore {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let snapshot = self.inner.read().unwrap_or_else(|err| err.into_inner());
-        formatter
-            .debug_struct("TokenStore")
-            .field("expires_at", &snapshot.expires_at)
-            .finish_non_exhaustive()
-    }
-}
-
-/// An already-parsed sensitive authorization header and its trusted server expiry.
-struct TokenSnapshot {
-    authorization_header: HeaderValue,
-    expires_at: DateTime<Utc>,
-}
-
-impl TokenSnapshot {
-    /// Constructs a snapshot whose header redacts its value from standard debug formatting.
-    fn new(token: String, expires_at: DateTime<Utc>) -> anyhow::Result<Self> {
-        let mut authorization_header = HeaderValue::from_str(&format!("Bearer {token}"))
-            .map_err(|_| anyhow!("Cloud-agent OTLP token cannot be used as an HTTP header"))?;
-        authorization_header.set_sensitive(true);
-        Ok(Self {
-            authorization_header,
-            expires_at,
-        })
-    }
-}
-
-impl fmt::Debug for TokenSnapshot {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter
-            .debug_struct("TokenSnapshot")
-            .field("authorization_header", &"<redacted>")
-            .field("expires_at", &self.expires_at)
-            .finish()
-    }
-}
-
-/// Validates that the unverified refreshed-token payload names the immutable expected run exactly.
-///
-/// This local decode never establishes token authenticity. The collector remains responsible for
-/// cryptographically verifying the token, while malformed or mismatched tokens fail closed here
-/// before replacement and leave the existing credential untouched.
-fn validate_refreshed_token_run_id(
-    token: &str,
-    expected_run_id: Option<&str>,
-) -> anyhow::Result<()> {
-    let expected_run_id = expected_run_id
-        .filter(|run_id| !run_id.trim().is_empty())
-        .context("Expected cloud-agent run ID is missing or empty")?;
-
-    let mut segments = token.split('.');
-    let _header = segments
-        .next()
-        .filter(|segment| !segment.is_empty())
-        .context("Refreshed cloud-agent OTLP token is not a valid JWT")?;
-    let payload = segments
-        .next()
-        .filter(|segment| !segment.is_empty())
-        .context("Refreshed cloud-agent OTLP token is not a valid JWT")?;
-    let _signature = segments
-        .next()
-        .filter(|segment| !segment.is_empty())
-        .context("Refreshed cloud-agent OTLP token is not a valid JWT")?;
-    anyhow::ensure!(
-        segments.next().is_none(),
-        "Refreshed cloud-agent OTLP token is not a valid JWT"
-    );
-    let payload = base64::engine::general_purpose::URL_SAFE_NO_PAD
-        .decode(payload)
-        .map_err(|_| anyhow!("Refreshed cloud-agent OTLP token payload is not valid base64"))?;
-    let payload: serde_json::Value = serde_json::from_slice(&payload)
-        .map_err(|_| anyhow!("Refreshed cloud-agent OTLP token payload is not valid JSON"))?;
-    let run_id = payload
-        .get("run_id")
-        .and_then(serde_json::Value::as_str)
-        .context("Refreshed cloud-agent OTLP token has no string run ID")?;
-    anyhow::ensure!(
-        run_id == expected_run_id,
-        "Refreshed cloud-agent OTLP token run ID does not match"
-    );
-    Ok(())
-}
-
-/// The set of errors that can occur when making an HTTP request using [`AuthenticatedHttpClient`].
-#[derive(thiserror::Error, Debug)]
-enum AuthenticatedHttpError {
-    #[error("No unexpired cloud-agent OTLP token is available")]
-    NoValidToken,
-    #[error("Cloud-agent OTLP request failed with HTTP status {0}")]
-    HttpStatus(u16),
-}
-
-/// An HTTP client that injects the latest valid token immediately before each request.
-///
-/// The token-store lock is released before network I/O begins. A manual `Debug` implementation
-/// prevents the client from formatting cached state, while sensitive [`HeaderValue`] instances
-/// redact request headers. Expired credentials are removed and refused rather than sent.
-pub(super) struct AuthenticatedHttpClient {
-    inner: reqwest::Client,
-    token_store: TokenStore,
-    refresh_hint_sender: Sender<()>,
-}
-
-impl fmt::Debug for AuthenticatedHttpClient {
-    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
-        formatter
-            .debug_struct("AuthenticatedHttpClient")
-            .field("token_store", &self.token_store)
-            .finish_non_exhaustive()
-    }
-}
-
-impl AuthenticatedHttpClient {
-    /// Overwrites any supplied authorization header with the latest unexpired credential.
-    ///
-    /// Removing the supplied header first ensures an expired store fails closed rather than
-    /// accidentally sending a stale or caller-provided credential.
-    fn authorize_request(
-        &self,
-        request: &mut Request<Bytes>,
-    ) -> Result<(), AuthenticatedHttpError> {
-        request.headers_mut().remove(AUTHORIZATION);
-        let authorization = self
-            .token_store
-            .valid_authorization_header()
-            .ok_or(AuthenticatedHttpError::NoValidToken)?;
-        request.headers_mut().insert(AUTHORIZATION, authorization);
-        Ok(())
-    }
-}
-
-#[async_trait]
-impl HttpClient for AuthenticatedHttpClient {
-    async fn send_bytes(&self, mut request: Request<Bytes>) -> Result<Response<Bytes>, HttpError> {
-        self.authorize_request(&mut request)?;
-
-        let request: reqwest::Request = request.try_into()?;
-        // Reqwest requires a Tokio-compatible context, while the exporter may use another executor.
-        let (status, response) = Compat::new(async {
-            let mut response = self.inner.execute(request).await?;
-            let status = response.status();
-            let response = if status.is_success() {
-                let headers = std::mem::take(response.headers_mut());
-                Some((headers, response.bytes().await?))
-            } else {
-                None
-            };
-            Ok::<_, reqwest::Error>((status, response))
-        })
-        .await?;
-        if status == http::StatusCode::UNAUTHORIZED {
-            // The bounded nonblocking hint cannot recurse into or delay this export request.
-            let _ = self.refresh_hint_sender.try_send(());
-        }
-        let Some((headers, body)) = response else {
-            return Err(AuthenticatedHttpError::HttpStatus(status.as_u16()).into());
-        };
-
-        let mut response = Response::builder().status(status).body(body)?;
-        *response.headers_mut() = headers;
-        Ok(response)
-    }
-}
-
-/// Starts the one refresh coordinator after authenticated server connectivity is available.
-///
-/// Consuming the bounded hint receiver coalesces concurrent starts, and the coordinator immediately
-/// mints once so the short-lived dispatch credential is replaced as soon as possible.
-pub(super) fn start_refresh_coordinator(
-    auth_context: AuthContext,
-    client: Arc<dyn ManagedSecretsClient>,
-    ctx: &mut AppContext,
-) {
-    let Some(refresh_hint_receiver) = auth_context.take_refresh_hint_receiver() else {
-        return;
-    };
-    ctx.add_singleton_model(move |ctx| {
-        AuthRefreshCoordinator::new(
-            auth_context.token_store,
-            auth_context.expected_run_id,
-            refresh_hint_receiver,
-            client,
-            ctx,
-        )
-    });
-}
-
-/// Owns serialized credential minting, proactive scheduling, failure backoff, and diagnostics.
-///
-/// At most one mint is in flight and one scheduled wakeup is retained. A bounded nonblocking 401
-/// hint can accelerate refresh without recursing into or blocking the export request.
-struct AuthRefreshCoordinator {
-    token_store: TokenStore,
-    expected_run_id: Option<Arc<str>>,
-    client: Arc<dyn ManagedSecretsClient>,
-    refresh_in_flight: bool,
-    consecutive_failures: u32,
-    scheduled_refresh: Option<AbortHandle>,
-    last_failure_diagnostic: Option<Instant>,
-}
-
-impl AuthRefreshCoordinator {
-    /// Installs the hint stream and immediately starts the first bounded refresh request.
-    fn new(
-        token_store: TokenStore,
-        expected_run_id: Option<Arc<str>>,
-        refresh_hint_receiver: Receiver<()>,
-        client: Arc<dyn ManagedSecretsClient>,
-        ctx: &mut ModelContext<Self>,
-    ) -> Self {
-        let mut coordinator = Self {
-            token_store,
-            expected_run_id,
-            client,
-            refresh_in_flight: false,
-            consecutive_failures: 0,
-            scheduled_refresh: None,
-            last_failure_diagnostic: None,
-        };
-        let _ = ctx.spawn_stream_local(
-            refresh_hint_receiver,
-            |coordinator, (), ctx| coordinator.start_refresh(ctx),
-            |_, _| {},
-        );
-        coordinator.start_refresh(ctx);
-        coordinator
-    }
-
-    /// Starts one mint and coalesces all triggers while it remains in flight.
-    ///
-    /// Each request asks for the fixed collector audience and principal-only subject, and the
-    /// timeout guarantees a stalled request eventually enters the ordinary failure path.
-    fn start_refresh(&mut self, ctx: &mut ModelContext<Self>) {
-        if self.refresh_in_flight {
-            return;
-        }
-        self.cancel_scheduled_refresh();
-        self.refresh_in_flight = true;
-        let client = self.client.clone();
-        ctx.spawn(
-            async move {
-                client
-                    .issue_task_identity_token(IdentityTokenOptions {
-                        audience: COLLECTOR_AUDIENCE.to_owned(),
-                        requested_duration: REFRESHED_TOKEN_DURATION,
-                        subject_template: vec1::vec1!["principal".to_owned()],
-                    })
-                    .with_timeout(REFRESH_REQUEST_TIMEOUT)
-                    .await
-                    .map_err(|_| anyhow!("Cloud-agent OTLP authorization refresh timed out"))?
-            },
-            |coordinator, result, ctx| coordinator.finish_refresh(result, ctx),
-        );
-    }
-
-    /// Accepts a refreshed credential only after all replacement gates succeed.
-    ///
-    /// Any mint, timeout, expiry, header, or run-ID failure retains the last valid token and enters
-    /// the same bounded retry path without logging token contents.
-    fn finish_refresh(
-        &mut self,
-        result: anyhow::Result<TaskIdentityToken>,
-        ctx: &mut ModelContext<Self>,
-    ) {
-        self.refresh_in_flight = false;
-        match result {
-            Ok(token) => {
-                let expires_at = token.expires_at;
-                if self
-                    .token_store
-                    .replace_refreshed(token.token, expires_at, self.expected_run_id.as_deref())
-                    .is_ok()
-                {
-                    self.consecutive_failures = 0;
-                    log::info!("Cloud-agent OTLP authorization refreshed");
-                    self.schedule_proactive_refresh(expires_at, ctx);
-                } else {
-                    self.warn_refresh_failure();
-                    self.schedule_failure_retry(ctx);
-                }
-            }
-            Err(_) => {
-                self.warn_refresh_failure();
-                self.schedule_failure_retry(ctx);
-            }
-        }
-    }
-
-    /// Schedules a refresh to occur before the current token expires.
-    ///
-    /// This leaves some buffer for retries in case the refresh fails, but also guarantees
-    /// some minimum amount of time before the first refresh attempt.
-    fn schedule_proactive_refresh(
-        &mut self,
-        expires_at: DateTime<Utc>,
-        ctx: &mut ModelContext<Self>,
-    ) {
-        let jitter = PROACTIVE_REFRESH_JITTER.mul_f64(rand::random::<f64>());
-        let refresh_buffer = PROACTIVE_REFRESH_BUFFER.saturating_add(jitter);
-        let remaining = (expires_at - Utc::now()).to_std().unwrap_or_default();
-        let delay = remaining
-            .saturating_sub(refresh_buffer)
-            .max(remaining.mul_f64(0.5))
-            .max(MIN_PROACTIVE_REFRESH_DELAY);
-        self.schedule_refresh(delay, ctx);
-    }
-
-    /// Schedules a full-jitter exponential retry capped at five minutes.
-    fn schedule_failure_retry(&mut self, ctx: &mut ModelContext<Self>) {
-        let exponent = self.consecutive_failures.min(31);
-        let upper_bound = INITIAL_FAILURE_BACKOFF
-            .saturating_mul(1u32 << exponent)
-            .min(MAX_FAILURE_BACKOFF);
-        self.consecutive_failures = self.consecutive_failures.saturating_add(1);
-        let delay = upper_bound.mul_f64(rand::random::<f64>());
-        self.schedule_refresh(delay, ctx);
-    }
-
-    /// Replaces the one scheduled wakeup so proactive, retry, and hint triggers stay coalesced.
-    fn schedule_refresh(&mut self, delay: Duration, ctx: &mut ModelContext<Self>) {
-        self.cancel_scheduled_refresh();
-        let task = ctx.spawn(
-            async move {
-                Timer::after(delay).await;
-            },
-            |coordinator, _, ctx| {
-                coordinator.scheduled_refresh = None;
-                coordinator.start_refresh(ctx);
-            },
-        );
-        self.scheduled_refresh = Some(task.abort_handle());
-    }
-
-    /// Cancels the prior wakeup without affecting a refresh already in flight.
-    fn cancel_scheduled_refresh(&mut self) {
-        if let Some(handle) = self.scheduled_refresh.take() {
-            handle.abort();
-        }
-    }
-
-    /// Emits a local token-free failure diagnostic at most once per configured interval.
-    fn warn_refresh_failure(&mut self) {
-        let now = Instant::now();
-        if self
-            .last_failure_diagnostic
-            .is_none_or(|last| now.duration_since(last) >= FAILURE_LOG_INTERVAL)
-        {
-            self.last_failure_diagnostic = Some(now);
-            log::warn!("Cloud-agent OTLP authorization refresh failed");
-        }
-    }
-}
-
-impl Entity for AuthRefreshCoordinator {
-    type Event = ();
-}
-
-impl SingletonEntity for AuthRefreshCoordinator {}
-
-#[cfg(test)]
-#[path = "cloud_agent_auth_tests.rs"]
-mod tests;
diff --git a/app/src/tracing/cloud_agent_auth_tests.rs b/app/src/tracing/cloud_agent_auth_tests.rs
deleted file mode 100644
index 0a32b02b..00000000
--- a/app/src/tracing/cloud_agent_auth_tests.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use base64::Engine as _;
-use chrono::TimeDelta;
-
-use super::*;
-
-fn jwt_with_payload(payload: serde_json::Value) -> String {
-    let encoder = base64::engine::general_purpose::URL_SAFE_NO_PAD;
-    let header = encoder.encode(br#"{"alg":"none"}"#);
-    let payload = encoder.encode(serde_json::to_vec(&payload).unwrap());
-    format!("{header}.{payload}.test-signature")
-}
-
-fn client_with_expiry(token: &str, expires_at: DateTime<Utc>) -> AuthenticatedHttpClient {
-    let (refresh_hint_sender, _) = async_channel::bounded(1);
-    AuthenticatedHttpClient {
-        inner: reqwest::Client::new(),
-        token_store: TokenStore::new(token.to_owned(), expires_at).unwrap(),
-        refresh_hint_sender,
-    }
-}
-
-#[test]
-fn authorization_overwrites_supplied_header() {
-    let client = client_with_expiry(
-        "current-test-token",
-        Utc::now() + TimeDelta::try_minutes(5).unwrap(),
-    );
-    let mut request = Request::builder()
-        .header(AUTHORIZATION, "Bearer stale-test-token")
-        .body(Bytes::new())
-        .unwrap();
-
-    client.authorize_request(&mut request).unwrap();
-
-    assert_eq!(
-        request.headers().get(AUTHORIZATION).unwrap(),
-        "Bearer current-test-token"
-    );
-}
-
-#[test]
-fn expired_token_is_refused_and_supplied_header_is_removed() {
-    let client = client_with_expiry(
-        "expired-test-token",
-        Utc::now() - TimeDelta::try_minutes(5).unwrap(),
-    );
-    let mut request = Request::builder()
-        .header(AUTHORIZATION, "Bearer stale-test-token")
-        .body(Bytes::new())
-        .unwrap();
-
-    assert!(matches!(
-        client.authorize_request(&mut request),
-        Err(AuthenticatedHttpError::NoValidToken)
-    ));
-    assert!(!request.headers().contains_key(AUTHORIZATION));
-}
-
-#[test]
-fn debug_output_redacts_token() {
-    let client = client_with_expiry(
-        "secret-test-token",
-        Utc::now() + TimeDelta::try_minutes(5).unwrap(),
-    );
-
-    let debug_output = format!("{client:?}");
-
-    assert!(!debug_output.contains("secret-test-token"));
-    assert!(debug_output.contains("expires_at"));
-}
-
-#[test]
-fn authorized_request_debug_redacts_token() {
-    let client = client_with_expiry(
-        "secret-request-test-token",
-        Utc::now() + TimeDelta::try_minutes(5).unwrap(),
-    );
-    let mut request = Request::builder().body(Bytes::new()).unwrap();
-
-    client.authorize_request(&mut request).unwrap();
-    let request_debug = format!("{request:?}");
-    let headers_debug = format!("{:?}", request.headers());
-
-    assert!(!request_debug.contains("secret-request-test-token"));
-    assert!(!headers_debug.contains("secret-request-test-token"));
-    assert!(request_debug.contains("Sensitive"));
-    assert!(headers_debug.contains("Sensitive"));
-}
-
-#[test]
-fn refreshed_token_run_id_exactly_matches() {
-    let token = jwt_with_payload(serde_json::json!({ "run_id": "expected-run-id" }));
-
-    validate_refreshed_token_run_id(&token, Some("expected-run-id")).unwrap();
-}
-
-#[test]
-fn refreshed_token_run_id_is_required() {
-    let token = jwt_with_payload(serde_json::json!({}));
-    assert!(validate_refreshed_token_run_id(&token, Some("expected-run-id")).is_err());
-}
-
-#[test]
-fn expected_run_id_is_required() {
-    let token = jwt_with_payload(serde_json::json!({ "run_id": "expected-run-id" }));
-
-    assert!(validate_refreshed_token_run_id(&token, None).is_err());
-    assert!(validate_refreshed_token_run_id(&token, Some("")).is_err());
-}
-
-#[test]
-fn refreshed_token_run_id_must_match() {
-    let token = jwt_with_payload(serde_json::json!({ "run_id": "wrong-run-id" }));
-
-    assert!(validate_refreshed_token_run_id(&token, Some("expected-run-id")).is_err());
-}
-
-#[test]
-fn refreshed_token_run_id_must_be_a_string() {
-    let token = jwt_with_payload(serde_json::json!({ "run_id": 123 }));
-    assert!(validate_refreshed_token_run_id(&token, Some("expected-run-id")).is_err());
-}
-
-#[test]
-fn malformed_refreshed_tokens_are_rejected() {
-    let invalid_json = {
-        let encoder = base64::engine::general_purpose::URL_SAFE_NO_PAD;
-        let payload = encoder.encode(b"not-json");
-        format!("header.{payload}.signature")
-    };
-
-    for token in ["not-a-jwt", "header.!!!.signature", &invalid_json] {
-        assert!(validate_refreshed_token_run_id(token, Some("expected-run-id")).is_err());
-    }
-}
-
-#[test]
-fn rejected_refreshed_token_preserves_previous_token() {
-    let token_store = TokenStore::new(
-        "current-test-token".to_owned(),
-        Utc::now() + TimeDelta::try_minutes(5).unwrap(),
-    )
-    .unwrap();
-    let wrong_run_token = jwt_with_payload(serde_json::json!({ "run_id": "wrong-run-id" }));
-
-    assert!(token_store
-        .replace_refreshed(
-            wrong_run_token,
-            Utc::now() + TimeDelta::try_minutes(5).unwrap(),
-            Some("expected-run-id"),
-        )
-        .is_err());
-    assert_eq!(
-        token_store.valid_authorization_header().unwrap(),
-        "Bearer current-test-token"
-    );
-}
diff --git a/app/src/tracing/native.rs b/app/src/tracing/native.rs
deleted file mode 100644
index a2f182e5..00000000
--- a/app/src/tracing/native.rs
+++ /dev/null
@@ -1,542 +0,0 @@
-//! Configures opt-in OpenTelemetry export for cloud-agent traces on native platforms.
-//!
-//! The global `tracing` subscriber observes the whole application, while
-//! [`CloudAgentSpanExporter`] limits OTLP export to spans explicitly marked with
-//! [`CLOUD_AGENT_MARKER`]. Keeping this selection at the exporter boundary lets callers use the
-//! normal `tracing` macros and propagation machinery without installing a second subscriber or
-//! coupling generic task executors to cloud-agent tracing.
-//!
-//! # Why spans must be ended during shutdown
-//!
-//! An OpenTelemetry span becomes exportable and passes owned span data to a processor's `on_end`
-//! callback only after it ends. Shutting down an [`SdkTracerProvider`] flushes spans that have
-//! reached `on_end`, but it does not end spans that are still active. Some `tracing::Span`
-//! references are intentionally propagated into asynchronous task machinery and can therefore
-//! remain alive when the application terminates. Shutting down the provider before those spans end
-//! would silently discard them.
-//!
-//! [`ShutdownAwareTracer`] and [`ShutdownAwareSpan`] wrap the SDK tracer and spans used by
-//! `tracing-opentelemetry`. This keeps existing `tracing` instrumentation unchanged while allowing
-//! [`ActiveSpanRegistry`] to explicitly end still-reachable, registered SDK spans before shutting
-//! down the provider. The standard application lifecycle retains [`Initialization`] in its
-//! termination callback so this ordering happens before platforms that terminate the process
-//! without running Rust destructors. [`Initialization`]'s `Drop` implementation remains a fallback
-//! for ordinary returns. Explicit process exits bypass both forms of cleanup.
-//!
-//! # Span ownership and synchronization
-//!
-//! `tracing-opentelemetry` creates SDK spans lazily during several `tracing` span lifecycle
-//! operations, including when it needs a span's context and when a span closes. Every SDK span that
-//! reaches [`ShutdownAwareTracer::build_with_context`] is wrapped in an `Arc<Mutex<_>>`. Before
-//! shutdown begins, it is weakly registered; after shutdown begins, it is immediately ended
-//! instead. The wrapper remains the span's owner; the registry uses weak references so tracking
-//! does not extend normal span lifetimes. An SDK span that has not yet been built when shutdown
-//! begins cannot reach `on_end` before provider shutdown. If it materializes later, it is ended too
-//! late for export.
-//!
-//! SDK-span creation and shutdown are serialized by the registry-state mutex. Shutdown keeps that
-//! mutex locked while it ends every still-upgradeable registered span and shuts down the provider,
-//! preventing an SDK span from being created in the otherwise-dangerous gap between those
-//! operations. A final span owner can begin dropping after its weak reference becomes impossible
-//! to upgrade, so shutdown cannot strictly guarantee that every previously registered span has
-//! finished ending. The lock order is always registry state followed by an individual SDK span.
-//! Normal span operations lock only the individual SDK span and never attempt to lock the registry.
-//! Mutex acquisition recovers poisoned inner values because trace export and shutdown are
-//! best-effort cleanup that should continue after an unrelated panic.
-
-use std::borrow::Cow;
-use std::sync::{Arc, Mutex, OnceLock, Weak};
-use std::time::{Duration, SystemTime};
-
-use anyhow::{anyhow, Context as _};
-use instant::Instant;
-use opentelemetry::trace::{
-    Span as _, SpanBuilder, SpanContext, Status, Tracer as _, TracerProvider as _,
-};
-use opentelemetry::{Context as OtelContext, KeyValue, Value};
-use opentelemetry_otlp::{Protocol, WithExportConfig as _, WithHttpConfig as _};
-use opentelemetry_sdk::error::OTelSdkResult;
-use opentelemetry_sdk::resource::{EnvResourceDetector, TelemetryResourceDetector};
-use opentelemetry_sdk::trace::{
-    SdkTracer, SdkTracerProvider, Span as SdkSpan, SpanData, SpanExporter,
-};
-use opentelemetry_sdk::Resource;
-use tracing::subscriber;
-use tracing_subscriber::layer::SubscriberExt as _;
-use tracing_subscriber::EnvFilter;
-use url::{Host, Url};
-use warp_managed_secrets::client::ManagedSecretsClient;
-use warpui::AppContext;
-
-use super::cloud_agent_auth::{self, AuthContext};
-use super::Initialization;
-use crate::channel::ChannelState;
-use crate::tracing::install_no_subscriber;
-
-/// The tag used to mark spans related to cloud agents, which we use to filter out
-/// spans we don't care about (e.g.: ones from dependencies).
-const CLOUD_AGENT_MARKER: &str = "tags.cloud_agent";
-/// The environment variable used to configure the cloud agent OTLP endpoint.
-const CLOUD_AGENT_OTLP_ENDPOINT: &str = "WARP_CLOUD_AGENT_OTLP_ENDPOINT";
-/// The environment variable used to configure the OTel service name.
-const OTEL_SERVICE_NAME: &str = "OTEL_SERVICE_NAME";
-/// The minimum interval between local export failure diagnostics.
-const EXPORT_FAILURE_LOG_INTERVAL: Duration = Duration::from_secs(60);
-
-/// Process-global authentication context for cloud-agent OTLP export.
-///
-/// The exporter is built once during [`init`], while the stored context later starts dynamic
-/// credential refresh after authenticated application services become available, and this static
-/// remains unset for processes that did not opt in.
-static AUTH_CONTEXT: OnceLock<AuthContext> = OnceLock::new();
-
-/// Installs the native tracing subscriber and optional cloud-agent OTLP exporter.
-///
-/// Export is deliberately opt-in through [`CLOUD_AGENT_OTLP_ENDPOINT`] plus a currently valid
-/// dispatch token. When either is absent or the exporter cannot be constructed, a no-op subscriber
-/// is installed so tracing instrumentation remains safe without producing output or partially
-/// initializing export.
-pub fn init() -> anyhow::Result<Initialization> {
-    // INFO is the default because this is a global subscriber and DEBUG-level application spans
-    // would otherwise create substantial work even though only marked cloud-agent spans are
-    // exported. RUST_LOG can still override this when deeper tracing is needed.
-    let env_filter = EnvFilter::builder()
-        .with_default_directive(tracing::Level::INFO.into())
-        .from_env_lossy();
-
-    let Some(base_endpoint) = std::env::var(CLOUD_AGENT_OTLP_ENDPOINT)
-        .ok()
-        .filter(|endpoint| !endpoint.trim().is_empty())
-    else {
-        install_no_subscriber()?;
-        return Ok(Initialization::default());
-    };
-    let Ok(auth_context) = AuthContext::from_environment() else {
-        install_no_subscriber()?;
-        return Ok(Initialization::default());
-    };
-
-    let shutdown_timeout = export_timeout();
-    let provider = match build_provider(base_endpoint.trim(), &auth_context) {
-        Ok(provider) => provider,
-        Err(err) => {
-            install_no_subscriber()?;
-            return Ok(Initialization {
-                initialization_warning: Some(err),
-                active_spans: None,
-                provider: None,
-                shutdown_timeout,
-            });
-        }
-    };
-    let _ = AUTH_CONTEXT.set(auth_context);
-
-    let active_spans = ActiveSpanRegistry::default();
-    let tracer =
-        ShutdownAwareTracer::new(provider.tracer("warp-cloud-agent"), active_spans.clone());
-    let subscriber = tracing_subscriber::registry()
-        .with(env_filter)
-        .with(tracing_opentelemetry::layer().with_tracer(tracer));
-    subscriber::set_global_default(subscriber)?;
-
-    Ok(Initialization {
-        initialization_warning: None,
-        active_spans: Some(active_spans),
-        provider: Some(provider),
-        shutdown_timeout,
-    })
-}
-
-/// Builds the SDK provider and its batch exporter.
-///
-/// A batch exporter keeps network export off instrumentation call sites. The provider is retained
-/// by [`Initialization`] so application termination can explicitly shut it down after attempting
-/// to end registered active spans. Exported resources include Warp's version and channel alongside
-/// standard environment-detected OpenTelemetry attributes, with [`OTEL_SERVICE_NAME`] taking
-/// precedence over the default service name. The exporter is built once with a dynamic HTTP client
-/// so credential refresh can update requests without reconstructing provider state.
-fn build_provider(
-    base_endpoint: &str,
-    auth_context: &AuthContext,
-) -> anyhow::Result<SdkTracerProvider> {
-    let endpoint = traces_endpoint(base_endpoint)?;
-    let exporter = opentelemetry_otlp::SpanExporter::builder()
-        .with_http()
-        .with_http_client(auth_context.http_client())
-        .with_protocol(Protocol::HttpBinary)
-        .with_endpoint(endpoint)
-        .build()
-        .context("Failed to build the OTLP span exporter")?;
-
-    let resource = Resource::builder_empty()
-        .with_service_name("warp-cloud-agent")
-        .with_attribute(KeyValue::new(
-            "service.version",
-            ChannelState::app_version().unwrap_or("<no tag>"),
-        ))
-        .with_attribute(KeyValue::new(
-            "warp.channel",
-            ChannelState::channel().to_string(),
-        ))
-        .with_detector(Box::new(TelemetryResourceDetector))
-        .with_detector(Box::new(EnvResourceDetector::new()));
-    let resource = match std::env::var(OTEL_SERVICE_NAME) {
-        Ok(service_name) if !service_name.is_empty() => resource.with_service_name(service_name),
-        Ok(_) | Err(_) => resource,
-    }
-    .build();
-
-    Ok(SdkTracerProvider::builder()
-        .with_batch_exporter(CloudAgentSpanExporter {
-            inner: exporter,
-            diagnostics: RateLimitedDiagnostics::default(),
-        })
-        .with_resource(resource)
-        .build())
-}
-
-/// Starts the single refresh coordinator after the authenticated server client exists.
-///
-/// Processes that did not opt in with both an endpoint and valid dispatch credential have no
-/// retained [`AUTH_CONTEXT`] and remain no-ops here.
-pub(super) fn start_auth_refresh(client: Arc<dyn ManagedSecretsClient>, ctx: &mut AppContext) {
-    if let Some(auth_context) = AUTH_CONTEXT.get() {
-        cloud_agent_auth::start_refresh_coordinator(auth_context.clone(), client, ctx);
-    }
-}
-
-/// Converts the configured OTLP base URL into the HTTP/protobuf traces endpoint.
-///
-/// The configuration is treated as a base URL rather than a complete signal-specific URL, so any
-/// query or fragment is discarded before appending `v1/traces`. Authenticated export requires
-/// HTTPS unless the configured host is guaranteed to resolve to the local machine.
-fn traces_endpoint(base_endpoint: &str) -> anyhow::Result<String> {
-    let mut endpoint = Url::parse(base_endpoint).context("Invalid cloud-agent OTLP endpoint")?;
-    match endpoint.scheme() {
-        "https" => {}
-        "http" if endpoint_host_is_loopback(&endpoint) => {}
-        "http" => {
-            return Err(anyhow!(
-                "Cloud-agent OTLP endpoint must use HTTPS unless its host is loopback"
-            ));
-        }
-        _ => return Err(anyhow!("Cloud-agent OTLP endpoint must use HTTP or HTTPS")),
-    }
-
-    endpoint.set_query(None);
-    endpoint.set_fragment(None);
-    endpoint
-        .path_segments_mut()
-        .map_err(|_| anyhow!("Cloud-agent OTLP endpoint cannot be used as a base URL"))?
-        .pop_if_empty()
-        .extend(["v1", "traces"]);
-    Ok(endpoint.into())
-}
-/// Returns whether the endpoint host is guaranteed to resolve to the local machine.
-fn endpoint_host_is_loopback(endpoint: &Url) -> bool {
-    match endpoint.host() {
-        Some(Host::Domain(domain)) => domain.eq_ignore_ascii_case("localhost"),
-        Some(Host::Ipv4(address)) => address.is_loopback(),
-        Some(Host::Ipv6(address)) => address.is_loopback(),
-        None => false,
-    }
-}
-
-/// Returns the export shutdown timeout using the standard OpenTelemetry environment variables.
-fn export_timeout() -> Duration {
-    [
-        "OTEL_EXPORTER_OTLP_TRACES_TIMEOUT",
-        "OTEL_EXPORTER_OTLP_TIMEOUT",
-    ]
-    .into_iter()
-    .find_map(|name| {
-        std::env::var(name)
-            .ok()
-            .and_then(|value| value.parse::<u64>().ok())
-            .map(Duration::from_millis)
-    })
-    .unwrap_or(super::DEFAULT_EXPORT_TIMEOUT)
-}
-
-/// A registry of started SDK spans used for best-effort ending before provider shutdown.
-///
-/// This registry belongs beside the provider in [`Initialization`]. It stores only weak references
-/// so a span that ends normally can be dropped without first unregistering itself.
-#[derive(Clone, Debug, Default)]
-pub(super) struct ActiveSpanRegistry {
-    state: Arc<Mutex<ActiveSpanRegistryState>>,
-}
-
-#[derive(Debug, Default)]
-struct ActiveSpanRegistryState {
-    /// Prevents new spans from remaining active after shutdown begins.
-    shutting_down: bool,
-    /// Weak references avoid extending the lifetime of spans that end normally.
-    spans: Vec<Weak<Mutex<SdkSpan>>>,
-}
-
-impl ActiveSpanRegistry {
-    /// Builds an SDK span, registering it before shutdown or ending it after shutdown begins.
-    ///
-    /// `tracing-opentelemetry` calls this whenever it materializes an SDK span. If shutdown has
-    /// already begun, the newly built span is ended immediately rather than being allowed to
-    /// remain active.
-    fn build_span(
-        &self,
-        tracer: &SdkTracer,
-        builder: SpanBuilder,
-        parent_cx: &OtelContext,
-    ) -> ShutdownAwareSpan {
-        let mut state = self.state.lock().unwrap_or_else(|err| err.into_inner());
-        let span = tracer.build_with_context(builder, parent_cx);
-        let span_context = span.span_context().clone();
-        let span = Arc::new(Mutex::new(span));
-        if state.shutting_down {
-            span.lock().unwrap_or_else(|err| err.into_inner()).end();
-        } else {
-            // Dead weak references are pruned opportunistically to avoid requiring normal span
-            // completion to acquire the registry lock.
-            state.spans.retain(|span| span.strong_count() > 0);
-            state.spans.push(Arc::downgrade(&span));
-        }
-        ShutdownAwareSpan {
-            span_context,
-            inner: span,
-        }
-    }
-
-    /// Ends every still-upgradeable registered span and then shuts down the provider.
-    ///
-    /// The registry lock intentionally remains held through provider shutdown. This guarantees
-    /// that no SDK span can be built between the final end attempt and the provider becoming unable
-    /// to accept ended spans. It does not synchronize with the final drop of a span whose weak
-    /// reference can no longer be upgraded, so ending previously built spans remains best-effort.
-    pub(super) fn shutdown(
-        &self,
-        provider: &SdkTracerProvider,
-        timeout: Duration,
-    ) -> OTelSdkResult {
-        let mut state = self.state.lock().unwrap_or_else(|err| err.into_inner());
-        state.shutting_down = true;
-        let spans = std::mem::take(&mut state.spans);
-
-        for span in spans {
-            if let Some(span) = span.upgrade() {
-                span.lock().unwrap_or_else(|err| err.into_inner()).end();
-            }
-        }
-        let result = provider.shutdown_with_timeout(timeout);
-        drop(state);
-        result
-    }
-}
-
-/// An [`SdkTracer`] adapter that routes spans through shutdown-aware construction.
-///
-/// Wrapping the tracer, rather than the span processor, is necessary because processors receive
-/// only a temporary mutable reference in `on_start` and receive owned exportable data only after
-/// `on_end`. A processor therefore cannot retain handles to, or end, active spans during shutdown.
-#[derive(Clone, Debug)]
-struct ShutdownAwareTracer {
-    inner: SdkTracer,
-    active_spans: ActiveSpanRegistry,
-}
-
-impl ShutdownAwareTracer {
-    fn new(inner: SdkTracer, active_spans: ActiveSpanRegistry) -> Self {
-        Self {
-            inner,
-            active_spans,
-        }
-    }
-}
-
-impl opentelemetry::trace::Tracer for ShutdownAwareTracer {
-    type Span = ShutdownAwareSpan;
-
-    fn build_with_context(&self, builder: SpanBuilder, parent_cx: &OtelContext) -> Self::Span {
-        self.active_spans
-            .build_span(&self.inner, builder, parent_cx)
-    }
-}
-
-/// A synchronized wrapper around an SDK span shared with [`ActiveSpanRegistry`].
-///
-/// The immutable [`SpanContext`] is cached outside the mutex because the OpenTelemetry
-/// [`opentelemetry::trace::Span`] trait must return it by reference. All mutable SDK-span operations
-/// are forwarded through the mutex, allowing shutdown to end the same underlying span. Repeated
-/// end calls are harmless because SDK spans export only once.
-#[derive(Debug)]
-struct ShutdownAwareSpan {
-    span_context: SpanContext,
-    inner: Arc<Mutex<SdkSpan>>,
-}
-
-impl opentelemetry::trace::Span for ShutdownAwareSpan {
-    fn add_event_with_timestamp<T>(
-        &mut self,
-        name: T,
-        timestamp: SystemTime,
-        attributes: Vec<KeyValue>,
-    ) where
-        T: Into<Cow<'static, str>>,
-    {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .add_event_with_timestamp(name, timestamp, attributes);
-    }
-
-    fn span_context(&self) -> &SpanContext {
-        &self.span_context
-    }
-
-    fn is_recording(&self) -> bool {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .is_recording()
-    }
-
-    fn set_attribute(&mut self, attribute: KeyValue) {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .set_attribute(attribute);
-    }
-
-    fn set_status(&mut self, status: Status) {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .set_status(status);
-    }
-
-    fn update_name<T>(&mut self, new_name: T)
-    where
-        T: Into<Cow<'static, str>>,
-    {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .update_name(new_name);
-    }
-
-    fn add_link(&mut self, span_context: SpanContext, attributes: Vec<KeyValue>) {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .add_link(span_context, attributes);
-    }
-
-    fn end_with_timestamp(&mut self, timestamp: SystemTime) {
-        self.inner
-            .lock()
-            .unwrap_or_else(|err| err.into_inner())
-            .end_with_timestamp(timestamp);
-    }
-}
-
-/// An exporter that restricts the shared tracing subscriber's output to explicitly marked
-/// cloud-agent spans.
-///
-/// Filtering here preserves normal parent/context propagation inside the application while
-/// ensuring unrelated application tracing is never sent to the configured cloud-agent endpoint.
-/// The marker is a per-span routing attribute rather than an inherited property, so every span
-/// intended for export must set it explicitly.
-struct CloudAgentSpanExporter {
-    inner: opentelemetry_otlp::SpanExporter,
-    diagnostics: RateLimitedDiagnostics,
-}
-impl std::fmt::Debug for CloudAgentSpanExporter {
-    fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        formatter
-            .debug_struct("CloudAgentSpanExporter")
-            .finish_non_exhaustive()
-    }
-}
-
-impl SpanExporter for CloudAgentSpanExporter {
-    fn export(
-        &self,
-        batch: Vec<SpanData>,
-    ) -> impl std::future::Future<Output = OTelSdkResult> + Send {
-        let batch: Vec<_> = batch
-            .into_iter()
-            .filter_map(filter_cloud_agent_span)
-            .collect();
-
-        async move {
-            if batch.is_empty() {
-                return Ok(());
-            }
-
-            let result = self.inner.export(batch).await;
-            if result.is_err() {
-                self.diagnostics.warn_export_failure();
-            }
-            result
-        }
-    }
-
-    fn shutdown_with_timeout(&self, timeout: Duration) -> OTelSdkResult {
-        let result = self.inner.shutdown_with_timeout(timeout);
-        if let Err(err) = &result {
-            log::warn!("Failed to shut down the cloud-agent OpenTelemetry span exporter: {err}");
-        }
-        result
-    }
-
-    fn force_flush(&self) -> OTelSdkResult {
-        let result = self.inner.force_flush();
-        if let Err(err) = &result {
-            log::warn!("Failed to flush the cloud-agent OpenTelemetry span exporter: {err}");
-        }
-        result
-    }
-
-    fn set_resource(&mut self, resource: &Resource) {
-        self.inner.set_resource(resource);
-    }
-}
-
-/// Rate-limits local token-free export diagnostics independently of exporter retries.
-#[derive(Debug, Default)]
-struct RateLimitedDiagnostics {
-    last_export_failure: Mutex<Option<Instant>>,
-}
-
-impl RateLimitedDiagnostics {
-    /// Emits at most one local export-failure warning per configured interval.
-    fn warn_export_failure(&self) {
-        let now = Instant::now();
-        let mut last_failure = self
-            .last_export_failure
-            .lock()
-            .unwrap_or_else(|err| err.into_inner());
-        if last_failure.is_none_or(|last| now.duration_since(last) >= EXPORT_FAILURE_LOG_INTERVAL) {
-            *last_failure = Some(now);
-            log::warn!("Failed to export cloud-agent OpenTelemetry spans");
-        }
-    }
-}
-
-/// Removes unrelated spans and strips the internal routing marker from spans and events before
-/// export.
-fn filter_cloud_agent_span(mut span: SpanData) -> Option<SpanData> {
-    let is_cloud_agent_span = span.attributes.iter().any(|attribute| {
-        attribute.key.as_str() == CLOUD_AGENT_MARKER && attribute.value == Value::Bool(true)
-    });
-    if !is_cloud_agent_span {
-        return None;
-    }
-
-    span.attributes
-        .retain(|attribute| attribute.key.as_str() != CLOUD_AGENT_MARKER);
-    for event in &mut span.events.events {
-        event
-            .attributes
-            .retain(|attribute| attribute.key.as_str() != CLOUD_AGENT_MARKER);
-    }
-    Some(span)
-}
diff --git a/app/src/uri/mod.rs b/app/src/uri/mod.rs
index 1e5f3d71..93c2fb98 100644
--- a/app/src/uri/mod.rs
+++ b/app/src/uri/mod.rs
@@ -405,7 +405,7 @@ impl UriHost {
                                 primary_window_id,
                                 "root_view:open_settings_page_in_existing_window",
                                 "root_view:open_settings_page_in_new_window",
-                                &SettingsSection::CloudEnvironments,
+                                &SettingsSection::About,
                                 ctx,
                             );
                         }
@@ -1631,8 +1631,8 @@ fn dispatch_action_in_new_or_existing_window<T: 'static>(
 
 fn settings_section_for_simple_subpage(subpage: &str) -> Option<SettingsSection> {
     match subpage {
-        "billing_and_usage" => Some(SettingsSection::BillingAndUsage),
-        "platform" => Some(SettingsSection::OzCloudAPIKeys),
+        "billing_and_usage" => Some(SettingsSection::About),
+        "platform" => Some(SettingsSection::About),
         "appearance" => Some(SettingsSection::Appearance),
         "warp_agent" => Some(SettingsSection::WarpAgent),
         _ => None,
diff --git a/app/src/workspace/mod.rs b/app/src/workspace/mod.rs
index c5a8ad2f..286f1788 100644
--- a/app/src/workspace/mod.rs
+++ b/app/src/workspace/mod.rs
@@ -1501,7 +1501,7 @@ fn add_open_setting_pages_as_editable_binding(app: &mut AppContext) {
         EditableBinding::new(
             "workspace:show_settings_account_page",
             "Open Settings: Account",
-            WorkspaceAction::ShowSettingsPage(SettingsSection::Account),
+            WorkspaceAction::ShowSettingsPage(SettingsSection::About),
         )
         .with_context_predicate(id!("Workspace"))
         .with_group(bindings::BindingGroup::Settings.as_str())
@@ -1526,7 +1526,7 @@ fn add_open_setting_pages_as_editable_binding(app: &mut AppContext) {
             "workspace:show_settings_shared_blocks_page",
             BindingDescription::new("Open Settings: Shared Blocks")
                 .with_custom_description(bindings::MAC_MENUS_CONTEXT, "View Shared Blocks..."),
-            WorkspaceAction::ShowSettingsPage(SettingsSection::SharedBlocks),
+            WorkspaceAction::ShowSettingsPage(SettingsSection::About),
         )
         .with_group(bindings::BindingGroup::Settings.as_str())
         .with_context_predicate(id!("Workspace"))
@@ -1583,13 +1583,6 @@ fn add_open_setting_pages_as_editable_binding(app: &mut AppContext) {
         .with_enabled(|| FeatureFlag::AgentMode.is_enabled())
         .with_group(bindings::BindingGroup::Settings.as_str())
         .with_context_predicate(id!("Workspace")),
-        EditableBinding::new(
-            "workspace:show_settings_billing_and_usage_page",
-            BindingDescription::new("Open Settings: Billing and usage"),
-            WorkspaceAction::ShowSettingsPage(SettingsSection::BillingAndUsage),
-        )
-        .with_group(bindings::BindingGroup::Settings.as_str())
-        .with_context_predicate(id!("Workspace")),
         EditableBinding::new(
             "workspace:show_settings_code_page",
             BindingDescription::new("Open Settings: Code"),
@@ -1600,14 +1593,14 @@ fn add_open_setting_pages_as_editable_binding(app: &mut AppContext) {
         EditableBinding::new(
             "workspace:show_settings_referrals_page",
             BindingDescription::new("Open Settings: Referrals"),
-            WorkspaceAction::ShowSettingsPage(SettingsSection::Referrals),
+            WorkspaceAction::ShowSettingsPage(SettingsSection::About),
         )
         .with_group(bindings::BindingGroup::Settings.as_str())
         .with_context_predicate(id!("Workspace")),
         EditableBinding::new(
             "workspace:show_settings_environments_page",
             BindingDescription::new("Open Settings: Environments"),
-            WorkspaceAction::ShowSettingsPage(SettingsSection::CloudEnvironments),
+            WorkspaceAction::ShowSettingsPage(SettingsSection::About),
         )
         .with_group(bindings::BindingGroup::Settings.as_str())
         .with_context_predicate(id!("Workspace")),
diff --git a/app/src/workspace/view.rs b/app/src/workspace/view.rs
index 95b257ca..7cfca587 100644
--- a/app/src/workspace/view.rs
+++ b/app/src/workspace/view.rs
@@ -291,7 +291,7 @@ use crate::pane_group::pane::ActionOrigin;
 use crate::pane_group::FilePane;
 use crate::pane_group::{
     self, AIFactPane, AnyPaneContent, ChildAgentOrigin, CodeDiffPane, CodePane, CodeReviewPanelArg,
-    CustomRouterEditorPane, Direction as PaneGroupDirection, Direction, EnvironmentManagementPane,
+    CustomRouterEditorPane, Direction as PaneGroupDirection, Direction,
     ExecutionProfileEditorPane, NetworkLogPane, NewTerminalOptions, PaneGroup, PaneId, PanesLayout,
     TabBarHoverIndex, TerminalPaneId,
 };
@@ -344,10 +344,6 @@ use crate::settings::{
     MonospaceFontSize, PaneSettings, PrivacySettings, SelectionSettings, Settings, SshSettings,
     ThemeSettings,
 };
-use crate::settings_view::environments_page::EnvironmentsPage;
-use crate::settings_view::handoff_environment_creation_modal::{
-    HandoffEnvironmentCreationModal, HandoffEnvironmentCreationModalEvent,
-};
 use crate::settings_view::keybindings::{KeybindingChangedEvent, KeybindingChangedNotifier};
 use crate::settings_view::mcp_servers_page::MCPServersSettingsPage;
 use crate::settings_view::pane_manager::SettingsPaneManager;
@@ -1174,7 +1170,6 @@ pub struct Workspace {
     tab_config_action_sidecar_item: Option<SidecarItemKind>,
     tab_config_action_sidecar_mouse_states: crate::tab_configs::action_sidecar::SidecarMouseStates,
     remove_tab_config_confirmation_dialog: ViewHandle<RemoveTabConfigConfirmationDialog>,
-    handoff_environment_creation_modal: Option<ViewHandle<HandoffEnvironmentCreationModal>>,
     /// Workspace-level modal hosting `AuthSecretFtuxView` for the
     /// orchestration cards' "New API key…" flow. Cloud mode renders the
     /// FTUX view inline and does not use this.
@@ -3470,7 +3465,6 @@ impl Workspace {
             tab_config_action_sidecar_mouse_states: Default::default(),
             remove_tab_config_confirmation_dialog:
                 Self::build_remove_tab_config_confirmation_dialog(ctx),
-            handoff_environment_creation_modal: None,
             create_auth_secret_modal: None,
         };
 
@@ -8746,27 +8740,6 @@ impl Workspace {
         });
     }
 
-    /// Open the Environment Management pane in a split pane (default direction is right).
-    pub fn open_environment_management_pane(
-        &mut self,
-        direction: Option<Direction>,
-        mode: EnvironmentsPage,
-        ctx: &mut ViewContext<Self>,
-    ) {
-        let direction = direction.unwrap_or(Direction::Right);
-        let environments_page_view = self.active_tab_pane_group().update(ctx, |pane_group, ctx| {
-            let pane = EnvironmentManagementPane::new(ctx);
-            let view = pane.environments_page_view(ctx);
-            pane_group
-                .add_pane_with_direction(direction, pane, true /* focus_new_pane */, ctx);
-            view
-        });
-        // Update page after the pane is added so focus works correctly
-        environments_page_view.update(ctx, |view, ctx| {
-            view.update_page(mode, ctx);
-        });
-    }
-
     pub(super) fn active_session_view(
         &self,
         ctx: &mut ViewContext<Self>,
@@ -9599,7 +9572,7 @@ impl Workspace {
             items.push(
                 MenuItemFields::new("Billing and usage")
                     .with_on_select_action(WorkspaceAction::ShowSettingsPage(
-                        SettingsSection::BillingAndUsage,
+                        SettingsSection::About,
                     ))
                     .into_item(),
             );
@@ -14959,83 +14932,6 @@ impl Workspace {
         });
     }
 
-    fn show_handoff_environment_creation_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        // Capture the initiating source view now, before async creation begins.
-        // If we waited until the Created callback, the user may have switched panes.
-        #[cfg(all(feature = "local_fs", not(target_family = "wasm")))]
-        let source_view = self
-            .active_tab_pane_group()
-            .as_ref(ctx)
-            .active_session_view(ctx);
-
-        let modal = ctx.add_typed_action_view(HandoffEnvironmentCreationModal::new);
-        ctx.subscribe_to_view(&modal, move |me, _, event, ctx| match event {
-            HandoffEnvironmentCreationModalEvent::Created { env_id } => {
-                let env_id = *env_id;
-                me.handoff_environment_creation_modal = None;
-                #[cfg(all(feature = "local_fs", not(target_family = "wasm")))]
-                {
-                    if let Some(source_view) = source_view.as_ref() {
-                        let (launch, entry_point) = source_view.update(ctx, |view, ctx| {
-                            let input = view.input().clone();
-                            input.update(ctx, |input, ctx| {
-                                let prompt = input
-                                    .editor()
-                                    .as_ref(ctx)
-                                    .buffer_text(ctx)
-                                    .trim()
-                                    .to_owned();
-                                let attachments = input.collect_cloud_launch_attachments(ctx);
-                                let entry_point = input.handoff_entry_point(ctx);
-                                input.exit_cloud_handoff_compose_and_clear(ctx);
-                                let launch = if prompt.is_empty() {
-                                    None
-                                } else {
-                                    Some(PendingCloudLaunch {
-                                        prompt,
-                                        attachments,
-                                    })
-                                };
-                                (launch, entry_point)
-                            })
-                        });
-                        ctx.dispatch_typed_action_deferred(
-                            WorkspaceAction::OpenLocalToCloudHandoffPane {
-                                launch,
-                                environment_id: Some(env_id),
-                                entry_point,
-                            },
-                        );
-                    }
-                }
-                #[cfg(not(all(feature = "local_fs", not(target_family = "wasm"))))]
-                {
-                    let _ = env_id;
-                }
-            }
-            HandoffEnvironmentCreationModalEvent::Cancelled => {
-                me.handoff_environment_creation_modal = None;
-                me.focus_active_tab(ctx);
-            }
-            HandoffEnvironmentCreationModalEvent::CreationFailed { error_message } => {
-                me.handoff_environment_creation_modal = None;
-                me.toast_stack.update(ctx, |toast_stack, ctx| {
-                    toast_stack.add_ephemeral_toast(
-                        DismissibleToast::error(format!(
-                            "Failed to create environment: {error_message}"
-                        )),
-                        ctx,
-                    );
-                });
-                me.focus_active_tab(ctx);
-            }
-        });
-        modal.update(ctx, |modal, ctx| modal.show(ctx));
-        ctx.focus(&modal);
-        self.handoff_environment_creation_modal = Some(modal);
-        ctx.notify();
-    }
-
     /// Opens the workspace-level blocking modal for creating a new managed
     /// auth secret. Persists the new secret on success and dismisses the
     /// modal; cards adopt it via `HarnessAvailabilityEvent::AuthSecretCreated`.
@@ -15089,81 +14985,6 @@ impl Workspace {
         }
     }
 
-    fn show_cloud_mode_v2_environment_creation_modal(&mut self, ctx: &mut ViewContext<Self>) {
-        let Some(source_view) = self
-            .active_tab_pane_group()
-            .as_ref(ctx)
-            .active_session_view(ctx)
-        else {
-            return;
-        };
-        let modal = ctx.add_typed_action_view(HandoffEnvironmentCreationModal::new);
-        ctx.subscribe_to_view(&modal, move |me, _, event, ctx| match event {
-            HandoffEnvironmentCreationModalEvent::Created { env_id } => {
-                let env_id = *env_id;
-                me.handoff_environment_creation_modal = None;
-                let Some(model_handle) =
-                    source_view.as_ref(ctx).ambient_agent_view_model().cloned()
-                else {
-                    return;
-                };
-                let pending = source_view.update(ctx, |view, ctx| {
-                    let input = view.input().clone();
-                    input.update(ctx, |input, ctx| {
-                        let prompt = input
-                            .editor()
-                            .as_ref(ctx)
-                            .buffer_text(ctx)
-                            .trim()
-                            .to_owned();
-                        if prompt.is_empty() {
-                            return None;
-                        }
-                        #[cfg(all(feature = "local_fs", not(target_family = "wasm")))]
-                        let attachments = input
-                            .collect_cloud_launch_attachments(ctx)
-                            .request_attachments;
-                        #[cfg(not(all(feature = "local_fs", not(target_family = "wasm"))))]
-                        let attachments = Vec::new();
-                        input.editor().update(ctx, |editor, ctx| {
-                            editor.clear_buffer(ctx);
-                        });
-                        input.ai_context_model().update(ctx, |model, ctx| {
-                            model.clear_pending_attachments(ctx);
-                        });
-                        Some((prompt, attachments))
-                    })
-                });
-                model_handle.update(ctx, |model, ctx| {
-                    model.set_environment_id(Some(env_id), ctx);
-                    if let Some((prompt, attachments)) = pending {
-                        model.spawn_agent(prompt, attachments, ctx);
-                    }
-                });
-            }
-            HandoffEnvironmentCreationModalEvent::Cancelled => {
-                me.handoff_environment_creation_modal = None;
-                me.focus_active_tab(ctx);
-            }
-            HandoffEnvironmentCreationModalEvent::CreationFailed { error_message } => {
-                me.handoff_environment_creation_modal = None;
-                me.toast_stack.update(ctx, |toast_stack, ctx| {
-                    toast_stack.add_ephemeral_toast(
-                        DismissibleToast::error(format!(
-                            "Failed to create environment: {error_message}"
-                        )),
-                        ctx,
-                    );
-                });
-                me.focus_active_tab(ctx);
-            }
-        });
-        modal.update(ctx, |modal, ctx| modal.show(ctx));
-        ctx.focus(&modal);
-        self.handoff_environment_creation_modal = Some(modal);
-        ctx.notify();
-    }
-
     #[cfg(all(feature = "local_fs", not(target_family = "wasm")))]
     fn restore_source_handoff_draft(
         source_view: &ViewHandle<TerminalView>,
@@ -16895,13 +16716,7 @@ impl Workspace {
             pane_group::Event::OpenAgentProfileEditor { profile_id } => {
                 self.open_execution_profile_editor_pane(None, *profile_id, ctx);
             }
-            pane_group::Event::OpenEnvironmentManagementPane => {
-                self.open_environment_management_pane(
-                    None,
-                    crate::settings_view::environments_page::EnvironmentsPage::Create,
-                    ctx,
-                );
-            }
+            pane_group::Event::OpenEnvironmentManagementPane => {}
             pane_group::Event::OpenLspLogs { log_path } => {
                 self.open_lsp_logs(log_path, ctx);
             }
@@ -23872,12 +23687,8 @@ impl TypedActionView for Workspace {
                     let _ = (terminal_view_id, conversation_id, trigger);
                 }
             }
-            ShowHandoffEnvironmentCreationModal => {
-                self.show_handoff_environment_creation_modal(ctx);
-            }
-            ShowCloudModeV2EnvironmentCreationModal => {
-                self.show_cloud_mode_v2_environment_creation_modal(ctx);
-            }
+            ShowHandoffEnvironmentCreationModal => {}
+            ShowCloudModeV2EnvironmentCreationModal => {}
             OpenCreateAuthSecretModal { harness } => {
                 self.show_create_auth_secret_modal(*harness, ctx);
             }
@@ -23994,7 +23805,7 @@ impl TypedActionView for Workspace {
                 ctx.open_url(&upgrade_url);
             }
             ShowReferralSettingsPage => {
-                self.show_settings_with_section(Some(SettingsSection::Referrals), ctx);
+                self.show_settings_with_section(Some(SettingsSection::About), ctx);
             }
             JoinSlack => self.join_slack(ctx),
             ViewUserDocs => self.view_user_docs(ctx),
@@ -24946,9 +24757,7 @@ impl TypedActionView for Workspace {
                     ctx
                 );
             }
-            OpenEnvironmentManagementPane => {
-                self.open_environment_management_pane(None, EnvironmentsPage::Create, ctx);
-            }
+            OpenEnvironmentManagementPane => {}
             ToggleAIDocumentPane {
                 document_id,
                 document_version,
@@ -26986,10 +26795,6 @@ impl View for Workspace {
             stack.add_child(ChildView::new(lightbox_view).finish());
         }
 
-        if let Some(handoff_modal) = &self.handoff_environment_creation_modal {
-            stack.add_child(ChildView::new(handoff_modal).finish());
-        }
-
         if let Some(create_auth_secret_modal) = &self.create_auth_secret_modal {
             stack.add_child(ChildView::new(create_auth_secret_modal).finish());
         }
diff --git a/crates/mcp/src/sse_transport/reqwest_impl.rs b/crates/mcp/src/sse_transport/reqwest_impl.rs
index 3f5a718c..f2f2b959 100644
--- a/crates/mcp/src/sse_transport/reqwest_impl.rs
+++ b/crates/mcp/src/sse_transport/reqwest_impl.rs
@@ -71,7 +71,7 @@ impl SseClient for reqwest::Client {
                 return Err(SseTransportError::UnexpectedContentType(None));
             }
         }
-        let event_stream = SseStream::from_byte_stream(response.bytes_stream()).boxed();
+        let event_stream = SseStream::from_bytes_stream(response.bytes_stream()).boxed();
         Ok(event_stream)
     }
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 904bafae..ef450a16 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.92.0"
+channel = "1.94.1"
 components = ["rustfmt", "clippy"]
 profile = "minimal"