Fallback to default_model

Use thread_summary_model for Text Threads too
2025-09-03 16:17:27 -04:00 · 2025-09-03 15:59:23 -04:00
361 changed files with 8290 additions and 9829 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -19,6 +19,8 @@ rustflags = [
    "windows_slim_errors",        # This cfg will reduce the size of `windows::core::Error` from 16 bytes to 4 bytes
    "-C",
    "target-feature=+crt-static", # This fixes the linking issue when compiling livekit on Windows
+    "-C",
+    "link-arg=-fuse-ld=lld",
 ]

 [env]
--- a/.config/hakari.toml
+++ b/.config/hakari.toml
@@ -26,7 +26,7 @@ third-party = [
    # build of remote_server should not include scap / its x11 dependency
    { name = "scap", git = "https://github.com/zed-industries/scap", rev = "808aa5c45b41e8f44729d02e38fd00a2fe2722e7" },
    # build of remote_server should not need to include on libalsa through rodio
-    { name = "rodio", git = "https://github.com/RustAudio/rodio", branch = "better_wav_output"},
+    { name = "rodio" },
 ]

 [final-excludes]
@@ -41,4 +41,5 @@ workspace-members = [
    "slash_commands_example",
    "zed_snippets",
    "zed_test_extension",
+    "zed_toml",
 ]
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,4 +2,4 @@
 *.json linguist-language=JSON-with-Comments

 # Ensure the WSL script always has LF line endings, even on Windows
-crates/zed/resources/windows/zed.sh text eol=lf
+crates/zed/resources/windows/zed-wsl text eol=lf
--- a/.rules
+++ b/.rules
@@ -12,19 +12,6 @@
  - Example: avoid `let _ = client.request(...).await?;` - use `client.request(...).await?;` instead
 * When implementing async operations that may fail, ensure errors propagate to the UI layer so users get meaningful feedback.
 * Never create files with `mod.rs` paths - prefer `src/some_module.rs` instead of `src/some_module/mod.rs`.
-* When creating new crates, prefer specifying the library root path in `Cargo.toml` using `[lib] path = "...rs"` instead of the default `lib.rs`, to maintain consistent and descriptive naming (e.g., `gpui.rs` or `main.rs`).
-* Avoid creative additions unless explicitly requested
-* Use full words for variable names (no abbreviations like "q" for "queue")
-* Use variable shadowing to scope clones in async contexts for clarity, minimizing the lifetime of borrowed references.
-  Example:
-  ```rust
-  executor.spawn({
-      let task_ran = task_ran.clone();
-      async move {
-          *task_ran.borrow_mut() = true;
-      }
-  });
-  ```

 # GPUI

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,7 +65,7 @@ If you would like to add a new icon to the Zed icon theme, [open a Discussion](h

 ## Bird's-eye view of Zed

-We suggest you keep the [zed glossary](docs/src/development/glossary.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.
+We suggest you keep the [zed glossary](docs/src/development/GLOSSARY.md) at your side when starting out. It lists and explains some of the structures and terms you will see throughout the codebase.

 Zed is made up of several smaller crates - let's go over those you're most likely to interact with:

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,7 +26,7 @@ dependencies = [
 "portable-pty",
 "project",
 "prompt_store",
- "rand 0.9.1",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "settings",
@@ -79,7 +79,7 @@ dependencies = [
 "log",
 "pretty_assertions",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "serde_json",
 "settings",
 "text",
@@ -172,7 +172,7 @@ dependencies = [
 "pretty_assertions",
 "project",
 "prompt_store",
- "rand 0.9.1",
+ "rand 0.8.5",
 "ref-cast",
 "rope",
 "schemars",
@@ -190,15 +190,14 @@ dependencies = [
 "uuid",
 "workspace",
 "workspace-hack",
- "zed_env_vars",
 "zstd",
 ]

 [[package]]
 name = "agent-client-protocol"
-version = "0.2.0-alpha.6"
+version = "0.2.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d02292efd75080932b6466471d428c70e2ac06908ae24792fc7c36ecbaf67ca"
+checksum = "603941db1d130ee275840c465b73a2312727d4acef97449550ccf033de71301f"
 dependencies = [
 "anyhow",
 "async-broadcast",
@@ -279,7 +278,6 @@ dependencies = [
 "web_search",
 "workspace-hack",
 "worktree",
- "zed_env_vars",
 "zlog",
 "zstd",
 ]
@@ -408,7 +406,7 @@ dependencies = [
 "project",
 "prompt_store",
 "proto",
- "rand 0.9.1",
+ "rand 0.8.5",
 "release_channel",
 "rope",
 "rules_library",
@@ -834,7 +832,7 @@ dependencies = [
 "project",
 "prompt_store",
 "proto",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "rpc",
 "serde",
@@ -850,7 +848,6 @@ dependencies = [
 "uuid",
 "workspace",
 "workspace-hack",
- "zed_env_vars",
 ]

 [[package]]
@@ -933,7 +930,7 @@ dependencies = [
 "parking_lot",
 "pretty_assertions",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "serde",
 "serde_json",
@@ -985,7 +982,7 @@ dependencies = [
 "pretty_assertions",
 "project",
 "prompt_store",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "reqwest_client",
 "rust-embed",
@@ -1385,19 +1382,12 @@ name = "audio"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "async-tar",
 "collections",
- "crossbeam",
 "gpui",
- "libwebrtc",
- "log",
- "parking_lot",
 "rodio",
 "schemars",
 "serde",
 "settings",
- "smol",
- "thiserror 2.0.12",
 "util",
 "workspace-hack",
 ]
@@ -2298,7 +2288,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.6.0"
-source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9"
+source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
 dependencies = [
 "ash",
 "ash-window",
@@ -2331,7 +2321,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9"
+source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2341,7 +2331,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.2.0"
-source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9"
+source = "git+https://github.com/kvark/blade?rev=e0ec4e720957edd51b945b64dd85605ea54bcfe5#e0ec4e720957edd51b945b64dd85605ea54bcfe5"
 dependencies = [
 "blade-graphics",
 "bytemuck",
@@ -2358,6 +2348,19 @@ dependencies = [
 "digest",
 ]

+[[package]]
+name = "blake3"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq 0.3.1",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
@@ -2472,7 +2475,7 @@ dependencies = [
 "language",
 "log",
 "pretty_assertions",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rope",
 "serde_json",
 "sum_tree",
@@ -2618,7 +2621,6 @@ dependencies = [
 "audio",
 "client",
 "collections",
- "feature_flags",
 "fs",
 "futures 0.3.31",
 "gpui",
@@ -2894,7 +2896,7 @@ dependencies = [
 "language",
 "log",
 "postage",
- "rand 0.9.1",
+ "rand 0.8.5",
 "release_channel",
 "rpc",
 "settings",
@@ -3065,6 +3067,7 @@ dependencies = [
 "clock",
 "cloud_api_client",
 "cloud_llm_client",
+ "cocoa 0.26.0",
 "collections",
 "credentials_provider",
 "derive_more",
@@ -3077,11 +3080,10 @@ dependencies = [
 "http_client_tls",
 "httparse",
 "log",
- "objc2-foundation",
 "parking_lot",
 "paths",
 "postage",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "release_channel",
 "rpc",
@@ -3330,7 +3332,7 @@ dependencies = [
 "prometheus",
 "prompt_store",
 "prost 0.9.0",
- "rand 0.9.1",
+ "rand 0.8.5",
 "recent_projects",
 "release_channel",
 "remote",
@@ -3510,7 +3512,6 @@ name = "component"
 version = "0.1.0"
 dependencies = [
 "collections",
- "documented",
 "gpui",
 "inventory",
 "parking_lot",
@@ -3573,6 +3574,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"

+[[package]]
+name = "constant_time_eq"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
 [[package]]
 name = "context_server"
 version = "0.1.0"
@@ -4152,19 +4159,6 @@ dependencies = [
 "itertools 0.10.5",
 ]

-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.15"
@@ -4495,7 +4489,6 @@ dependencies = [
 "tempfile",
 "util",
 "workspace-hack",
- "zed_env_vars",
 ]

 [[package]]
@@ -4700,7 +4693,7 @@ dependencies = [
 "markdown",
 "pretty_assertions",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "serde",
 "serde_json",
 "settings",
@@ -5071,7 +5064,7 @@ dependencies = [
 "parking_lot",
 "pretty_assertions",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "release_channel",
 "rpc",
@@ -5566,7 +5559,7 @@ dependencies = [
 "parking_lot",
 "paths",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "release_channel",
 "remote",
 "reqwest_client",
@@ -6166,6 +6159,17 @@ dependencies = [
 "futures-util",
 ]

+[[package]]
+name = "futures-batch"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f444c45a1cb86f2a7e301469fd50a82084a60dadc25d94529a8312276ecb71a"
+dependencies = [
+ "futures 0.3.31",
+ "futures-timer",
+ "pin-utils",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -6261,6 +6265,12 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"

+[[package]]
+name = "futures-timer"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
+
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -6398,7 +6408,7 @@ dependencies = [
 "log",
 "parking_lot",
 "pretty_assertions",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "rope",
 "schemars",
@@ -7451,7 +7461,7 @@ dependencies = [
 "pathfinder_geometry",
 "postage",
 "profiling",
- "rand 0.9.1",
+ "rand 0.8.5",
 "raw-window-handle",
 "refineable",
 "reqwest_client",
@@ -9064,7 +9074,7 @@ dependencies = [
 "parking_lot",
 "postage",
 "pretty_assertions",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "rpc",
 "schemars",
@@ -9233,7 +9243,6 @@ dependencies = [
 "anyhow",
 "client",
 "collections",
- "command_palette_hooks",
 "copilot",
 "editor",
 "futures 0.3.31",
@@ -9504,21 +9513,6 @@ dependencies = [
 "vcpkg",
 ]

-[[package]]
-name = "line_ending_selector"
-version = "0.1.0"
-dependencies = [
- "editor",
- "gpui",
- "language",
- "picker",
- "project",
- "ui",
- "util",
- "workspace",
- "workspace-hack",
-]
-
 [[package]]
 name = "link-cplusplus"
 version = "1.0.10"
@@ -9673,7 +9667,6 @@ dependencies = [
 "scap",
 "serde",
 "serde_json",
- "serde_urlencoded",
 "settings",
 "sha2",
 "simplelog",
@@ -10395,7 +10388,7 @@ dependencies = [
 "parking_lot",
 "pretty_assertions",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rope",
 "serde",
 "settings",
@@ -12621,7 +12614,7 @@ dependencies = [
 "postage",
 "prettier",
 "pretty_assertions",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "release_channel",
 "remote",
@@ -13875,15 +13868,15 @@ dependencies = [
 [[package]]
 name = "rodio"
 version = "0.21.1"
-source = "git+https://github.com/RustAudio/rodio?branch=better_wav_output#82514bd1f2c6cfd9a1a885019b26a8ffea75bc5c"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
 dependencies = [
 "cpal",
 "dasp_sample",
 "hound",
 "num-rational",
- "rtrb",
 "symphonia",
- "thiserror 2.0.12",
+ "tracing",
 ]

 [[package]]
@@ -13895,7 +13888,7 @@ dependencies = [
 "ctor",
 "gpui",
 "log",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rayon",
 "smallvec",
 "sum_tree",
@@ -13924,7 +13917,7 @@ dependencies = [
 "gpui",
 "parking_lot",
 "proto",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rsa",
 "serde",
 "serde_json",
@@ -13957,12 +13950,6 @@ dependencies = [
 "zeroize",
 ]

-[[package]]
-name = "rtrb"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8388ea1a9e0ea807e442e8263a699e7edcb320ecbcd21b4fa8ff859acce3ba"
-
 [[package]]
 name = "rules_library"
 version = "0.1.0"
@@ -14365,19 +14352,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

-[[package]]
-name = "scheduler"
-version = "0.1.0"
-dependencies = [
- "async-task",
- "chrono",
- "futures 0.3.31",
- "parking",
- "parking_lot",
- "rand 0.9.1",
- "workspace-hack",
-]
-
 [[package]]
 name = "schema_generator"
 version = "0.1.0"
@@ -14680,6 +14654,49 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749"

+[[package]]
+name = "semantic_index"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "arrayvec",
+ "blake3",
+ "client",
+ "clock",
+ "collections",
+ "feature_flags",
+ "fs",
+ "futures 0.3.31",
+ "futures-batch",
+ "gpui",
+ "heed",
+ "http_client",
+ "language",
+ "language_model",
+ "languages",
+ "log",
+ "open_ai",
+ "parking_lot",
+ "project",
+ "reqwest_client",
+ "serde",
+ "serde_json",
+ "settings",
+ "sha2",
+ "smol",
+ "streaming-iterator",
+ "tempfile",
+ "theme",
+ "tree-sitter",
+ "ui",
+ "unindent",
+ "util",
+ "workspace",
+ "workspace-hack",
+ "worktree",
+ "zlog",
+]
+
 [[package]]
 name = "semantic_version"
 version = "0.1.0"
@@ -14889,7 +14906,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "command_palette_hooks",
- "debugger_ui",
 "editor",
 "feature_flags",
 "gpui",
@@ -15297,7 +15313,6 @@ dependencies = [
 "futures 0.3.31",
 "indoc",
 "libsqlite3-sys",
- "log",
 "parking_lot",
 "smol",
 "sqlformat",
@@ -15635,7 +15650,7 @@ name = "streaming_diff"
 version = "0.1.0"
 dependencies = [
 "ordered-float 2.10.1",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rope",
 "util",
 "workspace-hack",
@@ -15749,7 +15764,7 @@ dependencies = [
 "arrayvec",
 "ctor",
 "log",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rayon",
 "workspace-hack",
 "zlog",
@@ -15924,53 +15939,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
 dependencies = [
 "lazy_static",
- "symphonia-bundle-flac",
- "symphonia-bundle-mp3",
- "symphonia-codec-aac",
 "symphonia-codec-pcm",
- "symphonia-codec-vorbis",
 "symphonia-core",
- "symphonia-format-isomp4",
- "symphonia-format-ogg",
 "symphonia-format-riff",
 "symphonia-metadata",
 ]

-[[package]]
-name = "symphonia-bundle-flac"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e34f34298a7308d4397a6c7fbf5b84c5d491231ce3dd379707ba673ab3bd97"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-bundle-mp3"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
- "symphonia-metadata",
-]
-
-[[package]]
-name = "symphonia-codec-aac"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70"
-dependencies = [
- "lazy_static",
- "log",
- "symphonia-core",
-]
-
 [[package]]
 name = "symphonia-codec-pcm"
 version = "0.5.4"
@@ -15981,17 +15955,6 @@ dependencies = [
 "symphonia-core",
 ]

-[[package]]
-name = "symphonia-codec-vorbis"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-utils-xiph",
-]
-
 [[package]]
 name = "symphonia-core"
 version = "0.5.4"
@@ -16005,31 +15968,6 @@ dependencies = [
 "log",
 ]

-[[package]]
-name = "symphonia-format-isomp4"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844"
-dependencies = [
- "encoding_rs",
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
-[[package]]
-name = "symphonia-format-ogg"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931"
-dependencies = [
- "log",
- "symphonia-core",
- "symphonia-metadata",
- "symphonia-utils-xiph",
-]
-
 [[package]]
 name = "symphonia-format-riff"
 version = "0.5.4"
@@ -16054,16 +15992,6 @@ dependencies = [
 "symphonia-core",
 ]

-[[package]]
-name = "symphonia-utils-xiph"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
-dependencies = [
- "symphonia-core",
- "symphonia-metadata",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -16427,7 +16355,7 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "libc",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "release_channel",
 "schemars",
@@ -16475,7 +16403,7 @@ dependencies = [
 "language",
 "log",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "schemars",
 "search",
@@ -16507,7 +16435,7 @@ dependencies = [
 "log",
 "parking_lot",
 "postage",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "rope",
 "smallvec",
@@ -17038,15 +16966,10 @@ checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 name = "toolchain_selector"
 version = "0.1.0"
 dependencies = [
- "anyhow",
- "convert_case 0.8.0",
 "editor",
- "file_finder",
- "futures 0.3.31",
 "fuzzy",
 "gpui",
 "language",
- "menu",
 "picker",
 "project",
 "ui",
@@ -17869,7 +17792,7 @@ dependencies = [
 "libc",
 "log",
 "nix 0.29.0",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "rust-embed",
 "schemars",
@@ -18054,8 +17977,6 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "gpui",
- "schemars",
- "serde",
 "settings",
 "workspace-hack",
 ]
@@ -18662,7 +18583,7 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "parking_lot",
- "rand 0.9.1",
+ "rand 0.8.5",
 "workspace-hack",
 "zlog",
 ]
@@ -19954,7 +19875,6 @@ dependencies = [
 "core-foundation-sys",
 "cranelift-codegen",
 "crc32fast",
- "crossbeam-channel",
 "crossbeam-epoch",
 "crossbeam-utils",
 "crypto-common",
@@ -19998,7 +19918,6 @@ dependencies = [
 "libsqlite3-sys",
 "linux-raw-sys 0.4.15",
 "linux-raw-sys 0.9.4",
- "livekit-runtime",
 "log",
 "lyon",
 "lyon_path",
@@ -20123,7 +20042,7 @@ dependencies = [
 "paths",
 "postage",
 "pretty_assertions",
- "rand 0.9.1",
+ "rand 0.8.5",
 "rpc",
 "schemars",
 "serde",
@@ -20552,7 +20471,7 @@ dependencies = [
 "language_tools",
 "languages",
 "libc",
- "line_ending_selector",
+ "livekit_client",
 "log",
 "markdown",
 "markdown_preview",
@@ -20629,7 +20548,6 @@ dependencies = [
 "workspace",
 "workspace-hack",
 "zed_actions",
- "zed_env_vars",
 "zeta",
 "zlog",
 "zlog_settings",
@@ -20646,13 +20564,6 @@ dependencies = [
 "workspace-hack",
 ]

-[[package]]
-name = "zed_env_vars"
-version = "0.1.0"
-dependencies = [
- "workspace-hack",
-]
-
 [[package]]
 name = "zed_extension_api"
 version = "0.1.0"
@@ -20703,7 +20614,7 @@ dependencies = [

 [[package]]
 name = "zed_snippets"
-version = "0.0.6"
+version = "0.0.5"
 dependencies = [
 "serde_json",
 "zed_extension_api 0.1.0",
@@ -20716,6 +20627,13 @@ dependencies = [
 "zed_extension_api 0.6.0",
 ]

+[[package]]
+name = "zed_toml"
+version = "0.1.4"
+dependencies = [
+ "zed_extension_api 0.1.0",
+]
+
 [[package]]
 name = "zeno"
 version = "0.3.2"
@@ -20879,10 +20797,9 @@ dependencies = [
 "language_model",
 "log",
 "menu",
- "parking_lot",
 "postage",
 "project",
- "rand 0.9.1",
+ "rand 0.8.5",
 "regex",
 "release_channel",
 "reqwest_client",
@@ -20952,7 +20869,7 @@ dependencies = [
 "aes",
 "byteorder",
 "bzip2",
- "constant_time_eq",
+ "constant_time_eq 0.1.5",
 "crc32fast",
 "crossbeam-utils",
 "flate2",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -97,7 +97,6 @@ members = [
    "crates/language_selector",
    "crates/language_tools",
    "crates/languages",
-    "crates/line_ending_selector",
    "crates/livekit_api",
    "crates/livekit_client",
    "crates/lmstudio",
@@ -132,7 +131,6 @@ members = [
    "crates/refineable",
    "crates/refineable/derive_refineable",
    "crates/release_channel",
-    "crates/scheduler",
    "crates/remote",
    "crates/remote_server",
    "crates/repl",
@@ -143,6 +141,7 @@ members = [
    "crates/rules_library",
    "crates/schema_generator",
    "crates/search",
+    "crates/semantic_index",
    "crates/semantic_version",
    "crates/session",
    "crates/settings",
@@ -194,7 +193,6 @@ members = [
    "crates/x_ai",
    "crates/zed",
    "crates/zed_actions",
-    "crates/zed_env_vars",
    "crates/zeta",
    "crates/zeta_cli",
    "crates/zlog",
@@ -211,6 +209,7 @@ members = [
    "extensions/slash-commands-example",
    "extensions/snippets",
    "extensions/test-extension",
+    "extensions/toml",

    #
    # Tooling
@@ -276,7 +275,6 @@ context_server = { path = "crates/context_server" }
 copilot = { path = "crates/copilot" }
 crashes = { path = "crates/crashes" }
 credentials_provider = { path = "crates/credentials_provider" }
-crossbeam = "0.8.4"
 dap = { path = "crates/dap" }
 dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
@@ -324,7 +322,6 @@ language_models = { path = "crates/language_models" }
 language_selector = { path = "crates/language_selector" }
 language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
-line_ending_selector = { path = "crates/line_ending_selector" }
 livekit_api = { path = "crates/livekit_api" }
 livekit_client = { path = "crates/livekit_client" }
 lmstudio = { path = "crates/lmstudio" }
@@ -362,17 +359,17 @@ proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
-scheduler = { path = "crates/scheduler" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
 repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
-rodio = { git = "https://github.com/RustAudio/rodio", branch = "better_wav_output"}
+rodio = { version = "0.21.1", default-features = false }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 rules_library = { path = "crates/rules_library" }
 search = { path = "crates/search" }
+semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
@@ -423,7 +420,6 @@ worktree = { path = "crates/worktree" }
 x_ai = { path = "crates/x_ai" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
-zed_env_vars = { path = "crates/zed_env_vars" }
 zeta = { path = "crates/zeta" }
 zlog = { path = "crates/zlog" }
 zlog_settings = { path = "crates/zlog_settings" }
@@ -432,7 +428,7 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #

-agent-client-protocol = { version = "0.2.0-alpha.6", features = ["unstable"]}
+agent-client-protocol = { version = "0.2.0-alpha.4", features = ["unstable"]}
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
@@ -446,7 +442,6 @@ async-fs = "2.1"
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
-async-task = "4.7"
 async-trait = "0.1"
 async-tungstenite = "0.29.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
@@ -462,9 +457,9 @@ aws-smithy-types = { version = "1.3.0", features = ["http-body-1-x"] }
 base64 = "0.22"
 bincode = "1.2.1"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "bfa594ea697d4b6326ea29f747525c85ecf933b9" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "e0ec4e720957edd51b945b64dd85605ea54bcfe5" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -538,35 +533,9 @@ nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c80421
 nix = "0.29"
 num-format = "0.4.4"
 objc = "0.2"
-objc2-foundation = { version = "0.3", default-features = false, features = [
-    "NSArray",
-    "NSAttributedString",
-    "NSBundle",
-    "NSCoder",
-    "NSData",
-    "NSDate",
-    "NSDictionary",
-    "NSEnumerator",
-    "NSError",
-    "NSGeometry",
-    "NSNotification",
-    "NSNull",
-    "NSObjCRuntime",
-    "NSObject",
-    "NSProcessInfo",
-    "NSRange",
-    "NSRunLoop",
-    "NSString",
-    "NSURL",
-    "NSUndoManager",
-    "NSValue",
-    "objc2-core-foundation",
-    "std"
-] }
 open = "5.0.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
-parking = "2.0"
 parking_lot = "0.12.1"
 partial-json-fixer = "0.5.3"
 parse_int = "0.9"
@@ -589,7 +558,7 @@ prost-build = "0.9"
 prost-types = "0.9"
 pulldown-cmark = { version = "0.12.0", default-features = false }
 quote = "1.0.9"
-rand = "0.9"
+rand = "0.8.5"
 rayon = "1.8"
 ref-cast = "1.0.24"
 regex = "1.5"
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -16,7 +16,6 @@
      "up": "menu::SelectPrevious",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
      "escape": "menu::Cancel",
      "alt-shift-enter": "menu::Restart",
@@ -583,7 +582,7 @@
      "ctrl-n": "workspace::NewFile",
      "shift-new": "workspace::NewWindow",
      "ctrl-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::Toggle",
+      "ctrl-`": "terminal_panel::ToggleFocus",
      "f10": ["app_menu::OpenApplicationMenu", "Zed"],
      "alt-1": ["workspace::ActivatePane", 0],
      "alt-2": ["workspace::ActivatePane", 1],
@@ -628,7 +627,6 @@
      "alt-save": "workspace::SaveAll",
      "ctrl-alt-s": "workspace::SaveAll",
      "ctrl-k m": "language_selector::Toggle",
-      "ctrl-k ctrl-m": "toolchain::AddToolchain",
      "escape": "workspace::Unfollow",
      "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
      "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
@@ -1029,13 +1027,6 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
-  {
-    "context": "ToolchainSelector",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-a": "toolchain::AddToolchain"
-    }
-  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor)",
    "bindings": {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -649,7 +649,7 @@
      "alt-shift-enter": "toast::RunAction",
      "cmd-shift-s": "workspace::SaveAs",
      "cmd-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::Toggle",
+      "ctrl-`": "terminal_panel::ToggleFocus",
      "cmd-1": ["workspace::ActivatePane", 0],
      "cmd-2": ["workspace::ActivatePane", 1],
      "cmd-3": ["workspace::ActivatePane", 2],
@@ -690,7 +690,6 @@
      "cmd-?": "agent::ToggleFocus",
      "cmd-alt-s": "workspace::SaveAll",
      "cmd-k m": "language_selector::Toggle",
-      "cmd-k cmd-m": "toolchain::AddToolchain",
      "escape": "workspace::Unfollow",
      "cmd-k cmd-left": "workspace::ActivatePaneLeft",
      "cmd-k cmd-right": "workspace::ActivatePaneRight",
@@ -1095,13 +1094,6 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
-  {
-    "context": "ToolchainSelector",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-shift-a": "toolchain::AddToolchain"
-    }
-  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor)",
    "use_key_equivalents": true,
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -25,6 +25,7 @@
      "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
      "ctrl-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
+      "open": "workspace::Open",
      "ctrl-o": "workspace::Open",
      "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
      "ctrl-shift-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
@@ -67,13 +68,18 @@
      "ctrl-k q": "editor::Rewrap",
      "ctrl-backspace": ["editor::DeleteToPreviousWordStart", { "ignore_newlines": false, "ignore_brackets": false }],
      "ctrl-delete": ["editor::DeleteToNextWordEnd", { "ignore_newlines": false, "ignore_brackets": false }],
+      "cut": "editor::Cut",
      "shift-delete": "editor::Cut",
      "ctrl-x": "editor::Cut",
+      "copy": "editor::Copy",
      "ctrl-insert": "editor::Copy",
      "ctrl-c": "editor::Copy",
+      "paste": "editor::Paste",
      "shift-insert": "editor::Paste",
      "ctrl-v": "editor::Paste",
+      "undo": "editor::Undo",
      "ctrl-z": "editor::Undo",
+      "redo": "editor::Redo",
      "ctrl-y": "editor::Redo",
      "ctrl-shift-z": "editor::Redo",
      "up": "editor::MoveUp",
@@ -132,6 +138,7 @@
      "ctrl-shift-enter": "editor::NewlineAbove",
      "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
      "ctrl-k z": "editor::ToggleSoftWrap",
+      "find": "buffer_search::Deploy",
      "ctrl-f": "buffer_search::Deploy",
      "ctrl-h": "buffer_search::DeployReplace",
      "ctrl-shift-.": "assistant::QuoteSelection",
@@ -170,6 +177,7 @@
    "context": "Markdown",
    "use_key_equivalents": true,
    "bindings": {
+      "copy": "markdown::Copy",
      "ctrl-c": "markdown::Copy"
    }
  },
@@ -217,6 +225,7 @@
    "bindings": {
      "ctrl-enter": "assistant::Assist",
      "ctrl-s": "workspace::Save",
+      "save": "workspace::Save",
      "ctrl-shift-,": "assistant::InsertIntoEditor",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
@@ -263,6 +272,7 @@
    "context": "AgentPanel > Markdown",
    "use_key_equivalents": true,
    "bindings": {
+      "copy": "markdown::CopyAsMarkdown",
      "ctrl-c": "markdown::CopyAsMarkdown"
    }
  },
@@ -357,6 +367,7 @@
    "context": "PromptLibrary",
    "use_key_equivalents": true,
    "bindings": {
+      "new": "rules_library::NewRule",
      "ctrl-n": "rules_library::NewRule",
      "ctrl-shift-s": "rules_library::ToggleDefaultRule"
    }
@@ -370,6 +381,7 @@
      "enter": "search::SelectNextMatch",
      "shift-enter": "search::SelectPreviousMatch",
      "alt-enter": "search::SelectAllMatches",
+      "find": "search::FocusSearch",
      "ctrl-f": "search::FocusSearch",
      "ctrl-h": "search::ToggleReplace",
      "ctrl-l": "search::ToggleSelection"
@@ -396,6 +408,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "escape": "project_search::ToggleFocus",
+      "shift-find": "search::FocusSearch",
      "ctrl-shift-f": "search::FocusSearch",
      "ctrl-shift-h": "search::ToggleReplace",
      "alt-r": "search::ToggleRegex" // vscode
@@ -459,12 +472,14 @@
      "forward": "pane::GoForward",
      "f3": "search::SelectNextMatch",
      "shift-f3": "search::SelectPreviousMatch",
+      "shift-find": "project_search::ToggleFocus",
      "ctrl-shift-f": "project_search::ToggleFocus",
      "shift-alt-h": "search::ToggleReplace",
      "alt-l": "search::ToggleSelection",
      "alt-enter": "search::SelectAllMatches",
      "alt-c": "search::ToggleCaseSensitive",
      "alt-w": "search::ToggleWholeWord",
+      "alt-find": "project_search::ToggleFilters",
      "alt-f": "project_search::ToggleFilters",
      "alt-r": "search::ToggleRegex",
      // "ctrl-shift-alt-x": "search::ToggleRegex",
@@ -564,21 +579,27 @@
    "context": "Workspace",
    "use_key_equivalents": true,
    "bindings": {
+      "alt-open": ["projects::OpenRecent", { "create_new_window": false }],
      // Change the default action on `menu::Confirm` by setting the parameter
      // "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
      "ctrl-r": ["projects::OpenRecent", { "create_new_window": false }],
+      "shift-alt-open": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
      // Change to open path modal for existing remote connection by setting the parameter
      // "ctrl-shift-alt-o": "["projects::OpenRemote", { "from_existing_connection": true }]",
      "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
      "shift-alt-b": "branches::OpenRecent",
      "shift-alt-enter": "toast::RunAction",
      "ctrl-shift-`": "workspace::NewTerminal",
+      "save": "workspace::Save",
      "ctrl-s": "workspace::Save",
      "ctrl-k ctrl-shift-s": "workspace::SaveWithoutFormat",
+      "shift-save": "workspace::SaveAs",
      "ctrl-shift-s": "workspace::SaveAs",
+      "new": "workspace::NewFile",
      "ctrl-n": "workspace::NewFile",
+      "shift-new": "workspace::NewWindow",
      "ctrl-shift-n": "workspace::NewWindow",
-      "ctrl-`": "terminal_panel::Toggle",
+      "ctrl-`": "terminal_panel::ToggleFocus",
      "f10": ["app_menu::OpenApplicationMenu", "Zed"],
      "alt-1": ["workspace::ActivatePane", 0],
      "alt-2": ["workspace::ActivatePane", 1],
@@ -600,6 +621,7 @@
      "shift-alt-0": "workspace::ResetOpenDocksSize",
      "ctrl-shift-alt--": ["workspace::DecreaseOpenDocksSize", { "px": 0 }],
      "ctrl-shift-alt-=": ["workspace::IncreaseOpenDocksSize", { "px": 0 }],
+      "shift-find": "pane::DeploySearch",
      "ctrl-shift-f": "pane::DeploySearch",
      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
      "ctrl-shift-t": "pane::ReopenClosedItem",
@@ -619,9 +641,9 @@
      "ctrl-shift-g": "git_panel::ToggleFocus",
      "ctrl-shift-d": "debug_panel::ToggleFocus",
      "ctrl-shift-/": "agent::ToggleFocus",
+      "alt-save": "workspace::SaveAll",
      "ctrl-k s": "workspace::SaveAll",
      "ctrl-k m": "language_selector::Toggle",
-      "ctrl-m ctrl-m": "toolchain::AddToolchain",
      "escape": "workspace::Unfollow",
      "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
      "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
@@ -826,7 +848,9 @@
    "bindings": {
      "left": "outline_panel::CollapseSelectedEntry",
      "right": "outline_panel::ExpandSelectedEntry",
+      "alt-copy": "outline_panel::CopyPath",
      "shift-alt-c": "outline_panel::CopyPath",
+      "shift-alt-copy": "workspace::CopyRelativePath",
      "ctrl-shift-alt-c": "workspace::CopyRelativePath",
      "ctrl-alt-r": "outline_panel::RevealInFileManager",
      "space": "outline_panel::OpenSelectedEntry",
@@ -842,14 +866,21 @@
    "bindings": {
      "left": "project_panel::CollapseSelectedEntry",
      "right": "project_panel::ExpandSelectedEntry",
+      "new": "project_panel::NewFile",
      "ctrl-n": "project_panel::NewFile",
+      "alt-new": "project_panel::NewDirectory",
      "alt-n": "project_panel::NewDirectory",
+      "cut": "project_panel::Cut",
      "ctrl-x": "project_panel::Cut",
+      "copy": "project_panel::Copy",
      "ctrl-insert": "project_panel::Copy",
      "ctrl-c": "project_panel::Copy",
+      "paste": "project_panel::Paste",
      "shift-insert": "project_panel::Paste",
      "ctrl-v": "project_panel::Paste",
+      "alt-copy": "project_panel::CopyPath",
      "shift-alt-c": "project_panel::CopyPath",
+      "shift-alt-copy": "workspace::CopyRelativePath",
      "ctrl-k ctrl-shift-c": "workspace::CopyRelativePath",
      "enter": "project_panel::Rename",
      "f2": "project_panel::Rename",
@@ -861,6 +892,7 @@
      "ctrl-alt-r": "project_panel::RevealInFileManager",
      "ctrl-shift-enter": "project_panel::OpenWithSystem",
      "alt-d": "project_panel::CompareMarkedFiles",
+      "shift-find": "project_panel::NewSearchInDirectory",
      "ctrl-k ctrl-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
      "shift-up": "menu::SelectPrevious",
@@ -1043,13 +1075,6 @@
      "tab": "channel_modal::ToggleMode"
    }
  },
-  {
-    "context": "ToolchainSelector",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-shift-a": "toolchain::AddToolchain"
-    }
-  },
  {
    "context": "FileFinder || (FileFinder > Picker > Editor)",
    "use_key_equivalents": true,
@@ -1085,8 +1110,10 @@
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-alt-space": "terminal::ShowCharacterPalette",
+      "copy": "terminal::Copy",
      "ctrl-insert": "terminal::Copy",
      "ctrl-shift-c": "terminal::Copy",
+      "paste": "terminal::Paste",
      "shift-insert": "terminal::Paste",
      "ctrl-shift-v": "terminal::Paste",
      "ctrl-enter": "assistant::InlineAssist",
@@ -1102,6 +1129,7 @@
      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
      "ctrl-backspace": ["terminal::SendKeystroke", "ctrl-w"],
      "ctrl-shift-a": "editor::SelectAll",
+      "find": "buffer_search::Deploy",
      "ctrl-shift-f": "buffer_search::Deploy",
      "ctrl-shift-l": "terminal::Clear",
      "ctrl-shift-w": "pane::CloseActiveItem",
@@ -1182,6 +1210,7 @@
    "use_key_equivalents": true,
    "bindings": {
      "ctrl-f": "search::FocusSearch",
+      "alt-find": "keymap_editor::ToggleKeystrokeSearch",
      "alt-f": "keymap_editor::ToggleKeystrokeSearch",
      "alt-c": "keymap_editor::ToggleConflictFilter",
      "enter": "keymap_editor::EditBinding",
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -125,7 +125,7 @@
  {
    "context": "Workspace || Editor",
    "bindings": {
-      "alt-f12": "terminal_panel::Toggle",
+      "alt-f12": "terminal_panel::ToggleFocus",
      "ctrl-shift-k": "git::Push"
    }
  },
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -127,7 +127,7 @@
  {
    "context": "Workspace || Editor",
    "bindings": {
-      "alt-f12": "terminal_panel::Toggle",
+      "alt-f12": "terminal_panel::ToggleFocus",
      "cmd-shift-k": "git::Push"
    }
  },
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -962,7 +962,7 @@
    // Show git status colors in the editor tabs.
    "git_status": false,
    // Position of the close button on the editor tabs.
-    // One of: ["right", "left"]
+    // One of: ["right", "left", "hidden"]
    "close_position": "right",
    // Whether to show the file icon for a tab.
    "file_icons": false,
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -785,6 +785,7 @@ pub struct AcpThread {
    session_id: acp::SessionId,
    token_usage: Option<TokenUsage>,
    prompt_capabilities: acp::PromptCapabilities,
+    available_commands: Vec<acp::AvailableCommand>,
    _observe_prompt_capabilities: Task<anyhow::Result<()>>,
    determine_shell: Shared<Task<String>>,
    terminals: HashMap<acp::TerminalId, Entity<Terminal>>,
@@ -804,7 +805,6 @@ pub enum AcpThreadEvent {
    LoadError(LoadError),
    PromptCapabilitiesUpdated,
    Refusal,
-    AvailableCommandsUpdated(Vec<acp::AvailableCommand>),
 }

 impl EventEmitter<AcpThreadEvent> for AcpThread {}
@@ -860,6 +860,7 @@ impl AcpThread {
        action_log: Entity<ActionLog>,
        session_id: acp::SessionId,
        mut prompt_capabilities_rx: watch::Receiver<acp::PromptCapabilities>,
+        available_commands: Vec<acp::AvailableCommand>,
        cx: &mut Context<Self>,
    ) -> Self {
        let prompt_capabilities = *prompt_capabilities_rx.borrow();
@@ -899,6 +900,7 @@ impl AcpThread {
            session_id,
            token_usage: None,
            prompt_capabilities,
+            available_commands,
            _observe_prompt_capabilities: task,
            terminals: HashMap::default(),
            determine_shell,
@@ -909,6 +911,10 @@ impl AcpThread {
        self.prompt_capabilities
    }

+    pub fn available_commands(&self) -> Vec<acp::AvailableCommand> {
+        self.available_commands.clone()
+    }
+
    pub fn connection(&self) -> &Rc<dyn AgentConnection> {
        &self.connection
    }
@@ -1004,9 +1010,6 @@ impl AcpThread {
            acp::SessionUpdate::Plan(plan) => {
                self.update_plan(plan, cx);
            }
-            acp::SessionUpdate::AvailableCommandsUpdate { available_commands } => {
-                cx.emit(AcpThreadEvent::AvailableCommandsUpdated(available_commands))
-            }
        }
        Ok(())
    }
@@ -2114,7 +2117,7 @@ mod tests {
    use gpui::{App, AsyncApp, TestAppContext, WeakEntity};
    use indoc::indoc;
    use project::{FakeFs, Fs};
-    use rand::{distr, prelude::*};
+    use rand::Rng as _;
    use serde_json::json;
    use settings::SettingsStore;
    use smol::stream::StreamExt as _;
@@ -3057,8 +3060,8 @@ mod tests {
            cx: &mut App,
        ) -> Task<gpui::Result<Entity<AcpThread>>> {
            let session_id = acp::SessionId(
-                rand::rng()
-                    .sample_iter(&distr::Alphanumeric)
+                rand::thread_rng()
+                    .sample_iter(&rand::distributions::Alphanumeric)
                    .take(7)
                    .map(char::from)
                    .collect::<String>()
@@ -3077,6 +3080,7 @@ mod tests {
                        audio: true,
                        embedded_context: true,
                    }),
+                    vec![],
                    cx,
                )
            });
--- a/crates/acp_thread/src/connection.rs
+++ b/crates/acp_thread/src/connection.rs
@@ -338,6 +338,7 @@ mod test_support {
                        audio: true,
                        embedded_context: true,
                    }),
+                    vec![],
                    cx,
                )
            });
--- a/crates/action_log/src/action_log.rs
+++ b/crates/action_log/src/action_log.rs
@@ -2218,7 +2218,7 @@ mod tests {
        action_log.update(cx, |log, cx| log.buffer_read(buffer.clone(), cx));

        for _ in 0..operations {
-            match rng.random_range(0..100) {
+            match rng.gen_range(0..100) {
                0..25 => {
                    action_log.update(cx, |log, cx| {
                        let range = buffer.read(cx).random_byte_range(0, &mut rng);
@@ -2237,7 +2237,7 @@ mod tests {
                        .unwrap();
                }
                _ => {
-                    let is_agent_edit = rng.random_bool(0.5);
+                    let is_agent_edit = rng.gen_bool(0.5);
                    if is_agent_edit {
                        log::info!("agent edit");
                    } else {
@@ -2252,7 +2252,7 @@ mod tests {
                }
            }

-            if rng.random_bool(0.2) {
+            if rng.gen_bool(0.2) {
                quiesce(&action_log, &buffer, cx);
            }
        }
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -84,6 +84,7 @@ impl ActivityIndicator {
    ) -> Entity<ActivityIndicator> {
        let project = workspace.project().clone();
        let auto_updater = AutoUpdater::get(cx);
+        let workspace_handle = cx.entity();
        let this = cx.new(|cx| {
            let mut status_events = languages.language_server_binary_statuses();
            cx.spawn(async move |this, cx| {
@@ -101,6 +102,20 @@ impl ActivityIndicator {
            })
            .detach();

+            cx.subscribe_in(
+                &workspace_handle,
+                window,
+                |activity_indicator, _, event, window, cx| {
+                    if let workspace::Event::ClearActivityIndicator = event
+                        && activity_indicator.statuses.pop().is_some()
+                    {
+                        activity_indicator.dismiss_error_message(&DismissErrorMessage, window, cx);
+                        cx.notify();
+                    }
+                },
+            )
+            .detach();
+
            cx.subscribe(
                &project.read(cx).lsp_store(),
                |activity_indicator, _, event, cx| {
@@ -212,8 +227,7 @@ impl ActivityIndicator {
                server_name,
                status,
            } => {
-                let create_buffer =
-                    project.update(cx, |project, cx| project.create_buffer(false, cx));
+                let create_buffer = project.update(cx, |project, cx| project.create_buffer(cx));
                let status = status.clone();
                let server_name = server_name.clone();
                cx.spawn_in(window, async move |workspace, cx| {
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -63,7 +63,6 @@ time.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace-hack.workspace = true
-zed_env_vars.workspace = true
 zstd.workspace = true

 [dev-dependencies]
--- a/crates/agent/src/thread_store.rs
+++ b/crates/agent/src/thread_store.rs
@@ -41,7 +41,8 @@ use std::{
 };
 use util::ResultExt as _;

-use zed_env_vars::ZED_STATELESS;
+pub static ZED_STATELESS: std::sync::LazyLock<bool> =
+    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));

 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
--- a/crates/agent2/Cargo.toml
+++ b/crates/agent2/Cargo.toml
@@ -68,7 +68,6 @@ uuid.workspace = true
 watch.workspace = true
 web_search.workspace = true
 workspace-hack.workspace = true
-zed_env_vars.workspace = true
 zstd.workspace = true

 [dev-dependencies]
--- a/crates/agent2/src/agent.rs
+++ b/crates/agent2/src/agent.rs
@@ -292,6 +292,7 @@ impl NativeAgent {
                action_log.clone(),
                session_id.clone(),
                prompt_capabilities_rx,
+                vec![],
                cx,
            )
        });
--- a/crates/agent2/src/db.rs
+++ b/crates/agent2/src/db.rs
@@ -18,7 +18,6 @@ use sqlez::{
 };
 use std::sync::Arc;
 use ui::{App, SharedString};
-use zed_env_vars::ZED_STATELESS;

 pub type DbMessage = crate::Message;
 pub type DbSummary = DetailedSummaryState;
@@ -202,6 +201,9 @@ impl DbThread {
    }
 }

+pub static ZED_STATELESS: std::sync::LazyLock<bool> =
+    std::sync::LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum DataType {
    #[serde(rename = "json")]
--- a/crates/agent2/src/tools/edit_file_tool.rs
+++ b/crates/agent2/src/tools/edit_file_tool.rs
@@ -83,7 +83,6 @@ struct EditFileToolPartialInput {

 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "lowercase")]
-#[schemars(inline)]
 pub enum EditFileMode {
    Edit,
    Create,
--- a/crates/agent2/src/tools/now_tool.rs
+++ b/crates/agent2/src/tools/now_tool.rs
@@ -11,7 +11,6 @@ use crate::{AgentTool, ToolCallEventStream};

 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
-#[schemars(inline)]
 pub enum Timezone {
    /// Use UTC for the datetime.
    Utc,
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -224,6 +224,7 @@ impl AgentConnection for AcpConnection {
                    session_id.clone(),
                    // ACP doesn't currently support per-session prompt capabilities or changing capabilities dynamically.
                    watch::Receiver::constant(self.agent_capabilities.prompt_capabilities),
+                    response.available_commands,
                    cx,
                )
            })?;
--- a/crates/agent_servers/src/agent_servers.rs
+++ b/crates/agent_servers/src/agent_servers.rs
@@ -45,20 +45,11 @@ pub fn init(cx: &mut App) {
 pub struct AgentServerDelegate {
    project: Entity<Project>,
    status_tx: Option<watch::Sender<SharedString>>,
-    new_version_available: Option<watch::Sender<Option<String>>>,
 }

 impl AgentServerDelegate {
-    pub fn new(
-        project: Entity<Project>,
-        status_tx: Option<watch::Sender<SharedString>>,
-        new_version_tx: Option<watch::Sender<Option<String>>>,
-    ) -> Self {
-        Self {
-            project,
-            status_tx,
-            new_version_available: new_version_tx,
-        }
+    pub fn new(project: Entity<Project>, status_tx: Option<watch::Sender<SharedString>>) -> Self {
+        Self { project, status_tx }
    }

    pub fn project(&self) -> &Entity<Project> {
@@ -82,7 +73,6 @@ impl AgentServerDelegate {
            )));
        };
        let status_tx = self.status_tx;
-        let new_version_available = self.new_version_available;

        cx.spawn(async move |cx| {
            if !ignore_system_version {
@@ -111,11 +101,9 @@ impl AgentServerDelegate {
                        continue;
                    };

-                    if let Some(name) = file_name.to_str()
-                        && let Some(version) = semver::Version::from_str(name).ok()
-                        && fs
-                            .is_file(&dir.join(file_name).join(&entrypoint_path))
-                            .await
+                    if let Some(version) = file_name
+                        .to_str()
+                        .and_then(|name| semver::Version::from_str(&name).ok())
                    {
                        versions.push((version, file_name.to_owned()));
                    } else {
@@ -158,7 +146,6 @@ impl AgentServerDelegate {
                    cx.background_spawn({
                        let file_name = file_name.clone();
                        let dir = dir.clone();
-                        let fs = fs.clone();
                        async move {
                            let latest_version =
                                node_runtime.npm_package_latest_version(&package_name).await;
@@ -173,9 +160,6 @@ impl AgentServerDelegate {
                                )
                                .await
                                .log_err();
-                                if let Some(mut new_version_available) = new_version_available {
-                                    new_version_available.send(Some(latest_version)).ok();
-                                }
                            }
                        }
                    })
@@ -187,7 +171,7 @@ impl AgentServerDelegate {
                    }
                    let dir = dir.clone();
                    cx.background_spawn(Self::download_latest_version(
-                        fs.clone(),
+                        fs,
                        dir.clone(),
                        node_runtime,
                        package_name,
@@ -195,18 +179,14 @@ impl AgentServerDelegate {
                    .await?
                    .into()
                };
-
-                let agent_server_path = dir.join(version).join(entrypoint_path);
-                let agent_server_path_exists = fs.is_file(&agent_server_path).await;
-                anyhow::ensure!(
-                    agent_server_path_exists,
-                    "Missing entrypoint path {} after installation",
-                    agent_server_path.to_string_lossy()
-                );
-
                anyhow::Ok(AgentServerCommand {
                    path: node_path,
-                    args: vec![agent_server_path.to_string_lossy().to_string()],
+                    args: vec![
+                        dir.join(version)
+                            .join(entrypoint_path)
+                            .to_string_lossy()
+                            .to_string(),
+                    ],
                    env: Default::default(),
                })
            })
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -1,3 +1,4 @@
+use language_models::provider::anthropic::AnthropicLanguageModelProvider;
 use settings::SettingsStore;
 use std::path::Path;
 use std::rc::Rc;
@@ -39,7 +40,7 @@ impl ClaudeCode {
                        Self::PACKAGE_NAME.into(),
                        "node_modules/@anthropic-ai/claude-code/cli.js".into(),
                        true,
-                        Some("0.2.5".parse().unwrap()),
+                        None,
                        cx,
                    )
                })?
@@ -75,20 +76,12 @@ impl AgentServer for ClaudeCode {
        cx: &mut App,
    ) -> Task<Result<Rc<dyn AgentConnection>>> {
        let root_dir = root_dir.to_path_buf();
-        let fs = delegate.project().read(cx).fs().clone();
        let server_name = self.name();
        let settings = cx.read_global(|settings: &SettingsStore, _| {
            settings.get::<AllAgentServersSettings>(None).claude.clone()
        });
-        let project = delegate.project().clone();

        cx.spawn(async move |cx| {
-            let mut project_env = project
-                .update(cx, |project, cx| {
-                    project.directory_environment(root_dir.as_path().into(), cx)
-                })?
-                .await
-                .unwrap_or_default();
            let mut command = if let Some(settings) = settings {
                settings.command
            } else {
@@ -104,20 +97,17 @@ impl AgentServer for ClaudeCode {
                })?
                .await?
            };
-            project_env.extend(command.env.take().unwrap_or_default());
-            command.env = Some(project_env);

-            command
-                .env
-                .get_or_insert_default()
-                .insert("ANTHROPIC_API_KEY".to_owned(), "".to_owned());
-
-            let root_dir_exists = fs.is_dir(&root_dir).await;
-            anyhow::ensure!(
-                root_dir_exists,
-                "Session root {} does not exist or is not a directory",
-                root_dir.to_string_lossy()
-            );
+            if let Some(api_key) = cx
+                .update(AnthropicLanguageModelProvider::api_key)?
+                .await
+                .ok()
+            {
+                command
+                    .env
+                    .get_or_insert_default()
+                    .insert("ANTHROPIC_API_KEY".to_owned(), api_key.key);
+            }

            crate::acp::connect(server_name, command.clone(), &root_dir, cx).await
        })
--- a/crates/agent_servers/src/e2e_tests.rs
+++ b/crates/agent_servers/src/e2e_tests.rs
@@ -498,7 +498,7 @@ pub async fn new_test_thread(
    current_dir: impl AsRef<Path>,
    cx: &mut TestAppContext,
 ) -> Entity<AcpThread> {
-    let delegate = AgentServerDelegate::new(project.clone(), None, None);
+    let delegate = AgentServerDelegate::new(project.clone(), None);

    let connection = cx
        .update(|cx| server.connect(current_dir.as_ref(), delegate, cx))
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -36,24 +36,16 @@ impl AgentServer for Gemini {
        cx: &mut App,
    ) -> Task<Result<Rc<dyn AgentConnection>>> {
        let root_dir = root_dir.to_path_buf();
-        let fs = delegate.project().read(cx).fs().clone();
        let server_name = self.name();
        let settings = cx.read_global(|settings: &SettingsStore, _| {
            settings.get::<AllAgentServersSettings>(None).gemini.clone()
        });
-        let project = delegate.project().clone();

        cx.spawn(async move |cx| {
            let ignore_system_version = settings
                .as_ref()
                .and_then(|settings| settings.ignore_system_version)
                .unwrap_or(true);
-            let mut project_env = project
-                .update(cx, |project, cx| {
-                    project.directory_environment(root_dir.as_path().into(), cx)
-                })?
-                .await
-                .unwrap_or_default();
            let mut command = if let Some(settings) = settings
                && let Some(command) = settings.custom_command()
            {
@@ -74,19 +66,13 @@ impl AgentServer for Gemini {
            if !command.args.contains(&ACP_ARG.into()) {
                command.args.push(ACP_ARG.into());
            }
+
            if let Some(api_key) = cx.update(GoogleLanguageModelProvider::api_key)?.await.ok() {
-                project_env
+                command
+                    .env
+                    .get_or_insert_default()
                    .insert("GEMINI_API_KEY".to_owned(), api_key.key);
            }
-            project_env.extend(command.env.take().unwrap_or_default());
-            command.env = Some(project_env);
-
-            let root_dir_exists = fs.is_dir(&root_dir).await;
-            anyhow::ensure!(
-                root_dir_exists,
-                "Session root {} does not exist or is not a directory",
-                root_dir.to_string_lossy()
-            );

            let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
            match &result {
@@ -106,7 +92,7 @@ impl AgentServer for Gemini {
                        log::error!("connected to gemini, but missing prompt_capabilities.image (version is {current_version})");
                        return Err(LoadError::Unsupported {
                            current_version: current_version.into(),
-                            command: (command.path.to_string_lossy().to_string() + " " + &command.args.join(" ")).into(),
+                            command: command.path.to_string_lossy().to_string().into(),
                            minimum_version: Self::MINIMUM_VERSION.into(),
                        }
                        .into());
@@ -143,7 +129,7 @@ impl AgentServer for Gemini {
                    if !supported {
                        return Err(LoadError::Unsupported {
                            current_version: current_version.into(),
-                            command: (command.path.to_string_lossy().to_string() + " " + &command.args.join(" ")).into(),
+                            command: command.path.to_string_lossy().to_string().into(),
                            minimum_version: Self::MINIMUM_VERSION.into(),
                        }
                        .into());
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -6,14 +6,13 @@ use collections::HashMap;
 use gpui::{App, SharedString};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};

 pub fn init(cx: &mut App) {
    AllAgentServersSettings::register(cx);
 }

-#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "agent_servers")]
+#[derive(Default, Deserialize, Serialize, Clone, JsonSchema, Debug, SettingsUi)]
 pub struct AllAgentServersSettings {
    pub gemini: Option<BuiltinAgentServerSettings>,
    pub claude: Option<CustomAgentServerSettings>,
@@ -76,6 +75,8 @@ pub struct CustomAgentServerSettings {
 }

 impl settings::Settings for AllAgentServersSettings {
+    const KEY: Option<&'static str> = Some("agent_servers");
+
    type FileContent = Self;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -8,7 +8,7 @@ use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
 use schemars::{JsonSchema, json_schema};
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::borrow::Cow;

 pub use crate::agent_profile::*;
@@ -223,8 +223,7 @@ impl AgentSettingsContent {
    }
 }

-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default, SettingsUi, SettingsKey)]
-#[settings_key(key = "agent", fallback_key = "assistant")]
+#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default, SettingsUi)]
 pub struct AgentSettingsContent {
    /// Whether the Agent is enabled.
    ///
@@ -400,6 +399,10 @@ pub struct ContextServerPresetContent {
 }

 impl Settings for AgentSettings {
+    const KEY: Option<&'static str> = Some("agent");
+
+    const FALLBACK_KEY: Option<&'static str> = Some("assistant");
+
    const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);

    type FileContent = AgentSettingsContent;
--- a/crates/agent_ui/src/acp/completion_provider.rs
+++ b/crates/agent_ui/src/acp/completion_provider.rs
@@ -1025,31 +1025,43 @@ impl SlashCommandCompletion {
            return None;
        }

-        let (prefix, last_command) = line.rsplit_once('/')?;
-        if prefix.chars().last().is_some_and(|c| !c.is_whitespace())
-            || last_command.starts_with(char::is_whitespace)
+        let last_command_start = line.rfind('/')?;
+        if last_command_start >= line.len() {
+            return Some(Self::default());
+        }
+        if last_command_start > 0
+            && line
+                .chars()
+                .nth(last_command_start - 1)
+                .is_some_and(|c| !c.is_whitespace())
        {
            return None;
        }

-        let mut argument = None;
+        let rest_of_line = &line[last_command_start + 1..];
+
        let mut command = None;
-        if let Some((command_text, args)) = last_command.split_once(char::is_whitespace) {
-            if !args.is_empty() {
-                argument = Some(args.trim_end().to_string());
-            }
+        let mut argument = None;
+        let mut end = last_command_start + 1;
+
+        if let Some(command_text) = rest_of_line.split_whitespace().next() {
            command = Some(command_text.to_string());
-        } else if !last_command.is_empty() {
-            command = Some(last_command.to_string());
-        };
+            end += command_text.len();
+
+            // Find the start of arguments after the command
+            if let Some(args_start) =
+                rest_of_line[command_text.len()..].find(|c: char| !c.is_whitespace())
+            {
+                let args = &rest_of_line[command_text.len() + args_start..].trim_end();
+                if !args.is_empty() {
+                    argument = Some(args.to_string());
+                    end += args.len() + 1;
+                }
+            }
+        }

        Some(Self {
-            source_range: prefix.len() + offset_to_line
-                ..line
-                    .rfind(|c: char| !c.is_whitespace())
-                    .unwrap_or_else(|| line.len())
-                    + 1
-                    + offset_to_line,
+            source_range: last_command_start + offset_to_line..end + offset_to_line,
            command,
            argument,
        })
@@ -1168,15 +1180,6 @@ mod tests {
            })
        );

-        assert_eq!(
-            SlashCommandCompletion::try_parse("/拿不到命令 拿不到命令 ", 0),
-            Some(SlashCommandCompletion {
-                source_range: 0..30,
-                command: Some("拿不到命令".to_string()),
-                argument: Some("拿不到命令".to_string()),
-            })
-        );
-
        assert_eq!(SlashCommandCompletion::try_parse("Lorem Ipsum", 0), None);

        assert_eq!(SlashCommandCompletion::try_parse("Lorem /", 0), None);
@@ -1184,8 +1187,6 @@ mod tests {
        assert_eq!(SlashCommandCompletion::try_parse("Lorem /help", 0), None);

        assert_eq!(SlashCommandCompletion::try_parse("Lorem/", 0), None);
-
-        assert_eq!(SlashCommandCompletion::try_parse("/ ", 0), None);
    }

    #[test]
--- a/crates/agent_ui/src/acp/entry_view_state.rs
+++ b/crates/agent_ui/src/acp/entry_view_state.rs
@@ -207,7 +207,7 @@ impl EntryViewState {
        self.entries.drain(range);
    }

-    pub fn agent_font_size_changed(&mut self, cx: &mut App) {
+    pub fn settings_changed(&mut self, cx: &mut App) {
        for entry in self.entries.iter() {
            match entry {
                Entry::UserMessage { .. } | Entry::AssistantMessage { .. } => {}
--- a/crates/agent_ui/src/acp/message_editor.rs
+++ b/crates/agent_ui/src/acp/message_editor.rs
@@ -493,13 +493,14 @@ impl MessageEditor {
        let Some(entry) = self.project.read(cx).entry_for_path(&project_path, cx) else {
            return Task::ready(Err(anyhow!("project entry not found")));
        };
-        let directory_path = entry.path.clone();
-        let worktree_id = project_path.worktree_id;
-        let Some(worktree) = self.project.read(cx).worktree_for_id(worktree_id, cx) else {
+        let Some(worktree) = self.project.read(cx).worktree_for_entry(entry.id, cx) else {
            return Task::ready(Err(anyhow!("worktree not found")));
        };
        let project = self.project.clone();
        cx.spawn(async move |_, cx| {
+            let directory_path = entry.path.clone();
+
+            let worktree_id = worktree.read_with(cx, |worktree, _| worktree.id())?;
            let file_paths = worktree.read_with(cx, |worktree, _cx| {
                collect_files_in_path(worktree, &directory_path)
            })?;
@@ -699,7 +700,7 @@ impl MessageEditor {
            self.project.read(cx).fs().clone(),
            self.history_store.clone(),
        ));
-        let delegate = AgentServerDelegate::new(self.project.clone(), None, None);
+        let delegate = AgentServerDelegate::new(self.project.clone(), None);
        let connection = server.connect(Path::new(""), delegate, cx);
        cx.spawn(async move |_, cx| {
            let agent = connection.await?;
--- a/crates/agent_ui/src/acp/model_selector.rs
+++ b/crates/agent_ui/src/acp/model_selector.rs
@@ -192,10 +192,8 @@ impl PickerDelegate for AcpModelPickerDelegate {
        }
    }

-    fn dismissed(&mut self, window: &mut Window, cx: &mut Context<Picker<Self>>) {
-        cx.defer_in(window, |picker, window, cx| {
-            picker.set_query("", window, cx);
-        });
+    fn dismissed(&mut self, _: &mut Window, cx: &mut Context<Picker<Self>>) {
+        cx.emit(DismissEvent);
    }

    fn render_match(
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -43,10 +43,10 @@ use std::{collections::BTreeMap, rc::Rc, time::Duration};
 use task::SpawnInTerminal;
 use terminal_view::terminal_panel::TerminalPanel;
 use text::Anchor;
-use theme::{AgentFontSize, ThemeSettings};
+use theme::ThemeSettings;
 use ui::{
    Callout, CommonAnimationExt, Disclosure, Divider, DividerColor, ElevationIndex, KeyBinding,
-    PopoverMenuHandle, Scrollbar, ScrollbarState, SpinnerLabel, TintColor, Tooltip, prelude::*,
+    PopoverMenuHandle, Scrollbar, ScrollbarState, SpinnerLabel, Tooltip, prelude::*,
 };
 use util::{ResultExt, size::format_file_size, time::duration_alt_display};
 use workspace::{CollaboratorId, Workspace};
@@ -288,9 +288,8 @@ pub struct AcpThreadView {
    prompt_capabilities: Rc<Cell<PromptCapabilities>>,
    available_commands: Rc<RefCell<Vec<acp::AvailableCommand>>>,
    is_loading_contents: bool,
-    new_server_version_available: Option<SharedString>,
    _cancel_task: Option<Task<()>>,
-    _subscriptions: [Subscription; 4],
+    _subscriptions: [Subscription; 3],
 }

 enum ThreadState {
@@ -380,8 +379,7 @@ impl AcpThreadView {
        });

        let subscriptions = [
-            cx.observe_global_in::<SettingsStore>(window, Self::agent_font_size_changed),
-            cx.observe_global_in::<AgentFontSize>(window, Self::agent_font_size_changed),
+            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
            cx.subscribe_in(&message_editor, window, Self::handle_message_editor_event),
            cx.subscribe_in(&entry_view_state, window, Self::handle_entry_view_event),
        ];
@@ -418,24 +416,9 @@ impl AcpThreadView {
            _subscriptions: subscriptions,
            _cancel_task: None,
            focus_handle: cx.focus_handle(),
-            new_server_version_available: None,
        }
    }

-    fn reset(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.thread_state = Self::initial_state(
-            self.agent.clone(),
-            None,
-            self.workspace.clone(),
-            self.project.clone(),
-            window,
-            cx,
-        );
-        self.available_commands.replace(vec![]);
-        self.new_server_version_available.take();
-        cx.notify();
-    }
-
    fn initial_state(
        agent: Rc<dyn AgentServer>,
        resume_thread: Option<DbThreadMetadata>,
@@ -468,13 +451,8 @@ impl AcpThreadView {
            })
            .next()
            .unwrap_or_else(|| paths::home_dir().as_path().into());
-        let (status_tx, mut status_rx) = watch::channel("Loading…".into());
-        let (new_version_available_tx, mut new_version_available_rx) = watch::channel(None);
-        let delegate = AgentServerDelegate::new(
-            project.clone(),
-            Some(status_tx),
-            Some(new_version_available_tx),
-        );
+        let (tx, mut rx) = watch::channel("Loading…".into());
+        let delegate = AgentServerDelegate::new(project.clone(), Some(tx));

        let connect_task = agent.connect(&root_dir, delegate, cx);
        let load_task = cx.spawn_in(window, async move |this, cx| {
@@ -537,6 +515,26 @@ impl AcpThreadView {
                    Ok(thread) => {
                        let action_log = thread.read(cx).action_log().clone();

+                        let mut available_commands = thread.read(cx).available_commands();
+
+                        if connection
+                            .auth_methods()
+                            .iter()
+                            .any(|method| method.id.0.as_ref() == "claude-login")
+                        {
+                            available_commands.push(acp::AvailableCommand {
+                                name: "login".to_owned(),
+                                description: "Authenticate".to_owned(),
+                                input: None,
+                            });
+                            available_commands.push(acp::AvailableCommand {
+                                name: "logout".to_owned(),
+                                description: "Authenticate".to_owned(),
+                                input: None,
+                            });
+                        }
+                        this.available_commands.replace(available_commands);
+
                        this.prompt_capabilities
                            .set(thread.read(cx).prompt_capabilities());

@@ -629,23 +627,10 @@ impl AcpThreadView {
            .log_err();
        });

-        cx.spawn(async move |this, cx| {
-            while let Ok(new_version) = new_version_available_rx.recv().await {
-                if let Some(new_version) = new_version {
-                    this.update(cx, |this, cx| {
-                        this.new_server_version_available = Some(new_version.into());
-                        cx.notify();
-                    })
-                    .log_err();
-                }
-            }
-        })
-        .detach();
-
        let loading_view = cx.new(|cx| {
            let update_title_task = cx.spawn(async move |this, cx| {
                loop {
-                    let status = status_rx.recv().await?;
+                    let status = rx.recv().await?;
                    this.update(cx, |this: &mut LoadingView, cx| {
                        this.title = status;
                        cx.notify();
@@ -687,7 +672,15 @@ impl AcpThreadView {
                            .map_or(false, |provider| provider.is_authenticated(cx))
                    {
                        this.update(cx, |this, cx| {
-                            this.reset(window, cx);
+                            this.thread_state = Self::initial_state(
+                                agent.clone(),
+                                None,
+                                this.workspace.clone(),
+                                this.project.clone(),
+                                window,
+                                cx,
+                            );
+                            cx.notify();
                        })
                        .ok();
                    }
@@ -984,7 +977,7 @@ impl AcpThreadView {
                    this,
                    AuthRequired {
                        description: None,
-                        provider_id: None,
+                        provider_id: Some(language_model::ANTHROPIC_PROVIDER_ID),
                    },
                    agent,
                    connection,
@@ -1325,30 +1318,6 @@ impl AcpThreadView {
                    .set(thread.read(cx).prompt_capabilities());
            }
            AcpThreadEvent::TokenUsageUpdated => {}
-            AcpThreadEvent::AvailableCommandsUpdated(available_commands) => {
-                let mut available_commands = available_commands.clone();
-
-                if thread
-                    .read(cx)
-                    .connection()
-                    .auth_methods()
-                    .iter()
-                    .any(|method| method.id.0.as_ref() == "claude-login")
-                {
-                    available_commands.push(acp::AvailableCommand {
-                        name: "login".to_owned(),
-                        description: "Authenticate".to_owned(),
-                        input: None,
-                    });
-                    available_commands.push(acp::AvailableCommand {
-                        name: "logout".to_owned(),
-                        description: "Authenticate".to_owned(),
-                        input: None,
-                    });
-                }
-
-                self.available_commands.replace(available_commands);
-            }
        }
        cx.notify();
    }
@@ -1474,6 +1443,7 @@ impl AcpThreadView {
        cx.notify();
        self.auth_task =
            Some(cx.spawn_in(window, {
+                let project = self.project.clone();
                let agent = self.agent.clone();
                async move |this, cx| {
                    let result = authenticate.await;
@@ -1502,7 +1472,14 @@ impl AcpThreadView {
                            }
                            this.handle_thread_error(err, cx);
                        } else {
-                            this.reset(window, cx);
+                            this.thread_state = Self::initial_state(
+                                agent,
+                                None,
+                                this.workspace.clone(),
+                                project.clone(),
+                                window,
+                                cx,
+                            )
                        }
                        this.auth_task.take()
                    })
@@ -1524,7 +1501,7 @@ impl AcpThreadView {
        let cwd = project.first_project_directory(cx);
        let shell = project.terminal_settings(&cwd, cx).shell.clone();

-        let delegate = AgentServerDelegate::new(project_entity.clone(), None, None);
+        let delegate = AgentServerDelegate::new(project_entity.clone(), None);
        let command = ClaudeCode::login_command(delegate, cx);

        window.spawn(cx, async move |cx| {
@@ -2643,6 +2620,28 @@ impl AcpThreadView {
                            .with_rotate_animation(2)
                    )
            })
+            .child(
+                Disclosure::new(
+                    SharedString::from(format!(
+                        "terminal-tool-disclosure-{}",
+                        terminal.entity_id()
+                    )),
+                    is_expanded,
+                )
+                .opened_icon(IconName::ChevronUp)
+                .closed_icon(IconName::ChevronDown)
+                .visible_on_hover(&header_group)
+                .on_click(cx.listener({
+                    let id = tool_call.id.clone();
+                    move |this, _event, _window, _cx| {
+                        if is_expanded {
+                            this.expanded_tool_calls.remove(&id);
+                        } else {
+                            this.expanded_tool_calls.insert(id.clone());
+                        }
+                    }
+                })),
+            )
            .when(truncated_output, |header| {
                let tooltip = if let Some(output) = output {
                    if output_line_count + 10 > terminal::MAX_SCROLL_HISTORY_LINES {
@@ -2701,29 +2700,7 @@ impl AcpThreadView {
                            )))
                        }),
                )
-            })
-            .child(
-                Disclosure::new(
-                    SharedString::from(format!(
-                        "terminal-tool-disclosure-{}",
-                        terminal.entity_id()
-                    )),
-                    is_expanded,
-                )
-                .opened_icon(IconName::ChevronUp)
-                .closed_icon(IconName::ChevronDown)
-                .visible_on_hover(&header_group)
-                .on_click(cx.listener({
-                    let id = tool_call.id.clone();
-                    move |this, _event, _window, _cx| {
-                        if is_expanded {
-                            this.expanded_tool_calls.remove(&id);
-                        } else {
-                            this.expanded_tool_calls.insert(id.clone());
-                        }
-                    }
-                })),
-            );
+            });

        let terminal_view = self
            .entry_view_state
@@ -3011,8 +2988,6 @@ impl AcpThreadView {
        let show_description =
            configuration_view.is_none() && description.is_none() && pending_auth_method.is_none();

-        let auth_methods = connection.auth_methods();
-
        v_flex().flex_1().size_full().justify_end().child(
            v_flex()
                .p_2()
@@ -3043,23 +3018,21 @@ impl AcpThreadView {
                        .cloned()
                        .map(|view| div().w_full().child(view)),
                )
-                .when(show_description, |el| {
-                    el.child(
-                        Label::new(format!(
-                            "You are not currently authenticated with {}.{}",
-                            self.agent.name(),
-                            if auth_methods.len() > 1 {
-                                " Please choose one of the following options:"
-                            } else {
-                                ""
-                            }
-                        ))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                        .mb_1()
-                        .ml_5(),
-                    )
-                })
+                .when(
+                    show_description,
+                    |el| {
+                        el.child(
+                            Label::new(format!(
+                                "You are not currently authenticated with {}. Please choose one of the following options:",
+                                self.agent.name()
+                            ))
+                            .size(LabelSize::Small)
+                            .color(Color::Muted)
+                            .mb_1()
+                            .ml_5(),
+                        )
+                    },
+                )
                .when_some(pending_auth_method, |el, _| {
                    el.child(
                        h_flex()
@@ -3071,12 +3044,12 @@ impl AcpThreadView {
                                Icon::new(IconName::ArrowCircle)
                                    .size(IconSize::Small)
                                    .color(Color::Muted)
-                                    .with_rotate_animation(2),
+                                    .with_rotate_animation(2)
                            )
                            .child(Label::new("Authenticating…").size(LabelSize::Small)),
                    )
                })
-                .when(!auth_methods.is_empty(), |this| {
+                .when(!connection.auth_methods().is_empty(), |this| {
                    this.child(
                        h_flex()
                            .justify_end()
@@ -3088,32 +3061,38 @@ impl AcpThreadView {
                                    .pt_2()
                                    .border_color(cx.theme().colors().border.opacity(0.8))
                            })
-                            .children(connection.auth_methods().iter().enumerate().rev().map(
-                                |(ix, method)| {
-                                    Button::new(
-                                        SharedString::from(method.id.0.clone()),
-                                        method.name.clone(),
-                                    )
-                                    .when(ix == 0, |el| {
-                                        el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
-                                    })
-                                    .label_size(LabelSize::Small)
-                                    .on_click({
-                                        let method_id = method.id.clone();
-                                        cx.listener(move |this, _, window, cx| {
-                                            telemetry::event!(
-                                                "Authenticate Agent Started",
-                                                agent = this.agent.telemetry_id(),
-                                                method = method_id
-                                            );
-
-                                            this.authenticate(method_id.clone(), window, cx)
+                            .children(
+                                connection
+                                    .auth_methods()
+                                    .iter()
+                                    .enumerate()
+                                    .rev()
+                                    .map(|(ix, method)| {
+                                        Button::new(
+                                            SharedString::from(method.id.0.clone()),
+                                            method.name.clone(),
+                                        )
+                                        .when(ix == 0, |el| {
+                                            el.style(ButtonStyle::Tinted(ui::TintColor::Warning))
                                        })
-                                    })
-                                },
-                            )),
+                                        .label_size(LabelSize::Small)
+                                        .on_click({
+                                            let method_id = method.id.clone();
+                                            cx.listener(move |this, _, window, cx| {
+                                                telemetry::event!(
+                                                    "Authenticate Agent Started",
+                                                    agent = this.agent.telemetry_id(),
+                                                    method = method_id
+                                                );
+
+                                                this.authenticate(method_id.clone(), window, cx)
+                                            })
+                                        })
+                                    }),
+                            ),
                    )
-                }),
+                })
+
        )
    }

@@ -4070,15 +4049,15 @@ impl AcpThreadView {
                MentionUri::PastedImage => {}
                MentionUri::Directory { abs_path } => {
                    let project = workspace.project();
-                    let Some(entry_id) = project.update(cx, |project, cx| {
+                    let Some(entry) = project.update(cx, |project, cx| {
                        let path = project.find_project_path(abs_path, cx)?;
-                        project.entry_for_path(&path, cx).map(|entry| entry.id)
+                        project.entry_for_path(&path, cx)
                    }) else {
                        return;
                    };

                    project.update(cx, |_, cx| {
-                        cx.emit(project::Event::RevealInProjectPanel(entry_id));
+                        cx.emit(project::Event::RevealInProjectPanel(entry.id));
                    });
                }
                MentionUri::Symbol {
@@ -4091,9 +4070,11 @@ impl AcpThreadView {
                    line_range,
                } => {
                    let project = workspace.project();
-                    let Some(path) =
-                        project.update(cx, |project, cx| project.find_project_path(path, cx))
-                    else {
+                    let Some((path, _)) = project.update(cx, |project, cx| {
+                        let path = project.find_project_path(path, cx)?;
+                        let entry = project.entry_for_path(&path, cx)?;
+                        Some((path, entry))
+                    }) else {
                        return;
                    };

@@ -4255,7 +4236,7 @@ impl AcpThreadView {
                }

                let buffer = project.update(cx, |project, cx| {
-                    project.create_local_buffer(&markdown, Some(markdown_language), true, cx)
+                    project.create_local_buffer(&markdown, Some(markdown_language), cx)
                });
                let buffer = cx.new(|cx| {
                    MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone())
@@ -4734,9 +4715,9 @@ impl AcpThreadView {
        )
    }

-    fn agent_font_size_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+    fn settings_changed(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
        self.entry_view_state.update(cx, |entry_view_state, cx| {
-            entry_view_state.agent_font_size_changed(cx);
+            entry_view_state.settings_changed(cx);
        });
    }

@@ -4819,38 +4800,6 @@ impl AcpThreadView {
        Some(div().child(content))
    }

-    fn render_new_version_callout(&self, version: &SharedString, cx: &mut Context<Self>) -> Div {
-        v_flex().w_full().justify_end().child(
-            h_flex()
-                .p_2()
-                .pr_3()
-                .w_full()
-                .gap_1p5()
-                .border_t_1()
-                .border_color(cx.theme().colors().border)
-                .bg(cx.theme().colors().element_background)
-                .child(
-                    h_flex()
-                        .flex_1()
-                        .gap_1p5()
-                        .child(
-                            Icon::new(IconName::Download)
-                                .color(Color::Accent)
-                                .size(IconSize::Small),
-                        )
-                        .child(Label::new("New version available").size(LabelSize::Small)),
-                )
-                .child(
-                    Button::new("update-button", format!("Update to v{}", version))
-                        .label_size(LabelSize::Small)
-                        .style(ButtonStyle::Tinted(TintColor::Accent))
-                        .on_click(cx.listener(|this, _, window, cx| {
-                            this.reset(window, cx);
-                        })),
-                ),
-        )
-    }
-
    fn get_current_model_name(&self, cx: &App) -> SharedString {
        // For native agent (Zed Agent), use the specific model name (e.g., "Claude 3.5 Sonnet")
        // For ACP agents, use the agent name (e.g., "Claude Code", "Gemini CLI")
@@ -5261,12 +5210,6 @@ impl Render for AcpThreadView {
            })
            .children(self.render_thread_retry_status_callout(window, cx))
            .children(self.render_thread_error(window, cx))
-            .when_some(
-                self.new_server_version_available.as_ref().filter(|_| {
-                    !has_messages || !matches!(self.thread_state, ThreadState::Ready { .. })
-                }),
-                |this, version| this.child(self.render_new_version_callout(&version, cx)),
-            )
            .children(
                if let Some(usage_callout) = self.render_usage_callout(line_height, cx) {
                    Some(usage_callout.into_any_element())
@@ -5747,6 +5690,7 @@ pub(crate) mod tests {
                        audio: true,
                        embedded_context: true,
                    }),
+                    vec![],
                    cx,
                )
            })))
@@ -5806,6 +5750,7 @@ pub(crate) mod tests {
                        audio: true,
                        embedded_context: true,
                    }),
+                    Vec::new(),
                    cx,
                )
            })))
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -3585,7 +3585,7 @@ pub(crate) fn open_active_thread_as_markdown(
            }

            let buffer = project.update(cx, |project, cx| {
-                project.create_local_buffer(&markdown, Some(markdown_language), true, cx)
+                project.create_local_buffer(&markdown, Some(markdown_language), cx)
            });
            let buffer =
                cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone()));
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -251,7 +251,6 @@ pub struct ConfigureContextServerModal {
    workspace: WeakEntity<Workspace>,
    source: ConfigurationSource,
    state: State,
-    original_server_id: Option<ContextServerId>,
 }

 impl ConfigureContextServerModal {
@@ -349,11 +348,6 @@ impl ConfigureContextServerModal {
                    context_server_store,
                    workspace: workspace_handle,
                    state: State::Idle,
-                    original_server_id: match &target {
-                        ConfigurationTarget::Existing { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::Extension { id, .. } => Some(id.clone()),
-                        ConfigurationTarget::New => None,
-                    },
                    source: ConfigurationSource::from_target(
                        target,
                        language_registry,
@@ -421,19 +415,9 @@ impl ConfigureContextServerModal {
            // When we write the settings to the file, the context server will be restarted.
            workspace.update(cx, |workspace, cx| {
                let fs = workspace.app_state().fs.clone();
-                let original_server_id = self.original_server_id.clone();
-                update_settings_file::<ProjectSettings>(
-                    fs.clone(),
-                    cx,
-                    move |project_settings, _| {
-                        if let Some(original_id) = original_server_id {
-                            if original_id != id {
-                                project_settings.context_servers.remove(&original_id.0);
-                            }
-                        }
-                        project_settings.context_servers.insert(id.0, settings);
-                    },
-                );
+                update_settings_file::<ProjectSettings>(fs.clone(), cx, |project_settings, _| {
+                    project_settings.context_servers.insert(id.0, settings);
+                });
            });
        } else if let Some(existing_server) = existing_server {
            self.context_server_store
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1528,7 +1528,6 @@ impl AgentDiff {
            | AcpThreadEvent::EntriesRemoved(_)
            | AcpThreadEvent::ToolAuthorizationRequired
            | AcpThreadEvent::PromptCapabilitiesUpdated
-            | AcpThreadEvent::AvailableCommandsUpdated(_)
            | AcpThreadEvent::Retry(_) => {}
        }
    }
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -2967,20 +2967,6 @@ impl AgentPanel {
            return false;
        }

-        let user_store = self.user_store.read(cx);
-
-        if user_store
-            .plan()
-            .is_some_and(|plan| matches!(plan, Plan::ZedPro))
-            && user_store
-                .subscription_period()
-                .and_then(|period| period.0.checked_add_days(chrono::Days::new(1)))
-                .is_some_and(|date| date < chrono::Utc::now())
-        {
-            OnboardingUpsell::set_dismissed(true, cx);
-            return false;
-        }
-
        match &self.active_view {
            ActiveView::History | ActiveView::Configuration => false,
            ActiveView::ExternalAgentThread { thread_view, .. }
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -337,7 +337,8 @@ fn update_command_palette_filter(cx: &mut App) {
            ];
            filter.show_action_types(edit_prediction_actions.iter());

-            filter.show_action_types(&[TypeId::of::<zed_actions::OpenZedPredictOnboarding>()]);
+            filter
+                .show_action_types([TypeId::of::<zed_actions::OpenZedPredictOnboarding>()].iter());
        }
    });
 }
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1139,7 +1139,7 @@ mod tests {
        );
        while !new_text.is_empty() {
            let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.random_range(1..=max_len);
+            let len = rng.gen_range(1..=max_len);
            let (chunk, suffix) = new_text.split_at(len);
            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
            new_text = suffix;
@@ -1208,7 +1208,7 @@ mod tests {
        );
        while !new_text.is_empty() {
            let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.random_range(1..=max_len);
+            let len = rng.gen_range(1..=max_len);
            let (chunk, suffix) = new_text.split_at(len);
            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
            new_text = suffix;
@@ -1277,7 +1277,7 @@ mod tests {
        );
        while !new_text.is_empty() {
            let max_len = cmp::min(new_text.len(), 10);
-            let len = rng.random_range(1..=max_len);
+            let len = rng.gen_range(1..=max_len);
            let (chunk, suffix) = new_text.split_at(len);
            chunks_tx.unbounded_send(chunk.to_string()).unwrap();
            new_text = suffix;
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -987,8 +987,7 @@ impl MentionLink {
                    .read(cx)
                    .project()
                    .read(cx)
-                    .entry_for_path(&project_path, cx)?
-                    .clone();
+                    .entry_for_path(&project_path, cx)?;
                Some(MentionLink::File(project_path, entry))
            }
            Self::SYMBOL => {
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -125,7 +125,6 @@ pub(crate) fn create_editor(
            cx,
        );
        editor.set_placeholder_text("Message the agent – @ to include context", cx);
-        editor.disable_word_completions();
        editor.set_show_indent_guides(false, cx);
        editor.set_soft_wrap();
        editor.set_use_modal_editing(true);
--- a/crates/agent_ui/src/slash_command_settings.rs
+++ b/crates/agent_ui/src/slash_command_settings.rs
@@ -2,11 +2,10 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};

 /// Settings for slash commands.
-#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi, SettingsKey)]
-#[settings_key(key = "slash_commands")]
+#[derive(Deserialize, Serialize, Debug, Default, Clone, JsonSchema, SettingsUi)]
 pub struct SlashCommandSettings {
    /// Settings for the `/cargo-workspace` slash command.
    #[serde(default)]
@@ -22,6 +21,8 @@ pub struct CargoWorkspaceCommandSettings {
 }

 impl Settings for SlashCommandSettings {
+    const KEY: Option<&'static str> = Some("slash_commands");
+
    type FileContent = Self;

    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
--- a/crates/ai_onboarding/src/ai_upsell_card.rs
+++ b/crates/ai_onboarding/src/ai_upsell_card.rs
@@ -86,16 +86,10 @@ impl RenderOnce for AiUpsellCard {
            )
            .child(plan_definitions.free_plan());

-        let grid_bg = h_flex()
-            .absolute()
-            .inset_0()
-            .w_full()
-            .h(px(240.))
-            .bg(gpui::pattern_slash(
-                cx.theme().colors().border.opacity(0.1),
-                2.,
-                25.,
-            ));
+        let grid_bg = h_flex().absolute().inset_0().w_full().h(px(240.)).child(
+            Vector::new(VectorName::Grid, rems_from_px(500.), rems_from_px(240.))
+                .color(Color::Custom(cx.theme().colors().border.opacity(0.05))),
+        );

        let gradient_bg = div()
            .absolute()
--- a/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
+++ b/crates/ai_onboarding/src/edit_prediction_onboarding_content.rs
@@ -1,7 +1,6 @@
 use std::sync::Arc;

 use client::{Client, UserStore};
-use cloud_llm_client::Plan;
 use gpui::{Entity, IntoElement, ParentElement};
 use ui::prelude::*;

@@ -36,8 +35,6 @@ impl EditPredictionOnboarding {

 impl Render for EditPredictionOnboarding {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let is_free_plan = self.user_store.read(cx).plan() == Some(Plan::ZedFree);
-
        let github_copilot = v_flex()
            .gap_1()
            .child(Label::new(if self.copilot_is_configured {
@@ -70,8 +67,7 @@ impl Render for EditPredictionOnboarding {
                self.continue_with_zed_ai.clone(),
                cx,
            ))
-            .when(is_free_plan, |this| {
-                this.child(ui::Divider::horizontal()).child(github_copilot)
-            })
+            .child(ui::Divider::horizontal())
+            .child(github_copilot)
    }
 }
--- a/crates/ai_onboarding/src/young_account_banner.rs
+++ b/crates/ai_onboarding/src/young_account_banner.rs
@@ -6,7 +6,7 @@ pub struct YoungAccountBanner;

 impl RenderOnce for YoungAccountBanner {
    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
-        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, GitHub accounts created fewer than 30 days ago are not eligible for free plan usage or Pro plan free trial. To request an exception, reach out to billing-support@zed.dev.";
+        const YOUNG_ACCOUNT_DISCLAIMER: &str = "To prevent abuse of our service, we cannot offer plans to GitHub accounts created fewer than 30 days ago. To request an exception, reach out to billing-support@zed.dev.";

        let label = div()
            .w_full()
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -363,9 +363,11 @@ pub async fn complete(
    api_url: &str,
    api_key: &str,
    request: Request,
-    beta_headers: String,
 ) -> Result<Response, AnthropicError> {
    let uri = format!("{api_url}/v1/messages");
+    let beta_headers = Model::from_id(&request.model)
+        .map(|model| model.beta_headers())
+        .unwrap_or_else(|_| Model::DEFAULT_BETA_HEADERS.join(","));
    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
@@ -407,9 +409,8 @@ pub async fn stream_completion(
    api_url: &str,
    api_key: &str,
    request: Request,
-    beta_headers: String,
 ) -> Result<BoxStream<'static, Result<Event, AnthropicError>>, AnthropicError> {
-    stream_completion_with_rate_limit_info(client, api_url, api_key, request, beta_headers)
+    stream_completion_with_rate_limit_info(client, api_url, api_key, request)
        .await
        .map(|output| output.0)
 }
@@ -505,7 +506,6 @@ pub async fn stream_completion_with_rate_limit_info(
    api_url: &str,
    api_key: &str,
    request: Request,
-    beta_headers: String,
 ) -> Result<
    (
        BoxStream<'static, Result<Event, AnthropicError>>,
@@ -518,7 +518,9 @@ pub async fn stream_completion_with_rate_limit_info(
        stream: true,
    };
    let uri = format!("{api_url}/v1/messages");
-
+    let beta_headers = Model::from_id(&request.base.model)
+        .map(|model| model.beta_headers())
+        .unwrap_or_else(|_| Model::DEFAULT_BETA_HEADERS.join(","));
    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
--- a/crates/assistant_context/Cargo.toml
+++ b/crates/assistant_context/Cargo.toml
@@ -50,9 +50,8 @@ text.workspace = true
 ui.workspace = true
 util.workspace = true
 uuid.workspace = true
-workspace.workspace = true
 workspace-hack.workspace = true
-zed_env_vars.workspace = true
+workspace.workspace = true

 [dev-dependencies]
 indoc.workspace = true
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -2669,7 +2669,11 @@ impl AssistantContext {
    }

    pub fn summarize(&mut self, mut replace_old: bool, cx: &mut Context<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).default_model() else {
+        let registry = LanguageModelRegistry::read_global(cx);
+        let Some(model) = registry
+            .thread_summary_model()
+            .or_else(|| registry.default_model())
+        else {
            return;
        };

--- a/crates/assistant_context/src/assistant_context_tests.rs
+++ b/crates/assistant_context/src/assistant_context_tests.rs
@@ -764,7 +764,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
    let network = Arc::new(Mutex::new(Network::new(rng.clone())));
    let mut contexts = Vec::new();

-    let num_peers = rng.random_range(min_peers..=max_peers);
+    let num_peers = rng.gen_range(min_peers..=max_peers);
    let context_id = ContextId::new();
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    for i in 0..num_peers {
@@ -806,10 +806,10 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
        || !network.lock().is_idle()
        || network.lock().contains_disconnected_peers()
    {
-        let context_index = rng.random_range(0..contexts.len());
+        let context_index = rng.gen_range(0..contexts.len());
        let context = &contexts[context_index];

-        match rng.random_range(0..100) {
+        match rng.gen_range(0..100) {
            0..=29 if mutation_count > 0 => {
                log::info!("Context {}: edit buffer", context_index);
                context.update(cx, |context, cx| {
@@ -874,10 +874,10 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
                        merge_same_roles: true,
                    })];

-                    let num_sections = rng.random_range(0..=3);
+                    let num_sections = rng.gen_range(0..=3);
                    let mut section_start = 0;
                    for _ in 0..num_sections {
-                        let mut section_end = rng.random_range(section_start..=output_text.len());
+                        let mut section_end = rng.gen_range(section_start..=output_text.len());
                        while !output_text.is_char_boundary(section_end) {
                            section_end += 1;
                        }
@@ -924,7 +924,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
            75..=84 if mutation_count > 0 => {
                context.update(cx, |context, cx| {
                    if let Some(message) = context.messages(cx).choose(&mut rng) {
-                        let new_status = match rng.random_range(0..3) {
+                        let new_status = match rng.gen_range(0..3) {
                            0 => MessageStatus::Done,
                            1 => MessageStatus::Pending,
                            _ => MessageStatus::Error(SharedString::from("Random error")),
@@ -971,7 +971,7 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std

                    network.lock().broadcast(replica_id, ops_to_send);
                    context.update(cx, |context, cx| context.apply_ops(ops_to_receive, cx));
-                } else if rng.random_bool(0.1) && replica_id != 0 {
+                } else if rng.gen_bool(0.1) && replica_id != 0 {
                    log::info!("Context {}: disconnecting", context_index);
                    network.lock().disconnect_peer(replica_id);
                } else if network.lock().has_unreceived(replica_id) {
--- a/crates/assistant_context/src/context_store.rs
+++ b/crates/assistant_context/src/context_store.rs
@@ -24,7 +24,6 @@ use rpc::AnyProtoClient;
 use std::sync::LazyLock;
 use std::{cmp::Reverse, ffi::OsStr, mem, path::Path, sync::Arc, time::Duration};
 use util::{ResultExt, TryFutureExt};
-use zed_env_vars::ZED_STATELESS;

 pub(crate) fn init(client: &AnyProtoClient) {
    client.add_entity_message_handler(ContextStore::handle_advertise_contexts);
@@ -789,6 +788,8 @@ impl ContextStore {
    fn reload(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        let fs = self.fs.clone();
        cx.spawn(async move |this, cx| {
+            pub static ZED_STATELESS: LazyLock<bool> =
+                LazyLock::new(|| std::env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
            if *ZED_STATELESS {
                return Ok(());
            }
--- a/crates/assistant_tools/src/edit_agent.rs
+++ b/crates/assistant_tools/src/edit_agent.rs
@@ -1315,17 +1315,17 @@ mod tests {

    #[gpui::test(iterations = 100)]
    async fn test_random_indents(mut rng: StdRng) {
-        let len = rng.random_range(1..=100);
+        let len = rng.gen_range(1..=100);
        let new_text = util::RandomCharIter::new(&mut rng)
            .with_simple_text()
            .take(len)
            .collect::<String>();
        let new_text = new_text
            .split('\n')
-            .map(|line| format!("{}{}", " ".repeat(rng.random_range(0..=8)), line))
+            .map(|line| format!("{}{}", " ".repeat(rng.gen_range(0..=8)), line))
            .collect::<Vec<_>>()
            .join("\n");
-        let delta = IndentDelta::Spaces(rng.random_range(-4i8..=4i8) as isize);
+        let delta = IndentDelta::Spaces(rng.gen_range(-4..=4));

        let chunks = to_random_chunks(&mut rng, &new_text);
        let new_text_chunks = stream::iter(chunks.iter().enumerate().map(|(index, chunk)| {
@@ -1357,7 +1357,7 @@ mod tests {
    }

    fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
        chunk_indices.sort();
        chunk_indices.push(input.len());
--- a/crates/assistant_tools/src/edit_agent/create_file_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/create_file_parser.rs
@@ -204,7 +204,7 @@ mod tests {
    }

    fn parse_random_chunks(input: &str, parser: &mut CreateFileParser, rng: &mut StdRng) -> String {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
        chunk_indices.sort();
        chunk_indices.push(input.len());
--- a/crates/assistant_tools/src/edit_agent/edit_parser.rs
+++ b/crates/assistant_tools/src/edit_agent/edit_parser.rs
@@ -996,7 +996,7 @@ mod tests {
    }

    fn parse_random_chunks(input: &str, parser: &mut EditParser, rng: &mut StdRng) -> Vec<Edit> {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
        chunk_indices.sort();
        chunk_indices.push(input.len());
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -1399,7 +1399,7 @@ fn eval(
 }

 fn run_eval(eval: EvalInput, tx: mpsc::Sender<Result<EvalOutput>>) {
-    let dispatcher = gpui::TestDispatcher::new(StdRng::from_os_rng());
+    let dispatcher = gpui::TestDispatcher::new(StdRng::from_entropy());
    let mut cx = TestAppContext::build(dispatcher, None);
    let output = cx.executor().block_test(async {
        let test = EditAgentTest::new(&mut cx).await;
@@ -1707,7 +1707,7 @@ async fn retry_on_rate_limit<R>(mut request: impl AsyncFnMut() -> Result<R>) ->
        };

        if let Some(retry_after) = retry_delay {
-            let jitter = retry_after.mul_f64(rand::rng().random_range(0.0..1.0));
+            let jitter = retry_after.mul_f64(rand::thread_rng().gen_range(0.0..1.0));
            eprintln!("Attempt #{attempt}: Retry after {retry_after:?} + jitter of {jitter:?}");
            Timer::after(retry_after + jitter).await;
        } else {
--- a/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
+++ b/crates/assistant_tools/src/edit_agent/streaming_fuzzy_matcher.rs
@@ -771,7 +771,7 @@ mod tests {
    }

    fn to_random_chunks(rng: &mut StdRng, input: &str) -> Vec<String> {
-        let chunk_count = rng.random_range(1..=cmp::min(input.len(), 50));
+        let chunk_count = rng.gen_range(1..=cmp::min(input.len(), 50));
        let mut chunk_indices = (0..input.len()).choose_multiple(rng, chunk_count);
        chunk_indices.sort();
        chunk_indices.push(input.len());
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -14,20 +14,11 @@ doctest = false

 [dependencies]
 anyhow.workspace = true
-async-tar.workspace = true
 collections.workspace = true
-crossbeam.workspace = true
 gpui.workspace = true
-log.workspace = true
-parking_lot.workspace = true
-rodio = { workspace = true, features = [ "wav", "playback", "wav_output" ] }
+settings.workspace = true
 schemars.workspace = true
 serde.workspace = true
-settings.workspace = true
-smol.workspace = true
-thiserror.workspace = true
+rodio = { workspace = true, features = [ "wav", "playback", "tracing" ] }
 util.workspace = true
 workspace-hack.workspace = true
-
-[target.'cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))'.dependencies]
-libwebrtc = { rev = "5f04705ac3f356350ae31534ffbc476abc9ea83d", git = "https://github.com/zed-industries/livekit-rust-sdks" }
--- a/crates/audio/src/audio.rs
+++ b/crates/audio/src/audio.rs
@@ -1,56 +1,19 @@
-use anyhow::{Context as _, Result};
+use anyhow::{Context as _, Result, anyhow};
 use collections::HashMap;
-use gpui::{App, BackgroundExecutor, BorrowAppContext, Global};
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-mod non_windows_and_freebsd_deps {
-    pub(super) use gpui::AsyncApp;
-    pub(super) use libwebrtc::native::apm;
-    pub(super) use log::info;
-    pub(super) use parking_lot::Mutex;
-    pub(super) use rodio::cpal::Sample;
-    pub(super) use rodio::source::{LimitSettings, UniformSourceIterator};
-    pub(super) use std::sync::Arc;
-}
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-use non_windows_and_freebsd_deps::*;
-
-use rodio::{
-    Decoder, OutputStream, OutputStreamBuilder, Source, mixer::Mixer, nz, source::Buffered,
-};
+use gpui::{App, BorrowAppContext, Global};
+use rodio::{Decoder, OutputStream, OutputStreamBuilder, Source, source::Buffered};
 use settings::Settings;
-use std::{io::Cursor, num::NonZero, path::PathBuf, sync::atomic::Ordering, time::Duration};
+use std::io::Cursor;
 use util::ResultExt;

 mod audio_settings;
-mod replays;
-mod rodio_ext;
 pub use audio_settings::AudioSettings;
-pub use rodio_ext::RodioExt;
-
-use crate::audio_settings::LIVE_SETTINGS;
-
-// NOTE: We used to use WebRTC's mixer which only supported
-// 16kHz, 32kHz and 48kHz. As 48 is the most common "next step up"
-// for audio output devices like speakers/bluetooth, we just hard-code
-// this; and downsample when we need to.
-//
-// Since most noise cancelling requires 16kHz we will move to
-// that in the future.
-pub const SAMPLE_RATE: NonZero<u32> = nz!(48000);
-pub const CHANNEL_COUNT: NonZero<u16> = nz!(2);
-pub const BUFFER_SIZE: usize = // echo canceller and livekit want 10ms of audio
-    (SAMPLE_RATE.get() as usize / 100) * CHANNEL_COUNT.get() as usize;
-
-pub const REPLAY_DURATION: Duration = Duration::from_secs(30);

 pub fn init(cx: &mut App) {
    AudioSettings::register(cx);
-    LIVE_SETTINGS.initialize(cx);
 }

-#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq)]
+#[derive(Copy, Clone, Eq, Hash, PartialEq)]
 pub enum Sound {
    Joined,
    Leave,
@@ -75,152 +38,32 @@ impl Sound {
    }
 }

+#[derive(Default)]
 pub struct Audio {
    output_handle: Option<OutputStream>,
-    output_mixer: Option<Mixer>,
-    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-    pub echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
    source_cache: HashMap<Sound, Buffered<Decoder<Cursor<Vec<u8>>>>>,
-    replays: replays::Replays,
-}
-
-impl Default for Audio {
-    fn default() -> Self {
-        Self {
-            output_handle: Default::default(),
-            output_mixer: Default::default(),
-            #[cfg(not(any(
-                all(target_os = "windows", target_env = "gnu"),
-                target_os = "freebsd"
-            )))]
-            echo_canceller: Arc::new(Mutex::new(apm::AudioProcessingModule::new(
-                true, false, false, false,
-            ))),
-            source_cache: Default::default(),
-            replays: Default::default(),
-        }
-    }
 }

 impl Global for Audio {}

 impl Audio {
-    fn ensure_output_exists(&mut self) -> Result<&Mixer> {
+    fn ensure_output_exists(&mut self) -> Option<&OutputStream> {
        if self.output_handle.is_none() {
-            self.output_handle = Some(
-                OutputStreamBuilder::open_default_stream()
-                    .context("Could not open default output stream")?,
-            );
-            if let Some(output_handle) = &self.output_handle {
-                let (mixer, source) = rodio::mixer::mixer(CHANNEL_COUNT, SAMPLE_RATE);
-                // or the mixer will end immediately as its empty.
-                mixer.add(rodio::source::Zero::new(CHANNEL_COUNT, SAMPLE_RATE));
-                self.output_mixer = Some(mixer);
-
-                // The webrtc apm is not yet compiling for windows & freebsd
-                #[cfg(not(any(
-                    any(all(target_os = "windows", target_env = "gnu")),
-                    target_os = "freebsd"
-                )))]
-                let echo_canceller = Arc::clone(&self.echo_canceller);
-                #[cfg(not(any(
-                    any(all(target_os = "windows", target_env = "gnu")),
-                    target_os = "freebsd"
-                )))]
-                let source = source.inspect_buffer::<BUFFER_SIZE, _>(move |buffer| {
-                    let mut buf: [i16; _] = buffer.map(|s| s.to_sample());
-                    echo_canceller
-                        .lock()
-                        .process_reverse_stream(
-                            &mut buf,
-                            SAMPLE_RATE.get() as i32,
-                            CHANNEL_COUNT.get().into(),
-                        )
-                        .expect("Audio input and output threads should not panic");
-                });
-                output_handle.mixer().add(source);
-            }
+            self.output_handle = OutputStreamBuilder::open_default_stream().log_err();
        }

-        Ok(self
-            .output_mixer
-            .as_ref()
-            .expect("we only get here if opening the outputstream succeeded"))
+        self.output_handle.as_ref()
    }

-    pub fn save_replays(
-        &self,
-        executor: BackgroundExecutor,
-    ) -> gpui::Task<anyhow::Result<(PathBuf, Duration)>> {
-        self.replays.replays_to_tar(executor)
-    }
-
-    #[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-    pub fn open_microphone(voip_parts: VoipParts) -> anyhow::Result<impl Source> {
-        let stream = rodio::microphone::MicrophoneBuilder::new()
-            .default_device()?
-            .default_config()?
-            .prefer_sample_rates([SAMPLE_RATE, SAMPLE_RATE.saturating_mul(nz!(2))])
-            .prefer_channel_counts([nz!(1), nz!(2)])
-            .prefer_buffer_sizes(512..)
-            .open_stream()?;
-        info!("Opened microphone: {:?}", stream.config());
-
-        let (replay, stream) = UniformSourceIterator::new(stream, CHANNEL_COUNT, SAMPLE_RATE)
-            .limit(LimitSettings::live_performance())
-            .process_buffer::<BUFFER_SIZE, _>(move |buffer| {
-                let mut int_buffer: [i16; _] = buffer.map(|s| s.to_sample());
-                if voip_parts
-                    .echo_canceller
-                    .lock()
-                    .process_stream(
-                        &mut int_buffer,
-                        SAMPLE_RATE.get() as i32,
-                        CHANNEL_COUNT.get() as i32,
-                    )
-                    .context("livekit audio processor error")
-                    .log_err()
-                    .is_some()
-                {
-                    for (sample, processed) in buffer.iter_mut().zip(&int_buffer) {
-                        *sample = (*processed).to_sample();
-                    }
-                }
-            })
-            .automatic_gain_control(1.0, 4.0, 0.0, 5.0)
-            .periodic_access(Duration::from_millis(100), move |agc_source| {
-                agc_source.set_enabled(LIVE_SETTINGS.control_input_volume.load(Ordering::Relaxed));
-            })
-            .replayable(REPLAY_DURATION)?;
-
-        voip_parts
-            .replays
-            .add_voip_stream("local microphone".to_string(), replay);
-        Ok(stream)
-    }
-
-    pub fn play_voip_stream(
+    pub fn play_source(
        source: impl rodio::Source + Send + 'static,
-        speaker_name: String,
-        is_staff: bool,
        cx: &mut App,
    ) -> anyhow::Result<()> {
-        let (replay_source, source) = source
-            .automatic_gain_control(1.0, 4.0, 0.0, 5.0)
-            .periodic_access(Duration::from_millis(100), move |agc_source| {
-                agc_source.set_enabled(LIVE_SETTINGS.control_input_volume.load(Ordering::Relaxed));
-            })
-            .replayable(REPLAY_DURATION)
-            .expect("REPLAY_DURATION is longer then 100ms");
-
        cx.update_default_global(|this: &mut Self, _cx| {
-            let output_mixer = this
+            let output_handle = this
                .ensure_output_exists()
-                .context("Could not get output mixer")?;
-            output_mixer.add(source);
-            if is_staff {
-                this.replays.add_voip_stream(speaker_name, replay_source);
-            }
+                .ok_or_else(|| anyhow!("Could not open audio output"))?;
+            output_handle.mixer().add(source);
            Ok(())
        })
    }
@@ -228,12 +71,8 @@ impl Audio {
    pub fn play_sound(sound: Sound, cx: &mut App) {
        cx.update_default_global(|this: &mut Self, cx| {
            let source = this.sound_source(sound, cx).log_err()?;
-            let output_mixer = this
-                .ensure_output_exists()
-                .context("Could not get output mixer")
-                .log_err()?;
-
-            output_mixer.add(source);
+            let output_handle = this.ensure_output_exists()?;
+            output_handle.mixer().add(source);
            Some(())
        });
    }
@@ -264,23 +103,3 @@ impl Audio {
        Ok(source)
    }
 }
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-pub struct VoipParts {
-    echo_canceller: Arc<Mutex<apm::AudioProcessingModule>>,
-    replays: replays::Replays,
-}
-
-#[cfg(not(any(all(target_os = "windows", target_env = "gnu"), target_os = "freebsd")))]
-impl VoipParts {
-    pub fn new(cx: &AsyncApp) -> anyhow::Result<Self> {
-        let (apm, replays) = cx.try_read_default_global::<Audio, _>(|audio, _| {
-            (Arc::clone(&audio.echo_canceller), audio.replays.clone())
-        })?;
-
-        Ok(Self {
-            echo_canceller: apm,
-            replays,
-        })
-    }
-}
--- a/crates/audio/src/audio_settings.rs
+++ b/crates/audio/src/audio_settings.rs
@@ -1,55 +1,28 @@
-use std::sync::atomic::{AtomicBool, Ordering};
-
 use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};

-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
 pub struct AudioSettings {
    /// Opt into the new audio system.
    #[serde(rename = "experimental.rodio_audio", default)]
    pub rodio_audio: bool, // default is false
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Use the new audio systems automatic gain control for your microphone.
-    /// This affects how loud you sound to others.
-    #[serde(rename = "experimental.control_input_volume", default)]
-    pub control_input_volume: bool,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Use the new audio systems automatic gain control on everyone in the
-    /// call. This makes call members who are too quite louder and those who are
-    /// too loud quieter. This only affects how things sound for you.
-    #[serde(rename = "experimental.control_output_volume", default)]
-    pub control_output_volume: bool,
 }

 /// Configuration of audio in Zed.
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 #[serde(default)]
-#[settings_key(key = "audio")]
 pub struct AudioSettingsContent {
-    /// Opt into the new audio system.
+    /// Whether to use the experimental audio system
    #[serde(rename = "experimental.rodio_audio", default)]
-    pub rodio_audio: bool, // default is false
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Use the new audio systems automatic gain control for your microphone.
-    /// This affects how loud you sound to others.
-    #[serde(rename = "experimental.control_input_volume", default)]
-    pub control_input_volume: bool,
-    /// Requires 'rodio_audio: true'
-    ///
-    /// Use the new audio systems automatic gain control on everyone in the
-    /// call. This makes call members who are too quite louder and those who are
-    /// too loud quieter. This only affects how things sound for you.
-    #[serde(rename = "experimental.control_output_volume", default)]
-    pub control_output_volume: bool,
+    pub rodio_audio: bool,
 }

 impl Settings for AudioSettings {
+    const KEY: Option<&'static str> = Some("audio");
+
    type FileContent = AudioSettingsContent;

    fn load(sources: SettingsSources<Self::FileContent>, _cx: &mut App) -> Result<Self> {
@@ -58,42 +31,3 @@ impl Settings for AudioSettings {

    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }
-
-/// See docs on [LIVE_SETTINGS]
-pub(crate) struct LiveSettings {
-    pub(crate) control_input_volume: AtomicBool,
-    pub(crate) control_output_volume: AtomicBool,
-}
-
-impl LiveSettings {
-    pub(crate) fn initialize(&self, cx: &mut App) {
-        cx.observe_global::<SettingsStore>(move |cx| {
-            LIVE_SETTINGS.control_input_volume.store(
-                AudioSettings::get_global(cx).control_input_volume,
-                Ordering::Relaxed,
-            );
-            LIVE_SETTINGS.control_output_volume.store(
-                AudioSettings::get_global(cx).control_output_volume,
-                Ordering::Relaxed,
-            );
-        })
-        .detach();
-
-        let init_settings = AudioSettings::get_global(cx);
-        LIVE_SETTINGS
-            .control_input_volume
-            .store(init_settings.control_input_volume, Ordering::Relaxed);
-        LIVE_SETTINGS
-            .control_output_volume
-            .store(init_settings.control_output_volume, Ordering::Relaxed);
-    }
-}
-
-/// Allows access to settings from the audio thread. Updated by
-/// observer of SettingsStore. Needed because audio playback and recording are
-/// real time and must each run in a dedicated OS thread, therefore we can not
-/// use the background executor.
-pub(crate) static LIVE_SETTINGS: LiveSettings = LiveSettings {
-    control_input_volume: AtomicBool::new(true),
-    control_output_volume: AtomicBool::new(true),
-};
--- a/crates/audio/src/replays.rs
+++ b/crates/audio/src/replays.rs
@@ -1,77 +0,0 @@
-use anyhow::{Context, anyhow};
-use async_tar::{Builder, Header};
-use gpui::{BackgroundExecutor, Task};
-
-use collections::HashMap;
-use parking_lot::Mutex;
-use rodio::Source;
-use smol::fs::File;
-use std::{io, path::PathBuf, sync::Arc, time::Duration};
-
-use crate::{REPLAY_DURATION, rodio_ext::Replay};
-
-#[derive(Default, Clone)]
-pub(crate) struct Replays(Arc<Mutex<HashMap<String, Replay>>>);
-
-impl Replays {
-    pub(crate) fn add_voip_stream(&self, stream_name: String, source: Replay) {
-        let mut map = self.0.lock();
-        map.retain(|_, replay| replay.source_is_active());
-        map.insert(stream_name, source);
-    }
-
-    pub(crate) fn replays_to_tar(
-        &self,
-        executor: BackgroundExecutor,
-    ) -> Task<anyhow::Result<(PathBuf, Duration)>> {
-        let map = Arc::clone(&self.0);
-        executor.spawn(async move {
-            let recordings: Vec<_> = map
-                .lock()
-                .iter_mut()
-                .map(|(name, replay)| {
-                    let queued = REPLAY_DURATION.min(replay.duration_ready());
-                    (name.clone(), replay.take_duration(queued).record())
-                })
-                .collect();
-            let longest = recordings
-                .iter()
-                .map(|(_, r)| {
-                    r.total_duration()
-                        .expect("SamplesBuffer always returns a total duration")
-                })
-                .max()
-                .ok_or(anyhow!("There is no audio to capture"))?;
-
-            let path = std::env::current_dir()
-                .context("Could not get current dir")?
-                .join("replays.tar");
-            let tar = File::create(&path)
-                .await
-                .context("Could not create file for tar")?;
-
-            let mut tar = Builder::new(tar);
-
-            for (name, recording) in recordings {
-                let mut writer = io::Cursor::new(Vec::new());
-                rodio::wav_to_writer(recording, &mut writer).context("failed to encode wav")?;
-                let wav_data = writer.into_inner();
-                let path = name.replace(' ', "_") + ".wav";
-                let mut header = Header::new_gnu();
-                // rw permissions for everyone
-                header.set_mode(0o666);
-                header.set_size(wav_data.len() as u64);
-                tar.append_data(&mut header, path, wav_data.as_slice())
-                    .await
-                    .context("failed to apped wav to tar")?;
-            }
-            tar.into_inner()
-                .await
-                .context("Could not finish writing tar")?
-                .sync_all()
-                .await
-                .context("Could not flush tar file to disk")?;
-            Ok((path, longest))
-        })
-    }
-}
--- a/crates/audio/src/rodio_ext.rs
+++ b/crates/audio/src/rodio_ext.rs
@@ -1,598 +0,0 @@
-use std::{
-    sync::{
-        Arc, Mutex,
-        atomic::{AtomicBool, Ordering},
-    },
-    time::Duration,
-};
-
-use crossbeam::queue::ArrayQueue;
-use rodio::{ChannelCount, Sample, SampleRate, Source};
-
-#[derive(Debug, thiserror::Error)]
-#[error("Replay duration is too short must be >= 100ms")]
-pub struct ReplayDurationTooShort;
-
-pub trait RodioExt: Source + Sized {
-    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
-    where
-        F: FnMut(&mut [Sample; N]);
-    fn inspect_buffer<const N: usize, F>(self, callback: F) -> InspectBuffer<N, Self, F>
-    where
-        F: FnMut(&[Sample; N]);
-    fn replayable(
-        self,
-        duration: Duration,
-    ) -> Result<(Replay, Replayable<Self>), ReplayDurationTooShort>;
-    fn take_samples(self, n: usize) -> TakeSamples<Self>;
-}
-
-impl<S: Source> RodioExt for S {
-    fn process_buffer<const N: usize, F>(self, callback: F) -> ProcessBuffer<N, Self, F>
-    where
-        F: FnMut(&mut [Sample; N]),
-    {
-        ProcessBuffer {
-            inner: self,
-            callback,
-            buffer: [0.0; N],
-            next: N,
-        }
-    }
-    fn inspect_buffer<const N: usize, F>(self, callback: F) -> InspectBuffer<N, Self, F>
-    where
-        F: FnMut(&[Sample; N]),
-    {
-        InspectBuffer {
-            inner: self,
-            callback,
-            buffer: [0.0; N],
-            free: 0,
-        }
-    }
-    /// Maintains a live replay with a history of at least `duration` seconds.
-    ///
-    /// Note:
-    /// History can be 100ms longer if the source drops before or while the
-    /// replay is being read
-    ///
-    /// # Errors
-    /// If duration is smaller then 100ms
-    fn replayable(
-        self,
-        duration: Duration,
-    ) -> Result<(Replay, Replayable<Self>), ReplayDurationTooShort> {
-        if duration < Duration::from_millis(100) {
-            return Err(ReplayDurationTooShort);
-        }
-
-        let samples_per_second = self.sample_rate().get() as usize * self.channels().get() as usize;
-        let samples_to_queue = duration.as_secs_f64() * samples_per_second as f64;
-        let samples_to_queue =
-            (samples_to_queue as usize).next_multiple_of(self.channels().get().into());
-
-        let chunk_size =
-            (samples_per_second.div_ceil(10)).next_multiple_of(self.channels().get() as usize);
-        let chunks_to_queue = samples_to_queue.div_ceil(chunk_size);
-
-        let is_active = Arc::new(AtomicBool::new(true));
-        let queue = Arc::new(ReplayQueue::new(chunks_to_queue, chunk_size));
-        Ok((
-            Replay {
-                rx: Arc::clone(&queue),
-                buffer: Vec::new().into_iter(),
-                sleep_duration: duration / 2,
-                sample_rate: self.sample_rate(),
-                channel_count: self.channels(),
-                source_is_active: is_active.clone(),
-            },
-            Replayable {
-                tx: queue,
-                inner: self,
-                buffer: Vec::with_capacity(chunk_size),
-                chunk_size,
-                is_active,
-            },
-        ))
-    }
-    fn take_samples(self, n: usize) -> TakeSamples<S> {
-        TakeSamples {
-            inner: self,
-            left_to_take: n,
-        }
-    }
-}
-
-pub struct TakeSamples<S> {
-    inner: S,
-    left_to_take: usize,
-}
-
-impl<S: Source> Iterator for TakeSamples<S> {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if self.left_to_take == 0 {
-            None
-        } else {
-            self.left_to_take -= 1;
-            self.inner.next()
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (0, Some(self.left_to_take))
-    }
-}
-
-impl<S: Source> Source for TakeSamples<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        None // does not support spans
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        Some(Duration::from_secs_f64(
-            self.left_to_take as f64
-                / self.sample_rate().get() as f64
-                / self.channels().get() as f64,
-        ))
-    }
-}
-
-#[derive(Debug)]
-struct ReplayQueue {
-    inner: ArrayQueue<Vec<Sample>>,
-    normal_chunk_len: usize,
-    /// The last chunk in the queue may be smaller then
-    /// the normal chunk size. This is always equal to the
-    /// size of the last element in the queue.
-    /// (so normally chunk_size)
-    last_chunk: Mutex<Vec<Sample>>,
-}
-
-impl ReplayQueue {
-    fn new(queue_len: usize, chunk_size: usize) -> Self {
-        Self {
-            inner: ArrayQueue::new(queue_len),
-            normal_chunk_len: chunk_size,
-            last_chunk: Mutex::new(Vec::new()),
-        }
-    }
-    /// Returns the length in samples
-    fn len(&self) -> usize {
-        self.inner.len().saturating_sub(1) * self.normal_chunk_len
-            + self
-                .last_chunk
-                .lock()
-                .expect("Self::push_last can not poison this lock")
-                .len()
-    }
-
-    fn pop(&self) -> Option<Vec<Sample>> {
-        self.inner.pop() // removes element that was inserted first
-    }
-
-    fn push_last(&self, mut samples: Vec<Sample>) {
-        let mut last_chunk = self
-            .last_chunk
-            .lock()
-            .expect("Self::len can not poison this lock");
-        std::mem::swap(&mut *last_chunk, &mut samples);
-    }
-
-    fn push_normal(&self, samples: Vec<Sample>) {
-        let _pushed_out_of_ringbuf = self.inner.force_push(samples);
-    }
-}
-
-pub struct ProcessBuffer<const N: usize, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&mut [Sample; N]),
-{
-    inner: S,
-    callback: F,
-    /// Buffer used for both input and output.
-    buffer: [Sample; N],
-    /// Next already processed sample is at this index
-    /// in buffer.
-    ///
-    /// If this is equal to the length of the buffer we have no more samples and
-    /// we must get new ones and process them
-    next: usize,
-}
-
-impl<const N: usize, S, F> Iterator for ProcessBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&mut [Sample; N]),
-{
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.next += 1;
-        if self.next < self.buffer.len() {
-            let sample = self.buffer[self.next];
-            return Some(sample);
-        }
-
-        for sample in &mut self.buffer {
-            *sample = self.inner.next()?
-        }
-        (self.callback)(&mut self.buffer);
-
-        self.next = 0;
-        Some(self.buffer[0])
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<const N: usize, S, F> Source for ProcessBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&mut [Sample; N]),
-{
-    fn current_span_len(&self) -> Option<usize> {
-        None
-    }
-
-    fn channels(&self) -> rodio::ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> rodio::SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        self.inner.total_duration()
-    }
-}
-
-pub struct InspectBuffer<const N: usize, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&[Sample; N]),
-{
-    inner: S,
-    callback: F,
-    /// Stores already emitted samples, once its full we call the callback.
-    buffer: [Sample; N],
-    /// Next free element in buffer. If this is equal to the buffer length
-    /// we have no more free lements.
-    free: usize,
-}
-
-impl<const N: usize, S, F> Iterator for InspectBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&[Sample; N]),
-{
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        let Some(sample) = self.inner.next() else {
-            return None;
-        };
-
-        self.buffer[self.free] = sample;
-        self.free += 1;
-
-        if self.free == self.buffer.len() {
-            (self.callback)(&self.buffer);
-            self.free = 0
-        }
-
-        Some(sample)
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<const N: usize, S, F> Source for InspectBuffer<N, S, F>
-where
-    S: Source + Sized,
-    F: FnMut(&[Sample; N]),
-{
-    fn current_span_len(&self) -> Option<usize> {
-        None
-    }
-
-    fn channels(&self) -> rodio::ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> rodio::SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<std::time::Duration> {
-        self.inner.total_duration()
-    }
-}
-
-#[derive(Debug)]
-pub struct Replayable<S: Source> {
-    inner: S,
-    buffer: Vec<Sample>,
-    chunk_size: usize,
-    tx: Arc<ReplayQueue>,
-    is_active: Arc<AtomicBool>,
-}
-
-impl<S: Source> Iterator for Replayable<S> {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(sample) = self.inner.next() {
-            self.buffer.push(sample);
-            // If the buffer is full send it
-            if self.buffer.len() == self.chunk_size {
-                self.tx.push_normal(std::mem::take(&mut self.buffer));
-            }
-            Some(sample)
-        } else {
-            let last_chunk = std::mem::take(&mut self.buffer);
-            self.tx.push_last(last_chunk);
-            self.is_active.store(false, Ordering::Relaxed);
-            None
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.inner.size_hint()
-    }
-}
-
-impl<S: Source> Source for Replayable<S> {
-    fn current_span_len(&self) -> Option<usize> {
-        self.inner.current_span_len()
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.inner.channels()
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.inner.sample_rate()
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        self.inner.total_duration()
-    }
-}
-
-#[derive(Debug)]
-pub struct Replay {
-    rx: Arc<ReplayQueue>,
-    buffer: std::vec::IntoIter<Sample>,
-    sleep_duration: Duration,
-    sample_rate: SampleRate,
-    channel_count: ChannelCount,
-    source_is_active: Arc<AtomicBool>,
-}
-
-impl Replay {
-    pub fn source_is_active(&self) -> bool {
-        // - source could return None and not drop
-        // - source could be dropped before returning None
-        self.source_is_active.load(Ordering::Relaxed) && Arc::strong_count(&self.rx) < 2
-    }
-
-    /// Duration of what is in the buffer and can be returned without blocking.
-    pub fn duration_ready(&self) -> Duration {
-        let samples_per_second = self.channels().get() as u32 * self.sample_rate().get();
-
-        let seconds_queued = self.samples_ready() as f64 / samples_per_second as f64;
-        Duration::from_secs_f64(seconds_queued)
-    }
-
-    /// Number of samples in the buffer and can be returned without blocking.
-    pub fn samples_ready(&self) -> usize {
-        self.rx.len() + self.buffer.len()
-    }
-}
-
-impl Iterator for Replay {
-    type Item = Sample;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        if let Some(sample) = self.buffer.next() {
-            return Some(sample);
-        }
-
-        loop {
-            if let Some(new_buffer) = self.rx.pop() {
-                self.buffer = new_buffer.into_iter();
-                return self.buffer.next();
-            }
-
-            if !self.source_is_active() {
-                return None;
-            }
-
-            // The queue does not support blocking on a next item. We want this queue as it
-            // is quite fast and provides a fixed size. We know how many samples are in a
-            // buffer so if we do not get one now we must be getting one after `sleep_duration`.
-            std::thread::sleep(self.sleep_duration);
-        }
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        ((self.rx.len() + self.buffer.len()), None)
-    }
-}
-
-impl Source for Replay {
-    fn current_span_len(&self) -> Option<usize> {
-        None // source is not compatible with spans
-    }
-
-    fn channels(&self) -> ChannelCount {
-        self.channel_count
-    }
-
-    fn sample_rate(&self) -> SampleRate {
-        self.sample_rate
-    }
-
-    fn total_duration(&self) -> Option<Duration> {
-        None
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use rodio::{nz, static_buffer::StaticSamplesBuffer};
-
-    use super::*;
-
-    const SAMPLES: [Sample; 5] = [0.0, 1.0, 2.0, 3.0, 4.0];
-
-    fn test_source() -> StaticSamplesBuffer {
-        StaticSamplesBuffer::new(nz!(1), nz!(1), &SAMPLES)
-    }
-
-    mod process_buffer {
-        use super::*;
-
-        #[test]
-        fn callback_gets_all_samples() {
-            let input = test_source();
-
-            let _ = input
-                .process_buffer::<{ SAMPLES.len() }, _>(|buffer| assert_eq!(*buffer, SAMPLES))
-                .count();
-        }
-        #[test]
-        fn callback_modifies_yielded() {
-            let input = test_source();
-
-            let yielded: Vec<_> = input
-                .process_buffer::<{ SAMPLES.len() }, _>(|buffer| {
-                    for sample in buffer {
-                        *sample += 1.0;
-                    }
-                })
-                .collect();
-            assert_eq!(
-                yielded,
-                SAMPLES.into_iter().map(|s| s + 1.0).collect::<Vec<_>>()
-            )
-        }
-        #[test]
-        fn source_truncates_to_whole_buffers() {
-            let input = test_source();
-
-            let yielded = input
-                .process_buffer::<3, _>(|buffer| assert_eq!(buffer, &SAMPLES[..3]))
-                .count();
-            assert_eq!(yielded, 3)
-        }
-    }
-
-    mod inspect_buffer {
-        use super::*;
-
-        #[test]
-        fn callback_gets_all_samples() {
-            let input = test_source();
-
-            let _ = input
-                .inspect_buffer::<{ SAMPLES.len() }, _>(|buffer| assert_eq!(*buffer, SAMPLES))
-                .count();
-        }
-        #[test]
-        fn source_does_not_truncate() {
-            let input = test_source();
-
-            let yielded = input
-                .inspect_buffer::<3, _>(|buffer| assert_eq!(buffer, &SAMPLES[..3]))
-                .count();
-            assert_eq!(yielded, SAMPLES.len())
-        }
-    }
-
-    mod instant_replay {
-        use super::*;
-
-        #[test]
-        fn continues_after_history() {
-            let input = test_source();
-
-            let (mut replay, mut source) = input
-                .replayable(Duration::from_secs(3))
-                .expect("longer then 100ms");
-
-            source.by_ref().take(3).count();
-            let yielded: Vec<Sample> = replay.by_ref().take(3).collect();
-            assert_eq!(&yielded, &SAMPLES[0..3],);
-
-            source.count();
-            let yielded: Vec<Sample> = replay.collect();
-            assert_eq!(&yielded, &SAMPLES[3..5],);
-        }
-
-        #[test]
-        fn keeps_only_latest() {
-            let input = test_source();
-
-            let (mut replay, mut source) = input
-                .replayable(Duration::from_secs(2))
-                .expect("longer then 100ms");
-
-            source.by_ref().take(5).count(); // get all items but do not end the source
-            let yielded: Vec<Sample> = replay.by_ref().take(2).collect();
-            assert_eq!(&yielded, &SAMPLES[3..5]);
-            source.count(); // exhaust source
-            assert_eq!(replay.next(), None);
-        }
-
-        #[test]
-        fn keeps_correct_amount_of_seconds() {
-            let input = StaticSamplesBuffer::new(nz!(1), nz!(16_000), &[0.0; 40_000]);
-
-            let (replay, mut source) = input
-                .replayable(Duration::from_secs(2))
-                .expect("longer then 100ms");
-
-            // exhaust but do not yet end source
-            source.by_ref().take(40_000).count();
-
-            // take all samples we can without blocking
-            let ready = replay.samples_ready();
-            let n_yielded = replay.take_samples(ready).count();
-
-            let max = source.sample_rate().get() * source.channels().get() as u32 * 2;
-            let margin = 16_000 / 10; // 100ms
-            assert!(n_yielded as u32 >= max - margin);
-        }
-
-        #[test]
-        fn samples_ready() {
-            let input = StaticSamplesBuffer::new(nz!(1), nz!(16_000), &[0.0; 40_000]);
-            let (mut replay, source) = input
-                .replayable(Duration::from_secs(2))
-                .expect("longer then 100ms");
-            assert_eq!(replay.by_ref().samples_ready(), 0);
-
-            source.take(8000).count(); // half a second
-            let margin = 16_000 / 10; // 100ms
-            let ready = replay.samples_ready();
-            assert!(ready >= 8000 - margin);
-        }
-    }
-}
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -10,7 +10,7 @@ use paths::remote_servers_dir;
 use release_channel::{AppCommitSha, ReleaseChannel};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsStore, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsStore, SettingsUi};
 use smol::{fs, io::AsyncReadExt};
 use smol::{fs::File, process::Command};
 use std::{
@@ -118,12 +118,13 @@ struct AutoUpdateSetting(bool);
 /// Whether or not to automatically check for updates.
 ///
 /// Default: true
-#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi, SettingsKey)]
+#[derive(Clone, Copy, Default, JsonSchema, Deserialize, Serialize, SettingsUi)]
 #[serde(transparent)]
-#[settings_key(key = "auto_update")]
 struct AutoUpdateSettingContent(bool);

 impl Settings for AutoUpdateSetting {
+    const KEY: Option<&'static str> = Some("auto_update");
+
    type FileContent = AutoUpdateSettingContent;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -88,7 +88,10 @@ fn view_release_notes_locally(
                        .update_in(cx, |workspace, window, cx| {
                            let project = workspace.project().clone();
                            let buffer = project.update(cx, |project, cx| {
-                                project.create_local_buffer("", markdown, false, cx)
+                                let buffer = project.create_local_buffer("", markdown, cx);
+                                project
+                                    .mark_buffer_as_non_searchable(buffer.read(cx).remote_id(), cx);
+                                buffer
                            });
                            buffer.update(cx, |buffer, cx| {
                                buffer.edit([(0..0, body.release_notes)], None, cx)
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -2044,10 +2044,10 @@ mod tests {
    #[gpui::test(iterations = 100)]
    async fn test_staging_and_unstaging_hunks(cx: &mut TestAppContext, mut rng: StdRng) {
        fn gen_line(rng: &mut StdRng) -> String {
-            if rng.random_bool(0.2) {
+            if rng.gen_bool(0.2) {
                "\n".to_owned()
            } else {
-                let c = rng.random_range('A'..='Z');
+                let c = rng.gen_range('A'..='Z');
                format!("{c}{c}{c}\n")
            }
        }
@@ -2066,7 +2066,7 @@ mod tests {
                old_lines.into_iter()
            };
            let mut result = String::new();
-            let unchanged_count = rng.random_range(0..=old_lines.len());
+            let unchanged_count = rng.gen_range(0..=old_lines.len());
            result +=
                &old_lines
                    .by_ref()
@@ -2076,14 +2076,14 @@ mod tests {
                        s
                    });
            while old_lines.len() > 0 {
-                let deleted_count = rng.random_range(0..=old_lines.len());
+                let deleted_count = rng.gen_range(0..=old_lines.len());
                let _advance = old_lines
                    .by_ref()
                    .take(deleted_count)
                    .map(|line| line.len() + 1)
                    .sum::<usize>();
                let minimum_added = if deleted_count == 0 { 1 } else { 0 };
-                let added_count = rng.random_range(minimum_added..=5);
+                let added_count = rng.gen_range(minimum_added..=5);
                let addition = (0..added_count).map(|_| gen_line(rng)).collect::<String>();
                result += &addition;

@@ -2092,8 +2092,7 @@ mod tests {
                    if blank_lines == old_lines.len() {
                        break;
                    };
-                    let unchanged_count =
-                        rng.random_range((blank_lines + 1).max(1)..=old_lines.len());
+                    let unchanged_count = rng.gen_range((blank_lines + 1).max(1)..=old_lines.len());
                    result += &old_lines.by_ref().take(unchanged_count).fold(
                        String::new(),
                        |mut s, line| {
@@ -2150,7 +2149,7 @@ mod tests {
            )
        });
        let working_copy = working_copy.read_with(cx, |working_copy, _| working_copy.snapshot());
-        let mut index_text = if rng.random() {
+        let mut index_text = if rng.r#gen() {
            Rope::from(head_text.as_str())
        } else {
            working_copy.as_rope().clone()
@@ -2166,7 +2165,7 @@ mod tests {
        }

        for _ in 0..operations {
-            let i = rng.random_range(0..hunks.len());
+            let i = rng.gen_range(0..hunks.len());
            let hunk = &mut hunks[i];
            let hunk_to_change = hunk.clone();
            let stage = match hunk.secondary_status {
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -29,7 +29,6 @@ client.workspace = true
 collections.workspace = true
 fs.workspace = true
 futures.workspace = true
-feature_flags.workspace = true
 gpui = { workspace = true, features = ["screen-capture"] }
 language.workspace = true
 log.workspace = true
--- a/crates/call/src/call_impl/room.rs
+++ b/crates/call/src/call_impl/room.rs
@@ -9,7 +9,6 @@ use client::{
    proto::{self, PeerId},
 };
 use collections::{BTreeMap, HashMap, HashSet};
-use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
 use futures::StreamExt;
 use gpui::{
@@ -1323,18 +1322,8 @@ impl Room {
            return Task::ready(Err(anyhow!("live-kit was not initialized")));
        };

-        let is_staff = cx.is_staff();
-        let user_name = self
-            .user_store
-            .read(cx)
-            .current_user()
-            .and_then(|user| user.name.clone())
-            .unwrap_or_else(|| "unknown".to_string());
-
        cx.spawn(async move |this, cx| {
-            let publication = room
-                .publish_local_microphone_track(user_name, is_staff, cx)
-                .await;
+            let publication = room.publish_local_microphone_track(cx).await;
            this.update(cx, |this, cx| {
                let live_kit = this
                    .live_kit
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 use gpui::App;
 use schemars::JsonSchema;
 use serde_derive::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};

 #[derive(Deserialize, Debug)]
 pub struct CallSettings {
@@ -11,8 +11,7 @@ pub struct CallSettings {
 }

 /// Configuration of voice calls in Zed.
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "calls")]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct CallSettingsContent {
    /// Whether the microphone should be muted when joining a channel or a call.
    ///
@@ -26,6 +25,8 @@ pub struct CallSettingsContent {
 }

 impl Settings for CallSettings {
+    const KEY: Option<&'static str> = Some("calls");
+
    type FileContent = CallSettingsContent;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
--- a/crates/channel/src/channel_chat.rs
+++ b/crates/channel/src/channel_chat.rs
@@ -129,7 +129,7 @@ impl ChannelChat {
                loaded_all_messages: false,
                next_pending_message_id: 0,
                last_acknowledged_id: None,
-                rng: StdRng::from_os_rng(),
+                rng: StdRng::from_entropy(),
                first_loaded_message_id: None,
                _subscription: subscription.set_entity(&cx.entity(), &cx.to_async()),
            }
@@ -183,7 +183,7 @@ impl ChannelChat {

        let channel_id = self.channel_id;
        let pending_id = ChannelMessageId::Pending(post_inc(&mut self.next_pending_message_id));
-        let nonce = self.rng.random();
+        let nonce = self.rng.r#gen();
        self.insert_messages(
            SumTree::from_item(
                ChannelMessage {
@@ -257,7 +257,7 @@ impl ChannelChat {
            cx,
        );

-        let nonce: u128 = self.rng.random();
+        let nonce: u128 = self.rng.r#gen();

        let request = self.rpc.request(proto::UpdateChannelMessage {
            channel_id: self.channel_id.0,
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -75,7 +75,7 @@ util = { workspace = true, features = ["test-support"] }
 windows.workspace = true

 [target.'cfg(target_os = "macos")'.dependencies]
-objc2-foundation.workspace = true
+cocoa.workspace = true

 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies]
 tokio-native-tls = "0.3"
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -31,7 +31,7 @@ use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};
 use std::{
    any::TypeId,
    convert::TryFrom,
@@ -96,8 +96,7 @@ actions!(
    ]
 );

-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
-#[settings_key(None)]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ClientSettingsContent {
    server_url: Option<String>,
 }
@@ -108,6 +107,8 @@ pub struct ClientSettings {
 }

 impl Settings for ClientSettings {
+    const KEY: Option<&'static str> = None;
+
    type FileContent = ClientSettingsContent;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -121,8 +122,7 @@ impl Settings for ClientSettings {
    fn import_from_vscode(_vscode: &settings::VsCodeSettings, _current: &mut Self::FileContent) {}
 }

-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi, SettingsKey)]
-#[settings_key(None)]
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, SettingsUi)]
 pub struct ProxySettingsContent {
    proxy: Option<String>,
 }
@@ -133,6 +133,8 @@ pub struct ProxySettings {
 }

 impl Settings for ProxySettings {
+    const KEY: Option<&'static str> = None;
+
    type FileContent = ProxySettingsContent;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -525,8 +527,7 @@ pub struct TelemetrySettings {
 }

 /// Control what info is collected by Zed.
-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "telemetry")]
+#[derive(Default, Clone, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct TelemetrySettingsContent {
    /// Send debug info like crash reports.
    ///
@@ -539,6 +540,8 @@ pub struct TelemetrySettingsContent {
 }

 impl settings::Settings for TelemetrySettings {
+    const KEY: Option<&'static str> = Some("telemetry");
+
    type FileContent = TelemetrySettingsContent;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
@@ -688,7 +691,7 @@ impl Client {
                    #[cfg(any(test, feature = "test-support"))]
                    let mut rng = StdRng::seed_from_u64(0);
                    #[cfg(not(any(test, feature = "test-support")))]
-                    let mut rng = StdRng::from_os_rng();
+                    let mut rng = StdRng::from_entropy();

                    let mut delay = INITIAL_RECONNECTION_DELAY;
                    loop {
@@ -718,9 +721,8 @@ impl Client {
                                },
                                cx,
                            );
-                            let jitter = Duration::from_millis(
-                                rng.random_range(0..delay.as_millis() as u64),
-                            );
+                            let jitter =
+                                Duration::from_millis(rng.gen_range(0..delay.as_millis() as u64));
                            cx.background_executor().timer(delay + jitter).await;
                            delay = cmp::min(delay * 2, MAX_RECONNECTION_DELAY);
                        } else {
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -84,10 +84,6 @@ static DOTNET_PROJECT_FILES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
    Regex::new(r"^(global\.json|Directory\.Build\.props|.*\.(csproj|fsproj|vbproj|sln))$").unwrap()
 });

-#[cfg(target_os = "macos")]
-static MACOS_VERSION_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"(\s*\(Build [^)]*[0-9]\))").unwrap());
-
 pub fn os_name() -> String {
    #[cfg(target_os = "macos")]
    {
@@ -112,16 +108,19 @@ pub fn os_name() -> String {
 pub fn os_version() -> String {
    #[cfg(target_os = "macos")]
    {
-        use objc2_foundation::NSProcessInfo;
-        let process_info = NSProcessInfo::processInfo();
-        let version_nsstring = unsafe { process_info.operatingSystemVersionString() };
-        // "Version 15.6.1 (Build 24G90)" -> "15.6.1 (Build 24G90)"
-        let version_string = version_nsstring.to_string().replace("Version ", "");
-        // "15.6.1 (Build 24G90)" -> "15.6.1"
-        // "26.0.0 (Build 25A5349a)" -> unchanged (Beta or Rapid Security Response; ends with letter)
-        MACOS_VERSION_REGEX
-            .replace_all(&version_string, "")
+        use cocoa::base::nil;
+        use cocoa::foundation::NSProcessInfo;
+
+        unsafe {
+            let process_info = cocoa::foundation::NSProcessInfo::processInfo(nil);
+            let version = process_info.operatingSystemVersion();
+            gpui::SemanticVersion::new(
+                version.majorVersion as usize,
+                version.minorVersion as usize,
+                version.patchVersion as usize,
+            )
            .to_string()
+        }
    }
    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
    {
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -227,7 +227,7 @@ pub async fn verify_access_token(

 #[cfg(test)]
 mod test {
-    use rand::prelude::*;
+    use rand::thread_rng;
    use scrypt::password_hash::{PasswordHasher, SaltString};
    use sea_orm::EntityTrait;

@@ -358,42 +358,9 @@ mod test {
                None,
                None,
                params,
-                &SaltString::generate(PasswordHashRngCompat::new()),
+                &SaltString::generate(thread_rng()),
            )
            .map_err(anyhow::Error::new)?
            .to_string())
    }
-
-    // TODO: remove once we password_hash v0.6 is released.
-    struct PasswordHashRngCompat(rand::rngs::ThreadRng);
-
-    impl PasswordHashRngCompat {
-        fn new() -> Self {
-            Self(rand::rng())
-        }
-    }
-
-    impl scrypt::password_hash::rand_core::RngCore for PasswordHashRngCompat {
-        fn next_u32(&mut self) -> u32 {
-            self.0.next_u32()
-        }
-
-        fn next_u64(&mut self) -> u64 {
-            self.0.next_u64()
-        }
-
-        fn fill_bytes(&mut self, dest: &mut [u8]) {
-            self.0.fill_bytes(dest);
-        }
-
-        fn try_fill_bytes(
-            &mut self,
-            dest: &mut [u8],
-        ) -> Result<(), scrypt::password_hash::rand_core::Error> {
-            self.fill_bytes(dest);
-            Ok(())
-        }
-    }
-
-    impl scrypt::password_hash::rand_core::CryptoRng for PasswordHashRngCompat {}
 }
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -256,7 +256,7 @@ impl Database {
            let test_options = self.test_options.as_ref().unwrap();
            test_options.executor.simulate_random_delay().await;
            let fail_probability = *test_options.query_failure_probability.lock();
-            if test_options.executor.rng().random_bool(fail_probability) {
+            if test_options.executor.rng().gen_bool(fail_probability) {
                return Err(anyhow!("simulated query failure"))?;
            }

--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -75,10 +75,10 @@ impl TestDb {
        static LOCK: Mutex<()> = Mutex::new(());

        let _guard = LOCK.lock();
-        let mut rng = StdRng::from_os_rng();
+        let mut rng = StdRng::from_entropy();
        let url = format!(
            "postgres://postgres@localhost/zed-test-{}",
-            rng.random::<u128>()
+            rng.r#gen::<u128>()
        );
        let runtime = tokio::runtime::Builder::new_current_thread()
            .enable_io()
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -2098,7 +2098,7 @@ async fn test_following_after_replacement(cx_a: &mut TestAppContext, cx_b: &mut
    share_workspace(&workspace, cx_a).await.unwrap();
    let buffer = workspace.update(cx_a, |workspace, cx| {
        workspace.project().update(cx, |project, cx| {
-            project.create_local_buffer(&sample_text(26, 5, 'a'), None, false, cx)
+            project.create_local_buffer(&sample_text(26, 5, 'a'), None, cx)
        })
    });
    let multibuffer = cx_a.new(|cx| {
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -2506,7 +2506,7 @@ async fn test_propagate_saves_and_fs_changes(
    });

    let new_buffer_a = project_a
-        .update(cx_a, |p, cx| p.create_buffer(false, cx))
+        .update(cx_a, |p, cx| p.create_buffer(cx))
        .await
        .unwrap();

@@ -5746,7 +5746,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(

    let definitions;
    let buffer_b2;
-    if rng.random() {
+    if rng.r#gen() {
        cx_a.run_until_parked();
        cx_b.run_until_parked();
        definitions = project_b.update(cx_b, |p, cx| p.definitions(&buffer_b1, 23, cx));
--- a/crates/collab/src/tests/random_channel_buffer_tests.rs
+++ b/crates/collab/src/tests/random_channel_buffer_tests.rs
@@ -84,7 +84,7 @@ impl RandomizedTest for RandomChannelBufferTest {
        }

        loop {
-            match rng.random_range(0..100_u32) {
+            match rng.gen_range(0..100_u32) {
                0..=29 => {
                    let channel_name = client.channel_store().read_with(cx, |store, cx| {
                        store.ordered_channels().find_map(|(_, channel)| {
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -17,7 +17,7 @@ use project::{
    DEFAULT_COMPLETION_CONTEXT, Project, ProjectPath, search::SearchQuery, search::SearchResult,
 };
 use rand::{
-    distr::{self, SampleString},
+    distributions::{Alphanumeric, DistString},
    prelude::*,
 };
 use serde::{Deserialize, Serialize};
@@ -168,19 +168,19 @@ impl RandomizedTest for ProjectCollaborationTest {
    ) -> ClientOperation {
        let call = cx.read(ActiveCall::global);
        loop {
-            match rng.random_range(0..100_u32) {
+            match rng.gen_range(0..100_u32) {
                // Mutate the call
                0..=29 => {
                    // Respond to an incoming call
                    if call.read_with(cx, |call, _| call.incoming().borrow().is_some()) {
-                        break if rng.random_bool(0.7) {
+                        break if rng.gen_bool(0.7) {
                            ClientOperation::AcceptIncomingCall
                        } else {
                            ClientOperation::RejectIncomingCall
                        };
                    }

-                    match rng.random_range(0..100_u32) {
+                    match rng.gen_range(0..100_u32) {
                        // Invite a contact to the current call
                        0..=70 => {
                            let available_contacts =
@@ -212,7 +212,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                }

                // Mutate projects
-                30..=59 => match rng.random_range(0..100_u32) {
+                30..=59 => match rng.gen_range(0..100_u32) {
                    // Open a new project
                    0..=70 => {
                        // Open a remote project
@@ -270,7 +270,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                    }

                    // Mutate project worktrees
-                    81.. => match rng.random_range(0..100_u32) {
+                    81.. => match rng.gen_range(0..100_u32) {
                        // Add a worktree to a local project
                        0..=50 => {
                            let Some(project) = client.local_projects().choose(rng).cloned() else {
@@ -279,7 +279,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                            let project_root_name = root_name_for_project(&project, cx);
                            let mut paths = client.fs().paths(false);
                            paths.remove(0);
-                            let new_root_path = if paths.is_empty() || rng.random() {
+                            let new_root_path = if paths.is_empty() || rng.r#gen() {
                                Path::new(path!("/")).join(plan.next_root_dir_name())
                            } else {
                                paths.choose(rng).unwrap().clone()
@@ -309,7 +309,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    .choose(rng)
                            });
                            let Some(worktree) = worktree else { continue };
-                            let is_dir = rng.random::<bool>();
+                            let is_dir = rng.r#gen::<bool>();
                            let mut full_path =
                                worktree.read_with(cx, |w, _| PathBuf::from(w.root_name()));
                            full_path.push(gen_file_name(rng));
@@ -334,7 +334,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                    let project_root_name = root_name_for_project(&project, cx);
                    let is_local = project.read_with(cx, |project, _| project.is_local());

-                    match rng.random_range(0..100_u32) {
+                    match rng.gen_range(0..100_u32) {
                        // Manipulate an existing buffer
                        0..=70 => {
                            let Some(buffer) = client
@@ -349,7 +349,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                            let full_path = buffer
                                .read_with(cx, |buffer, cx| buffer.file().unwrap().full_path(cx));

-                            match rng.random_range(0..100_u32) {
+                            match rng.gen_range(0..100_u32) {
                                // Close the buffer
                                0..=15 => {
                                    break ClientOperation::CloseBuffer {
@@ -360,7 +360,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                }
                                // Save the buffer
                                16..=29 if buffer.read_with(cx, |b, _| b.is_dirty()) => {
-                                    let detach = rng.random_bool(0.3);
+                                    let detach = rng.gen_bool(0.3);
                                    break ClientOperation::SaveBuffer {
                                        project_root_name,
                                        is_local,
@@ -383,17 +383,17 @@ impl RandomizedTest for ProjectCollaborationTest {
                                _ => {
                                    let offset = buffer.read_with(cx, |buffer, _| {
                                        buffer.clip_offset(
-                                            rng.random_range(0..=buffer.len()),
+                                            rng.gen_range(0..=buffer.len()),
                                            language::Bias::Left,
                                        )
                                    });
-                                    let detach = rng.random();
+                                    let detach = rng.r#gen();
                                    break ClientOperation::RequestLspDataInBuffer {
                                        project_root_name,
                                        full_path,
                                        offset,
                                        is_local,
-                                        kind: match rng.random_range(0..5_u32) {
+                                        kind: match rng.gen_range(0..5_u32) {
                                            0 => LspRequestKind::Rename,
                                            1 => LspRequestKind::Highlights,
                                            2 => LspRequestKind::Definition,
@@ -407,8 +407,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                        }

                        71..=80 => {
-                            let query = rng.random_range('a'..='z').to_string();
-                            let detach = rng.random_bool(0.3);
+                            let query = rng.gen_range('a'..='z').to_string();
+                            let detach = rng.gen_bool(0.3);
                            break ClientOperation::SearchProject {
                                project_root_name,
                                is_local,
@@ -460,7 +460,7 @@ impl RandomizedTest for ProjectCollaborationTest {

                // Create or update a file or directory
                96.. => {
-                    let is_dir = rng.random::<bool>();
+                    let is_dir = rng.r#gen::<bool>();
                    let content;
                    let mut path;
                    let dir_paths = client.fs().directories(false);
@@ -470,11 +470,11 @@ impl RandomizedTest for ProjectCollaborationTest {
                        path = dir_paths.choose(rng).unwrap().clone();
                        path.push(gen_file_name(rng));
                    } else {
-                        content = distr::Alphanumeric.sample_string(rng, 16);
+                        content = Alphanumeric.sample_string(rng, 16);

                        // Create a new file or overwrite an existing file
                        let file_paths = client.fs().files();
-                        if file_paths.is_empty() || rng.random_bool(0.5) {
+                        if file_paths.is_empty() || rng.gen_bool(0.5) {
                            path = dir_paths.choose(rng).unwrap().clone();
                            path.push(gen_file_name(rng));
                            path.set_extension("rs");
@@ -1090,7 +1090,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                            move |_, cx| {
                                let background = cx.background_executor();
                                let mut rng = background.rng();
-                                let count = rng.random_range::<usize, _>(1..3);
+                                let count = rng.gen_range::<usize, _>(1..3);
                                let files = fs.as_fake().files();
                                let files = (0..count)
                                    .map(|_| files.choose(&mut rng).unwrap().clone())
@@ -1117,12 +1117,12 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    let background = cx.background_executor();
                                    let mut rng = background.rng();

-                                    let highlight_count = rng.random_range(1..=5);
+                                    let highlight_count = rng.gen_range(1..=5);
                                    for _ in 0..highlight_count {
-                                        let start_row = rng.random_range(0..100);
-                                        let start_column = rng.random_range(0..100);
-                                        let end_row = rng.random_range(0..100);
-                                        let end_column = rng.random_range(0..100);
+                                        let start_row = rng.gen_range(0..100);
+                                        let start_column = rng.gen_range(0..100);
+                                        let end_row = rng.gen_range(0..100);
+                                        let end_column = rng.gen_range(0..100);
                                        let start = PointUtf16::new(start_row, start_column);
                                        let end = PointUtf16::new(end_row, end_column);
                                        let range =
@@ -1219,8 +1219,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                                        guest_project.remote_id(),
                                    );
                                    assert_eq!(
-                                        guest_snapshot.entries(false, 0).map(null_out_entry_size).collect::<Vec<_>>(),
-                                        host_snapshot.entries(false, 0).map(null_out_entry_size).collect::<Vec<_>>(),
+                                        guest_snapshot.entries(false, 0).collect::<Vec<_>>(),
+                                        host_snapshot.entries(false, 0).collect::<Vec<_>>(),
                                        "{} has different snapshot than the host for worktree {:?} ({:?}) and project {:?}",
                                        client.username,
                                        host_snapshot.abs_path(),
@@ -1248,18 +1248,6 @@ impl RandomizedTest for ProjectCollaborationTest {
                            );
                        }
                    });
-
-                // A hack to work around a hack in
-                // https://github.com/zed-industries/zed/pull/16696 that wasn't
-                // detected until we upgraded the rng crate. This whole crate is
-                // going away with DeltaDB soon, so we hold our nose and
-                // continue.
-                fn null_out_entry_size(entry: &project::Entry) -> project::Entry {
-                    project::Entry {
-                        size: 0,
-                        ..entry.clone()
-                    }
-                }
            }

            let buffers = client.buffers().clone();
@@ -1434,7 +1422,7 @@ fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation
            .filter(|path| path.starts_with(repo_path))
            .collect::<Vec<_>>();

-        let count = rng.random_range(0..=paths.len());
+        let count = rng.gen_range(0..=paths.len());
        paths.shuffle(rng);
        paths.truncate(count);

@@ -1446,13 +1434,13 @@ fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation

    let repo_path = client.fs().directories(false).choose(rng).unwrap().clone();

-    match rng.random_range(0..100_u32) {
+    match rng.gen_range(0..100_u32) {
        0..=25 => {
            let file_paths = generate_file_paths(&repo_path, rng, client);

            let contents = file_paths
                .into_iter()
-                .map(|path| (path, distr::Alphanumeric.sample_string(rng, 16)))
+                .map(|path| (path, Alphanumeric.sample_string(rng, 16)))
                .collect();

            GitOperation::WriteGitIndex {
@@ -1461,8 +1449,7 @@ fn generate_git_operation(rng: &mut StdRng, client: &TestClient) -> GitOperation
            }
        }
        26..=63 => {
-            let new_branch =
-                (rng.random_range(0..10) > 3).then(|| distr::Alphanumeric.sample_string(rng, 8));
+            let new_branch = (rng.gen_range(0..10) > 3).then(|| Alphanumeric.sample_string(rng, 8));

            GitOperation::WriteGitBranch {
                repo_path,
@@ -1609,7 +1596,7 @@ fn choose_random_project(client: &TestClient, rng: &mut StdRng) -> Option<Entity
 fn gen_file_name(rng: &mut StdRng) -> String {
    let mut name = String::new();
    for _ in 0..10 {
-        let letter = rng.random_range('a'..='z');
+        let letter = rng.gen_range('a'..='z');
        name.push(letter);
    }
    name
@@ -1617,7 +1604,7 @@ fn gen_file_name(rng: &mut StdRng) -> String {

 fn gen_status(rng: &mut StdRng) -> FileStatus {
    fn gen_tracked_status(rng: &mut StdRng) -> TrackedStatus {
-        match rng.random_range(0..3) {
+        match rng.gen_range(0..3) {
            0 => TrackedStatus {
                index_status: StatusCode::Unmodified,
                worktree_status: StatusCode::Unmodified,
@@ -1639,7 +1626,7 @@ fn gen_status(rng: &mut StdRng) -> FileStatus {
    }

    fn gen_unmerged_status_code(rng: &mut StdRng) -> UnmergedStatusCode {
-        match rng.random_range(0..3) {
+        match rng.gen_range(0..3) {
            0 => UnmergedStatusCode::Updated,
            1 => UnmergedStatusCode::Added,
            2 => UnmergedStatusCode::Deleted,
@@ -1647,7 +1634,7 @@ fn gen_status(rng: &mut StdRng) -> FileStatus {
        }
    }

-    match rng.random_range(0..2) {
+    match rng.gen_range(0..2) {
        0 => FileStatus::Unmerged(UnmergedStatus {
            first_head: gen_unmerged_status_code(rng),
            second_head: gen_unmerged_status_code(rng),
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -208,9 +208,9 @@ pub fn save_randomized_test_plan() {

 impl<T: RandomizedTest> TestPlan<T> {
    pub async fn new(server: &mut TestServer, mut rng: StdRng) -> Arc<Mutex<Self>> {
-        let allow_server_restarts = rng.random_bool(0.7);
-        let allow_client_reconnection = rng.random_bool(0.7);
-        let allow_client_disconnection = rng.random_bool(0.1);
+        let allow_server_restarts = rng.gen_bool(0.7);
+        let allow_client_reconnection = rng.gen_bool(0.7);
+        let allow_client_disconnection = rng.gen_bool(0.1);

        let mut users = Vec::new();
        for ix in 0..max_peers() {
@@ -407,7 +407,7 @@ impl<T: RandomizedTest> TestPlan<T> {
        }

        Some(loop {
-            break match self.rng.random_range(0..100) {
+            break match self.rng.gen_range(0..100) {
                0..=29 if clients.len() < self.users.len() => {
                    let user = self
                        .users
@@ -421,13 +421,13 @@ impl<T: RandomizedTest> TestPlan<T> {
                    }
                }
                30..=34 if clients.len() > 1 && self.allow_client_disconnection => {
-                    let (client, cx) = &clients[self.rng.random_range(0..clients.len())];
+                    let (client, cx) = &clients[self.rng.gen_range(0..clients.len())];
                    let user_id = client.current_user_id(cx);
                    self.operation_ix += 1;
                    ServerOperation::RemoveConnection { user_id }
                }
                35..=39 if clients.len() > 1 && self.allow_client_reconnection => {
-                    let (client, cx) = &clients[self.rng.random_range(0..clients.len())];
+                    let (client, cx) = &clients[self.rng.gen_range(0..clients.len())];
                    let user_id = client.current_user_id(cx);
                    self.operation_ix += 1;
                    ServerOperation::BounceConnection { user_id }
@@ -439,12 +439,12 @@ impl<T: RandomizedTest> TestPlan<T> {
                _ if !clients.is_empty() => {
                    let count = self
                        .rng
-                        .random_range(1..10)
+                        .gen_range(1..10)
                        .min(self.max_operations - self.operation_ix);
                    let batch_id = util::post_inc(&mut self.next_batch_id);
                    let mut user_ids = (0..count)
                        .map(|_| {
-                            let ix = self.rng.random_range(0..clients.len());
+                            let ix = self.rng.gen_range(0..clients.len());
                            let (client, cx) = &clients[ix];
                            client.current_user_id(cx)
                        })
@@ -453,7 +453,7 @@ impl<T: RandomizedTest> TestPlan<T> {
                    ServerOperation::MutateClients {
                        user_ids,
                        batch_id,
-                        quiesce: self.rng.random_bool(0.7),
+                        quiesce: self.rng.gen_bool(0.7),
                    }
                }
                _ => continue,
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -1,7 +1,7 @@
 use gpui::Pixels;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};
 use workspace::dock::DockPosition;

 #[derive(Deserialize, Debug)]
@@ -27,8 +27,7 @@ pub struct ChatPanelSettings {
    pub default_width: Pixels,
 }

-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "chat_panel")]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct ChatPanelSettingsContent {
    /// When to show the panel button in the status bar.
    ///
@@ -44,8 +43,14 @@ pub struct ChatPanelSettingsContent {
    pub default_width: Option<f32>,
 }

-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "collaboration_panel")]
+#[derive(Deserialize, Debug)]
+pub struct NotificationPanelSettings {
+    pub button: bool,
+    pub dock: DockPosition,
+    pub default_width: Pixels,
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct PanelSettingsContent {
    /// Whether to show the panel button in the status bar.
    ///
@@ -61,32 +66,7 @@ pub struct PanelSettingsContent {
    pub default_width: Option<f32>,
 }

-#[derive(Deserialize, Debug)]
-pub struct NotificationPanelSettings {
-    pub button: bool,
-    pub dock: DockPosition,
-    pub default_width: Pixels,
-}
-
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "notification_panel")]
-pub struct NotificationPanelSettingsContent {
-    /// Whether to show the panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Where to dock the panel.
-    ///
-    /// Default: right
-    pub dock: Option<DockPosition>,
-    /// Default width of the panel in pixels.
-    ///
-    /// Default: 300
-    pub default_width: Option<f32>,
-}
-
-#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi, SettingsKey)]
-#[settings_key(key = "message_editor")]
+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug, SettingsUi)]
 pub struct MessageEditorSettings {
    /// Whether to automatically replace emoji shortcodes with emoji characters.
    /// For example: typing `:wave:` gets replaced with `👋`.
@@ -96,6 +76,8 @@ pub struct MessageEditorSettings {
 }

 impl Settings for CollaborationPanelSettings {
+    const KEY: Option<&'static str> = Some("collaboration_panel");
+
    type FileContent = PanelSettingsContent;

    fn load(
@@ -109,6 +91,8 @@ impl Settings for CollaborationPanelSettings {
 }

 impl Settings for ChatPanelSettings {
+    const KEY: Option<&'static str> = Some("chat_panel");
+
    type FileContent = ChatPanelSettingsContent;

    fn load(
@@ -122,7 +106,9 @@ impl Settings for ChatPanelSettings {
 }

 impl Settings for NotificationPanelSettings {
-    type FileContent = NotificationPanelSettingsContent;
+    const KEY: Option<&'static str> = Some("notification_panel");
+
+    type FileContent = PanelSettingsContent;

    fn load(
        sources: SettingsSources<Self::FileContent>,
@@ -135,6 +121,8 @@ impl Settings for NotificationPanelSettings {
 }

 impl Settings for MessageEditorSettings {
+    const KEY: Option<&'static str> = Some("message_editor");
+
    type FileContent = MessageEditorSettings;

    fn load(
--- a/crates/command_palette_hooks/src/command_palette_hooks.rs
+++ b/crates/command_palette_hooks/src/command_palette_hooks.rs
@@ -76,7 +76,7 @@ impl CommandPaletteFilter {
    }

    /// Hides all actions with the given types.
-    pub fn hide_action_types<'a>(&mut self, action_types: impl IntoIterator<Item = &'a TypeId>) {
+    pub fn hide_action_types(&mut self, action_types: &[TypeId]) {
        for action_type in action_types {
            self.hidden_action_types.insert(*action_type);
            self.shown_action_types.remove(action_type);
@@ -84,7 +84,7 @@ impl CommandPaletteFilter {
    }

    /// Shows all actions with the given types.
-    pub fn show_action_types<'a>(&mut self, action_types: impl IntoIterator<Item = &'a TypeId>) {
+    pub fn show_action_types<'a>(&mut self, action_types: impl Iterator<Item = &'a TypeId>) {
        for action_type in action_types {
            self.shown_action_types.insert(*action_type);
            self.hidden_action_types.remove(action_type);
--- a/crates/component/Cargo.toml
+++ b/crates/component/Cargo.toml
@@ -20,8 +20,5 @@ strum.workspace = true
 theme.workspace = true
 workspace-hack.workspace = true

-[dev-dependencies]
-documented.workspace = true
-
 [features]
 default = []
--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -227,8 +227,6 @@ pub trait Component {
    /// Example:
    ///
    /// ```
-    /// use documented::Documented;
-    ///
    /// /// This is a doc comment.
    /// #[derive(Documented)]
    /// struct MyComponent;
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -1095,7 +1095,7 @@ impl Copilot {
                _ => {
                    filter.hide_action_types(&signed_in_actions);
                    filter.hide_action_types(&auth_actions);
-                    filter.show_action_types(&no_auth_actions);
+                    filter.show_action_types(no_auth_actions.iter());
                }
            }
        }
--- a/crates/dap/src/debugger_settings.rs
+++ b/crates/dap/src/debugger_settings.rs
@@ -2,7 +2,7 @@ use dap_types::SteppingGranularity;
 use gpui::{App, Global};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsKey, SettingsSources, SettingsUi};
+use settings::{Settings, SettingsSources, SettingsUi};

 #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, SettingsUi)]
 #[serde(rename_all = "snake_case")]
@@ -12,12 +12,11 @@ pub enum DebugPanelDockPosition {
    Right,
 }

-#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi, SettingsKey)]
+#[derive(Serialize, Deserialize, JsonSchema, Clone, Copy, SettingsUi)]
 #[serde(default)]
 // todo(settings_ui) @ben: I'm pretty sure not having the fields be optional here is a bug,
 // it means the defaults will override previously set values if a single key is missing
-#[settings_ui(group = "Debugger")]
-#[settings_key(key = "debugger")]
+#[settings_ui(group = "Debugger", path = "debugger")]
 pub struct DebuggerSettings {
    /// Determines the stepping granularity.
    ///
@@ -65,6 +64,8 @@ impl Default for DebuggerSettings {
 }

 impl Settings for DebuggerSettings {
+    const KEY: Option<&'static str> = Some("debugger");
+
    type FileContent = Self;

    fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> anyhow::Result<Self> {
--- a/crates/db/Cargo.toml
+++ b/crates/db/Cargo.toml
@@ -27,7 +27,6 @@ sqlez.workspace = true
 sqlez_macros.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
-zed_env_vars.workspace = true

 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }
--- a/crates/db/src/db.rs
+++ b/crates/db/src/db.rs
@@ -17,10 +17,9 @@ use sqlez::thread_safe_connection::ThreadSafeConnection;
 use sqlez_macros::sql;
 use std::future::Future;
 use std::path::Path;
-use std::sync::atomic::AtomicBool;
 use std::sync::{LazyLock, atomic::Ordering};
+use std::{env, sync::atomic::AtomicBool};
 use util::{ResultExt, maybe};
-use zed_env_vars::ZED_STATELESS;

 const CONNECTION_INITIALIZE_QUERY: &str = sql!(
    PRAGMA foreign_keys=TRUE;
@@ -37,6 +36,9 @@ const FALLBACK_DB_NAME: &str = "FALLBACK_MEMORY_DB";

 const DB_FILE_NAME: &str = "db.sqlite";

+pub static ZED_STATELESS: LazyLock<bool> =
+    LazyLock::new(|| env::var("ZED_STATELESS").is_ok_and(|v| !v.is_empty()));
+
 pub static ALL_FILE_DB_FAILED: LazyLock<AtomicBool> = LazyLock::new(|| AtomicBool::new(false));

 /// Open or create a database at the given directory path.
--- a/crates/debugger_ui/src/attach_modal.rs
+++ b/crates/debugger_ui/src/attach_modal.rs
@@ -1,10 +1,8 @@
 use dap::{DapRegistry, DebugRequest};
 use fuzzy::{StringMatch, StringMatchCandidate};
-use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render, Task};
+use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Render};
 use gpui::{Subscription, WeakEntity};
 use picker::{Picker, PickerDelegate};
-use project::Project;
-use rpc::proto;
 use task::ZedDebugConfig;
 use util::debug_panic;

@@ -58,28 +56,29 @@ impl AttachModal {
    pub fn new(
        definition: ZedDebugConfig,
        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
        modal: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let processes_task = get_processes_for_project(&project, cx);
-
-        let modal = Self::with_processes(workspace, definition, Arc::new([]), modal, window, cx);
-
-        cx.spawn_in(window, async move |this, cx| {
-            let processes = processes_task.await;
-            this.update_in(cx, |modal, window, cx| {
-                modal.picker.update(cx, |picker, cx| {
-                    picker.delegate.candidates = processes;
-                    picker.refresh(window, cx);
-                });
-            })?;
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        modal
+        let mut processes: Box<[_]> = System::new_all()
+            .processes()
+            .values()
+            .map(|process| {
+                let name = process.name().to_string_lossy().into_owned();
+                Candidate {
+                    name: name.into(),
+                    pid: process.pid().as_u32(),
+                    command: process
+                        .cmd()
+                        .iter()
+                        .map(|s| s.to_string_lossy().to_string())
+                        .collect::<Vec<_>>(),
+                }
+            })
+            .collect();
+        processes.sort_by_key(|k| k.name.clone());
+        let processes = processes.into_iter().collect();
+        Self::with_processes(workspace, definition, processes, modal, window, cx)
    }

    pub(super) fn with_processes(
@@ -333,57 +332,6 @@ impl PickerDelegate for AttachModalDelegate {
    }
 }

-fn get_processes_for_project(project: &Entity<Project>, cx: &mut App) -> Task<Arc<[Candidate]>> {
-    let project = project.read(cx);
-
-    if let Some(remote_client) = project.remote_client() {
-        let proto_client = remote_client.read(cx).proto_client();
-        cx.spawn(async move |_cx| {
-            let response = proto_client
-                .request(proto::GetProcesses {
-                    project_id: proto::REMOTE_SERVER_PROJECT_ID,
-                })
-                .await
-                .unwrap_or_else(|_| proto::GetProcessesResponse {
-                    processes: Vec::new(),
-                });
-
-            let mut processes: Vec<Candidate> = response
-                .processes
-                .into_iter()
-                .map(|p| Candidate {
-                    pid: p.pid,
-                    name: p.name.into(),
-                    command: p.command,
-                })
-                .collect();
-
-            processes.sort_by_key(|k| k.name.clone());
-            Arc::from(processes.into_boxed_slice())
-        })
-    } else {
-        let mut processes: Box<[_]> = System::new_all()
-            .processes()
-            .values()
-            .map(|process| {
-                let name = process.name().to_string_lossy().into_owned();
-                Candidate {
-                    name: name.into(),
-                    pid: process.pid().as_u32(),
-                    command: process
-                        .cmd()
-                        .iter()
-                        .map(|s| s.to_string_lossy().to_string())
-                        .collect::<Vec<_>>(),
-                }
-            })
-            .collect();
-        processes.sort_by_key(|k| k.name.clone());
-        let processes = processes.into_iter().collect();
-        Task::ready(processes)
-    }
-}
-
 #[cfg(any(test, feature = "test-support"))]
 pub(crate) fn _process_names(modal: &AttachModal, cx: &mut Context<AttachModal>) -> Vec<String> {
    modal.picker.read_with(cx, |picker, _| {
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -13,8 +13,11 @@ use anyhow::{Context as _, Result, anyhow};
 use collections::IndexMap;
 use dap::adapters::DebugAdapterName;
 use dap::debugger_settings::DebugPanelDockPosition;
+use dap::{
+    ContinuedEvent, LoadedSourceEvent, ModuleEvent, OutputEvent, StoppedEvent, ThreadEvent,
+    client::SessionId, debugger_settings::DebuggerSettings,
+};
 use dap::{DapRegistry, StartDebuggingRequestArguments};
-use dap::{client::SessionId, debugger_settings::DebuggerSettings};
 use editor::Editor;
 use gpui::{
    Action, App, AsyncWindowContext, ClipboardItem, Context, DismissEvent, Entity, EntityId,
@@ -43,6 +46,23 @@ use workspace::{
 };
 use zed_actions::ToggleFocus;

+pub enum DebugPanelEvent {
+    Exited(SessionId),
+    Terminated(SessionId),
+    Stopped {
+        client_id: SessionId,
+        event: StoppedEvent,
+        go_to_stack_frame: bool,
+    },
+    Thread((SessionId, ThreadEvent)),
+    Continued((SessionId, ContinuedEvent)),
+    Output((SessionId, OutputEvent)),
+    Module((SessionId, ModuleEvent)),
+    LoadedSource((SessionId, LoadedSourceEvent)),
+    ClientShutdown(SessionId),
+    CapabilitiesChanged(SessionId),
+}
+
 pub struct DebugPanel {
    size: Pixels,
    active_session: Option<Entity<DebugSession>>,
@@ -1387,6 +1407,7 @@ async fn register_session_inner(
 }

 impl EventEmitter<PanelEvent> for DebugPanel {}
+impl EventEmitter<DebugPanelEvent> for DebugPanel {}

 impl Focusable for DebugPanel {
    fn focus_handle(&self, _: &App) -> FocusHandle {
--- a/crates/debugger_ui/src/dropdown_menus.rs
+++ b/crates/debugger_ui/src/dropdown_menus.rs
@@ -113,6 +113,23 @@ impl DebugPanel {
                }
            };
            session_entries.push(root_entry);
+
+            session_entries.extend(
+                sessions_with_children
+                    .by_ref()
+                    .take_while(|(session, _)| {
+                        session
+                            .read(cx)
+                            .session(cx)
+                            .read(cx)
+                            .parent_id(cx)
+                            .is_some()
+                    })
+                    .map(|(session, _)| SessionListEntry {
+                        leaf: session.clone(),
+                        ancestors: vec![],
+                    }),
+            );
        }

        let weak = cx.weak_entity();
--- a/crates/debugger_ui/src/new_process_modal.rs
+++ b/crates/debugger_ui/src/new_process_modal.rs
@@ -20,7 +20,7 @@ use gpui::{
 };
 use itertools::Itertools as _;
 use picker::{Picker, PickerDelegate, highlighted_match_with_paths::HighlightedMatch};
-use project::{DebugScenarioContext, Project, TaskContexts, TaskSourceKind, task_store::TaskStore};
+use project::{DebugScenarioContext, TaskContexts, TaskSourceKind, task_store::TaskStore};
 use settings::Settings;
 use task::{DebugScenario, RevealTarget, ZedDebugConfig};
 use theme::ThemeSettings;
@@ -88,10 +88,8 @@ impl NewProcessModal {
            })?;
            workspace.update_in(cx, |workspace, window, cx| {
                let workspace_handle = workspace.weak_handle();
-                let project = workspace.project().clone();
                workspace.toggle_modal(window, cx, |window, cx| {
-                    let attach_mode =
-                        AttachMode::new(None, workspace_handle.clone(), project, window, cx);
+                    let attach_mode = AttachMode::new(None, workspace_handle.clone(), window, cx);

                    let debug_picker = cx.new(|cx| {
                        let delegate =
@@ -942,7 +940,6 @@ impl AttachMode {
    pub(super) fn new(
        debugger: Option<DebugAdapterName>,
        workspace: WeakEntity<Workspace>,
-        project: Entity<Project>,
        window: &mut Window,
        cx: &mut Context<NewProcessModal>,
    ) -> Entity<Self> {
@@ -953,7 +950,7 @@ impl AttachMode {
            stop_on_entry: Some(false),
        };
        let attach_picker = cx.new(|cx| {
-            let modal = AttachModal::new(definition.clone(), workspace, project, false, window, cx);
+            let modal = AttachModal::new(definition.clone(), workspace, false, window, cx);
            window.focus(&modal.focus_handle(cx));

            modal
--- a/crates/debugger_ui/src/session.rs
+++ b/crates/debugger_ui/src/session.rs
@@ -2,7 +2,9 @@ pub mod running;

 use crate::{StackTraceView, persistence::SerializedLayout, session::running::DebugTerminal};
 use dap::client::SessionId;
-use gpui::{App, Axis, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity};
+use gpui::{
+    App, Axis, Entity, EventEmitter, FocusHandle, Focusable, Subscription, Task, WeakEntity,
+};
 use project::debugger::session::Session;
 use project::worktree_store::WorktreeStore;
 use project::{Project, debugger::session::SessionQuirks};
@@ -22,6 +24,13 @@ pub struct DebugSession {
    stack_trace_view: OnceCell<Entity<StackTraceView>>,
    _worktree_store: WeakEntity<WorktreeStore>,
    workspace: WeakEntity<Workspace>,
+    _subscriptions: [Subscription; 1],
+}
+
+#[derive(Debug)]
+pub enum DebugPanelItemEvent {
+    Close,
+    Stopped { go_to_stack_frame: bool },
 }

 impl DebugSession {
@@ -50,6 +59,9 @@ impl DebugSession {
        let quirks = session.read(cx).quirks();

        cx.new(|cx| Self {
+            _subscriptions: [cx.subscribe(&running_state, |_, _, _, cx| {
+                cx.notify();
+            })],
            remote_id: None,
            running_state,
            quirks,
@@ -121,7 +133,7 @@ impl DebugSession {
    }
 }

-impl EventEmitter<()> for DebugSession {}
+impl EventEmitter<DebugPanelItemEvent> for DebugSession {}

 impl Focusable for DebugSession {
    fn focus_handle(&self, cx: &App) -> FocusHandle {
@@ -130,7 +142,7 @@ impl Focusable for DebugSession {
 }

 impl Item for DebugSession {
-    type Event = ();
+    type Event = DebugPanelItemEvent;
    fn tab_content_text(&self, _detail: usize, _cx: &App) -> SharedString {
        "Debugger".into()
    }
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -14,6 +14,7 @@ use crate::{
    session::running::memory_view::MemoryView,
 };

+use super::DebugPanelItemEvent;
 use anyhow::{Context as _, Result, anyhow};
 use breakpoint_list::BreakpointList;
 use collections::{HashMap, IndexMap};
@@ -1825,6 +1826,8 @@ impl RunningState {
    }
 }

+impl EventEmitter<DebugPanelItemEvent> for RunningState {}
+
 impl Focusable for RunningState {
    fn focus_handle(&self, _: &App) -> FocusHandle {
        self.focus_handle.clone()
--- a/crates/debugger_ui/src/session/running/stack_frame_list.rs
+++ b/crates/debugger_ui/src/session/running/stack_frame_list.rs
@@ -28,8 +28,8 @@ pub enum StackFrameListEvent {
 }

 /// Represents the filter applied to the stack frame list
-#[derive(PartialEq, Eq, Copy, Clone, Debug)]
-pub(crate) enum StackFrameFilter {
+#[derive(PartialEq, Eq, Copy, Clone)]
+enum StackFrameFilter {
    /// Show all frames
    All,
    /// Show only frames from the user's code
@@ -174,29 +174,19 @@ impl StackFrameList {

    #[cfg(test)]
    pub(crate) fn dap_stack_frames(&self, cx: &mut App) -> Vec<dap::StackFrame> {
-        match self.list_filter {
-            StackFrameFilter::All => self
-                .stack_frames(cx)
-                .unwrap_or_default()
-                .into_iter()
-                .map(|stack_frame| stack_frame.dap)
-                .collect(),
-            StackFrameFilter::OnlyUserFrames => self
-                .filter_entries_indices
-                .iter()
-                .map(|ix| match &self.entries[*ix] {
-                    StackFrameEntry::Label(label) => label,
-                    StackFrameEntry::Collapsed(_) => panic!("Collapsed tabs should not be visible"),
-                    StackFrameEntry::Normal(frame) => frame,
-                })
-                .cloned()
-                .collect(),
-        }
-    }
-
-    #[cfg(test)]
-    pub(crate) fn list_filter(&self) -> StackFrameFilter {
-        self.list_filter
+        self.stack_frames(cx)
+            .unwrap_or_default()
+            .into_iter()
+            .enumerate()
+            .filter(|(ix, _)| {
+                self.list_filter == StackFrameFilter::All
+                    || self
+                        .filter_entries_indices
+                        .binary_search_by_key(&ix, |ix| ix)
+                        .is_ok()
+            })
+            .map(|(_, stack_frame)| stack_frame.dap)
+            .collect()
    }

    pub fn opened_stack_frame_id(&self) -> Option<StackFrameId> {
@@ -256,7 +246,6 @@ impl StackFrameList {
                self.entries.clear();
                self.selected_ix = None;
                self.list_state.reset(0);
-                self.filter_entries_indices.clear();
                cx.emit(StackFrameListEvent::BuiltEntries);
                cx.notify();
                return;
@@ -274,7 +263,7 @@ impl StackFrameList {
            .unwrap_or_default();

        let mut filter_entries_indices = Vec::default();
-        for stack_frame in stack_frames.iter() {
+        for (ix, stack_frame) in stack_frames.iter().enumerate() {
            let frame_in_visible_worktree = stack_frame.dap.source.as_ref().is_some_and(|source| {
                source.path.as_ref().is_some_and(|path| {
                    worktree_prefixes
@@ -284,6 +273,10 @@ impl StackFrameList {
                })
            });

+            if frame_in_visible_worktree {
+                filter_entries_indices.push(ix);
+            }
+
            match stack_frame.dap.presentation_hint {
                Some(dap::StackFramePresentationHint::Deemphasize)
                | Some(dap::StackFramePresentationHint::Subtle) => {
@@ -309,9 +302,6 @@ impl StackFrameList {
                        first_stack_frame_with_path.get_or_insert(entries.len());
                    }
                    entries.push(StackFrameEntry::Normal(stack_frame.dap.clone()));
-                    if frame_in_visible_worktree {
-                        filter_entries_indices.push(entries.len() - 1);
-                    }
                }
            }
        }
@@ -319,6 +309,7 @@ impl StackFrameList {
        let collapsed_entries = std::mem::take(&mut collapsed_entries);
        if !collapsed_entries.is_empty() {
            entries.push(StackFrameEntry::Collapsed(collapsed_entries));
+            self.filter_entries_indices.push(entries.len() - 1);
        }
        self.entries = entries;
        self.filter_entries_indices = filter_entries_indices;
@@ -621,16 +612,7 @@ impl StackFrameList {
        let entries = std::mem::take(stack_frames)
            .into_iter()
            .map(StackFrameEntry::Normal);
-        // HERE
-        let entries_len = entries.len();
        self.entries.splice(ix..ix + 1, entries);
-        let (Ok(filtered_indices_start) | Err(filtered_indices_start)) =
-            self.filter_entries_indices.binary_search(&ix);
-
-        for idx in &mut self.filter_entries_indices[filtered_indices_start..] {
-            *idx += entries_len - 1;
-        }
-
        self.selected_ix = Some(ix);
        self.list_state.reset(self.entries.len());
        cx.emit(StackFrameListEvent::BuiltEntries);
--- a/crates/debugger_ui/src/tests/stack_frame_list.rs
+++ b/crates/debugger_ui/src/tests/stack_frame_list.rs
@@ -1,6 +1,6 @@
 use crate::{
    debugger_panel::DebugPanel,
-    session::running::stack_frame_list::{StackFrameEntry, StackFrameFilter},
+    session::running::stack_frame_list::StackFrameEntry,
    tests::{active_debug_session_panel, init_test, init_test_workspace, start_debug_session},
 };
 use dap::{
@@ -867,28 +867,6 @@ async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppC
        },
        StackFrame {
            id: 4,
-            name: "node:internal/modules/run_main2".into(),
-            source: Some(dap::Source {
-                name: Some("run_main.js".into()),
-                path: Some(path!("/usr/lib/node/internal/modules/run_main2.js").into()),
-                source_reference: None,
-                presentation_hint: None,
-                origin: None,
-                sources: None,
-                adapter_data: None,
-                checksums: None,
-            }),
-            line: 50,
-            column: 1,
-            end_line: None,
-            end_column: None,
-            can_restart: None,
-            instruction_pointer_reference: None,
-            module_id: None,
-            presentation_hint: Some(dap::StackFramePresentationHint::Deemphasize),
-        },
-        StackFrame {
-            id: 5,
            name: "doSomething".into(),
            source: Some(dap::Source {
                name: Some("test.js".into()),
@@ -979,119 +957,83 @@ async fn test_stack_frame_filter(executor: BackgroundExecutor, cx: &mut TestAppC

    cx.run_until_parked();

-    let stack_frame_list =
-        active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
-            let stack_frame_list = debug_panel_item
-                .running_state()
-                .update(cx, |state, _| state.stack_frame_list().clone());
+    active_debug_session_panel(workspace, cx).update_in(cx, |debug_panel_item, window, cx| {
+        let stack_frame_list = debug_panel_item
+            .running_state()
+            .update(cx, |state, _| state.stack_frame_list().clone());

-            stack_frame_list.update(cx, |stack_frame_list, cx| {
-                stack_frame_list.build_entries(true, window, cx);
+        stack_frame_list.update(cx, |stack_frame_list, cx| {
+            stack_frame_list.build_entries(true, window, cx);

-                // Verify we have the expected collapsed structure
-                assert_eq!(
-                    stack_frame_list.entries(),
-                    &vec![
-                        StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                        StackFrameEntry::Collapsed(vec![
-                            stack_frames_for_assertions[1].clone(),
-                            stack_frames_for_assertions[2].clone(),
-                            stack_frames_for_assertions[3].clone()
-                        ]),
-                        StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
-                    ]
-                );
-            });
+            // Verify we have the expected collapsed structure
+            assert_eq!(
+                stack_frame_list.entries(),
+                &vec![
+                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                    StackFrameEntry::Collapsed(vec![
+                        stack_frames_for_assertions[1].clone(),
+                        stack_frames_for_assertions[2].clone()
+                    ]),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                ]
+            );

+            // Test 1: Verify filtering works
+            let all_frames = stack_frame_list.flatten_entries(true, false);
+            assert_eq!(all_frames.len(), 4, "Should see all 4 frames initially");
+
+            // Toggle to user frames only
            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+
+            let user_frames = stack_frame_list.dap_stack_frames(cx);
+            assert_eq!(user_frames.len(), 2, "Should only see 2 user frames");
+            assert_eq!(user_frames[0].name, "main");
+            assert_eq!(user_frames[1].name, "doSomething");
+
+            // Test 2: Verify filtering toggles correctly
+            // Check we can toggle back and see all frames again
+
+            // Toggle back to all frames
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+
+            let all_frames_again = stack_frame_list.flatten_entries(true, false);
+            assert_eq!(
+                all_frames_again.len(),
+                4,
+                "Should see all 4 frames after toggling back"
+            );
+
+            // Test 3: Verify collapsed entries stay expanded
+            stack_frame_list.expand_collapsed_entry(1, cx);
+            assert_eq!(
+                stack_frame_list.entries(),
+                &vec![
+                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                ]
+            );
+
+            // Toggle filter twice
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+            stack_frame_list
+                .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
+
+            // Verify entries remain expanded
+            assert_eq!(
+                stack_frame_list.entries(),
+                &vec![
+                    StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
+                    StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
+                ],
+                "Expanded entries should remain expanded after toggling filter"
+            );
        });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        let all_frames = stack_frame_list.flatten_entries(true, false);
-        assert_eq!(all_frames.len(), 5, "Should see all 5 frames initially");
-
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames
-        );
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        let user_frames = stack_frame_list.dap_stack_frames(cx);
-        assert_eq!(user_frames.len(), 2, "Should only see 2 user frames");
-        assert_eq!(user_frames[0].name, "main");
-        assert_eq!(user_frames[1].name, "doSomething");
-
-        // Toggle back to all frames
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(stack_frame_list.list_filter(), StackFrameFilter::All);
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        let all_frames_again = stack_frame_list.flatten_entries(true, false);
-        assert_eq!(
-            all_frames_again.len(),
-            5,
-            "Should see all 5 frames after toggling back"
-        );
-
-        // Test 3: Verify collapsed entries stay expanded
-        stack_frame_list.expand_collapsed_entry(1, cx);
-        assert_eq!(
-            stack_frame_list.entries(),
-            &vec![
-                StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
-            ]
-        );
-
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames
-        );
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(stack_frame_list.list_filter(), StackFrameFilter::All);
-    });
-
-    stack_frame_list.update(cx, |stack_frame_list, cx| {
-        stack_frame_list
-            .toggle_frame_filter(Some(project::debugger::session::ThreadStatus::Stopped), cx);
-        assert_eq!(
-            stack_frame_list.list_filter(),
-            StackFrameFilter::OnlyUserFrames
-        );
-
-        assert_eq!(
-            stack_frame_list.dap_stack_frames(cx).as_slice(),
-            &[
-                stack_frames_for_assertions[0].clone(),
-                stack_frames_for_assertions[4].clone()
-            ]
-        );
-
-        // Verify entries remain expanded
-        assert_eq!(
-            stack_frame_list.entries(),
-            &vec![
-                StackFrameEntry::Normal(stack_frames_for_assertions[0].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[1].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[2].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[3].clone()),
-                StackFrameEntry::Normal(stack_frames_for_assertions[4].clone()),
-            ],
-            "Expanded entries should remain expanded after toggling filter"
-        );
    });
 }
--- a/crates/deepseek/src/deepseek.rs
+++ b/crates/deepseek/src/deepseek.rs
@@ -96,7 +96,7 @@ impl Model {

    pub fn max_token_count(&self) -> u64 {
        match self {
-            Self::Chat | Self::Reasoner => 128_000,
+            Self::Chat | Self::Reasoner => 64_000,
            Self::Custom { max_tokens, .. } => *max_tokens,
        }
    }
@@ -104,7 +104,7 @@ impl Model {
    pub fn max_output_tokens(&self) -> Option<u64> {
        match self {
            Self::Chat => Some(8_192),
-            Self::Reasoner => Some(64_000),
+            Self::Reasoner => Some(8_192),
            Self::Custom {
                max_output_tokens, ..
            } => *max_output_tokens,
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -94,44 +94,43 @@ impl Render for ProjectDiagnosticsEditor {
            0
        };

-        let child =
-            if warning_count + self.summary.error_count == 0 && self.editor.read(cx).is_empty(cx) {
-                let label = if self.summary.warning_count == 0 {
-                    SharedString::new_static("No problems in workspace")
-                } else {
-                    SharedString::new_static("No errors in workspace")
-                };
-                v_flex()
-                    .key_context("EmptyPane")
-                    .size_full()
-                    .gap_1()
-                    .justify_center()
-                    .items_center()
-                    .text_center()
-                    .bg(cx.theme().colors().editor_background)
-                    .child(Label::new(label).color(Color::Muted))
-                    .when(self.summary.warning_count > 0, |this| {
-                        let plural_suffix = if self.summary.warning_count > 1 {
-                            "s"
-                        } else {
-                            ""
-                        };
-                        let label = format!(
-                            "Show {} warning{}",
-                            self.summary.warning_count, plural_suffix
-                        );
-                        this.child(
-                            Button::new("diagnostics-show-warning-label", label).on_click(
-                                cx.listener(|this, _, window, cx| {
-                                    this.toggle_warnings(&Default::default(), window, cx);
-                                    cx.notify();
-                                }),
-                            ),
-                        )
-                    })
+        let child = if warning_count + self.summary.error_count == 0 {
+            let label = if self.summary.warning_count == 0 {
+                SharedString::new_static("No problems in workspace")
            } else {
-                div().size_full().child(self.editor.clone())
+                SharedString::new_static("No errors in workspace")
            };
+            v_flex()
+                .key_context("EmptyPane")
+                .size_full()
+                .gap_1()
+                .justify_center()
+                .items_center()
+                .text_center()
+                .bg(cx.theme().colors().editor_background)
+                .child(Label::new(label).color(Color::Muted))
+                .when(self.summary.warning_count > 0, |this| {
+                    let plural_suffix = if self.summary.warning_count > 1 {
+                        "s"
+                    } else {
+                        ""
+                    };
+                    let label = format!(
+                        "Show {} warning{}",
+                        self.summary.warning_count, plural_suffix
+                    );
+                    this.child(
+                        Button::new("diagnostics-show-warning-label", label).on_click(cx.listener(
+                            |this, _, window, cx| {
+                                this.toggle_warnings(&Default::default(), window, cx);
+                                cx.notify();
+                            },
+                        )),
+                    )
+                })
+        } else {
+            div().size_full().child(self.editor.clone())
+        };

        div()
            .key_context("Diagnostics")
@@ -234,7 +233,6 @@ impl ProjectDiagnosticsEditor {
                        }
                    }
                    EditorEvent::Blurred => this.update_stale_excerpts(window, cx),
-                    EditorEvent::Saved => this.update_stale_excerpts(window, cx),
                    _ => {}
                }
            },
@@ -279,7 +277,7 @@ impl ProjectDiagnosticsEditor {
    }

    fn update_stale_excerpts(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if self.update_excerpts_task.is_some() || self.multibuffer.read(cx).is_dirty(cx) {
+        if self.update_excerpts_task.is_some() {
            return;
        }

--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -682,7 +682,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
        Default::default();

    for _ in 0..operations {
-        match rng.random_range(0..100) {
+        match rng.gen_range(0..100) {
            // language server completes its diagnostic check
            0..=20 if !updated_language_servers.is_empty() => {
                let server_id = *updated_language_servers.iter().choose(&mut rng).unwrap();
@@ -691,7 +691,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                    lsp_store.disk_based_diagnostics_finished(server_id, cx)
                });

-                if rng.random_bool(0.5) {
+                if rng.gen_bool(0.5) {
                    cx.run_until_parked();
                }
            }
@@ -701,7 +701,7 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                let (path, server_id, diagnostics) =
                    match current_diagnostics.iter_mut().choose(&mut rng) {
                        // update existing set of diagnostics
-                        Some(((path, server_id), diagnostics)) if rng.random_bool(0.5) => {
+                        Some(((path, server_id), diagnostics)) if rng.gen_bool(0.5) => {
                            (path.clone(), *server_id, diagnostics)
                        }

@@ -709,13 +709,13 @@ async fn test_random_diagnostics_blocks(cx: &mut TestAppContext, mut rng: StdRng
                        _ => {
                            let path: PathBuf =
                                format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
-                            let len = rng.random_range(128..256);
+                            let len = rng.gen_range(128..256);
                            let content =
                                RandomCharIter::new(&mut rng).take(len).collect::<String>();
                            fs.insert_file(&path, content.into_bytes()).await;

                            let server_id = match language_server_ids.iter().choose(&mut rng) {
-                                Some(server_id) if rng.random_bool(0.5) => *server_id,
+                                Some(server_id) if rng.gen_bool(0.5) => *server_id,
                                _ => {
                                    let id = LanguageServerId(language_server_ids.len());
                                    language_server_ids.push(id);
@@ -846,7 +846,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
    let mut next_inlay_id = 0;

    for _ in 0..operations {
-        match rng.random_range(0..100) {
+        match rng.gen_range(0..100) {
            // language server completes its diagnostic check
            0..=20 if !updated_language_servers.is_empty() => {
                let server_id = *updated_language_servers.iter().choose(&mut rng).unwrap();
@@ -855,7 +855,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                    lsp_store.disk_based_diagnostics_finished(server_id, cx)
                });

-                if rng.random_bool(0.5) {
+                if rng.gen_bool(0.5) {
                    cx.run_until_parked();
                }
            }
@@ -864,7 +864,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                diagnostics.editor.update(cx, |editor, cx| {
                    let snapshot = editor.snapshot(window, cx);
                    if !snapshot.buffer_snapshot.is_empty() {
-                        let position = rng.random_range(0..snapshot.buffer_snapshot.len());
+                        let position = rng.gen_range(0..snapshot.buffer_snapshot.len());
                        let position = snapshot.buffer_snapshot.clip_offset(position, Bias::Left);
                        log::info!(
                            "adding inlay at {position}/{}: {:?}",
@@ -890,7 +890,7 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                let (path, server_id, diagnostics) =
                    match current_diagnostics.iter_mut().choose(&mut rng) {
                        // update existing set of diagnostics
-                        Some(((path, server_id), diagnostics)) if rng.random_bool(0.5) => {
+                        Some(((path, server_id), diagnostics)) if rng.gen_bool(0.5) => {
                            (path.clone(), *server_id, diagnostics)
                        }

@@ -898,13 +898,13 @@ async fn test_random_diagnostics_with_inlays(cx: &mut TestAppContext, mut rng: S
                        _ => {
                            let path: PathBuf =
                                format!(path!("/test/{}.rs"), post_inc(&mut next_filename)).into();
-                            let len = rng.random_range(128..256);
+                            let len = rng.gen_range(128..256);
                            let content =
                                RandomCharIter::new(&mut rng).take(len).collect::<String>();
                            fs.insert_file(&path, content.into_bytes()).await;

                            let server_id = match language_server_ids.iter().choose(&mut rng) {
-                                Some(server_id) if rng.random_bool(0.5) => *server_id,
+                                Some(server_id) if rng.gen_bool(0.5) => *server_id,
                                _ => {
                                    let id = LanguageServerId(language_server_ids.len());
                                    language_server_ids.push(id);
@@ -1589,10 +1589,10 @@ fn randomly_update_diagnostics_for_path(
    next_id: &mut usize,
    rng: &mut impl Rng,
 ) {
-    let mutation_count = rng.random_range(1..=3);
+    let mutation_count = rng.gen_range(1..=3);
    for _ in 0..mutation_count {
-        if rng.random_bool(0.3) && !diagnostics.is_empty() {
-            let idx = rng.random_range(0..diagnostics.len());
+        if rng.gen_bool(0.3) && !diagnostics.is_empty() {
+            let idx = rng.gen_range(0..diagnostics.len());
            log::info!("  removing diagnostic at index {idx}");
            diagnostics.remove(idx);
        } else {
@@ -1601,7 +1601,7 @@ fn randomly_update_diagnostics_for_path(

            let new_diagnostic = random_lsp_diagnostic(rng, fs, path, unique_id);

-            let ix = rng.random_range(0..=diagnostics.len());
+            let ix = rng.gen_range(0..=diagnostics.len());
            log::info!(
                "  inserting {} at index {ix}. {},{}..{},{}",
                new_diagnostic.message,
@@ -1638,8 +1638,8 @@ fn random_lsp_diagnostic(
    let file_content = fs.read_file_sync(path).unwrap();
    let file_text = Rope::from(String::from_utf8_lossy(&file_content).as_ref());

-    let start = rng.random_range(0..file_text.len().saturating_add(ERROR_MARGIN));
-    let end = rng.random_range(start..file_text.len().saturating_add(ERROR_MARGIN));
+    let start = rng.gen_range(0..file_text.len().saturating_add(ERROR_MARGIN));
+    let end = rng.gen_range(start..file_text.len().saturating_add(ERROR_MARGIN));

    let start_point = file_text.offset_to_point_utf16(start);
    let end_point = file_text.offset_to_point_utf16(end);
@@ -1649,7 +1649,7 @@ fn random_lsp_diagnostic(
        lsp::Position::new(end_point.row, end_point.column),
    );

-    let severity = if rng.random_bool(0.5) {
+    let severity = if rng.gen_bool(0.5) {
        Some(lsp::DiagnosticSeverity::ERROR)
    } else {
        Some(lsp::DiagnosticSeverity::WARNING)
@@ -1657,14 +1657,13 @@ fn random_lsp_diagnostic(

    let message = format!("diagnostic {unique_id}");

-    let related_information = if rng.random_bool(0.3) {
-        let info_count = rng.random_range(1..=3);
+    let related_information = if rng.gen_bool(0.3) {
+        let info_count = rng.gen_range(1..=3);
        let mut related_info = Vec::with_capacity(info_count);

        for i in 0..info_count {
-            let info_start = rng.random_range(0..file_text.len().saturating_add(ERROR_MARGIN));
-            let info_end =
-                rng.random_range(info_start..file_text.len().saturating_add(ERROR_MARGIN));
+            let info_start = rng.gen_range(0..file_text.len().saturating_add(ERROR_MARGIN));
+            let info_end = rng.gen_range(info_start..file_text.len().saturating_add(ERROR_MARGIN));

            let info_start_point = file_text.offset_to_point_utf16(info_start);
            let info_end_point = file_text.offset_to_point_utf16(info_end);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peter Tripp	fb24f1bb5c	Fallback to default_model	2025-09-03 16:17:27 -04:00
Peter Tripp	a943acc7ee	Use `thread_summary_model` for Text Threads too	2025-09-03 15:59:23 -04:00