Spawn tasks with sh instead of user's shell

2025-06-25 14:48:36 -07:00
327 changed files with 6971 additions and 16947 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,6 @@ jobs:
      run_tests: ${{ steps.filter.outputs.run_tests }}
      run_license: ${{ steps.filter.outputs.run_license }}
      run_docs: ${{ steps.filter.outputs.run_docs }}
-      run_nix: ${{ steps.filter.outputs.run_nix }}
    runs-on:
      - ubuntu-latest
    steps:
@@ -70,12 +69,6 @@ jobs:
          else
            echo "run_license=false" >> $GITHUB_OUTPUT
          fi
-          NIX_REGEX='^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)'
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep "$NIX_REGEX") ]]; then
-            echo "run_nix=true" >> $GITHUB_OUTPUT
-          else
-            echo "run_nix=false" >> $GITHUB_OUTPUT
-          fi

  migration_checks:
    name: Check Postgres and Protobuf migrations, mergability
@@ -467,10 +460,8 @@ jobs:
          RET_CODE=0
          # Always check style
          [[ "${{ needs.style.result }}"      != 'success' ]] && { RET_CODE=1; echo "style tests failed"; }
+          [[ "${{ needs.check_docs.result }}" != 'success' ]] && { RET_CODE=1; echo "docs checks failed"; }

-          if [[ "${{ needs.job_spec.outputs.run_docs }}" == "true" ]]; then
-            [[ "${{ needs.check_docs.result }}" != 'success' ]] && { RET_CODE=1; echo "docs checks failed"; }
-          fi
          # Only check test jobs if they were supposed to run
          if [[ "${{ needs.job_spec.outputs.run_tests }}" == "true" ]]; then
            [[ "${{ needs.workspace_hack.result }}"       != 'success' ]] && { RET_CODE=1; echo "Workspace Hack failed"; }
@@ -753,10 +744,7 @@ jobs:
  nix-build:
    name: Build with Nix
    uses: ./.github/workflows/nix.yml
-    needs: [job_spec]
-    if: github.repository_owner == 'zed-industries' &&
-      (contains(github.event.pull_request.labels.*.name, 'run-nix') ||
-      needs.job_spec.outputs.run_nix == 'true')
+    if: github.repository_owner == 'zed-industries' && contains(github.event.pull_request.labels.*.name, 'run-nix')
    secrets: inherit
    with:
      flake-output: debug
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -7,7 +7,7 @@ on:
  pull_request:
    branches:
      - "**"
-    types: [synchronize, reopened, labeled]
+    types: [opened, synchronize, reopened, labeled]

  workflow_dispatch:

@@ -25,6 +25,16 @@ env:
  ZED_EVAL_TELEMETRY: 1

 jobs:
+  # This is a no-op job that we run to prevent GitHub from marking the workflow
+  # as failed for PRs that don't have the `run-eval` label.
+  noop:
+    name: No-op
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'zed-industries'
+    steps:
+      - name: No-op
+        run: echo "Nothing to do"
+
  run_eval:
    timeout-minutes: 60
    name: Run Agent Eval
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,38 +2,6 @@
 # It is not intended for manual editing.
 version = 4

-[[package]]
-name = "acp"
-version = "0.1.0"
-dependencies = [
- "agentic-coding-protocol",
- "anyhow",
- "async-trait",
- "base64 0.22.1",
- "buffer_diff",
- "chrono",
- "collections",
- "editor",
- "env_logger 0.11.8",
- "futures 0.3.31",
- "gpui",
- "language",
- "log",
- "markdown",
- "parking_lot",
- "project",
- "proto",
- "serde_json",
- "settings",
- "smol",
- "theme",
- "ui",
- "util",
- "uuid",
- "workspace-hack",
- "zed_actions",
-]
-
 [[package]]
 name = "activity_indicator"
 version = "0.1.0"
@@ -110,7 +78,6 @@ dependencies = [
 "language",
 "language_model",
 "log",
- "parking_lot",
 "paths",
 "postage",
 "pretty_assertions",
@@ -162,7 +129,6 @@ dependencies = [
 name = "agent_ui"
 version = "0.1.0"
 dependencies = [
- "acp",
 "agent",
 "agent_settings",
 "anyhow",
@@ -245,21 +211,6 @@ dependencies = [
 "zed_llm_client",
 ]

-[[package]]
-name = "agentic-coding-protocol"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "async-trait",
- "chrono",
- "futures 0.3.31",
- "log",
- "parking_lot",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -1959,6 +1910,7 @@ dependencies = [
 "serde_json",
 "strum 0.27.1",
 "thiserror 2.0.12",
+ "tokio",
 "workspace-hack",
 ]

@@ -4180,7 +4132,7 @@ dependencies = [
 [[package]]
 name = "dap-types"
 version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=7f39295b441614ca9dbf44293e53c32f666897f9#7f39295b441614ca9dbf44293e53c32f666897f9"
+source = "git+https://github.com/zed-industries/dap-types?rev=b40956a7f4d1939da67429d941389ee306a3a308#b40956a7f4d1939da67429d941389ee306a3a308"
 dependencies = [
 "schemars",
 "serde",
@@ -4195,8 +4147,6 @@ dependencies = [
 "async-trait",
 "collections",
 "dap",
- "dotenvy",
- "fs",
 "futures 0.3.31",
 "gpui",
 "json_dotpath",
@@ -4205,7 +4155,6 @@ dependencies = [
 "paths",
 "serde",
 "serde_json",
- "shlex",
 "task",
 "util",
 "workspace-hack",
@@ -4359,7 +4308,6 @@ version = "0.1.0"
 dependencies = [
 "alacritty_terminal",
 "anyhow",
- "bitflags 2.9.0",
 "client",
 "collections",
 "command_palette_hooks",
@@ -4725,6 +4673,12 @@ dependencies = [
 "syn 2.0.101",
 ]

+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -4857,7 +4811,6 @@ dependencies = [
 "pretty_assertions",
 "project",
 "rand 0.8.5",
- "regex",
 "release_channel",
 "rpc",
 "schemars",
@@ -5158,7 +5111,7 @@ dependencies = [
 "collections",
 "debug_adapter_extension",
 "dirs 4.0.0",
- "dotenvy",
+ "dotenv",
 "env_logger 0.11.8",
 "extension",
 "fs",
@@ -8891,7 +8844,6 @@ dependencies = [
 "http_client",
 "imara-diff",
 "indoc",
- "inventory",
 "itertools 0.14.0",
 "log",
 "lsp",
@@ -8990,10 +8942,8 @@ dependencies = [
 "aws-credential-types",
 "aws_http_client",
 "bedrock",
- "chrono",
 "client",
 "collections",
- "component",
 "copilot",
 "credentials_provider",
 "deepseek",
@@ -9064,7 +9014,6 @@ dependencies = [
 "collections",
 "copilot",
 "editor",
- "feature_flags",
 "futures 0.3.31",
 "gpui",
 "itertools 0.14.0",
@@ -9288,7 +9237,7 @@ dependencies = [
 [[package]]
 name = "libwebrtc"
 version = "0.3.10"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "cxx",
 "jni",
@@ -9368,7 +9317,7 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
 [[package]]
 name = "livekit"
 version = "0.7.8"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "chrono",
 "futures-util",
@@ -9391,7 +9340,7 @@ dependencies = [
 [[package]]
 name = "livekit-api"
 version = "0.4.2"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "futures-util",
 "http 0.2.12",
@@ -9415,7 +9364,7 @@ dependencies = [
 [[package]]
 name = "livekit-protocol"
 version = "0.3.9"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "futures-util",
 "livekit-runtime",
@@ -9432,7 +9381,7 @@ dependencies = [
 [[package]]
 name = "livekit-runtime"
 version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "tokio",
 "tokio-stream",
@@ -14100,14 +14049,12 @@ dependencies = [

 [[package]]
 name = "schemars"
-version = "1.0.1"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe8c9d1c68d67dd9f97ecbc6f932b60eb289c5dbddd8aa1405484a8fd2fcd984"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
- "chrono",
 "dyn-clone",
 "indexmap",
- "ref-cast",
 "schemars_derive",
 "serde",
 "serde_json",
@@ -14115,9 +14062,9 @@ dependencies = [

 [[package]]
 name = "schemars_derive"
-version = "1.0.1"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ca9fcb757952f8e8629b9ab066fc62da523c46c2b247b1708a3be06dd82530b"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -14604,34 +14551,25 @@ dependencies = [
 "serde_json",
 "serde_json_lenient",
 "smallvec",
+ "streaming-iterator",
 "tree-sitter",
 "tree-sitter-json",
 "unindent",
 "util",
 "workspace-hack",
- "zlog",
 ]

 [[package]]
 name = "settings_ui"
 version = "0.1.0"
 dependencies = [
- "collections",
- "command_palette",
 "command_palette_hooks",
- "component",
- "db",
 "editor",
 "feature_flags",
 "fs",
- "fuzzy",
 "gpui",
 "log",
- "menu",
- "paths",
- "project",
 "schemars",
- "search",
 "serde",
 "settings",
 "theme",
@@ -15585,18 +15523,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"

-[[package]]
-name = "svg_preview"
-version = "0.1.0"
-dependencies = [
- "editor",
- "file_icons",
- "gpui",
- "ui",
- "workspace",
- "workspace-hack",
-]
-
 [[package]]
 name = "svgtypes"
 version = "0.15.3"
@@ -16068,7 +15994,6 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "indexmap",
- "inventory",
 "log",
 "palette",
 "parking_lot",
@@ -16109,6 +16034,7 @@ dependencies = [
 "indexmap",
 "log",
 "palette",
+ "rust-embed",
 "serde",
 "serde_json",
 "serde_json_lenient",
@@ -16939,7 +16865,8 @@ dependencies = [
 [[package]]
 name = "tree-sitter-python"
 version = "0.23.6"
-source = "git+https://github.com/zed-industries/tree-sitter-python?rev=218fcbf3fda3d029225f3dec005cb497d111b35e#218fcbf3fda3d029225f3dec005cb497d111b35e"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04"
 dependencies = [
 "cc",
 "tree-sitter-language",
@@ -18355,7 +18282,7 @@ dependencies = [
 [[package]]
 name = "webrtc-sys"
 version = "0.3.7"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "cc",
 "cxx",
@@ -18368,7 +18295,7 @@ dependencies = [
 [[package]]
 name = "webrtc-sys-build"
 version = "0.3.6"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=80bb8f4c9112789f7c24cc98d8423010977806a6#80bb8f4c9112789f7c24cc98d8423010977806a6"
 dependencies = [
 "fs2",
 "regex",
@@ -20093,7 +20020,6 @@ dependencies = [
 "snippet_provider",
 "snippets_ui",
 "supermaven",
- "svg_preview",
 "sysinfo",
 "tab_switcher",
 "task",
@@ -20186,9 +20112,9 @@ dependencies = [

 [[package]]
 name = "zed_llm_client"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c740e29260b8797ad252c202ea09a255b3cbc13f30faaf92fb6b2490336106e0"
+checksum = "de7d9523255f4e00ee3d0918e5407bd252d798a4a8e71f6d37f23317a1588203"
 dependencies = [
 "anyhow",
 "serde",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,6 @@
 resolver = "2"
 members = [
    "crates/activity_indicator",
-    "crates/acp",
    "crates/agent_ui",
    "crates/agent",
    "crates/agent_settings",
@@ -96,7 +95,6 @@ members = [
    "crates/markdown_preview",
    "crates/media",
    "crates/menu",
-    "crates/svg_preview",
    "crates/migrator",
    "crates/mistral",
    "crates/multi_buffer",
@@ -216,9 +214,8 @@ edition = "2024"
 # Workspace member crates
 #

-acp = { path = "crates/acp" }
-agent = { path = "crates/agent" }
 activity_indicator = { path = "crates/activity_indicator" }
+agent = { path = "crates/agent" }
 agent_ui = { path = "crates/agent_ui" }
 agent_settings = { path = "crates/agent_settings" }
 ai = { path = "crates/ai" }
@@ -307,7 +304,6 @@ lmstudio = { path = "crates/lmstudio" }
 lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
-svg_preview = { path = "crates/svg_preview" }
 media = { path = "crates/media" }
 menu = { path = "crates/menu" }
 migrator = { path = "crates/migrator" }
@@ -400,7 +396,6 @@ zlog_settings = { path = "crates/zlog_settings" }
 # External crates
 #

-agentic-coding-protocol = { path = "../agentic-coding-protocol" }
 aho-corasick = "1.1"
 alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
@@ -447,12 +442,12 @@ core-video = { version = "0.4.3", features = ["metal"] }
 cpal = "0.16"
 criterion = { version = "0.5", features = ["html_reports"] }
 ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "7f39295b441614ca9dbf44293e53c32f666897f9" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "b40956a7f4d1939da67429d941389ee306a3a308" }
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
 documented = "0.9.1"
-dotenvy = "0.15.0"
+dotenv = "0.15.0"
 ec4rs = "1.1"
 emojis = "0.6.1"
 env_logger = "0.11"
@@ -483,7 +478,7 @@ json_dotpath = "1.1"
 jsonschema = "0.30.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
-jupyter-websocket-client = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
+jupyter-websocket-client = {  git = "https://github.com/ConradIrwin/runtimed" ,rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
@@ -494,7 +489,7 @@ metal = "0.29"
 moka = { version = "0.12.10", features = ["sync"] }
 naga = { version = "25.0", features = ["wgsl-in"] }
 nanoid = "0.4"
-nbformat = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
+nbformat = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734" }
 nix = "0.29"
 num-format = "0.4.4"
 objc = "0.2"
@@ -534,7 +529,7 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c77
    "stream",
 ] }
 rsa = "0.9.6"
-runtimelib = { git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
+runtimelib = {  git = "https://github.com/ConradIrwin/runtimed", rev = "7130c804216b6914355d15d0b91ea91f6babd734", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rust-embed = { version = "8.4", features = ["include-exclude"] }
@@ -543,7 +538,7 @@ rustc-hash = "2.1.0"
 rustls = { version = "0.23.26" }
 rustls-platform-verifier = "0.5.0"
 scap = { git = "https://github.com/zed-industries/scap", rev = "08f0a01417505cc0990b9931a37e5120db92e0d0", default-features = false }
-schemars = { version = "1.0", features = ["indexmap2"] }
+schemars = { version = "0.8", features = ["impl_json_schema", "indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
@@ -600,7 +595,7 @@ tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
 tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
-tree-sitter-python = { git = "https://github.com/zed-industries/tree-sitter-python", rev = "218fcbf3fda3d029225f3dec005cb497d111b35e" }
+tree-sitter-python = "0.23"
 tree-sitter-regex = "0.24"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.24"
@@ -628,7 +623,7 @@ wasmtime = { version = "29", default-features = false, features = [
 wasmtime-wasi = "29"
 which = "6.0.0"
 workspace-hack = "0.1.0"
-zed_llm_client = "0.8.5"
+zed_llm_client = "0.8.4"
 zstd = "0.11"

 [workspace.dependencies.async-stripe]
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

-FROM rust:1.88-bookworm as builder
+FROM rust:1.87-bookworm as builder
 WORKDIR app
 COPY . .

--- a/assets/icons/arrow_down10.svg
+++ b/assets/icons/arrow_down10.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down10-icon lucide-arrow-down-1-0"><path d="m3 16 4 4 4-4"/><path d="M7 20V4"/><path d="M17 10V4h-2"/><path d="M15 10h4"/><rect x="15" y="14" width="4" height="6" ry="2"/></svg>
--- a/assets/icons/bolt_filled_alt.svg
+++ b/assets/icons/bolt_filled_alt.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.75776 5.50003H8.49988C8.70769 5.50003 8.89518 5.62971 8.95455 5.82346C9.04049 6.01876 8.9858 6.23906 8.82956 6.37656L4.82971 9.87643C4.65315 10.0295 4.39488 10.042 4.20614 9.90455C4.01724 9.76705 3.94849 9.51706 4.04052 9.30301L5.24219 6.49999H3.48601C3.2918 6.49999 3.10524 6.37031 3.03197 6.17657C2.9587 5.98126 3.014 5.76096 3.1708 5.62346L7.17018 2.12375C7.34674 1.97001 7.60454 1.95829 7.7936 2.09547C7.98265 2.23275 8.0514 2.48218 7.95922 2.69695L6.75776 5.50003Z" fill="black"/>
-</svg>
--- a/assets/icons/lsp_debug.svg
+++ b/assets/icons/lsp_debug.svg
@@ -1,12 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6 3L7 4" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 4L10 3" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.002 6V5.51658C5.98992 5.32067 6.03266 5.12502 6.12762 4.94143C6.22259 4.75784 6.36781 4.59012 6.55453 4.44839C6.74125 4.30666 6.9656 4.19386 7.21403 4.1168C7.46246 4.03973 7.72983 4 8 4C8.27017 4 8.53754 4.03973 8.78597 4.1168C9.0344 4.19386 9.25875 4.30666 9.44547 4.44839C9.63219 4.59012 9.77741 4.75784 9.87238 4.94143C9.96734 5.12502 10.0101 5.32067 9.998 5.51658V6" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8 13C6.35 13 5 11.5462 5 9.76923V8.15385C5 7.58261 5.21071 7.03477 5.58579 6.63085C5.96086 6.22692 6.46957 6 7 6H9C9.53043 6 10.0391 6.22692 10.4142 6.63085C10.7893 7.03477 11 7.58261 11 8.15385V9.76923C11 11.5462 9.65 13 8 13Z" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 6.16663C3.90652 6.06663 3 5.21663 3 4.16663" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 9H3" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 13C3 11.95 3.89474 11.05 5 11" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 4C13 5.05 12.0857 5.9 11 6" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13 9H11" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 11C12.1053 11.05 13 11.95 13 13" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/lsp_restart.svg
+++ b/assets/icons/lsp_restart.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3.84265 10.7778C4.39206 11.6001 5.17295 12.241 6.08658 12.6194C7.00021 12.9978 8.00555 13.0969 8.97545 12.9039C9.94535 12.711 10.8363 12.2348 11.5355 11.5355C12.2348 10.8363 12.711 9.94535 12.9039 8.97545C13.0969 8.00555 12.9978 7.00021 12.6194 6.08658C12.241 5.17295 11.6001 4.39206 10.7778 3.84265C9.9556 3.29324 8.9889 3 8 3C6.60219 3.00526 5.26054 3.55068 4.25556 4.52222L3 5.77778" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M3 3V6H6" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/lsp_stop.svg
+++ b/assets/icons/lsp_stop.svg
@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8 13C10.7614 13 13 10.7614 13 8C13 5.23858 10.7614 3 8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5 5L11 11" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/scroll_text.svg
+++ b/assets/icons/scroll_text.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-scroll-text-icon lucide-scroll-text"><path d="M15 12h-5"/><path d="M15 8h-5"/><path d="M19 17V5a2 2 0 0 0-2-2H4"/><path d="M8 21h12a2 2 0 0 0 2-2v-1a1 1 0 0 0-1-1H11a1 1 0 0 0-1 1v1a2 2 0 1 1-4 0V5a2 2 0 1 0-4 0v2a1 1 0 0 0 1 1h3"/></svg>
--- a/assets/icons/split_alt.svg
+++ b/assets/icons/split_alt.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-split-icon lucide-split"><path d="M16 3h5v5"/><path d="M8 3H3v5"/><path d="M12 22v-8.3a4 4 0 0 0-1.172-2.872L3 3"/><path d="m15 9 6-6"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -244,7 +244,6 @@
      "ctrl-alt-e": "agent::RemoveAllContext",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-enter": "agent::ContinueThread",
-      "super-ctrl-b": "agent::ToggleBurnMode",
      "alt-enter": "agent::ContinueWithBurnMode"
    }
  },
@@ -491,27 +490,13 @@
      "ctrl-k r": "editor::RevealInFileManager",
      "ctrl-k p": "editor::CopyPath",
      "ctrl-\\": "pane::SplitRight",
+      "ctrl-k v": "markdown::OpenPreviewToTheSide",
+      "ctrl-shift-v": "markdown::OpenPreview",
      "ctrl-alt-shift-c": "editor::DisplayCursorNames",
      "alt-.": "editor::GoToHunk",
      "alt-,": "editor::GoToPreviousHunk"
    }
  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "markdown::OpenPreviewToTheSide",
-      "ctrl-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-k v": "svg::OpenPreviewToTheSide",
-      "ctrl-shift-v": "svg::OpenPreview"
-    }
-  },
  {
    "context": "Editor && mode == full",
    "bindings": {
@@ -919,9 +904,7 @@
    "context": "BreakpointList",
    "bindings": {
      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
+      "backspace": "debugger::UnsetBreakpoint"
    }
  },
  {
@@ -1067,12 +1050,5 @@
      "ctrl-tab": "pane::ActivateNextItem",
      "ctrl-shift-tab": "pane::ActivatePreviousItem"
    }
-  },
-  {
-    "context": "KeymapEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "ctrl-f": "search::FocusSearch"
-    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -283,7 +283,6 @@
      "cmd->": "assistant::QuoteSelection",
      "cmd-alt-e": "agent::RemoveAllContext",
      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-ctrl-b": "agent::ToggleBurnMode",
      "cmd-shift-enter": "agent::ContinueThread",
      "alt-enter": "agent::ContinueWithBurnMode"
    }
@@ -545,23 +544,9 @@
      "cmd-k r": "editor::RevealInFileManager",
      "cmd-k p": "editor::CopyPath",
      "cmd-\\": "pane::SplitRight",
-      "ctrl-cmd-c": "editor::DisplayCursorNames"
-    }
-  },
-  {
-    "context": "Editor && extension == md",
-    "use_key_equivalents": true,
-    "bindings": {
      "cmd-k v": "markdown::OpenPreviewToTheSide",
-      "cmd-shift-v": "markdown::OpenPreview"
-    }
-  },
-  {
-    "context": "Editor && extension == svg",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-k v": "svg::OpenPreviewToTheSide",
-      "cmd-shift-v": "svg::OpenPreview"
+      "cmd-shift-v": "markdown::OpenPreview",
+      "ctrl-cmd-c": "editor::DisplayCursorNames"
    }
  },
  {
@@ -602,7 +587,6 @@
      "alt-cmd-o": ["projects::OpenRecent", { "create_new_window": false }],
      "ctrl-cmd-o": ["projects::OpenRemote", { "from_existing_connection": false, "create_new_window": false }],
      "ctrl-cmd-shift-o": ["projects::OpenRemote", { "from_existing_connection": true, "create_new_window": false }],
-      "cmd-ctrl-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
      "cmd-s": "workspace::Save",
      "cmd-k s": "workspace::SaveWithoutFormat",
@@ -620,7 +604,6 @@
      "cmd-8": ["workspace::ActivatePane", 7],
      "cmd-9": ["workspace::ActivatePane", 8],
      "cmd-b": "workspace::ToggleLeftDock",
-      "cmd-alt-b": "workspace::ToggleRightDock",
      "cmd-r": "workspace::ToggleRightDock",
      "cmd-j": "workspace::ToggleBottomDock",
      "alt-cmd-y": "workspace::CloseAllDocks",
@@ -980,9 +963,7 @@
    "context": "BreakpointList",
    "bindings": {
      "space": "debugger::ToggleEnableBreakpoint",
-      "backspace": "debugger::UnsetBreakpoint",
-      "left": "debugger::PreviousBreakpointProperty",
-      "right": "debugger::NextBreakpointProperty"
+      "backspace": "debugger::UnsetBreakpoint"
    }
  },
  {
@@ -1167,12 +1148,5 @@
      "ctrl-tab": "pane::ActivateNextItem",
      "ctrl-shift-tab": "pane::ActivatePreviousItem"
    }
-  },
-  {
-    "context": "KeymapEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-f": "search::FocusSearch"
-    }
  }
 ]
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -59,8 +59,7 @@
      "alt->": "editor::MoveToEnd", // end-of-buffer
      "ctrl-l": "editor::ScrollCursorCenterTopBottom", // recenter-top-bottom
      "ctrl-s": "buffer_search::Deploy", // isearch-forward
-      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap" // fill-paragraph
+      "alt-^": "editor::JoinLines" // join-line
    }
  },
  {
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -59,8 +59,7 @@
      "alt->": "editor::MoveToEnd", // end-of-buffer
      "ctrl-l": "editor::ScrollCursorCenterTopBottom", // recenter-top-bottom
      "ctrl-s": "buffer_search::Deploy", // isearch-forward
-      "alt-^": "editor::JoinLines", // join-line
-      "alt-q": "editor::Rewrap" // fill-paragraph
+      "alt-^": "editor::JoinLines" // join-line
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -210,8 +210,7 @@
      "ctrl-w space": "editor::OpenExcerptsSplit",
      "ctrl-w g space": "editor::OpenExcerptsSplit",
      "ctrl-6": "pane::AlternateFile",
-      "ctrl-^": "pane::AlternateFile",
-      ".": "vim::Repeat"
+      "ctrl-^": "pane::AlternateFile"
    }
  },
  {
@@ -220,6 +219,7 @@
      "ctrl-[": "editor::Cancel",
      "escape": "editor::Cancel",
      ":": "command_palette::Toggle",
+      ".": "vim::Repeat",
      "c": "vim::PushChange",
      "shift-c": "vim::ChangeToEndOfLine",
      "d": "vim::PushDelete",
@@ -849,25 +849,6 @@
      "shift-u": "git::UnstageAll"
    }
  },
-  {
-    "context": "Editor && mode == auto_height && VimControl",
-    "bindings": {
-      // TODO: Implement search
-      "/": null,
-      "?": null,
-      "#": null,
-      "*": null,
-      "n": null,
-      "shift-n": null
-    }
-  },
-  {
-    "context": "GitCommit > Editor && VimControl && vim_mode == normal",
-    "bindings": {
-      "ctrl-c": "menu::Cancel",
-      "escape": "menu::Cancel"
-    }
-  },
  {
    "context": "Editor && edit_prediction",
    "bindings": {
@@ -879,7 +860,14 @@
  {
    "context": "MessageEditor > Editor && VimControl",
    "bindings": {
-      "enter": "agent::Chat"
+      "enter": "agent::Chat",
+      // TODO: Implement search
+      "/": null,
+      "?": null,
+      "#": null,
+      "*": null,
+      "n": null,
+      "shift-n": null
    }
  },
  {
--- a/crates/acp/Cargo.toml
+++ b/crates/acp/Cargo.toml
@@ -1,50 +0,0 @@
-[package]
-name = "acp"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/acp.rs"
-doctest = false
-
-[features]
-test-support = ["gpui/test-support", "project/test-support"]
-
-[dependencies]
-agentic-coding-protocol = { path = "../../../agentic-coding-protocol" }
-anyhow.workspace = true
-async-trait.workspace = true
-base64.workspace = true
-buffer_diff.workspace = true
-chrono.workspace = true
-collections.workspace = true
-editor.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-markdown.workspace = true
-parking_lot.workspace = true
-project.workspace = true
-proto.workspace = true
-settings.workspace = true
-smol.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-workspace-hack.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-env_logger.workspace = true
-gpui = { workspace = true, "features" = ["test-support"] }
-project = { workspace = true, "features" = ["test-support"] }
-serde_json.workspace = true
-util.workspace = true
-settings.workspace = true
--- a/crates/acp/LICENSE-GPL
+++ b/crates/acp/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/acp/src/acp.rs
+++ b/crates/acp/src/acp.rs
@@ -1,748 +0,0 @@
-mod server;
-mod thread_view;
-
-use agentic_coding_protocol::{self as acp, Role};
-use anyhow::{Context as _, Result};
-use buffer_diff::BufferDiff;
-use chrono::{DateTime, Utc};
-use editor::MultiBuffer;
-use futures::channel::oneshot;
-use gpui::{AppContext, Context, Entity, EventEmitter, SharedString, Task};
-use language::{Buffer, LanguageRegistry};
-use markdown::Markdown;
-use project::Project;
-use std::{mem, ops::Range, path::PathBuf, sync::Arc};
-use ui::{App, IconName};
-use util::{ResultExt, debug_panic};
-
-pub use server::AcpServer;
-pub use thread_view::AcpThreadView;
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct ThreadId(SharedString);
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct FileVersion(u64);
-
-#[derive(Debug)]
-pub struct AgentThreadSummary {
-    pub id: ThreadId,
-    pub title: String,
-    pub created_at: DateTime<Utc>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct FileContent {
-    pub path: PathBuf,
-    pub version: FileVersion,
-    pub content: SharedString,
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Message {
-    pub role: acp::Role,
-    pub chunks: Vec<MessageChunk>,
-}
-
-impl Message {
-    fn into_acp(self, cx: &App) -> acp::Message {
-        acp::Message {
-            role: self.role,
-            chunks: self
-                .chunks
-                .into_iter()
-                .map(|chunk| chunk.into_acp(cx))
-                .collect(),
-        }
-    }
-}
-
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub enum MessageChunk {
-    Text {
-        chunk: Entity<Markdown>,
-    },
-    File {
-        content: FileContent,
-    },
-    Directory {
-        path: PathBuf,
-        contents: Vec<FileContent>,
-    },
-    Symbol {
-        path: PathBuf,
-        range: Range<u64>,
-        version: FileVersion,
-        name: SharedString,
-        content: SharedString,
-    },
-    Fetch {
-        url: SharedString,
-        content: SharedString,
-    },
-}
-
-impl MessageChunk {
-    pub fn from_acp(
-        chunk: acp::MessageChunk,
-        language_registry: Arc<LanguageRegistry>,
-        cx: &mut App,
-    ) -> Self {
-        match chunk {
-            acp::MessageChunk::Text { chunk } => MessageChunk::Text {
-                chunk: cx.new(|cx| Markdown::new(chunk.into(), Some(language_registry), None, cx)),
-            },
-        }
-    }
-
-    pub fn into_acp(self, cx: &App) -> acp::MessageChunk {
-        match self {
-            MessageChunk::Text { chunk } => acp::MessageChunk::Text {
-                chunk: chunk.read(cx).source().to_string(),
-            },
-            MessageChunk::File { .. } => todo!(),
-            MessageChunk::Directory { .. } => todo!(),
-            MessageChunk::Symbol { .. } => todo!(),
-            MessageChunk::Fetch { .. } => todo!(),
-        }
-    }
-
-    pub fn from_str(chunk: &str, language_registry: Arc<LanguageRegistry>, cx: &mut App) -> Self {
-        MessageChunk::Text {
-            chunk: cx.new(|cx| {
-                Markdown::new(chunk.to_owned().into(), Some(language_registry), None, cx)
-            }),
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum AgentThreadEntryContent {
-    Message(Message),
-    ToolCall(ToolCall),
-}
-
-#[derive(Debug)]
-pub struct ToolCall {
-    id: ToolCallId,
-    label: Entity<Markdown>,
-    icon: IconName,
-    status: ToolCallStatus,
-}
-
-#[derive(Debug)]
-pub enum ToolCallStatus {
-    WaitingForConfirmation {
-        confirmation: acp::ToolCallConfirmation,
-        respond_tx: oneshot::Sender<acp::ToolCallConfirmationOutcome>,
-    },
-    Allowed {
-        status: acp::ToolCallStatus,
-        content: Option<ToolCallContent>,
-    },
-    Rejected,
-}
-
-#[derive(Debug)]
-pub enum ToolCallContent {
-    Markdown {
-        markdown: Entity<Markdown>,
-    },
-    Diff {
-        path: PathBuf,
-        diff: Entity<BufferDiff>,
-        buffer: Entity<MultiBuffer>,
-        _task: Task<Result<()>>,
-    },
-}
-
-/// A `ThreadEntryId` that is known to be a ToolCall
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct ToolCallId(ThreadEntryId);
-
-impl ToolCallId {
-    pub fn as_u64(&self) -> u64 {
-        self.0.0
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct ThreadEntryId(pub u64);
-
-impl ThreadEntryId {
-    pub fn post_inc(&mut self) -> Self {
-        let id = *self;
-        self.0 += 1;
-        id
-    }
-}
-
-#[derive(Debug)]
-pub struct ThreadEntry {
-    pub id: ThreadEntryId,
-    pub content: AgentThreadEntryContent,
-}
-
-pub struct AcpThread {
-    id: ThreadId,
-    next_entry_id: ThreadEntryId,
-    entries: Vec<ThreadEntry>,
-    server: Arc<AcpServer>,
-    title: SharedString,
-    project: Entity<Project>,
-}
-
-enum AcpThreadEvent {
-    NewEntry,
-    EntryUpdated(usize),
-}
-
-impl EventEmitter<AcpThreadEvent> for AcpThread {}
-
-impl AcpThread {
-    pub fn new(
-        server: Arc<AcpServer>,
-        thread_id: ThreadId,
-        entries: Vec<AgentThreadEntryContent>,
-        project: Entity<Project>,
-        _: &mut Context<Self>,
-    ) -> Self {
-        let mut next_entry_id = ThreadEntryId(0);
-        Self {
-            title: "A new agent2 thread".into(),
-            entries: entries
-                .into_iter()
-                .map(|entry| ThreadEntry {
-                    id: next_entry_id.post_inc(),
-                    content: entry,
-                })
-                .collect(),
-            server,
-            id: thread_id,
-            next_entry_id,
-            project,
-        }
-    }
-
-    pub fn title(&self) -> SharedString {
-        self.title.clone()
-    }
-
-    pub fn entries(&self) -> &[ThreadEntry] {
-        &self.entries
-    }
-
-    pub fn push_entry(
-        &mut self,
-        entry: AgentThreadEntryContent,
-        cx: &mut Context<Self>,
-    ) -> ThreadEntryId {
-        let id = self.next_entry_id.post_inc();
-        self.entries.push(ThreadEntry { id, content: entry });
-        cx.emit(AcpThreadEvent::NewEntry);
-        id
-    }
-
-    pub fn push_assistant_chunk(&mut self, chunk: acp::MessageChunk, cx: &mut Context<Self>) {
-        let entries_len = self.entries.len();
-        if let Some(last_entry) = self.entries.last_mut()
-            && let AgentThreadEntryContent::Message(Message {
-                ref mut chunks,
-                role: Role::Assistant,
-            }) = last_entry.content
-        {
-            cx.emit(AcpThreadEvent::EntryUpdated(entries_len - 1));
-
-            if let (
-                Some(MessageChunk::Text { chunk: old_chunk }),
-                acp::MessageChunk::Text { chunk: new_chunk },
-            ) = (chunks.last_mut(), &chunk)
-            {
-                old_chunk.update(cx, |old_chunk, cx| {
-                    old_chunk.append(&new_chunk, cx);
-                });
-            } else {
-                chunks.push(MessageChunk::from_acp(
-                    chunk,
-                    self.project.read(cx).languages().clone(),
-                    cx,
-                ));
-            }
-
-            return;
-        }
-
-        let chunk = MessageChunk::from_acp(chunk, self.project.read(cx).languages().clone(), cx);
-
-        self.push_entry(
-            AgentThreadEntryContent::Message(Message {
-                role: Role::Assistant,
-                chunks: vec![chunk],
-            }),
-            cx,
-        );
-    }
-
-    pub fn request_tool_call(
-        &mut self,
-        label: String,
-        icon: acp::Icon,
-        confirmation: acp::ToolCallConfirmation,
-        cx: &mut Context<Self>,
-    ) -> ToolCallRequest {
-        let (tx, rx) = oneshot::channel();
-
-        let status = ToolCallStatus::WaitingForConfirmation {
-            confirmation,
-            respond_tx: tx,
-        };
-
-        let id = self.insert_tool_call(label, status, icon, cx);
-        ToolCallRequest { id, outcome: rx }
-    }
-
-    pub fn push_tool_call(
-        &mut self,
-        label: String,
-        icon: acp::Icon,
-        cx: &mut Context<Self>,
-    ) -> ToolCallId {
-        let status = ToolCallStatus::Allowed {
-            status: acp::ToolCallStatus::Running,
-            content: None,
-        };
-
-        self.insert_tool_call(label, status, icon, cx)
-    }
-
-    fn insert_tool_call(
-        &mut self,
-        label: String,
-        status: ToolCallStatus,
-        icon: acp::Icon,
-        cx: &mut Context<Self>,
-    ) -> ToolCallId {
-        let language_registry = self.project.read(cx).languages().clone();
-
-        let entry_id = self.push_entry(
-            AgentThreadEntryContent::ToolCall(ToolCall {
-                // todo! clean up id creation
-                id: ToolCallId(ThreadEntryId(self.entries.len() as u64)),
-                label: cx.new(|cx| {
-                    Markdown::new(label.into(), Some(language_registry.clone()), None, cx)
-                }),
-                icon: acp_icon_to_ui_icon(icon),
-                status,
-            }),
-            cx,
-        );
-
-        ToolCallId(entry_id)
-    }
-
-    pub fn authorize_tool_call(
-        &mut self,
-        id: ToolCallId,
-        outcome: acp::ToolCallConfirmationOutcome,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(entry) = self.entry_mut(id.0) else {
-            return;
-        };
-
-        let AgentThreadEntryContent::ToolCall(call) = &mut entry.content else {
-            debug_panic!("expected ToolCall");
-            return;
-        };
-
-        let new_status = if outcome == acp::ToolCallConfirmationOutcome::Reject {
-            ToolCallStatus::Rejected
-        } else {
-            ToolCallStatus::Allowed {
-                status: acp::ToolCallStatus::Running,
-                content: None,
-            }
-        };
-
-        let curr_status = mem::replace(&mut call.status, new_status);
-
-        if let ToolCallStatus::WaitingForConfirmation { respond_tx, .. } = curr_status {
-            respond_tx.send(outcome).log_err();
-        } else {
-            debug_panic!("tried to authorize an already authorized tool call");
-        }
-
-        cx.emit(AcpThreadEvent::EntryUpdated(id.as_u64() as usize));
-    }
-
-    pub fn update_tool_call(
-        &mut self,
-        id: ToolCallId,
-        new_status: acp::ToolCallStatus,
-        new_content: Option<acp::ToolCallContent>,
-        cx: &mut Context<Self>,
-    ) -> Result<()> {
-        let language_registry = self.project.read(cx).languages().clone();
-        let entry = self.entry_mut(id.0).context("Entry not found")?;
-
-        match &mut entry.content {
-            AgentThreadEntryContent::ToolCall(call) => match &mut call.status {
-                ToolCallStatus::Allowed { content, status } => {
-                    *content = new_content.map(|new_content| match new_content {
-                        acp::ToolCallContent::Markdown { markdown } => ToolCallContent::Markdown {
-                            markdown: cx.new(|cx| {
-                                Markdown::new(
-                                    markdown.into(),
-                                    Some(language_registry.clone()),
-                                    None,
-                                    cx,
-                                )
-                            }),
-                        },
-                        acp::ToolCallContent::Diff {
-                            path,
-                            old_text,
-                            new_text,
-                        } => {
-                            let buffer = cx.new(|cx| Buffer::local(new_text, cx));
-                            let text_snapshot = buffer.read(cx).text_snapshot();
-                            let buffer_diff = cx.new(|cx| BufferDiff::new(&text_snapshot, cx));
-
-                            let multibuffer = cx.new(|cx| {
-                                let mut multibuffer = MultiBuffer::singleton(buffer.clone(), cx);
-                                multibuffer.add_diff(buffer_diff.clone(), cx);
-                                multibuffer
-                            });
-
-                            ToolCallContent::Diff {
-                                path: path.clone(),
-                                diff: buffer_diff.clone(),
-                                buffer: multibuffer,
-                                _task: cx.spawn(async move |_this, cx| {
-                                    let diff_snapshot = BufferDiff::update_diff(
-                                        buffer_diff.clone(),
-                                        text_snapshot.clone(),
-                                        old_text.map(|o| o.into()),
-                                        true,
-                                        true,
-                                        None,
-                                        Some(language_registry.clone()),
-                                        cx,
-                                    )
-                                    .await?;
-
-                                    buffer_diff.update(cx, |diff, cx| {
-                                        diff.set_snapshot(diff_snapshot, &text_snapshot, cx)
-                                    })?;
-
-                                    if let Some(language) = language_registry
-                                        .language_for_file_path(&path)
-                                        .await
-                                        .log_err()
-                                    {
-                                        buffer.update(cx, |buffer, cx| {
-                                            buffer.set_language(Some(language), cx)
-                                        })?;
-                                    }
-
-                                    anyhow::Ok(())
-                                }),
-                            }
-                        }
-                    });
-                    *status = new_status;
-                }
-                ToolCallStatus::WaitingForConfirmation { .. } => {
-                    anyhow::bail!("Tool call hasn't been authorized yet")
-                }
-                ToolCallStatus::Rejected => {
-                    anyhow::bail!("Tool call was rejected and therefore can't be updated")
-                }
-            },
-            _ => anyhow::bail!("Entry is not a tool call"),
-        }
-
-        cx.emit(AcpThreadEvent::EntryUpdated(id.as_u64() as usize));
-        Ok(())
-    }
-
-    fn entry_mut(&mut self, id: ThreadEntryId) -> Option<&mut ThreadEntry> {
-        let entry = self.entries.get_mut(id.0 as usize);
-        debug_assert!(
-            entry.is_some(),
-            "We shouldn't give out ids to entries that don't exist"
-        );
-        entry
-    }
-
-    /// Returns true if the last turn is awaiting tool authorization
-    pub fn waiting_for_tool_confirmation(&self) -> bool {
-        for entry in self.entries.iter().rev() {
-            match &entry.content {
-                AgentThreadEntryContent::ToolCall(call) => match call.status {
-                    ToolCallStatus::WaitingForConfirmation { .. } => return true,
-                    ToolCallStatus::Allowed { .. } | ToolCallStatus::Rejected => continue,
-                },
-                AgentThreadEntryContent::Message(_) => {
-                    // Reached the beginning of the turn
-                    return false;
-                }
-            }
-        }
-        false
-    }
-
-    pub fn send(&mut self, message: &str, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let agent = self.server.clone();
-        let id = self.id.clone();
-        let chunk = MessageChunk::from_str(message, self.project.read(cx).languages().clone(), cx);
-        let message = Message {
-            role: Role::User,
-            chunks: vec![chunk],
-        };
-        self.push_entry(AgentThreadEntryContent::Message(message.clone()), cx);
-        let acp_message = message.into_acp(cx);
-        cx.spawn(async move |_, cx| {
-            agent.send_message(id, acp_message, cx).await?;
-            Ok(())
-        })
-    }
-}
-
-fn acp_icon_to_ui_icon(icon: acp::Icon) -> IconName {
-    match icon {
-        acp::Icon::FileSearch => IconName::FileSearch,
-        acp::Icon::Folder => IconName::Folder,
-        acp::Icon::Globe => IconName::Globe,
-        acp::Icon::Hammer => IconName::Hammer,
-        acp::Icon::LightBulb => IconName::LightBulb,
-        acp::Icon::Pencil => IconName::Pencil,
-        acp::Icon::Regex => IconName::Regex,
-        acp::Icon::Terminal => IconName::Terminal,
-    }
-}
-
-pub struct ToolCallRequest {
-    pub id: ToolCallId,
-    pub outcome: oneshot::Receiver<acp::ToolCallConfirmationOutcome>,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use futures::{FutureExt as _, channel::mpsc, select};
-    use gpui::{AsyncApp, TestAppContext};
-    use project::FakeFs;
-    use serde_json::json;
-    use settings::SettingsStore;
-    use smol::stream::StreamExt as _;
-    use std::{env, path::Path, process::Stdio, time::Duration};
-    use util::path;
-
-    fn init_test(cx: &mut TestAppContext) {
-        env_logger::try_init().ok();
-        cx.update(|cx| {
-            let settings_store = SettingsStore::test(cx);
-            cx.set_global(settings_store);
-            Project::init_settings(cx);
-            language::init(cx);
-        });
-    }
-
-    #[gpui::test]
-    async fn test_gemini_basic(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [], cx).await;
-        let server = gemini_acp_server(project.clone(), cx.to_async()).unwrap();
-        let thread = server.create_thread(&mut cx.to_async()).await.unwrap();
-        thread
-            .update(cx, |thread, cx| thread.send("Hello from Zed!", cx))
-            .await
-            .unwrap();
-
-        thread.read_with(cx, |thread, _| {
-            assert_eq!(thread.entries.len(), 2);
-            assert!(matches!(
-                thread.entries[0].content,
-                AgentThreadEntryContent::Message(Message {
-                    role: Role::User,
-                    ..
-                })
-            ));
-            assert!(matches!(
-                thread.entries[1].content,
-                AgentThreadEntryContent::Message(Message {
-                    role: Role::Assistant,
-                    ..
-                })
-            ));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_gemini_tool_call(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-        fs.insert_tree(
-            path!("/private/tmp"),
-            json!({"foo": "Lorem ipsum dolor", "bar": "bar", "baz": "baz"}),
-        )
-        .await;
-        let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
-        let server = gemini_acp_server(project.clone(), cx.to_async()).unwrap();
-        let thread = server.create_thread(&mut cx.to_async()).await.unwrap();
-        thread
-            .update(cx, |thread, cx| {
-                thread.send(
-                    "Read the '/private/tmp/foo' file and tell me what you see.",
-                    cx,
-                )
-            })
-            .await
-            .unwrap();
-        thread.read_with(cx, |thread, _cx| {
-            assert!(matches!(
-                &thread.entries()[1].content,
-                AgentThreadEntryContent::ToolCall(ToolCall {
-                    status: ToolCallStatus::Allowed { .. },
-                    ..
-                })
-            ));
-
-            assert!(matches!(
-                thread.entries[2].content,
-                AgentThreadEntryContent::Message(Message {
-                    role: Role::Assistant,
-                    ..
-                })
-            ));
-        });
-    }
-
-    #[gpui::test]
-    async fn test_gemini_tool_call_with_confirmation(cx: &mut TestAppContext) {
-        init_test(cx);
-
-        cx.executor().allow_parking();
-
-        let fs = FakeFs::new(cx.executor());
-        let project = Project::test(fs, [path!("/private/tmp").as_ref()], cx).await;
-        let server = gemini_acp_server(project.clone(), cx.to_async()).unwrap();
-        let thread = server.create_thread(&mut cx.to_async()).await.unwrap();
-        let full_turn = thread.update(cx, |thread, cx| {
-            thread.send(r#"Run `echo "Hello, world!"`"#, cx)
-        });
-
-        run_until_tool_call(&thread, cx).await;
-
-        let tool_call_id = thread.read_with(cx, |thread, _cx| {
-            let AgentThreadEntryContent::ToolCall(ToolCall {
-                id,
-                status:
-                    ToolCallStatus::WaitingForConfirmation {
-                        confirmation: acp::ToolCallConfirmation::Execute { root_command, .. },
-                        ..
-                    },
-                ..
-            }) = &thread.entries()[1].content
-            else {
-                panic!();
-            };
-
-            assert_eq!(root_command, "echo");
-
-            *id
-        });
-
-        thread.update(cx, |thread, cx| {
-            thread.authorize_tool_call(tool_call_id, acp::ToolCallConfirmationOutcome::Allow, cx);
-
-            assert!(matches!(
-                &thread.entries()[1].content,
-                AgentThreadEntryContent::ToolCall(ToolCall {
-                    status: ToolCallStatus::Allowed { .. },
-                    ..
-                })
-            ));
-        });
-
-        full_turn.await.unwrap();
-
-        thread.read_with(cx, |thread, cx| {
-            let AgentThreadEntryContent::ToolCall(ToolCall {
-                status:
-                    ToolCallStatus::Allowed {
-                        content: Some(ToolCallContent::Markdown { markdown }),
-                        ..
-                    },
-                ..
-            }) = &thread.entries()[1].content
-            else {
-                panic!();
-            };
-
-            markdown.read_with(cx, |md, _cx| {
-                assert!(
-                    md.source().contains("Hello, world!"),
-                    r#"Expected '{}' to contain "Hello, world!""#,
-                    md.source()
-                );
-            });
-        });
-    }
-
-    async fn run_until_tool_call(thread: &Entity<AcpThread>, cx: &mut TestAppContext) {
-        let (mut tx, mut rx) = mpsc::channel::<()>(1);
-
-        let subscription = cx.update(|cx| {
-            cx.subscribe(thread, move |thread, _, cx| {
-                if thread
-                    .read(cx)
-                    .entries
-                    .iter()
-                    .any(|e| matches!(e.content, AgentThreadEntryContent::ToolCall(_)))
-                {
-                    tx.try_send(()).unwrap();
-                }
-            })
-        });
-
-        select! {
-            _ = futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(10))) => {
-                panic!("Timeout waiting for tool call")
-            }
-            _ = rx.next().fuse() => {
-                drop(subscription);
-            }
-        }
-    }
-
-    pub fn gemini_acp_server(project: Entity<Project>, mut cx: AsyncApp) -> Result<Arc<AcpServer>> {
-        let cli_path =
-            Path::new(env!("CARGO_MANIFEST_DIR")).join("../../../gemini-cli/packages/cli");
-        let mut command = util::command::new_smol_command("node");
-        command
-            .arg(cli_path)
-            .arg("--acp")
-            .current_dir("/private/tmp")
-            .stdin(Stdio::piped())
-            .stdout(Stdio::piped())
-            .stderr(Stdio::inherit())
-            .kill_on_drop(true);
-
-        if let Ok(gemini_key) = std::env::var("GEMINI_API_KEY") {
-            command.env("GEMINI_API_KEY", gemini_key);
-        }
-
-        let child = command.spawn().unwrap();
-
-        Ok(AcpServer::stdio(child, project, &mut cx))
-    }
-}
--- a/crates/acp/src/server.rs
+++ b/crates/acp/src/server.rs
@@ -1,363 +0,0 @@
-use crate::{AcpThread, ThreadEntryId, ThreadId, ToolCallId, ToolCallRequest};
-use agentic_coding_protocol as acp;
-use anyhow::{Context as _, Result};
-use async_trait::async_trait;
-use collections::HashMap;
-use gpui::{App, AppContext, AsyncApp, Context, Entity, Task, WeakEntity};
-use parking_lot::Mutex;
-use project::Project;
-use smol::process::Child;
-use std::{io::Write as _, path::Path, process::ExitStatus, sync::Arc};
-use util::ResultExt;
-
-pub struct AcpServer {
-    connection: Arc<acp::AgentConnection>,
-    threads: Arc<Mutex<HashMap<ThreadId, WeakEntity<AcpThread>>>>,
-    project: Entity<Project>,
-    exit_status: Arc<Mutex<Option<ExitStatus>>>,
-    _handler_task: Task<()>,
-    _io_task: Task<()>,
-}
-
-struct AcpClientDelegate {
-    project: Entity<Project>,
-    threads: Arc<Mutex<HashMap<ThreadId, WeakEntity<AcpThread>>>>,
-    cx: AsyncApp,
-    // sent_buffer_versions: HashMap<Entity<Buffer>, HashMap<u64, BufferSnapshot>>,
-}
-
-impl AcpClientDelegate {
-    fn new(
-        project: Entity<Project>,
-        threads: Arc<Mutex<HashMap<ThreadId, WeakEntity<AcpThread>>>>,
-        cx: AsyncApp,
-    ) -> Self {
-        Self {
-            project,
-            threads,
-            cx: cx,
-        }
-    }
-
-    fn update_thread<R>(
-        &self,
-        thread_id: &ThreadId,
-        cx: &mut App,
-        callback: impl FnOnce(&mut AcpThread, &mut Context<AcpThread>) -> R,
-    ) -> Option<R> {
-        let thread = self.threads.lock().get(&thread_id)?.clone();
-        let Some(thread) = thread.upgrade() else {
-            self.threads.lock().remove(&thread_id);
-            return None;
-        };
-        Some(thread.update(cx, callback))
-    }
-}
-
-#[async_trait(?Send)]
-impl acp::Client for AcpClientDelegate {
-    async fn stat(&self, params: acp::StatParams) -> Result<acp::StatResponse> {
-        let cx = &mut self.cx.clone();
-        self.project.update(cx, |project, cx| {
-            let path = project
-                .project_path_for_absolute_path(Path::new(&params.path), cx)
-                .context("Failed to get project path")?;
-
-            match project.entry_for_path(&path, cx) {
-                // todo! refresh entry?
-                None => Ok(acp::StatResponse {
-                    exists: false,
-                    is_directory: false,
-                }),
-                Some(entry) => Ok(acp::StatResponse {
-                    exists: entry.is_created(),
-                    is_directory: entry.is_dir(),
-                }),
-            }
-        })?
-    }
-
-    async fn stream_message_chunk(
-        &self,
-        params: acp::StreamMessageChunkParams,
-    ) -> Result<acp::StreamMessageChunkResponse> {
-        let cx = &mut self.cx.clone();
-
-        cx.update(|cx| {
-            self.update_thread(&params.thread_id.into(), cx, |thread, cx| {
-                thread.push_assistant_chunk(params.chunk, cx)
-            });
-        })?;
-
-        Ok(acp::StreamMessageChunkResponse)
-    }
-
-    async fn read_text_file(
-        &self,
-        request: acp::ReadTextFileParams,
-    ) -> Result<acp::ReadTextFileResponse> {
-        let cx = &mut self.cx.clone();
-        let buffer = self
-            .project
-            .update(cx, |project, cx| {
-                let path = project
-                    .project_path_for_absolute_path(Path::new(&request.path), cx)
-                    .context("Failed to get project path")?;
-                anyhow::Ok(project.open_buffer(path, cx))
-            })??
-            .await?;
-
-        buffer.update(cx, |buffer, _cx| {
-            let start = language::Point::new(request.line_offset.unwrap_or(0), 0);
-            let end = match request.line_limit {
-                None => buffer.max_point(),
-                Some(limit) => start + language::Point::new(limit + 1, 0),
-            };
-
-            let content: String = buffer.text_for_range(start..end).collect();
-
-            acp::ReadTextFileResponse {
-                content,
-                version: acp::FileVersion(0),
-            }
-        })
-    }
-
-    async fn read_binary_file(
-        &self,
-        request: acp::ReadBinaryFileParams,
-    ) -> Result<acp::ReadBinaryFileResponse> {
-        let cx = &mut self.cx.clone();
-        let file = self
-            .project
-            .update(cx, |project, cx| {
-                let (worktree, path) = project
-                    .find_worktree(Path::new(&request.path), cx)
-                    .context("Failed to get project path")?;
-
-                let task = worktree.update(cx, |worktree, cx| worktree.load_binary_file(&path, cx));
-                anyhow::Ok(task)
-            })??
-            .await?;
-
-        // todo! test
-        let content = cx
-            .background_spawn(async move {
-                let start = request.byte_offset.unwrap_or(0) as usize;
-                let end = request
-                    .byte_limit
-                    .map(|limit| (start + limit as usize).min(file.content.len()))
-                    .unwrap_or(file.content.len());
-
-                let range_content = &file.content[start..end];
-
-                let mut base64_content = Vec::new();
-                let mut base64_encoder = base64::write::EncoderWriter::new(
-                    std::io::Cursor::new(&mut base64_content),
-                    &base64::engine::general_purpose::STANDARD,
-                );
-                base64_encoder.write_all(range_content)?;
-                drop(base64_encoder);
-
-                // SAFETY: The base64 encoder should not produce non-UTF8.
-                unsafe { anyhow::Ok(String::from_utf8_unchecked(base64_content)) }
-            })
-            .await?;
-
-        Ok(acp::ReadBinaryFileResponse {
-            content,
-            // todo!
-            version: acp::FileVersion(0),
-        })
-    }
-
-    async fn glob_search(
-        &self,
-        _request: acp::GlobSearchParams,
-    ) -> Result<acp::GlobSearchResponse> {
-        todo!()
-    }
-
-    async fn request_tool_call_confirmation(
-        &self,
-        request: acp::RequestToolCallConfirmationParams,
-    ) -> Result<acp::RequestToolCallConfirmationResponse> {
-        let cx = &mut self.cx.clone();
-        let ToolCallRequest { id, outcome } = cx
-            .update(|cx| {
-                self.update_thread(&request.thread_id.into(), cx, |thread, cx| {
-                    thread.request_tool_call(request.label, request.icon, request.confirmation, cx)
-                })
-            })?
-            .context("Failed to update thread")?;
-
-        Ok(acp::RequestToolCallConfirmationResponse {
-            id: id.into(),
-            outcome: outcome.await?,
-        })
-    }
-
-    async fn push_tool_call(
-        &self,
-        request: acp::PushToolCallParams,
-    ) -> Result<acp::PushToolCallResponse> {
-        let cx = &mut self.cx.clone();
-        let entry_id = cx
-            .update(|cx| {
-                self.update_thread(&request.thread_id.into(), cx, |thread, cx| {
-                    thread.push_tool_call(request.label, request.icon, cx)
-                })
-            })?
-            .context("Failed to update thread")?;
-
-        Ok(acp::PushToolCallResponse {
-            id: entry_id.into(),
-        })
-    }
-
-    async fn update_tool_call(
-        &self,
-        request: acp::UpdateToolCallParams,
-    ) -> Result<acp::UpdateToolCallResponse> {
-        let cx = &mut self.cx.clone();
-
-        cx.update(|cx| {
-            self.update_thread(&request.thread_id.into(), cx, |thread, cx| {
-                thread.update_tool_call(
-                    request.tool_call_id.into(),
-                    request.status,
-                    request.content,
-                    cx,
-                )
-            })
-        })?
-        .context("Failed to update thread")??;
-
-        Ok(acp::UpdateToolCallResponse)
-    }
-}
-
-impl AcpServer {
-    pub fn stdio(mut process: Child, project: Entity<Project>, cx: &mut App) -> Arc<Self> {
-        let stdin = process.stdin.take().expect("process didn't have stdin");
-        let stdout = process.stdout.take().expect("process didn't have stdout");
-
-        let threads: Arc<Mutex<HashMap<ThreadId, WeakEntity<AcpThread>>>> = Default::default();
-        let (connection, handler_fut, io_fut) = acp::AgentConnection::connect_to_agent(
-            AcpClientDelegate::new(project.clone(), threads.clone(), cx.to_async()),
-            stdin,
-            stdout,
-        );
-
-        let exit_status: Arc<Mutex<Option<ExitStatus>>> = Default::default();
-        let io_task = cx.background_spawn({
-            let exit_status = exit_status.clone();
-            async move {
-                io_fut.await.log_err();
-                let result = process.status().await.log_err();
-                *exit_status.lock() = result;
-            }
-        });
-
-        Arc::new(Self {
-            project,
-            connection: Arc::new(connection),
-            threads,
-            exit_status,
-            _handler_task: cx.foreground_executor().spawn(handler_fut),
-            _io_task: io_task,
-        })
-    }
-
-    pub async fn initialize(&self) -> Result<acp::InitializeResponse> {
-        self.connection
-            .request(acp::InitializeParams)
-            .await
-            .map_err(to_anyhow)
-    }
-
-    pub async fn authenticate(&self) -> Result<()> {
-        self.connection
-            .request(acp::AuthenticateParams)
-            .await
-            .map_err(to_anyhow)?;
-
-        Ok(())
-    }
-
-    pub async fn create_thread(self: Arc<Self>, cx: &mut AsyncApp) -> Result<Entity<AcpThread>> {
-        let response = self
-            .connection
-            .request(acp::CreateThreadParams)
-            .await
-            .map_err(to_anyhow)?;
-
-        let thread_id: ThreadId = response.thread_id.into();
-        let server = self.clone();
-        let thread = cx.new(|_| AcpThread {
-            // todo!
-            title: "ACP Thread".into(),
-            id: thread_id.clone(), // Either<ErrorState, Id>
-            next_entry_id: ThreadEntryId(0),
-            entries: Vec::default(),
-            project: self.project.clone(),
-            server,
-        })?;
-        self.threads.lock().insert(thread_id, thread.downgrade());
-        Ok(thread)
-    }
-
-    pub async fn send_message(
-        &self,
-        thread_id: ThreadId,
-        message: acp::Message,
-        _cx: &mut AsyncApp,
-    ) -> Result<()> {
-        self.connection
-            .request(acp::SendMessageParams {
-                thread_id: thread_id.clone().into(),
-                message,
-            })
-            .await
-            .map_err(to_anyhow)?;
-        Ok(())
-    }
-
-    pub fn exit_status(&self) -> Option<ExitStatus> {
-        self.exit_status.lock().clone()
-    }
-}
-
-#[track_caller]
-fn to_anyhow(e: acp::Error) -> anyhow::Error {
-    log::error!(
-        "failed to send message: {code}: {message}",
-        code = e.code,
-        message = e.message
-    );
-    anyhow::anyhow!(e.message)
-}
-
-impl From<acp::ThreadId> for ThreadId {
-    fn from(thread_id: acp::ThreadId) -> Self {
-        Self(thread_id.0.into())
-    }
-}
-
-impl From<ThreadId> for acp::ThreadId {
-    fn from(thread_id: ThreadId) -> Self {
-        acp::ThreadId(thread_id.0.to_string())
-    }
-}
-
-impl From<acp::ToolCallId> for ToolCallId {
-    fn from(tool_call_id: acp::ToolCallId) -> Self {
-        Self(ThreadEntryId(tool_call_id.0))
-    }
-}
-
-impl From<ToolCallId> for acp::ToolCallId {
-    fn from(tool_call_id: ToolCallId) -> Self {
-        acp::ToolCallId(tool_call_id.as_u64())
-    }
-}
--- a/crates/acp/src/thread_view.rs
+++ b/crates/acp/src/thread_view.rs
--- a/crates/agent/Cargo.toml
+++ b/crates/agent/Cargo.toml
@@ -72,7 +72,6 @@ gpui = { workspace = true, "features" = ["test-support"] }
 indoc.workspace = true
 language = { workspace = true, "features" = ["test-support"] }
 language_model = { workspace = true, "features" = ["test-support"] }
-parking_lot.workspace = true
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
--- a/crates/agent/src/agent_profile.rs
+++ b/crates/agent/src/agent_profile.rs
@@ -96,11 +96,16 @@ impl AgentProfile {
    fn is_enabled(settings: &AgentProfileSettings, source: ToolSource, name: String) -> bool {
        match source {
            ToolSource::Native => *settings.tools.get(name.as_str()).unwrap_or(&false),
-            ToolSource::ContextServer { id } => settings
-                .context_servers
-                .get(id.as_ref())
-                .and_then(|preset| preset.tools.get(name.as_str()).copied())
-                .unwrap_or(settings.enable_all_context_servers),
+            ToolSource::ContextServer { id } => {
+                if settings.enable_all_context_servers {
+                    return true;
+                }
+
+                let Some(preset) = settings.context_servers.get(id.as_ref()) else {
+                    return false;
+                };
+                *preset.tools.get(name.as_str()).unwrap_or(&false)
+            }
        }
    }
 }
--- a/crates/agent/src/thread.rs
+++ b/crates/agent/src/thread.rs
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -6,10 +6,9 @@ use anyhow::{Result, bail};
 use collections::IndexMap;
 use gpui::{App, Pixels, SharedString};
 use language_model::LanguageModel;
-use schemars::{JsonSchema, json_schema};
+use schemars::{JsonSchema, schema::Schema};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
-use std::borrow::Cow;

 pub use crate::agent_profile::*;

@@ -50,7 +49,7 @@ pub struct AgentSettings {
    pub dock: AgentDockPosition,
    pub default_width: Pixels,
    pub default_height: Pixels,
-    pub default_model: Option<LanguageModelSelection>,
+    pub default_model: LanguageModelSelection,
    pub inline_assistant_model: Option<LanguageModelSelection>,
    pub commit_message_model: Option<LanguageModelSelection>,
    pub thread_summary_model: Option<LanguageModelSelection>,
@@ -212,6 +211,7 @@ impl AgentSettingsContent {
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug, Default)]
+#[schemars(deny_unknown_fields)]
 pub struct AgentSettingsContent {
    /// Whether the Agent is enabled.
    ///
@@ -321,27 +321,29 @@ pub struct LanguageModelSelection {
 pub struct LanguageModelProviderSetting(pub String);

 impl JsonSchema for LanguageModelProviderSetting {
-    fn schema_name() -> Cow<'static, str> {
+    fn schema_name() -> String {
        "LanguageModelProviderSetting".into()
    }

-    fn json_schema(_: &mut schemars::SchemaGenerator) -> schemars::Schema {
-        json_schema!({
-            "enum": [
-                "anthropic",
-                "amazon-bedrock",
-                "google",
-                "lmstudio",
-                "ollama",
-                "openai",
-                "zed.dev",
-                "copilot_chat",
-                "deepseek",
-                "openrouter",
-                "mistral",
-                "vercel"
-            ]
-        })
+    fn json_schema(_: &mut schemars::r#gen::SchemaGenerator) -> Schema {
+        schemars::schema::SchemaObject {
+            enum_values: Some(vec![
+                "anthropic".into(),
+                "amazon-bedrock".into(),
+                "google".into(),
+                "lmstudio".into(),
+                "ollama".into(),
+                "openai".into(),
+                "zed.dev".into(),
+                "copilot_chat".into(),
+                "deepseek".into(),
+                "openrouter".into(),
+                "mistral".into(),
+                "vercel".into(),
+            ]),
+            ..Default::default()
+        }
+        .into()
    }
 }

@@ -357,6 +359,15 @@ impl From<&str> for LanguageModelProviderSetting {
    }
 }

+impl Default for LanguageModelSelection {
+    fn default() -> Self {
+        Self {
+            provider: LanguageModelProviderSetting("openai".to_string()),
+            model: "gpt-4".to_string(),
+        }
+    }
+}
+
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize, JsonSchema)]
 pub struct AgentProfileContent {
    pub name: Arc<str>,
@@ -400,10 +411,7 @@ impl Settings for AgentSettings {
                &mut settings.default_height,
                value.default_height.map(Into::into),
            );
-            settings.default_model = value
-                .default_model
-                .clone()
-                .or(settings.default_model.take());
+            merge(&mut settings.default_model, value.default_model.clone());
            settings.inline_assistant_model = value
                .inline_assistant_model
                .clone()
--- a/crates/agent_ui/Cargo.toml
+++ b/crates/agent_ui/Cargo.toml
@@ -13,10 +13,12 @@ path = "src/agent_ui.rs"
 doctest = false

 [features]
-test-support = ["gpui/test-support", "language/test-support"]
+test-support = [
+    "gpui/test-support",
+    "language/test-support",
+]

 [dependencies]
-acp.workspace = true
 agent.workspace = true
 agent_settings.workspace = true
 anyhow.workspace = true
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -19,7 +19,7 @@ use audio::{Audio, Sound};
 use collections::{HashMap, HashSet};
 use editor::actions::{MoveUp, Paste};
 use editor::scroll::Autoscroll;
-use editor::{Editor, EditorElement, EditorEvent, EditorStyle, MultiBuffer, SelectionEffects};
+use editor::{Editor, EditorElement, EditorEvent, EditorStyle, MultiBuffer};
 use gpui::{
    AbsoluteLength, Animation, AnimationExt, AnyElement, App, ClickEvent, ClipboardEntry,
    ClipboardItem, DefiniteLength, EdgesRefinement, Empty, Entity, EventEmitter, Focusable, Hsla,
@@ -47,8 +47,8 @@ use std::time::Duration;
 use text::ToPoint;
 use theme::ThemeSettings;
 use ui::{
-    Banner, Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState, TextSize,
-    Tooltip, prelude::*,
+    Disclosure, KeyBinding, PopoverMenuHandle, Scrollbar, ScrollbarState, TextSize, Tooltip,
+    prelude::*,
 };
 use util::ResultExt as _;
 use util::markdown::MarkdownCodeBlock;
@@ -58,7 +58,6 @@ use zed_llm_client::CompletionIntent;

 const CODEBLOCK_CONTAINER_GROUP: &str = "codeblock_container";
 const EDIT_PREVIOUS_MESSAGE_MIN_LINES: usize = 1;
-const RESPONSE_PADDING_X: Pixels = px(19.);

 pub struct ActiveThread {
    context_store: Entity<ContextStore>,
@@ -205,7 +204,7 @@ pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle
    MarkdownStyle {
        base_text_style: text_style.clone(),
        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        code_block_overflow_x_scroll: true,
        table_overflow_x_scroll: true,
        heading_level_styles: Some(HeadingLevelStyles {
@@ -302,7 +301,7 @@ fn tool_use_markdown_style(window: &Window, cx: &mut App) -> MarkdownStyle {
    MarkdownStyle {
        base_text_style: text_style,
        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        code_block_overflow_x_scroll: false,
        code_block: StyleRefinement {
            margin: EdgesRefinement::default(),
@@ -690,12 +689,9 @@ fn open_markdown_link(
                            })
                            .context("Could not find matching symbol")?;

-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| s.select_anchor_ranges([symbol_range.start..symbol_range.start]),
-                        );
+                        editor.change_selections(Some(Autoscroll::center()), window, cx, |s| {
+                            s.select_anchor_ranges([symbol_range.start..symbol_range.start])
+                        });
                        anyhow::Ok(())
                    })
                })
@@ -712,15 +708,10 @@ fn open_markdown_link(
                        .downcast::<Editor>()
                        .context("Item is not an editor")?;
                    active_editor.update_in(cx, |editor, window, cx| {
-                        editor.change_selections(
-                            SelectionEffects::scroll(Autoscroll::center()),
-                            window,
-                            cx,
-                            |s| {
-                                s.select_ranges([Point::new(line_range.start as u32, 0)
-                                    ..Point::new(line_range.start as u32, 0)])
-                            },
-                        );
+                        editor.change_selections(Some(Autoscroll::center()), window, cx, |s| {
+                            s.select_ranges([Point::new(line_range.start as u32, 0)
+                                ..Point::new(line_range.start as u32, 0)])
+                        });
                        anyhow::Ok(())
                    })
                })
@@ -1149,9 +1140,6 @@ impl ActiveThread {
                self.save_thread(cx);
                cx.notify();
            }
-            ThreadEvent::RetriesFailed { message } => {
-                self.show_notification(message, ui::IconName::Warning, window, cx);
-            }
        }
    }

@@ -1847,10 +1835,9 @@ impl ActiveThread {
            .filter(|(id, _)| *id == message_id)
            .map(|(_, state)| state);

-        let (editor_bg_color, panel_bg) = {
-            let colors = cx.theme().colors();
-            (colors.editor_background, colors.panel_background)
-        };
+        let colors = cx.theme().colors();
+        let editor_bg_color = colors.editor_background;
+        let panel_bg = colors.panel_background;

        let open_as_markdown = IconButton::new(("open-as-markdown", ix), IconName::DocumentText)
            .icon_size(IconSize::XSmall)
@@ -1875,6 +1862,9 @@ impl ActiveThread {
                this.scroll_to_top(cx);
            }));

+        // For all items that should be aligned with the LLM's response.
+        const RESPONSE_PADDING_X: Pixels = px(19.);
+
        let show_feedback = thread.is_turn_end(ix);
        let feedback_container = h_flex()
            .group("feedback_container")
@@ -2035,162 +2025,152 @@ impl ActiveThread {
            }
        });

-        let styled_message = if message.ui_only {
-            self.render_ui_notification(message_content, ix, cx)
-        } else {
-            match message.role {
-                Role::User => {
-                    let colors = cx.theme().colors();
+        let styled_message = match message.role {
+            Role::User => v_flex()
+                .id(("message-container", ix))
+                .pt_2()
+                .pl_2()
+                .pr_2p5()
+                .pb_4()
+                .child(
                    v_flex()
-                        .id(("message-container", ix))
-                        .pt_2()
-                        .pl_2()
-                        .pr_2p5()
-                        .pb_4()
+                        .id(("user-message", ix))
+                        .bg(editor_bg_color)
+                        .rounded_lg()
+                        .shadow_md()
+                        .border_1()
+                        .border_color(colors.border)
+                        .hover(|hover| hover.border_color(colors.text_accent.opacity(0.5)))
                        .child(
                            v_flex()
-                                .id(("user-message", ix))
-                                .bg(editor_bg_color)
-                                .rounded_lg()
-                                .shadow_md()
-                                .border_1()
-                                .border_color(colors.border)
-                                .hover(|hover| hover.border_color(colors.text_accent.opacity(0.5)))
-                                .child(
-                                    v_flex()
-                                        .p_2p5()
-                                        .gap_1()
-                                        .children(message_content)
-                                        .when_some(editing_message_state, |this, state| {
-                                            let focus_handle = state.editor.focus_handle(cx).clone();
+                                .p_2p5()
+                                .gap_1()
+                                .children(message_content)
+                                .when_some(editing_message_state, |this, state| {
+                                    let focus_handle = state.editor.focus_handle(cx).clone();

-                                            this.child(
+                                    this.child(
+                                        h_flex()
+                                            .w_full()
+                                            .gap_1()
+                                            .justify_between()
+                                            .flex_wrap()
+                                            .child(
                                                h_flex()
-                                                    .w_full()
-                                                    .gap_1()
-                                                    .justify_between()
-                                                    .flex_wrap()
+                                                    .gap_1p5()
                                                    .child(
-                                                        h_flex()
-                                                            .gap_1p5()
+                                                        div()
+                                                            .opacity(0.8)
                                                            .child(
-                                                                div()
-                                                                    .opacity(0.8)
-                                                                    .child(
-                                                                        Icon::new(IconName::Warning)
-                                                                            .size(IconSize::Indicator)
-                                                                            .color(Color::Warning)
-                                                                    ),
-                                                            )
-                                                            .child(
-                                                                Label::new("Editing will restart the thread from this point.")
-                                                                    .color(Color::Muted)
-                                                                    .size(LabelSize::XSmall),
+                                                                Icon::new(IconName::Warning)
+                                                                    .size(IconSize::Indicator)
+                                                                    .color(Color::Warning)
                                                            ),
                                                    )
                                                    .child(
-                                                        h_flex()
-                                                            .gap_0p5()
-                                                            .child(
-                                                                IconButton::new(
-                                                                    "cancel-edit-message",
-                                                                    IconName::Close,
-                                                                )
-                                                                .shape(ui::IconButtonShape::Square)
-                                                                .icon_color(Color::Error)
-                                                                .icon_size(IconSize::Small)
-                                                                .tooltip({
-                                                                    let focus_handle = focus_handle.clone();
-                                                                    move |window, cx| {
-                                                                        Tooltip::for_action_in(
-                                                                            "Cancel Edit",
-                                                                            &menu::Cancel,
-                                                                            &focus_handle,
-                                                                            window,
-                                                                            cx,
-                                                                        )
-                                                                    }
-                                                                })
-                                                                .on_click(cx.listener(Self::handle_cancel_click)),
-                                                            )
-                                                            .child(
-                                                                IconButton::new(
-                                                                    "confirm-edit-message",
-                                                                    IconName::Return,
-                                                                )
-                                                                .disabled(state.editor.read(cx).is_empty(cx))
-                                                                .shape(ui::IconButtonShape::Square)
-                                                                .icon_color(Color::Muted)
-                                                                .icon_size(IconSize::Small)
-                                                                .tooltip({
-                                                                    let focus_handle = focus_handle.clone();
-                                                                    move |window, cx| {
-                                                                        Tooltip::for_action_in(
-                                                                            "Regenerate",
-                                                                            &menu::Confirm,
-                                                                            &focus_handle,
-                                                                            window,
-                                                                            cx,
-                                                                        )
-                                                                    }
-                                                                })
-                                                                .on_click(
-                                                                    cx.listener(Self::handle_regenerate_click),
-                                                                ),
-                                                            ),
-                                                    )
+                                                        Label::new("Editing will restart the thread from this point.")
+                                                            .color(Color::Muted)
+                                                            .size(LabelSize::XSmall),
+                                                    ),
                                            )
-                                        }),
-                                )
-                                .on_click(cx.listener({
-                                    let message_creases = message.creases.clone();
-                                    move |this, _, window, cx| {
-                                        if let Some(message_text) =
-                                            this.thread.read(cx).message(message_id).and_then(|message| {
-                                                message.segments.first().and_then(|segment| {
-                                                    match segment {
-                                                        MessageSegment::Text(message_text) => {
-                                                            Some(Into::<Arc<str>>::into(message_text.as_str()))
-                                                        }
-                                                        _ => {
-                                                            None
-                                                        }
-                                                    }
-                                                })
-                                            })
-                                        {
-                                            this.start_editing_message(
-                                                message_id,
-                                                message_text,
-                                                &message_creases,
-                                                window,
-                                                cx,
-                                            );
-                                        }
-                                    }
-                                })),
+                                            .child(
+                                                h_flex()
+                                                    .gap_0p5()
+                                                    .child(
+                                                        IconButton::new(
+                                                            "cancel-edit-message",
+                                                            IconName::Close,
+                                                        )
+                                                        .shape(ui::IconButtonShape::Square)
+                                                        .icon_color(Color::Error)
+                                                        .icon_size(IconSize::Small)
+                                                        .tooltip({
+                                                            let focus_handle = focus_handle.clone();
+                                                            move |window, cx| {
+                                                                Tooltip::for_action_in(
+                                                                    "Cancel Edit",
+                                                                    &menu::Cancel,
+                                                                    &focus_handle,
+                                                                    window,
+                                                                    cx,
+                                                                )
+                                                            }
+                                                        })
+                                                        .on_click(cx.listener(Self::handle_cancel_click)),
+                                                    )
+                                                    .child(
+                                                        IconButton::new(
+                                                            "confirm-edit-message",
+                                                            IconName::Return,
+                                                        )
+                                                        .disabled(state.editor.read(cx).is_empty(cx))
+                                                        .shape(ui::IconButtonShape::Square)
+                                                        .icon_color(Color::Muted)
+                                                        .icon_size(IconSize::Small)
+                                                        .tooltip({
+                                                            let focus_handle = focus_handle.clone();
+                                                            move |window, cx| {
+                                                                Tooltip::for_action_in(
+                                                                    "Regenerate",
+                                                                    &menu::Confirm,
+                                                                    &focus_handle,
+                                                                    window,
+                                                                    cx,
+                                                                )
+                                                            }
+                                                        })
+                                                        .on_click(
+                                                            cx.listener(Self::handle_regenerate_click),
+                                                        ),
+                                                    ),
+                                            )
+                                    )
+                                }),
                        )
-                }
-                Role::Assistant => v_flex()
-                    .id(("message-container", ix))
-                    .px(RESPONSE_PADDING_X)
-                    .gap_2()
-                    .children(message_content)
-                    .when(has_tool_uses, |parent| {
-                        parent.children(tool_uses.into_iter().map(|tool_use| {
-                            self.render_tool_use(tool_use, window, workspace.clone(), cx)
-                        }))
-                    }),
-                Role::System => {
-                    let colors = cx.theme().colors();
-                    div().id(("message-container", ix)).py_1().px_2().child(
-                        v_flex()
-                            .bg(colors.editor_background)
-                            .rounded_sm()
-                            .child(div().p_4().children(message_content)),
-                    )
-                }
-            }
+                        .on_click(cx.listener({
+                            let message_creases = message.creases.clone();
+                            move |this, _, window, cx| {
+                                if let Some(message_text) =
+                                    this.thread.read(cx).message(message_id).and_then(|message| {
+                                        message.segments.first().and_then(|segment| {
+                                            match segment {
+                                                MessageSegment::Text(message_text) => {
+                                                    Some(Into::<Arc<str>>::into(message_text.as_str()))
+                                                }
+                                                _ => {
+                                                    None
+                                                }
+                                            }
+                                        })
+                                    })
+                                {
+                                    this.start_editing_message(
+                                        message_id,
+                                        message_text,
+                                        &message_creases,
+                                        window,
+                                        cx,
+                                    );
+                                }
+                            }
+                        })),
+                ),
+            Role::Assistant => v_flex()
+                .id(("message-container", ix))
+                .px(RESPONSE_PADDING_X)
+                .gap_2()
+                .children(message_content)
+                .when(has_tool_uses, |parent| {
+                    parent.children(tool_uses.into_iter().map(|tool_use| {
+                        self.render_tool_use(tool_use, window, workspace.clone(), cx)
+                    }))
+                }),
+            Role::System => div().id(("message-container", ix)).py_1().px_2().child(
+                v_flex()
+                    .bg(colors.editor_background)
+                    .rounded_sm()
+                    .child(div().p_4().children(message_content)),
+            ),
        };

        let after_editing_message = self
@@ -2529,26 +2509,6 @@ impl ActiveThread {
            .blend(cx.theme().colors().editor_foreground.opacity(0.025))
    }

-    fn render_ui_notification(
-        &self,
-        message_content: impl IntoIterator<Item = impl IntoElement>,
-        ix: usize,
-        cx: &mut Context<Self>,
-    ) -> Stateful<Div> {
-        let message = div()
-            .flex_1()
-            .min_w_0()
-            .text_size(TextSize::XSmall.rems(cx))
-            .text_color(cx.theme().colors().text_muted)
-            .children(message_content);
-
-        div()
-            .id(("message-container", ix))
-            .py_1()
-            .px_2p5()
-            .child(Banner::new().severity(ui::Severity::Warning).child(message))
-    }
-
    fn render_message_thinking_segment(
        &self,
        message_id: MessageId,
@@ -3803,9 +3763,9 @@ mod tests {

        // Stream response to user message
        thread.update(cx, |thread, cx| {
-            let intent = CompletionIntent::UserPrompt;
-            let request = thread.to_completion_request(model.clone(), intent, cx);
-            thread.stream_completion(request, model, intent, cx.active_window(), cx)
+            let request =
+                thread.to_completion_request(model.clone(), CompletionIntent::UserPrompt, cx);
+            thread.stream_completion(request, model, cx.active_window(), cx)
        });
        // Follow the agent
        cx.update(|window, cx| {
--- a/crates/agent_ui/src/agent_configuration.rs
+++ b/crates/agent_ui/src/agent_configuration.rs
@@ -16,9 +16,7 @@ use gpui::{
    Focusable, ScrollHandle, Subscription, Task, Transformation, WeakEntity, percentage,
 };
 use language::LanguageRegistry;
-use language_model::{
-    LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
-};
+use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
 use notifications::status_toast::{StatusToast, ToastIcon};
 use project::{
    context_server_store::{ContextServerConfiguration, ContextServerStatus, ContextServerStore},
@@ -88,14 +86,6 @@ impl AgentConfiguration {
        let scroll_handle = ScrollHandle::new();
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());

-        let mut expanded_provider_configurations = HashMap::default();
-        if LanguageModelRegistry::read_global(cx)
-            .provider(&ZED_CLOUD_PROVIDER_ID)
-            .map_or(false, |cloud_provider| cloud_provider.must_accept_terms(cx))
-        {
-            expanded_provider_configurations.insert(ZED_CLOUD_PROVIDER_ID, true);
-        }
-
        let mut this = Self {
            fs,
            language_registry,
@@ -104,7 +94,7 @@ impl AgentConfiguration {
            configuration_views_by_provider: HashMap::default(),
            context_server_store,
            expanded_context_server_tools: HashMap::default(),
-            expanded_provider_configurations,
+            expanded_provider_configurations: HashMap::default(),
            tools,
            _registry_subscription: registry_subscription,
            scroll_handle,
--- a/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
+++ b/crates/agent_ui/src/agent_configuration/configure_context_server_modal.rs
@@ -180,7 +180,7 @@ impl ConfigurationSource {
 }

 fn context_server_input(existing: Option<(ContextServerId, ContextServerCommand)>) -> String {
-    let (name, command, args, env) = match existing {
+    let (name, path, args, env) = match existing {
        Some((id, cmd)) => {
            let args = serde_json::to_string(&cmd.args).unwrap();
            let env = serde_json::to_string(&cmd.env.unwrap_or_default()).unwrap();
@@ -198,12 +198,14 @@ fn context_server_input(existing: Option<(ContextServerId, ContextServerCommand)
        r#"{{
  /// The name of your MCP server
  "{name}": {{
-    /// The command which runs the MCP server
-    "command": "{command}",
-    /// The arguments to pass to the MCP server
-    "args": {args},
-    /// The environment variables to set
-    "env": {env}
+    "command": {{
+      /// The path to the executable
+      "path": "{path}",
+      /// The arguments to pass to the executable
+      "args": {args},
+      /// The environment variables to set for the executable
+      "env": {env}
+    }}
  }}
 }}"#
    )
@@ -437,7 +439,8 @@ fn parse_input(text: &str) -> Result<(ContextServerId, ContextServerCommand)> {
    let object = value.as_object().context("Expected object")?;
    anyhow::ensure!(object.len() == 1, "Expected exactly one key-value pair");
    let (context_server_name, value) = object.into_iter().next().unwrap();
-    let command: ContextServerCommand = serde_json::from_value(value.clone())?;
+    let command = value.get("command").context("Expected command")?;
+    let command: ContextServerCommand = serde_json::from_value(command.clone())?;
    Ok((ContextServerId(context_server_name.clone().into()), command))
 }

@@ -745,7 +748,7 @@ pub(crate) fn default_markdown_style(window: &Window, cx: &App) -> MarkdownStyle

    MarkdownStyle {
        base_text_style: text_style.clone(),
-        selection_background_color: colors.element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        link: TextStyleRefinement {
            background_color: Some(colors.editor_foreground.opacity(0.025)),
            underline: Some(UnderlineStyle {
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -5,8 +5,7 @@ use anyhow::Result;
 use buffer_diff::DiffHunkStatus;
 use collections::{HashMap, HashSet};
 use editor::{
-    Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot,
-    SelectionEffects, ToPoint,
+    Direction, Editor, EditorEvent, EditorSettings, MultiBuffer, MultiBufferSnapshot, ToPoint,
    actions::{GoToHunk, GoToPreviousHunk},
    scroll::Autoscroll,
 };
@@ -172,9 +171,15 @@ impl AgentDiffPane {

                    if let Some(first_hunk) = first_hunk {
                        let first_hunk_start = first_hunk.multi_buffer_range().start;
-                        editor.change_selections(Default::default(), window, cx, |selections| {
-                            selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
-                        })
+                        editor.change_selections(
+                            Some(Autoscroll::fit()),
+                            window,
+                            cx,
+                            |selections| {
+                                selections
+                                    .select_anchor_ranges([first_hunk_start..first_hunk_start]);
+                            },
+                        )
                    }
                }

@@ -237,7 +242,7 @@ impl AgentDiffPane {

                if let Some(first_hunk) = first_hunk {
                    let first_hunk_start = first_hunk.multi_buffer_range().start;
-                    editor.change_selections(Default::default(), window, cx, |selections| {
+                    editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
                        selections.select_anchor_ranges([first_hunk_start..first_hunk_start]);
                    })
                }
@@ -411,7 +416,7 @@ fn update_editor_selection(
    };

    if let Some(target_hunk) = target_hunk {
-        editor.change_selections(Default::default(), window, cx, |selections| {
+        editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
            let next_hunk_start = target_hunk.multi_buffer_range().start;
            selections.select_anchor_ranges([next_hunk_start..next_hunk_start]);
        })
@@ -1375,7 +1380,6 @@ impl AgentDiff {
            | ThreadEvent::ToolConfirmationNeeded
            | ThreadEvent::ToolUseLimitReached
            | ThreadEvent::CancelEditing
-            | ThreadEvent::RetriesFailed { .. }
            | ThreadEvent::ProfileChanged => {}
        }
    }
@@ -1539,7 +1543,7 @@ impl AgentDiff {
                            let first_hunk_start = first_hunk.multi_buffer_range().start;

                            editor.change_selections(
-                                SelectionEffects::scroll(Autoscroll::center()),
+                                Some(Autoscroll::center()),
                                window,
                                cx,
                                |selections| {
@@ -1863,7 +1867,7 @@ mod tests {

        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
        editor.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
            });
        });
@@ -2119,7 +2123,7 @@ mod tests {

        // Rejecting a hunk also moves the cursor to the next hunk, possibly cycling if it's at the end.
        editor1.update_in(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges([Point::new(10, 0)..Point::new(10, 0)])
            });
        });
--- a/crates/agent_ui/src/agent_model_selector.rs
+++ b/crates/agent_ui/src/agent_model_selector.rs
@@ -11,7 +11,7 @@ use language_model::{ConfiguredModel, LanguageModelRegistry};
 use picker::popover_menu::PickerPopoverMenu;
 use settings::update_settings_file;
 use std::sync::Arc;
-use ui::{ButtonLike, PopoverMenuHandle, Tooltip, prelude::*};
+use ui::{PopoverMenuHandle, Tooltip, prelude::*};

 pub struct AgentModelSelector {
    selector: Entity<LanguageModelSelector>,
@@ -94,35 +94,20 @@ impl Render for AgentModelSelector {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let model = self.selector.read(cx).delegate.active_model(cx);
        let model_name = model
-            .as_ref()
            .map(|model| model.model.name().0)
            .unwrap_or_else(|| SharedString::from("No model selected"));
-        let provider_icon = model
-            .as_ref()
-            .map(|model| model.provider.icon())
-            .unwrap_or_else(|| IconName::Ai);

        let focus_handle = self.focus_handle.clone();

        PickerPopoverMenu::new(
            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .child(
-                    Icon::new(provider_icon)
-                        .color(Color::Muted)
-                        .size(IconSize::XSmall),
-                )
-                .child(
-                    Label::new(model_name)
-                        .color(Color::Muted)
-                        .size(LabelSize::Small)
-                        .ml_0p5(),
-                )
-                .child(
-                    Icon::new(IconName::ChevronDown)
-                        .color(Color::Muted)
-                        .size(IconSize::XSmall),
-                ),
+            Button::new("active-model", model_name)
+                .label_size(LabelSize::Small)
+                .color(Color::Muted)
+                .icon(IconName::ChevronDown)
+                .icon_size(IconSize::XSmall)
+                .icon_position(IconPosition::End)
+                .icon_color(Color::Muted),
            move |window, cx| {
                Tooltip::for_action_in(
                    "Change Model",
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
--- a/crates/agent_ui/src/agent_ui.rs
+++ b/crates/agent_ui/src/agent_ui.rs
@@ -4,7 +4,6 @@ mod agent_diff;
 mod agent_model_selector;
 mod agent_panel;
 mod buffer_codegen;
-mod burn_mode_tooltip;
 mod context_picker;
 mod context_server_configuration;
 mod context_strip;
@@ -12,6 +11,7 @@ mod debug;
 mod inline_assistant;
 mod inline_prompt_editor;
 mod language_model_selector;
+mod max_mode_tooltip;
 mod message_editor;
 mod profile_selector;
 mod slash_command;
@@ -48,14 +48,13 @@ pub use crate::agent_panel::{AgentPanel, ConcreteAssistantPanelDelegate};
 pub use crate::inline_assistant::InlineAssistant;
 use crate::slash_command_settings::SlashCommandSettings;
 pub use agent_diff::{AgentDiffPane, AgentDiffToolbar};
-pub use text_thread_editor::{AgentPanelDelegate, TextThreadEditor};
+pub use text_thread_editor::AgentPanelDelegate;
 pub use ui::preview::{all_agent_previews, get_agent_preview};

 actions!(
    agent,
    [
        NewTextThread,
-        NewGeminiThread,
        ToggleContextPicker,
        ToggleNavigationMenu,
        ToggleOptionsMenu,
@@ -66,6 +65,7 @@ actions!(
        OpenHistory,
        AddContextServer,
        RemoveSelectedThread,
+        Chat,
        ChatWithFollow,
        CycleNextInlineAssist,
        CyclePreviousInlineAssist,
@@ -92,7 +92,6 @@ actions!(

 #[derive(Default, Clone, PartialEq, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
 pub struct NewThread {
    #[serde(default)]
    from_thread_id: Option<ThreadId>,
@@ -100,7 +99,6 @@ pub struct NewThread {

 #[derive(PartialEq, Clone, Default, Debug, Deserialize, JsonSchema, Action)]
 #[action(namespace = agent)]
-#[serde(deny_unknown_fields)]
 pub struct ManageProfiles {
    #[serde(default)]
    pub customize_tools: Option<AgentProfileId>,
@@ -159,7 +157,6 @@ pub fn init(
    agent::init(cx);
    agent_panel::init(cx);
    context_server_configuration::init(language_registry.clone(), fs.clone(), cx);
-    TextThreadEditor::init(cx);

    register_slash_commands(cx);
    inline_assistant::init(
@@ -211,7 +208,7 @@ fn update_active_language_model_from_settings(cx: &mut App) {
        }
    }

-    let default = settings.default_model.as_ref().map(to_selected_model);
+    let default = to_selected_model(&settings.default_model);
    let inline_assistant = settings
        .inline_assistant_model
        .as_ref()
@@ -231,7 +228,7 @@ fn update_active_language_model_from_settings(cx: &mut App) {
        .collect::<Vec<_>>();

    LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-        registry.select_default_model(default.as_ref(), cx);
+        registry.select_default_model(Some(&default), cx);
        registry.select_inline_assistant_model(inline_assistant.as_ref(), cx);
        registry.select_commit_message_model(commit_message.as_ref(), cx);
        registry.select_thread_summary_model(thread_summary.as_ref(), cx);
--- a/crates/agent_ui/src/buffer_codegen.rs
+++ b/crates/agent_ui/src/buffer_codegen.rs
@@ -1094,9 +1094,15 @@ mod tests {
    };
    use language_model::{LanguageModelRegistry, TokenUsage};
    use rand::prelude::*;
+    use serde::Serialize;
    use settings::SettingsStore;
    use std::{future, sync::Arc};

+    #[derive(Serialize)]
+    pub struct DummyCompletionRequest {
+        pub name: String,
+    }
+
    #[gpui::test(iterations = 10)]
    async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
        init_test(cx);
--- a/crates/agent_ui/src/context_picker.rs
+++ b/crates/agent_ui/src/context_picker.rs
@@ -661,7 +661,7 @@ fn recent_context_picker_entries(

    let active_thread_id = workspace
        .panel::<AgentPanel>(cx)
-        .and_then(|panel| Some(panel.read(cx).active_thread(cx)?.read(cx).id()));
+        .and_then(|panel| Some(panel.read(cx).active_thread()?.read(cx).id()));

    if let Some((thread_store, text_thread_store)) = thread_store
        .and_then(|store| store.upgrade())
@@ -930,8 +930,8 @@ impl MentionLink {
        format!(
            "[@{} ({}-{})]({}:{}:{}-{})",
            file_name,
-            line_range.start + 1,
-            line_range.end + 1,
+            line_range.start,
+            line_range.end,
            Self::SELECTION,
            full_path,
            line_range.start,
--- a/crates/agent_ui/src/context_strip.rs
+++ b/crates/agent_ui/src/context_strip.rs
@@ -161,7 +161,7 @@ impl ContextStrip {
        let workspace = self.workspace.upgrade()?;
        let panel = workspace.read(cx).panel::<AgentPanel>(cx)?.read(cx);

-        if let Some(active_thread) = panel.active_thread(cx) {
+        if let Some(active_thread) = panel.active_thread() {
            let weak_active_thread = active_thread.downgrade();

            let active_thread = active_thread.read(cx);
--- a/crates/agent_ui/src/inline_assistant.rs
+++ b/crates/agent_ui/src/inline_assistant.rs
@@ -18,7 +18,6 @@ use agent_settings::AgentSettings;
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, HashSet, VecDeque, hash_map};
-use editor::SelectionEffects;
 use editor::{
    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
    MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
@@ -1160,7 +1159,7 @@ impl InlineAssistant {

        let position = assist.range.start;
        editor.update(cx, |editor, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_anchor_ranges([position..position])
            });

--- a/crates/agent_ui/src/language_model_selector.rs
+++ b/crates/agent_ui/src/language_model_selector.rs
@@ -399,7 +399,7 @@ impl PickerDelegate for LanguageModelPickerDelegate {
        cx: &mut Context<Picker<Self>>,
    ) -> Task<()> {
        let all_models = self.all_models.clone();
-        let active_model = (self.get_active_model)(cx);
+        let current_index = self.selected_index;
        let bg_executor = cx.background_executor();

        let language_model_registry = LanguageModelRegistry::global(cx);
@@ -441,9 +441,12 @@ impl PickerDelegate for LanguageModelPickerDelegate {
        cx.spawn_in(window, async move |this, cx| {
            this.update_in(cx, |this, window, cx| {
                this.delegate.filtered_entries = filtered_models.entries();
-                // Finds the currently selected model in the list
-                let new_index =
-                    Self::get_active_model_index(&this.delegate.filtered_entries, active_model);
+                // Preserve selection focus
+                let new_index = if current_index >= this.delegate.filtered_entries.len() {
+                    0
+                } else {
+                    current_index
+                };
                this.set_selected_index(new_index, Some(picker::Direction::Down), true, window, cx);
                cx.notify();
            })
--- a/crates/agent_ui/src/burn_mode_tooltip.rs
+++ b/crates/agent_ui/src/burn_mode_tooltip.rs
@@ -1,11 +1,11 @@
 use gpui::{Context, FontWeight, IntoElement, Render, Window};
 use ui::{prelude::*, tooltip_container};

-pub struct BurnModeTooltip {
+pub struct MaxModeTooltip {
    selected: bool,
 }

-impl BurnModeTooltip {
+impl MaxModeTooltip {
    pub fn new() -> Self {
        Self { selected: false }
    }
@@ -16,7 +16,7 @@ impl BurnModeTooltip {
    }
 }

-impl Render for BurnModeTooltip {
+impl Render for MaxModeTooltip {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let (icon, color) = if self.selected {
            (IconName::ZedBurnModeOn, Color::Error)
--- a/crates/agent_ui/src/message_editor.rs
+++ b/crates/agent_ui/src/message_editor.rs
@@ -47,14 +47,13 @@ use ui::{
 };
 use util::ResultExt as _;
 use workspace::{CollaboratorId, Workspace};
-use zed_actions::agent::Chat;
 use zed_llm_client::CompletionIntent;

 use crate::context_picker::{ContextPicker, ContextPickerCompletionProvider, crease_for_mention};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::profile_selector::ProfileSelector;
 use crate::{
-    ActiveThread, AgentDiffPane, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
+    ActiveThread, AgentDiffPane, Chat, ChatWithFollow, ExpandMessageEditor, Follow, KeepAll,
    ModelUsageContext, NewThread, OpenAgentDiff, RejectAll, RemoveAllContext, ToggleBurnMode,
    ToggleContextPicker, ToggleProfileSelector, register_agent_preview,
 };
@@ -576,7 +575,7 @@ impl MessageEditor {
    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let thread = self.thread.read(cx);
        let model = thread.configured_model();
-        if !model?.model.supports_burn_mode() {
+        if !model?.model.supports_max_mode() {
            return None;
        }

@@ -1251,7 +1250,9 @@ impl MessageEditor {
        self.thread
            .read(cx)
            .configured_model()
-            .map_or(false, |model| model.provider.id() == ZED_CLOUD_PROVIDER_ID)
+            .map_or(false, |model| {
+                model.provider.id().0 == ZED_CLOUD_PROVIDER_ID
+            })
    }

    fn render_usage_callout(&self, line_height: Pixels, cx: &mut Context<Self>) -> Option<Div> {
--- a/crates/agent_ui/src/text_thread_editor.rs
+++ b/crates/agent_ui/src/text_thread_editor.rs
@@ -1,8 +1,8 @@
 use crate::{
-    burn_mode_tooltip::BurnModeTooltip,
    language_model_selector::{
        LanguageModelSelector, ToggleModelSelector, language_model_selector,
    },
+    max_mode_tooltip::MaxModeTooltip,
 };
 use agent_settings::{AgentSettings, CompletionMode};
 use anyhow::Result;
@@ -21,6 +21,7 @@ use editor::{
        BlockPlacement, BlockProperties, BlockStyle, Crease, CreaseMetadata, CustomBlockId, FoldId,
        RenderBlock, ToDisplayPoint,
    },
+    scroll::Autoscroll,
 };
 use editor::{FoldPlaceholder, display_map::CreaseId};
 use fs::Fs;
@@ -68,7 +69,7 @@ use workspace::{
    searchable::{Direction, SearchableItemHandle},
 };
 use workspace::{
-    Save, Toast, Workspace,
+    Save, Toast, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView, Workspace,
    item::{self, FollowableItem, Item, ItemHandle},
    notifications::NotificationId,
    pane,
@@ -388,7 +389,7 @@ impl TextThreadEditor {
                cursor..cursor
            };
            self.editor.update(cx, |editor, cx| {
-                editor.change_selections(Default::default(), window, cx, |selections| {
+                editor.change_selections(Some(Autoscroll::fit()), window, cx, |selections| {
                    selections.select_ranges([new_selection])
                });
            });
@@ -448,7 +449,8 @@ impl TextThreadEditor {
        if let Some(command) = self.slash_commands.command(name, cx) {
            self.editor.update(cx, |editor, cx| {
                editor.transact(window, cx, |editor, window, cx| {
-                    editor.change_selections(Default::default(), window, cx, |s| s.try_cancel());
+                    editor
+                        .change_selections(Some(Autoscroll::fit()), window, cx, |s| s.try_cancel());
                    let snapshot = editor.buffer().read(cx).snapshot(cx);
                    let newest_cursor = editor.selections.newest::<Point>(cx).head();
                    if newest_cursor.column > 0
@@ -1581,7 +1583,7 @@ impl TextThreadEditor {

            self.editor.update(cx, |editor, cx| {
                editor.transact(window, cx, |this, window, cx| {
-                    this.change_selections(Default::default(), window, cx, |s| {
+                    this.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
                        s.select(selections);
                    });
                    this.insert("", window, cx);
@@ -2073,12 +2075,12 @@ impl TextThreadEditor {
        )
    }

-    fn render_burn_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
+    fn render_max_mode_toggle(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let context = self.context().read(cx);
        let active_model = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.model)?;
-        if !active_model.supports_burn_mode() {
+        if !active_model.supports_max_mode() {
            return None;
        }

@@ -2105,7 +2107,7 @@ impl TextThreadEditor {
                    });
                }))
                .tooltip(move |_window, cx| {
-                    cx.new(|_| BurnModeTooltip::new().selected(burn_mode_enabled))
+                    cx.new(|_| MaxModeTooltip::new().selected(burn_mode_enabled))
                        .into()
                })
                .into_any_element(),
@@ -2120,21 +2122,12 @@ impl TextThreadEditor {
        let active_model = LanguageModelRegistry::read_global(cx)
            .default_model()
            .map(|default| default.model);
+        let focus_handle = self.editor().focus_handle(cx).clone();
        let model_name = match active_model {
            Some(model) => model.name().0,
            None => SharedString::from("No model selected"),
        };

-        let active_provider = LanguageModelRegistry::read_global(cx)
-            .default_model()
-            .map(|default| default.provider);
-        let provider_icon = match active_provider {
-            Some(provider) => provider.icon(),
-            None => IconName::Ai,
-        };
-
-        let focus_handle = self.editor().focus_handle(cx).clone();
-
        PickerPopoverMenu::new(
            self.language_model_selector.clone(),
            ButtonLike::new("active-model")
@@ -2142,16 +2135,10 @@ impl TextThreadEditor {
                .child(
                    h_flex()
                        .gap_0p5()
-                        .child(
-                            Icon::new(provider_icon)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        )
                        .child(
                            Label::new(model_name)
-                                .color(Color::Muted)
                                .size(LabelSize::Small)
-                                .ml_0p5(),
+                                .color(Color::Muted),
                        )
                        .child(
                            Icon::new(IconName::ChevronDown)
@@ -2588,7 +2575,7 @@ impl Render for TextThreadEditor {
        };

        let language_model_selector = self.language_model_selector_menu_handle.clone();
-        let burn_mode_toggle = self.render_burn_mode_toggle(cx);
+        let max_mode_toggle = self.render_max_mode_toggle(cx);

        v_flex()
            .key_context("ContextEditor")
@@ -2643,7 +2630,7 @@ impl Render for TextThreadEditor {
                        h_flex()
                            .gap_0p5()
                            .child(self.render_inject_context_menu(cx))
-                            .when_some(burn_mode_toggle, |this, element| this.child(element)),
+                            .when_some(max_mode_toggle, |this, element| this.child(element)),
                    )
                    .child(
                        h_flex()
@@ -2937,6 +2924,13 @@ impl FollowableItem for TextThreadEditor {
    }
 }

+pub struct ContextEditorToolbarItem {
+    active_context_editor: Option<WeakEntity<TextThreadEditor>>,
+    model_summary_editor: Entity<Editor>,
+}
+
+impl ContextEditorToolbarItem {}
+
 pub fn render_remaining_tokens(
    context_editor: &Entity<TextThreadEditor>,
    cx: &App,
@@ -2989,6 +2983,98 @@ pub fn render_remaining_tokens(
    )
 }

+impl Render for ContextEditorToolbarItem {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let left_side = h_flex()
+            .group("chat-title-group")
+            .gap_1()
+            .items_center()
+            .flex_grow()
+            .child(
+                div()
+                    .w_full()
+                    .when(self.active_context_editor.is_some(), |left_side| {
+                        left_side.child(self.model_summary_editor.clone())
+                    }),
+            )
+            .child(
+                div().visible_on_hover("chat-title-group").child(
+                    IconButton::new("regenerate-context", IconName::RefreshTitle)
+                        .shape(ui::IconButtonShape::Square)
+                        .tooltip(Tooltip::text("Regenerate Title"))
+                        .on_click(cx.listener(move |_, _, _window, cx| {
+                            cx.emit(ContextEditorToolbarItemEvent::RegenerateSummary)
+                        })),
+                ),
+            );
+
+        let right_side = h_flex()
+            .gap_2()
+            // TODO display this in a nicer way, once we have a design for it.
+            // .children({
+            //     let project = self
+            //         .workspace
+            //         .upgrade()
+            //         .map(|workspace| workspace.read(cx).project().downgrade());
+            //
+            //     let scan_items_remaining = cx.update_global(|db: &mut SemanticDb, cx| {
+            //         project.and_then(|project| db.remaining_summaries(&project, cx))
+            //     });
+            //     scan_items_remaining
+            //         .map(|remaining_items| format!("Files to scan: {}", remaining_items))
+            // })
+            .children(
+                self.active_context_editor
+                    .as_ref()
+                    .and_then(|editor| editor.upgrade())
+                    .and_then(|editor| render_remaining_tokens(&editor, cx)),
+            );
+
+        h_flex()
+            .px_0p5()
+            .size_full()
+            .gap_2()
+            .justify_between()
+            .child(left_side)
+            .child(right_side)
+    }
+}
+
+impl ToolbarItemView for ContextEditorToolbarItem {
+    fn set_active_pane_item(
+        &mut self,
+        active_pane_item: Option<&dyn ItemHandle>,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> ToolbarItemLocation {
+        self.active_context_editor = active_pane_item
+            .and_then(|item| item.act_as::<TextThreadEditor>(cx))
+            .map(|editor| editor.downgrade());
+        cx.notify();
+        if self.active_context_editor.is_none() {
+            ToolbarItemLocation::Hidden
+        } else {
+            ToolbarItemLocation::PrimaryRight
+        }
+    }
+
+    fn pane_focus_update(
+        &mut self,
+        _pane_focused: bool,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        cx.notify();
+    }
+}
+
+impl EventEmitter<ToolbarItemEvent> for ContextEditorToolbarItem {}
+
+pub enum ContextEditorToolbarItemEvent {
+    RegenerateSummary,
+}
+impl EventEmitter<ContextEditorToolbarItemEvent> for ContextEditorToolbarItem {}
+
 enum PendingSlashCommand {}

 fn invoked_slash_command_fold_placeholder(
@@ -3154,7 +3240,6 @@ pub fn make_lsp_adapter_delegate(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use editor::SelectionEffects;
    use fs::FakeFs;
    use gpui::{App, TestAppContext, VisualTestContext};
    use indoc::indoc;
@@ -3380,9 +3465,7 @@ mod tests {
    ) {
        context_editor.update_in(cx, |context_editor, window, cx| {
            context_editor.editor.update(cx, |editor, cx| {
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-                    s.select_ranges([range])
-                });
+                editor.change_selections(None, window, cx, |s| s.select_ranges([range]));
            });

            context_editor.copy(&Default::default(), window, cx);
--- a/crates/agent_ui/src/ui.rs
+++ b/crates/agent_ui/src/ui.rs
@@ -1,13 +1,13 @@
 mod agent_notification;
 mod animated_label;
-mod burn_mode_tooltip;
 mod context_pill;
+mod max_mode_tooltip;
 mod onboarding_modal;
 pub mod preview;
 mod upsell;

 pub use agent_notification::*;
 pub use animated_label::*;
-pub use burn_mode_tooltip::*;
 pub use context_pill::*;
+pub use max_mode_tooltip::*;
 pub use onboarding_modal::*;
--- a/crates/agent_ui/src/ui/burn_mode_tooltip.rs
+++ b/crates/agent_ui/src/ui/burn_mode_tooltip.rs
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -6,7 +6,7 @@ use anyhow::{Context as _, Result, anyhow};
 use chrono::{DateTime, Utc};
 use futures::{AsyncBufReadExt, AsyncReadExt, StreamExt, io::BufReader, stream::BoxStream};
 use http_client::http::{self, HeaderMap, HeaderValue};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest, StatusCode};
+use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use serde::{Deserialize, Serialize};
 use strum::{EnumIter, EnumString};
 use thiserror::Error;
@@ -356,7 +356,7 @@ pub async fn complete(
        .send(request)
        .await
        .map_err(AnthropicError::HttpSend)?;
-    let status_code = response.status();
+    let status = response.status();
    let mut body = String::new();
    response
        .body_mut()
@@ -364,12 +364,12 @@ pub async fn complete(
        .await
        .map_err(AnthropicError::ReadResponse)?;

-    if status_code.is_success() {
+    if status.is_success() {
        Ok(serde_json::from_str(&body).map_err(AnthropicError::DeserializeResponse)?)
    } else {
        Err(AnthropicError::HttpResponseError {
-            status_code,
-            message: body,
+            status: status.as_u16(),
+            body,
        })
    }
 }
@@ -444,7 +444,11 @@ impl RateLimitInfo {
        }

        Self {
-            retry_after: parse_retry_after(headers),
+            retry_after: headers
+                .get("retry-after")
+                .and_then(|v| v.to_str().ok())
+                .and_then(|v| v.parse::<u64>().ok())
+                .map(Duration::from_secs),
            requests: RateLimit::from_headers("requests", headers).ok(),
            tokens: RateLimit::from_headers("tokens", headers).ok(),
            input_tokens: RateLimit::from_headers("input-tokens", headers).ok(),
@@ -453,17 +457,6 @@ impl RateLimitInfo {
    }
 }

-/// Parses the Retry-After header value as an integer number of seconds (anthropic always uses
-/// seconds). Note that other services might specify an HTTP date or some other format for this
-/// header. Returns `None` if the header is not present or cannot be parsed.
-pub fn parse_retry_after(headers: &HeaderMap<HeaderValue>) -> Option<Duration> {
-    headers
-        .get("retry-after")
-        .and_then(|v| v.to_str().ok())
-        .and_then(|v| v.parse::<u64>().ok())
-        .map(Duration::from_secs)
-}
-
 fn get_header<'a>(key: &str, headers: &'a HeaderMap) -> anyhow::Result<&'a str> {
    Ok(headers
        .get(key)
@@ -527,10 +520,6 @@ pub async fn stream_completion_with_rate_limit_info(
            })
            .boxed();
        Ok((stream, Some(rate_limits)))
-    } else if response.status().as_u16() == 529 {
-        Err(AnthropicError::ServerOverloaded {
-            retry_after: rate_limits.retry_after,
-        })
    } else if let Some(retry_after) = rate_limits.retry_after {
        Err(AnthropicError::RateLimit { retry_after })
    } else {
@@ -543,9 +532,10 @@ pub async fn stream_completion_with_rate_limit_info(

        match serde_json::from_str::<Event>(&body) {
            Ok(Event::Error { error }) => Err(AnthropicError::ApiError(error)),
-            Ok(_) | Err(_) => Err(AnthropicError::HttpResponseError {
-                status_code: response.status(),
-                message: body,
+            Ok(_) => Err(AnthropicError::UnexpectedResponseFormat(body)),
+            Err(_) => Err(AnthropicError::HttpResponseError {
+                status: response.status().as_u16(),
+                body: body,
            }),
        }
    }
@@ -811,19 +801,16 @@ pub enum AnthropicError {
    ReadResponse(io::Error),

    /// HTTP error response from the API
-    HttpResponseError {
-        status_code: StatusCode,
-        message: String,
-    },
+    HttpResponseError { status: u16, body: String },

    /// Rate limit exceeded
    RateLimit { retry_after: Duration },

-    /// Server overloaded
-    ServerOverloaded { retry_after: Option<Duration> },
-
    /// API returned an error response
    ApiError(ApiError),
+
+    /// Unexpected response format
+    UnexpectedResponseFormat(String),
 }

 #[derive(Debug, Serialize, Deserialize, Error)]
--- a/crates/assistant_context/src/assistant_context.rs
+++ b/crates/assistant_context/src/assistant_context.rs
@@ -2140,8 +2140,7 @@ impl AssistantContext {
                                        );
                                    }
                                    LanguageModelCompletionEvent::ToolUse(_) |
-                                    LanguageModelCompletionEvent::ToolUseJsonParseError { .. } |
-                                    LanguageModelCompletionEvent::UsageUpdate(_) => {}
+                                    LanguageModelCompletionEvent::UsageUpdate(_)  => {}
                                }
                            });

@@ -2347,13 +2346,13 @@ impl AssistantContext {
                completion_request.messages.push(request_message);
            }
        }
-        let supports_burn_mode = if let Some(model) = model {
-            model.supports_burn_mode()
+        let supports_max_mode = if let Some(model) = model {
+            model.supports_max_mode()
        } else {
            false
        };

-        if supports_burn_mode {
+        if supports_max_mode {
            completion_request.mode = Some(self.completion_mode.into());
        }
        completion_request
--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -74,7 +74,7 @@ impl SlashCommand for DeltaSlashCommand {
                            .slice(section.range.to_offset(&context_buffer)),
                    );
                    file_command_new_outputs.push(Arc::new(FileSlashCommand).run(
-                        std::slice::from_ref(&metadata.path),
+                        &[metadata.path.clone()],
                        context_slash_command_output_sections,
                        context_buffer.clone(),
                        workspace.clone(),
--- a/crates/assistant_tools/src/edit_agent/evals.rs
+++ b/crates/assistant_tools/src/edit_agent/evals.rs
@@ -29,7 +29,6 @@ use std::{
    path::Path,
    str::FromStr,
    sync::mpsc,
-    time::Duration,
 };
 use util::path;

@@ -1659,14 +1658,12 @@ async fn retry_on_rate_limit<R>(mut request: impl AsyncFnMut() -> Result<R>) ->
        match request().await {
            Ok(result) => return Ok(result),
            Err(err) => match err.downcast::<LanguageModelCompletionError>() {
-                Ok(err) => match &err {
-                    LanguageModelCompletionError::RateLimitExceeded { retry_after, .. }
-                    | LanguageModelCompletionError::ServerOverloaded { retry_after, .. } => {
-                        let retry_after = retry_after.unwrap_or(Duration::from_secs(5));
+                Ok(err) => match err {
+                    LanguageModelCompletionError::RateLimitExceeded { retry_after } => {
                        // Wait for the duration supplied, with some jitter to avoid all requests being made at the same time.
                        let jitter = retry_after.mul_f64(rand::thread_rng().gen_range(0.0..1.0));
                        eprintln!(
-                            "Attempt #{attempt}: {err}. Retry after {retry_after:?} + jitter of {jitter:?}"
+                            "Attempt #{attempt}: Rate limit exceeded. Retry after {retry_after:?} + jitter of {jitter:?}"
                        );
                        Timer::after(retry_after + jitter).await;
                        continue;
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -10,7 +10,7 @@ use assistant_tool::{
    ToolUseStatus,
 };
 use buffer_diff::{BufferDiff, BufferDiffSnapshot};
-use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey};
+use editor::{Editor, EditorMode, MinimapVisibility, MultiBuffer, PathKey, scroll::Autoscroll};
 use futures::StreamExt;
 use gpui::{
    Animation, AnimationExt, AnyWindowHandle, App, AppContext, AsyncApp, Entity, Task,
@@ -823,7 +823,7 @@ impl ToolCard for EditFileToolCard {
                                                        let first_hunk_start =
                                                            first_hunk.multi_buffer_range().start;
                                                        editor.change_selections(
-                                                            Default::default(),
+                                                            Some(Autoscroll::fit()),
                                                            window,
                                                            cx,
                                                            |selections| {
@@ -1065,7 +1065,7 @@ fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {

    MarkdownStyle {
        base_text_style: text_style.clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        ..Default::default()
    }
 }
--- a/crates/assistant_tools/src/schema.rs
+++ b/crates/assistant_tools/src/schema.rs
@@ -1,9 +1,8 @@
 use anyhow::Result;
 use language_model::LanguageModelToolSchemaFormat;
 use schemars::{
-    JsonSchema, Schema,
-    generate::SchemaSettings,
-    transform::{Transform, transform_subschemas},
+    JsonSchema,
+    schema::{RootSchema, Schema, SchemaObject},
 };

 pub fn json_schema_for<T: JsonSchema>(
@@ -14,7 +13,7 @@ pub fn json_schema_for<T: JsonSchema>(
 }

 fn schema_to_json(
-    schema: &Schema,
+    schema: &RootSchema,
    format: LanguageModelToolSchemaFormat,
 ) -> Result<serde_json::Value> {
    let mut value = serde_json::to_value(schema)?;
@@ -22,42 +21,58 @@ fn schema_to_json(
    Ok(value)
 }

-fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> Schema {
+fn root_schema_for<T: JsonSchema>(format: LanguageModelToolSchemaFormat) -> RootSchema {
    let mut generator = match format {
-        LanguageModelToolSchemaFormat::JsonSchema => SchemaSettings::draft07().into_generator(),
-        // TODO: Gemini docs mention using a subset of OpenAPI 3, so this may benefit from using
-        // `SchemaSettings::openapi3()`.
-        LanguageModelToolSchemaFormat::JsonSchemaSubset => SchemaSettings::draft07()
-            .with(|settings| {
-                settings.meta_schema = None;
-                settings.inline_subschemas = true;
-            })
-            .with_transform(ToJsonSchemaSubsetTransform)
-            .into_generator(),
+        LanguageModelToolSchemaFormat::JsonSchema => schemars::SchemaGenerator::default(),
+        LanguageModelToolSchemaFormat::JsonSchemaSubset => {
+            schemars::r#gen::SchemaSettings::default()
+                .with(|settings| {
+                    settings.meta_schema = None;
+                    settings.inline_subschemas = true;
+                    settings
+                        .visitors
+                        .push(Box::new(TransformToJsonSchemaSubsetVisitor));
+                })
+                .into_generator()
+        }
    };
    generator.root_schema_for::<T>()
 }

 #[derive(Debug, Clone)]
-struct ToJsonSchemaSubsetTransform;
+struct TransformToJsonSchemaSubsetVisitor;

-impl Transform for ToJsonSchemaSubsetTransform {
-    fn transform(&mut self, schema: &mut Schema) {
+impl schemars::visit::Visitor for TransformToJsonSchemaSubsetVisitor {
+    fn visit_root_schema(&mut self, root: &mut RootSchema) {
+        schemars::visit::visit_root_schema(self, root)
+    }
+
+    fn visit_schema(&mut self, schema: &mut Schema) {
+        schemars::visit::visit_schema(self, schema)
+    }
+
+    fn visit_schema_object(&mut self, schema: &mut SchemaObject) {
        // Ensure that the type field is not an array, this happens when we use
        // Option<T>, the type will be [T, "null"].
-        if let Some(type_field) = schema.get_mut("type") {
-            if let Some(types) = type_field.as_array() {
-                if let Some(first_type) = types.first() {
-                    *type_field = first_type.clone();
+        if let Some(instance_type) = schema.instance_type.take() {
+            schema.instance_type = match instance_type {
+                schemars::schema::SingleOrVec::Single(t) => {
+                    Some(schemars::schema::SingleOrVec::Single(t))
                }
+                schemars::schema::SingleOrVec::Vec(items) => items
+                    .into_iter()
+                    .next()
+                    .map(schemars::schema::SingleOrVec::from),
+            };
+        }
+
+        // One of is not supported, use anyOf instead.
+        if let Some(subschema) = schema.subschemas.as_mut() {
+            if let Some(one_of) = subschema.one_of.take() {
+                subschema.any_of = Some(one_of);
            }
        }

-        // oneOf is not supported, use anyOf instead
-        if let Some(one_of) = schema.remove("oneOf") {
-            schema.insert("anyOf".to_string(), one_of);
-        }
-
-        transform_subschemas(self, schema);
+        schemars::visit::visit_schema_object(self, schema)
    }
 }
--- a/crates/assistant_tools/src/terminal_tool.rs
+++ b/crates/assistant_tools/src/terminal_tool.rs
@@ -691,7 +691,7 @@ fn markdown_style(window: &Window, cx: &App) -> MarkdownStyle {

    MarkdownStyle {
        base_text_style: text_style.clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: cx.theme().players().local().selection,
        ..Default::default()
    }
 }
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -1,7 +1,7 @@
 use auto_update::AutoUpdater;
 use client::proto::UpdateNotification;
 use editor::{Editor, MultiBuffer};
-use gpui::{App, Context, DismissEvent, Entity, Window, actions, prelude::*};
+use gpui::{App, Context, DismissEvent, Entity, SharedString, Window, actions, prelude::*};
 use http_client::HttpClient;
 use markdown_preview::markdown_preview_view::{MarkdownPreviewMode, MarkdownPreviewView};
 use release_channel::{AppVersion, ReleaseChannel};
@@ -94,6 +94,7 @@ fn view_release_notes_locally(

                            let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));

+                            let tab_content = Some(SharedString::from(body.title.to_string()));
                            let editor = cx.new(|cx| {
                                Editor::for_multibuffer(buffer, Some(project), window, cx)
                            });
@@ -104,6 +105,7 @@ fn view_release_notes_locally(
                                    editor,
                                    workspace_handle,
                                    language_registry,
+                                    tab_content,
                                    window,
                                    cx,
                                );
--- a/crates/bedrock/Cargo.toml
+++ b/crates/bedrock/Cargo.toml
@@ -25,4 +25,5 @@ serde.workspace = true
 serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
+tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }
 workspace-hack.workspace = true
--- a/crates/bedrock/src/bedrock.rs
+++ b/crates/bedrock/src/bedrock.rs
@@ -1,6 +1,9 @@
 mod models;

-use anyhow::{Context, Error, Result, anyhow};
+use std::collections::HashMap;
+use std::pin::Pin;
+
+use anyhow::{Context as _, Error, Result, anyhow};
 use aws_sdk_bedrockruntime as bedrock;
 pub use aws_sdk_bedrockruntime as bedrock_client;
 pub use aws_sdk_bedrockruntime::types::{
@@ -21,10 +24,9 @@ pub use bedrock::types::{
    ToolResultContentBlock as BedrockToolResultContentBlock,
    ToolResultStatus as BedrockToolResultStatus, ToolUseBlock as BedrockToolUseBlock,
 };
-use futures::stream::{self, BoxStream};
+use futures::stream::{self, BoxStream, Stream};
 use serde::{Deserialize, Serialize};
 use serde_json::{Number, Value};
-use std::collections::HashMap;
 use thiserror::Error;

 pub use crate::models::*;
@@ -32,59 +34,70 @@ pub use crate::models::*;
 pub async fn stream_completion(
    client: bedrock::Client,
    request: Request,
+    handle: tokio::runtime::Handle,
 ) -> Result<BoxStream<'static, Result<BedrockStreamingResponse, BedrockError>>, Error> {
-    let mut response = bedrock::Client::converse_stream(&client)
-        .model_id(request.model.clone())
-        .set_messages(request.messages.into());
+    handle
+        .spawn(async move {
+            let mut response = bedrock::Client::converse_stream(&client)
+                .model_id(request.model.clone())
+                .set_messages(request.messages.into());

-    if let Some(Thinking::Enabled {
-        budget_tokens: Some(budget_tokens),
-    }) = request.thinking
-    {
-        let thinking_config = HashMap::from([
-            ("type".to_string(), Document::String("enabled".to_string())),
-            (
-                "budget_tokens".to_string(),
-                Document::Number(AwsNumber::PosInt(budget_tokens)),
-            ),
-        ]);
-        response = response.additional_model_request_fields(Document::Object(HashMap::from([(
-            "thinking".to_string(),
-            Document::from(thinking_config),
-        )])));
-    }
+            if let Some(Thinking::Enabled {
+                budget_tokens: Some(budget_tokens),
+            }) = request.thinking
+            {
+                response =
+                    response.additional_model_request_fields(Document::Object(HashMap::from([(
+                        "thinking".to_string(),
+                        Document::from(HashMap::from([
+                            ("type".to_string(), Document::String("enabled".to_string())),
+                            (
+                                "budget_tokens".to_string(),
+                                Document::Number(AwsNumber::PosInt(budget_tokens)),
+                            ),
+                        ])),
+                    )])));
+            }

-    if request
-        .tools
-        .as_ref()
-        .map_or(false, |t| !t.tools.is_empty())
-    {
-        response = response.set_tool_config(request.tools);
-    }
+            if request.tools.is_some() && !request.tools.as_ref().unwrap().tools.is_empty() {
+                response = response.set_tool_config(request.tools);
+            }

-    let output = response
-        .send()
-        .await
-        .context("Failed to send API request to Bedrock");
+            let response = response.send().await;

-    let stream = Box::pin(stream::unfold(
-        output?.stream,
-        move |mut stream| async move {
-            match stream.recv().await {
-                Ok(Some(output)) => Some((Ok(output), stream)),
-                Ok(None) => None,
-                Err(err) => Some((
-                    Err(BedrockError::ClientError(anyhow!(
-                        "{:?}",
-                        aws_sdk_bedrockruntime::error::DisplayErrorContext(err)
-                    ))),
-                    stream,
+            match response {
+                Ok(output) => {
+                    let stream: Pin<
+                        Box<
+                            dyn Stream<Item = Result<BedrockStreamingResponse, BedrockError>>
+                                + Send,
+                        >,
+                    > = Box::pin(stream::unfold(output.stream, |mut stream| async move {
+                        match stream.recv().await {
+                            Ok(Some(output)) => Some(({ Ok(output) }, stream)),
+                            Ok(None) => None,
+                            Err(err) => {
+                                Some((
+                                    // TODO: Figure out how we can capture Throttling Exceptions
+                                    Err(BedrockError::ClientError(anyhow!(
+                                        "{:?}",
+                                        aws_sdk_bedrockruntime::error::DisplayErrorContext(err)
+                                    ))),
+                                    stream,
+                                ))
+                            }
+                        }
+                    }));
+                    Ok(stream)
+                }
+                Err(err) => Err(anyhow!(
+                    "{:?}",
+                    aws_sdk_bedrockruntime::error::DisplayErrorContext(err)
                )),
            }
-        },
-    ));
-
-    Ok(stream)
+        })
+        .await
+        .context("spawning a task")?
 }

 pub fn aws_document_to_value(document: &Document) -> Value {
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -1867,7 +1867,7 @@ mod tests {
            let hunk = diff.hunks(&buffer, cx).next().unwrap();

            let new_index_text = diff
-                .stage_or_unstage_hunks(true, std::slice::from_ref(&hunk), &buffer, true, cx)
+                .stage_or_unstage_hunks(true, &[hunk.clone()], &buffer, true, cx)
                .unwrap()
                .to_string();
            assert_eq!(new_index_text, buffer_text);
--- a/crates/call/src/call_settings.rs
+++ b/crates/call/src/call_settings.rs
@@ -12,6 +12,7 @@ pub struct CallSettings {

 /// Configuration of voice calls in Zed.
 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[schemars(deny_unknown_fields)]
 pub struct CallSettingsContent {
    /// Whether the microphone should be muted when joining a channel or a call.
    ///
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -734,8 +734,8 @@ impl Database {
                    users.push(proto::User {
                        id: user.id.to_proto(),
                        avatar_url: format!(
-                            "https://avatars.githubusercontent.com/u/{}?s=128&v=4",
-                            user.github_user_id
+                            "https://github.com/{}.png?size=128",
+                            user.github_login
                        ),
                        github_login: user.github_login,
                        name: user.name,
--- a/crates/collab/src/db/tests/embedding_tests.rs
+++ b/crates/collab/src/db/tests/embedding_tests.rs
@@ -76,10 +76,7 @@ async fn test_purge_old_embeddings(cx: &mut gpui::TestAppContext) {
    db.purge_old_embeddings().await.unwrap();

    // Try to retrieve the purged embeddings
-    let retrieved_embeddings = db
-        .get_embeddings(model, std::slice::from_ref(&digest))
-        .await
-        .unwrap();
+    let retrieved_embeddings = db.get_embeddings(model, &[digest.clone()]).await.unwrap();
    assert!(
        retrieved_embeddings.is_empty(),
        "Old embeddings should have been purged"
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -179,7 +179,7 @@ struct Session {
 }

 impl Session {
-    async fn db(&self) -> tokio::sync::MutexGuard<'_, DbHandle> {
+    async fn db(&self) -> tokio::sync::MutexGuard<DbHandle> {
        #[cfg(test)]
        tokio::task::yield_now().await;
        let guard = self.db.lock().await;
@@ -1037,7 +1037,7 @@ impl Server {
        }
    }

-    pub async fn snapshot(self: &Arc<Self>) -> ServerSnapshot<'_> {
+    pub async fn snapshot(self: &Arc<Self>) -> ServerSnapshot {
        ServerSnapshot {
            connection_pool: ConnectionPoolGuard {
                guard: self.connection_pool.lock(),
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ b/crates/collab/src/tests/channel_buffer_tests.rs
@@ -178,7 +178,7 @@ async fn test_channel_notes_participant_indices(
    channel_view_a.update_in(cx_a, |notes, window, cx| {
        notes.editor.update(cx, |editor, cx| {
            editor.insert("a", window, cx);
-            editor.change_selections(Default::default(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges(vec![0..1]);
            });
        });
@@ -188,7 +188,7 @@ async fn test_channel_notes_participant_indices(
        notes.editor.update(cx, |editor, cx| {
            editor.move_down(&Default::default(), window, cx);
            editor.insert("b", window, cx);
-            editor.change_selections(Default::default(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges(vec![1..2]);
            });
        });
@@ -198,7 +198,7 @@ async fn test_channel_notes_participant_indices(
        notes.editor.update(cx, |editor, cx| {
            editor.move_down(&Default::default(), window, cx);
            editor.insert("c", window, cx);
-            editor.change_selections(Default::default(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges(vec![2..3]);
            });
        });
@@ -273,12 +273,12 @@ async fn test_channel_notes_participant_indices(
        .unwrap();

    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |selections| {
+        editor.change_selections(None, window, cx, |selections| {
            selections.select_ranges(vec![0..1]);
        });
    });
    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(Default::default(), window, cx, |selections| {
+        editor.change_selections(None, window, cx, |selections| {
            selections.select_ranges(vec![2..3]);
        });
    });
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use call::ActiveCall;
 use editor::{
-    DocumentColorsRenderMode, Editor, EditorSettings, RowInfo, SelectionEffects,
+    DocumentColorsRenderMode, Editor, EditorSettings, RowInfo,
    actions::{
        ConfirmCodeAction, ConfirmCompletion, ConfirmRename, ContextMenuFirst,
        ExpandMacroRecursively, MoveToEnd, Redo, Rename, SelectAll, ToggleCodeActions, Undo,
@@ -348,9 +348,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu

    // Type a completion trigger character as the guest.
    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([13..13])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([13..13]));
        editor.handle_input(".", window, cx);
    });
    cx_b.focus(&editor_b);
@@ -463,9 +461,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
    // Now we do a second completion, this time to ensure that documentation/snippets are
    // resolved
    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([46..46])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([46..46]));
        editor.handle_input("; a", window, cx);
        editor.handle_input(".", window, cx);
    });
@@ -617,7 +613,7 @@ async fn test_collaborating_with_code_actions(

    // Move cursor to a location that contains code actions.
    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+        editor.change_selections(None, window, cx, |s| {
            s.select_ranges([Point::new(1, 31)..Point::new(1, 31)])
        });
    });
@@ -821,9 +817,7 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T

    // Move cursor to a location that can be renamed.
    let prepare_rename = editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([7..7])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([7..7]));
        editor.rename(&Rename, window, cx).unwrap()
    });

@@ -869,9 +863,7 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
        editor.cancel(&editor::actions::Cancel, window, cx);
    });
    let prepare_rename = editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([7..8])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([7..8]));
        editor.rename(&Rename, window, cx).unwrap()
    });

@@ -1372,9 +1364,7 @@ async fn test_on_input_format_from_host_to_guest(
    // Type a on type formatting trigger character as the guest.
    cx_a.focus(&editor_a);
    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([13..13])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([13..13]));
        editor.handle_input(">", window, cx);
    });

@@ -1470,9 +1460,7 @@ async fn test_on_input_format_from_guest_to_host(
    // Type a on type formatting trigger character as the guest.
    cx_b.focus(&editor_b);
    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([13..13])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([13..13]));
        editor.handle_input(":", window, cx);
    });

@@ -1709,9 +1697,7 @@ async fn test_mutual_editor_inlay_hint_cache_update(

    let after_client_edit = edits_made.fetch_add(1, atomic::Ordering::Release) + 1;
    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([13..13].clone())
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([13..13].clone()));
        editor.handle_input(":", window, cx);
    });
    cx_b.focus(&editor_b);
@@ -1732,9 +1718,7 @@ async fn test_mutual_editor_inlay_hint_cache_update(

    let after_host_edit = edits_made.fetch_add(1, atomic::Ordering::Release) + 1;
    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([13..13])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([13..13]));
        editor.handle_input("a change to increment both buffers' versions", window, cx);
    });
    cx_a.focus(&editor_a);
@@ -2137,9 +2121,7 @@ async fn test_lsp_document_color(cx_a: &mut TestAppContext, cx_b: &mut TestAppCo
    });

    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([13..13].clone())
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([13..13].clone()));
        editor.handle_input(":", window, cx);
    });
    color_request_handle.next().await.unwrap();
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -6,7 +6,7 @@ use collab_ui::{
    channel_view::ChannelView,
    notifications::project_shared_notification::ProjectSharedNotification,
 };
-use editor::{Editor, MultiBuffer, PathKey, SelectionEffects};
+use editor::{Editor, MultiBuffer, PathKey};
 use gpui::{
    AppContext as _, BackgroundExecutor, BorrowAppContext, Entity, SharedString, TestAppContext,
    VisualContext, VisualTestContext, point,
@@ -376,9 +376,7 @@ async fn test_basic_following(

    // Changes to client A's editor are reflected on client B.
    editor_a1.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([1..1, 2..2])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([1..1, 2..2]));
    });
    executor.advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
    executor.run_until_parked();
@@ -395,9 +393,7 @@ async fn test_basic_following(
    editor_b1.update(cx_b, |editor, cx| assert_eq!(editor.text(cx), "TWO"));

    editor_a1.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([3..3])
-        });
+        editor.change_selections(None, window, cx, |s| s.select_ranges([3..3]));
        editor.set_scroll_position(point(0., 100.), window, cx);
    });
    executor.advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
@@ -1651,9 +1647,7 @@ async fn test_following_stops_on_unshare(cx_a: &mut TestAppContext, cx_b: &mut T

    // b should follow a to position 1
    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([1..1])
-        })
+        editor.change_selections(None, window, cx, |s| s.select_ranges([1..1]))
    });
    cx_a.executor()
        .advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
@@ -1673,9 +1667,7 @@ async fn test_following_stops_on_unshare(cx_a: &mut TestAppContext, cx_b: &mut T

    // b should not follow a to position 2
    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
-            s.select_ranges([2..2])
-        })
+        editor.change_selections(None, window, cx, |s| s.select_ranges([2..2]))
    });
    cx_a.executor()
        .advance_clock(workspace::item::LEADER_UPDATE_THROTTLE);
@@ -1976,7 +1968,7 @@ async fn test_following_to_channel_notes_without_a_shared_project(
        assert_eq!(notes.channel(cx).unwrap().name, "channel-1");
        notes.editor.update(cx, |editor, cx| {
            editor.insert("Hello from A.", window, cx);
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges(vec![3..4]);
            });
        });
@@ -2117,7 +2109,7 @@ async fn test_following_after_replacement(cx_a: &mut TestAppContext, cx_b: &mut
        workspace.add_item_to_center(Box::new(editor.clone()) as _, window, cx)
    });
    editor.update_in(cx_a, |editor, window, cx| {
-        editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+        editor.change_selections(None, window, cx, |s| {
            s.select_ranges([Point::row_range(4..4)]);
        })
    });
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -22,7 +22,9 @@ use gpui::{
 use language::{
    Diagnostic, DiagnosticEntry, DiagnosticSourceKind, FakeLspAdapter, Language, LanguageConfig,
    LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
-    language_settings::{AllLanguageSettings, Formatter, PrettierSettings, SelectedFormatter},
+    language_settings::{
+        AllLanguageSettings, Formatter, FormatterList, PrettierSettings, SelectedFormatter,
+    },
    tree_sitter_rust, tree_sitter_typescript,
 };
 use lsp::{LanguageServerId, OneOf};
@@ -4589,13 +4591,15 @@ async fn test_formatting_buffer(
        cx_a.update(|cx| {
            SettingsStore::update_global(cx, |store, cx| {
                store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                    file.defaults.formatter =
-                        Some(SelectedFormatter::List(vec![Formatter::External {
+                    file.defaults.formatter = Some(SelectedFormatter::List(FormatterList(
+                        vec![Formatter::External {
                            command: "awk".into(),
                            arguments: Some(
                                vec!["{sub(/two/,\"{buffer_path}\")}1".to_string()].into(),
                            ),
-                        }]));
+                        }]
+                        .into(),
+                    )));
                });
            });
        });
@@ -4695,10 +4699,9 @@ async fn test_prettier_formatting_buffer(
    cx_b.update(|cx| {
        SettingsStore::update_global(cx, |store, cx| {
            store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                file.defaults.formatter =
-                    Some(SelectedFormatter::List(vec![Formatter::LanguageServer {
-                        name: None,
-                    }]));
+                file.defaults.formatter = Some(SelectedFormatter::List(FormatterList(
+                    vec![Formatter::LanguageServer { name: None }].into(),
+                )));
                file.defaults.prettier = Some(PrettierSettings {
                    allowed: true,
                    ..PrettierSettings::default()
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -14,7 +14,8 @@ use http_client::BlockedHttpClient;
 use language::{
    FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageRegistry,
    language_settings::{
-        AllLanguageSettings, Formatter, PrettierSettings, SelectedFormatter, language_settings,
+        AllLanguageSettings, Formatter, FormatterList, PrettierSettings, SelectedFormatter,
+        language_settings,
    },
    tree_sitter_typescript,
 };
@@ -504,10 +505,9 @@ async fn test_ssh_collaboration_formatting_with_prettier(
    cx_b.update(|cx| {
        SettingsStore::update_global(cx, |store, cx| {
            store.update_user_settings::<AllLanguageSettings>(cx, |file| {
-                file.defaults.formatter =
-                    Some(SelectedFormatter::List(vec![Formatter::LanguageServer {
-                        name: None,
-                    }]));
+                file.defaults.formatter = Some(SelectedFormatter::List(FormatterList(
+                    vec![Formatter::LanguageServer { name: None }].into(),
+                )));
                file.defaults.prettier = Some(PrettierSettings {
                    allowed: true,
                    ..PrettierSettings::default()
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -7,8 +7,8 @@ use client::{
 };
 use collections::HashMap;
 use editor::{
-    CollaborationHub, DisplayPoint, Editor, EditorEvent, SelectionEffects,
-    display_map::ToDisplayPoint, scroll::Autoscroll,
+    CollaborationHub, DisplayPoint, Editor, EditorEvent, display_map::ToDisplayPoint,
+    scroll::Autoscroll,
 };
 use gpui::{
    AnyView, App, ClipboardItem, Context, Entity, EventEmitter, Focusable, Pixels, Point, Render,
@@ -260,16 +260,9 @@ impl ChannelView {
                .find(|item| &Channel::slug(&item.text).to_lowercase() == &position)
            {
                self.editor.update(cx, |editor, cx| {
-                    editor.change_selections(
-                        SelectionEffects::scroll(Autoscroll::focused()),
-                        window,
-                        cx,
-                        |s| {
-                            s.replace_cursors_with(|map| {
-                                vec![item.range.start.to_display_point(map)]
-                            })
-                        },
-                    )
+                    editor.change_selections(Some(Autoscroll::focused()), window, cx, |s| {
+                        s.replace_cursors_with(|map| vec![item.range.start.to_display_point(map)])
+                    })
                });
                return;
            }
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -28,6 +28,7 @@ pub struct ChatPanelSettings {
 }

 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[schemars(deny_unknown_fields)]
 pub struct ChatPanelSettingsContent {
    /// When to show the panel button in the status bar.
    ///
@@ -51,6 +52,7 @@ pub struct NotificationPanelSettings {
 }

 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[schemars(deny_unknown_fields)]
 pub struct PanelSettingsContent {
    /// Whether to show the panel button in the status bar.
    ///
@@ -67,6 +69,7 @@ pub struct PanelSettingsContent {
 }

 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+#[schemars(deny_unknown_fields)]
 pub struct MessageEditorSettings {
    /// Whether to automatically replace emoji shortcodes with emoji characters.
    /// For example: typing `:wave:` gets replaced with `👋`.
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -41,7 +41,7 @@ pub struct CommandPalette {
 /// Removes subsequent whitespace characters and double colons from the query.
 ///
 /// This improves the likelihood of a match by either humanized name or keymap-style name.
-pub fn normalize_action_query(input: &str) -> String {
+fn normalize_query(input: &str) -> String {
    let mut result = String::with_capacity(input.len());
    let mut last_char = None;

@@ -297,7 +297,7 @@ impl PickerDelegate for CommandPaletteDelegate {
            let mut commands = self.all_commands.clone();
            let hit_counts = self.hit_counts();
            let executor = cx.background_executor().clone();
-            let query = normalize_action_query(query.as_str());
+            let query = normalize_query(query.as_str());
            async move {
                commands.sort_by_key(|action| {
                    (
@@ -311,17 +311,29 @@ impl PickerDelegate for CommandPaletteDelegate {
                    .enumerate()
                    .map(|(ix, command)| StringMatchCandidate::new(ix, &command.name))
                    .collect::<Vec<_>>();
-
-                let matches = fuzzy::match_strings(
-                    &candidates,
-                    &query,
-                    true,
-                    true,
-                    10000,
-                    &Default::default(),
-                    executor,
-                )
-                .await;
+                let matches = if query.is_empty() {
+                    candidates
+                        .into_iter()
+                        .enumerate()
+                        .map(|(index, candidate)| StringMatch {
+                            candidate_id: index,
+                            string: candidate.string,
+                            positions: Vec::new(),
+                            score: 0.0,
+                        })
+                        .collect()
+                } else {
+                    fuzzy::match_strings(
+                        &candidates,
+                        &query,
+                        true,
+                        true,
+                        10000,
+                        &Default::default(),
+                        executor,
+                    )
+                    .await
+                };

                tx.send((commands, matches)).await.log_err();
            }
@@ -410,8 +422,8 @@ impl PickerDelegate for CommandPaletteDelegate {
        window: &mut Window,
        cx: &mut Context<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        let matching_command = self.matches.get(ix)?;
-        let command = self.commands.get(matching_command.candidate_id)?;
+        let r#match = self.matches.get(ix)?;
+        let command = self.commands.get(r#match.candidate_id)?;
        Some(
            ListItem::new(ix)
                .inset(true)
@@ -424,7 +436,7 @@ impl PickerDelegate for CommandPaletteDelegate {
                        .justify_between()
                        .child(HighlightedLabel::new(
                            command.name.clone(),
-                            matching_command.positions.clone(),
+                            r#match.positions.clone(),
                        ))
                        .children(KeyBinding::for_action_in(
                            &*command.action,
@@ -500,28 +512,19 @@ mod tests {

    #[test]
    fn test_normalize_query() {
+        assert_eq!(normalize_query("editor: backspace"), "editor: backspace");
+        assert_eq!(normalize_query("editor:  backspace"), "editor: backspace");
+        assert_eq!(normalize_query("editor:    backspace"), "editor: backspace");
        assert_eq!(
-            normalize_action_query("editor: backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            normalize_action_query("editor:  backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            normalize_action_query("editor:    backspace"),
-            "editor: backspace"
-        );
-        assert_eq!(
-            normalize_action_query("editor::GoToDefinition"),
+            normalize_query("editor::GoToDefinition"),
            "editor:GoToDefinition"
        );
        assert_eq!(
-            normalize_action_query("editor::::GoToDefinition"),
+            normalize_query("editor::::GoToDefinition"),
            "editor:GoToDefinition"
        );
        assert_eq!(
-            normalize_action_query("editor: :GoToDefinition"),
+            normalize_query("editor: :GoToDefinition"),
            "editor: :GoToDefinition"
        );
    }
--- a/crates/context_server/src/context_server.rs
+++ b/crates/context_server/src/context_server.rs
@@ -29,7 +29,6 @@ impl Display for ContextServerId {

 #[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema)]
 pub struct ContextServerCommand {
-    #[serde(rename = "command")]
    pub path: String,
    pub args: Vec<String>,
    pub env: Option<HashMap<String, String>>,
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -698,16 +698,16 @@ async fn stream_completion(
    completion_url: Arc<str>,
    request: Request,
 ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
-    let is_vision_request = request.messages.iter().any(|message| match message {
-      ChatMessage::User { content }
-      | ChatMessage::Assistant { content, .. }
-      | ChatMessage::Tool { content, .. } => {
-          matches!(content, ChatMessageContent::Multipart(parts) if parts.iter().any(|part| matches!(part, ChatMessagePart::Image { .. })))
-      }
-      _ => false,
-  });
+    let is_vision_request = request.messages.last().map_or(false, |message| match message {
+        ChatMessage::User { content }
+        | ChatMessage::Assistant { content, .. }
+        | ChatMessage::Tool { content, .. } => {
+            matches!(content, ChatMessageContent::Multipart(parts) if parts.iter().any(|part| matches!(part, ChatMessagePart::Image { .. })))
+        }
+        _ => false,
+    });

-    let mut request_builder = HttpRequest::builder()
+    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(completion_url.as_ref())
        .header(
@@ -719,12 +719,8 @@ async fn stream_completion(
        )
        .header("Authorization", format!("Bearer {}", api_key))
        .header("Content-Type", "application/json")
-        .header("Copilot-Integration-Id", "vscode-chat");
-
-    if is_vision_request {
-        request_builder =
-            request_builder.header("Copilot-Vision-Request", is_vision_request.to_string());
-    }
+        .header("Copilot-Integration-Id", "vscode-chat")
+        .header("Copilot-Vision-Request", is_vision_request.to_string());

    let is_streaming = request.stream;

--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -264,8 +264,7 @@ fn common_prefix<T1: Iterator<Item = char>, T2: Iterator<Item = char>>(a: T1, b:
 mod tests {
    use super::*;
    use editor::{
-        Editor, ExcerptRange, MultiBuffer, SelectionEffects,
-        test::editor_lsp_test_context::EditorLspTestContext,
+        Editor, ExcerptRange, MultiBuffer, test::editor_lsp_test_context::EditorLspTestContext,
    };
    use fs::FakeFs;
    use futures::StreamExt;
@@ -479,7 +478,7 @@ mod tests {
        // Reset the editor to verify how suggestions behave when tabbing on leading indentation.
        cx.update_editor(|editor, window, cx| {
            editor.set_text("fn foo() {\n  \n}", window, cx);
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            editor.change_selections(None, window, cx, |s| {
                s.select_ranges([Point::new(1, 2)..Point::new(1, 2)])
            });
        });
@@ -768,7 +767,7 @@ mod tests {
        );
        _ = editor.update(cx, |editor, window, cx| {
            // Ensure copilot suggestions are shown for the first excerpt.
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            editor.change_selections(None, window, cx, |s| {
                s.select_ranges([Point::new(1, 5)..Point::new(1, 5)])
            });
            editor.next_edit_prediction(&Default::default(), window, cx);
@@ -794,7 +793,7 @@ mod tests {
        );
        _ = editor.update(cx, |editor, window, cx| {
            // Move to another excerpt, ensuring the suggestion gets cleared.
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            editor.change_selections(None, window, cx, |s| {
                s.select_ranges([Point::new(4, 5)..Point::new(4, 5)])
            });
            assert!(!editor.has_active_inline_completion());
@@ -1020,7 +1019,7 @@ mod tests {
            );

        _ = editor.update(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |selections| {
+            editor.change_selections(None, window, cx, |selections| {
                selections.select_ranges([Point::new(0, 0)..Point::new(0, 0)])
            });
            editor.refresh_inline_completion(true, false, window, cx);
@@ -1030,7 +1029,7 @@ mod tests {
        assert!(copilot_requests.try_next().is_err());

        _ = editor.update(cx, |editor, window, cx| {
-            editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+            editor.change_selections(None, window, cx, |s| {
                s.select_ranges([Point::new(5, 0)..Point::new(5, 0)])
            });
            editor.refresh_inline_completion(true, false, window, cx);
--- a/crates/dap/src/adapters.rs
+++ b/crates/dap/src/adapters.rs
@@ -10,7 +10,6 @@ use gpui::{AsyncApp, SharedString};
 pub use http_client::{HttpClient, github::latest_github_release};
 use language::{LanguageName, LanguageToolchainStore};
 use node_runtime::NodeRuntime;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use settings::WorktreeId;
 use smol::fs::File;
@@ -48,10 +47,7 @@ pub trait DapDelegate: Send + Sync + 'static {
    async fn shell_env(&self) -> collections::HashMap<String, String>;
 }

-#[derive(
-    Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize, JsonSchema,
-)]
-#[serde(transparent)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Deserialize, Serialize)]
 pub struct DebugAdapterName(pub SharedString);

 impl Deref for DebugAdapterName {
--- a/crates/dap_adapters/Cargo.toml
+++ b/crates/dap_adapters/Cargo.toml
@@ -25,9 +25,7 @@ anyhow.workspace = true
 async-trait.workspace = true
 collections.workspace = true
 dap.workspace = true
-dotenvy.workspace = true
 futures.workspace = true
-fs.workspace = true
 gpui.workspace = true
 json_dotpath.workspace = true
 language.workspace = true
@@ -35,7 +33,6 @@ log.workspace = true
 paths.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-shlex.workspace = true
 task.workspace = true
 util.workspace = true
 workspace-hack.workspace = true
--- a/crates/dap_adapters/src/codelldb.rs
+++ b/crates/dap_adapters/src/codelldb.rs
@@ -22,16 +22,17 @@ impl CodeLldbDebugAdapter {
    async fn request_args(
        &self,
        delegate: &Arc<dyn DapDelegate>,
-        mut configuration: Value,
-        label: &str,
+        task_definition: &DebugTaskDefinition,
    ) -> Result<dap::StartDebuggingRequestArguments> {
+        // CodeLLDB uses `name` for a terminal label.
+        let mut configuration = task_definition.config.clone();
+
        let obj = configuration
            .as_object_mut()
            .context("CodeLLDB is not a valid json object")?;

-        // CodeLLDB uses `name` for a terminal label.
        obj.entry("name")
-            .or_insert(Value::String(String::from(label)));
+            .or_insert(Value::String(String::from(task_definition.label.as_ref())));

        obj.entry("cwd")
            .or_insert(delegate.worktree_root_path().to_string_lossy().into());
@@ -360,31 +361,17 @@ impl DebugAdapter for CodeLldbDebugAdapter {
            self.path_to_codelldb.set(path.clone()).ok();
            command = Some(path);
        };
-        let mut json_config = config.config.clone();
+
        Ok(DebugAdapterBinary {
            command: Some(command.unwrap()),
            cwd: Some(delegate.worktree_root_path().to_path_buf()),
            arguments: user_args.unwrap_or_else(|| {
-                if let Some(config) = json_config.as_object_mut()
-                    && let Some(source_languages) = config.get("sourceLanguages").filter(|value| {
-                        value
-                            .as_array()
-                            .map_or(false, |array| array.iter().all(Value::is_string))
-                    })
-                {
-                    let ret = vec![
-                        "--settings".into(),
-                        json!({"sourceLanguages": source_languages}).to_string(),
-                    ];
-                    config.remove("sourceLanguages");
-                    ret
-                } else {
-                    vec![]
-                }
+                vec![
+                    "--settings".into(),
+                    json!({"sourceLanguages": ["cpp", "rust"]}).to_string(),
+                ]
            }),
-            request_args: self
-                .request_args(delegate, json_config, &config.label)
-                .await?,
+            request_args: self.request_args(delegate, &config).await?,
            envs: HashMap::default(),
            connection: None,
        })
--- a/crates/dap_adapters/src/dap_adapters.rs
+++ b/crates/dap_adapters/src/dap_adapters.rs
@@ -4,6 +4,7 @@ mod go;
 mod javascript;
 mod php;
 mod python;
+mod ruby;

 use std::sync::Arc;

@@ -24,6 +25,7 @@ use gpui::{App, BorrowAppContext};
 use javascript::JsDebugAdapter;
 use php::PhpDebugAdapter;
 use python::PythonDebugAdapter;
+use ruby::RubyDebugAdapter;
 use serde_json::json;
 use task::{DebugScenario, ZedDebugConfig};

@@ -33,6 +35,7 @@ pub fn init(cx: &mut App) {
        registry.add_adapter(Arc::from(PythonDebugAdapter::default()));
        registry.add_adapter(Arc::from(PhpDebugAdapter::default()));
        registry.add_adapter(Arc::from(JsDebugAdapter::default()));
+        registry.add_adapter(Arc::from(RubyDebugAdapter));
        registry.add_adapter(Arc::from(GoDebugAdapter::default()));
        registry.add_adapter(Arc::from(GdbDebugAdapter));

--- a/crates/dap_adapters/src/go.rs
+++ b/crates/dap_adapters/src/go.rs
@@ -7,22 +7,13 @@ use dap::{
        latest_github_release,
    },
 };
-use fs::Fs;
+
 use gpui::{AsyncApp, SharedString};
 use language::LanguageName;
-use log::warn;
-use serde_json::{Map, Value};
+use std::{env::consts, ffi::OsStr, path::PathBuf, sync::OnceLock};
 use task::TcpArgumentsTemplate;
 use util;

-use std::{
-    env::consts,
-    ffi::OsStr,
-    path::{Path, PathBuf},
-    str::FromStr,
-    sync::OnceLock,
-};
-
 use crate::*;

 #[derive(Default, Debug)]
@@ -446,34 +437,22 @@ impl DebugAdapter for GoDebugAdapter {
            adapter_path.join("dlv").to_string_lossy().to_string()
        };

-        let cwd = Some(
-            task_definition
-                .config
-                .get("cwd")
-                .and_then(|s| s.as_str())
-                .map(PathBuf::from)
-                .unwrap_or_else(|| delegate.worktree_root_path().to_path_buf()),
-        );
+        let cwd = task_definition
+            .config
+            .get("cwd")
+            .and_then(|s| s.as_str())
+            .map(PathBuf::from)
+            .unwrap_or_else(|| delegate.worktree_root_path().to_path_buf());

        let arguments;
        let command;
        let connection;

        let mut configuration = task_definition.config.clone();
-        let mut envs = HashMap::default();
-
        if let Some(configuration) = configuration.as_object_mut() {
            configuration
                .entry("cwd")
                .or_insert_with(|| delegate.worktree_root_path().to_string_lossy().into());
-
-            handle_envs(
-                configuration,
-                &mut envs,
-                cwd.as_deref(),
-                delegate.fs().clone(),
-            )
-            .await;
        }

        if let Some(connection_options) = &task_definition.tcp_connection {
@@ -515,8 +494,8 @@ impl DebugAdapter for GoDebugAdapter {
        Ok(DebugAdapterBinary {
            command,
            arguments,
-            cwd,
-            envs,
+            cwd: Some(cwd),
+            envs: HashMap::default(),
            connection,
            request_args: StartDebuggingRequestArguments {
                configuration,
@@ -525,44 +504,3 @@ impl DebugAdapter for GoDebugAdapter {
        })
    }
 }
-
-// delve doesn't do anything with the envFile setting, so we intercept it
-async fn handle_envs(
-    config: &mut Map<String, Value>,
-    envs: &mut HashMap<String, String>,
-    cwd: Option<&Path>,
-    fs: Arc<dyn Fs>,
-) -> Option<()> {
-    let env_files = match config.get("envFile")? {
-        Value::Array(arr) => arr.iter().map(|v| v.as_str()).collect::<Vec<_>>(),
-        Value::String(s) => vec![Some(s.as_str())],
-        _ => return None,
-    };
-
-    let rebase_path = |path: PathBuf| {
-        if path.is_absolute() {
-            Some(path)
-        } else {
-            cwd.map(|p| p.join(path))
-        }
-    };
-
-    for path in env_files {
-        let Some(path) = path
-            .and_then(|s| PathBuf::from_str(s).ok())
-            .and_then(rebase_path)
-        else {
-            continue;
-        };
-
-        if let Ok(file) = fs.open_sync(&path).await {
-            envs.extend(dotenvy::from_read_iter(file).filter_map(Result::ok))
-        } else {
-            warn!("While starting Go debug session: failed to read env file {path:?}");
-        };
-    }
-
-    // remove envFile now that it's been handled
-    config.remove("entry");
-    Some(())
-}
--- a/crates/dap_adapters/src/javascript.rs
+++ b/crates/dap_adapters/src/javascript.rs
@@ -5,7 +5,7 @@ use gpui::AsyncApp;
 use serde_json::Value;
 use std::{collections::HashMap, path::PathBuf, sync::OnceLock};
 use task::DebugRequest;
-use util::{ResultExt, maybe};
+use util::ResultExt;

 use crate::*;

@@ -72,24 +72,6 @@ impl JsDebugAdapter {

        let mut configuration = task_definition.config.clone();
        if let Some(configuration) = configuration.as_object_mut() {
-            maybe!({
-                configuration
-                    .get("type")
-                    .filter(|value| value == &"node-terminal")?;
-                let command = configuration.get("command")?.as_str()?.to_owned();
-                let mut args = shlex::split(&command)?.into_iter();
-                let program = args.next()?;
-                configuration.insert("program".to_owned(), program.into());
-                configuration.insert(
-                    "args".to_owned(),
-                    args.map(Value::from).collect::<Vec<_>>().into(),
-                );
-                configuration.insert("console".to_owned(), "externalTerminal".into());
-                Some(())
-            });
-
-            configuration.entry("type").and_modify(normalize_task_type);
-
            if let Some(program) = configuration
                .get("program")
                .cloned()
@@ -114,6 +96,7 @@ impl JsDebugAdapter {
                .entry("cwd")
                .or_insert(delegate.worktree_root_path().to_string_lossy().into());

+            configuration.entry("type").and_modify(normalize_task_type);
            configuration
                .entry("console")
                .or_insert("externalTerminal".into());
@@ -282,10 +265,6 @@ impl DebugAdapter for JsDebugAdapter {
                                    "description": "Automatically stop program after launch",
                                    "default": false
                                },
-                                "attachSimplePort": {
-                                    "type": "number",
-                                    "description": "If set, attaches to the process via the given port. This is generally no longer necessary for Node.js programs and loses the ability to debug child processes, but can be useful in more esoteric scenarios such as with Deno and Docker launches. If set to 0, a random port will be chosen and --inspect-brk added to the launch arguments automatically."
-                                },
                                "runtimeExecutable": {
                                    "type": ["string", "null"],
                                    "description": "Runtime to use, an absolute path or the name of a runtime available on PATH",
@@ -533,7 +512,7 @@ fn normalize_task_type(task_type: &mut Value) {
    };

    let new_name = match task_type_str {
-        "node" | "pwa-node" | "node-terminal" => "pwa-node",
+        "node" | "pwa-node" => "pwa-node",
        "chrome" | "pwa-chrome" => "pwa-chrome",
        "edge" | "msedge" | "pwa-edge" | "pwa-msedge" => "pwa-msedge",
        _ => task_type_str,
--- a/crates/dap_adapters/src/ruby.rs
+++ b/crates/dap_adapters/src/ruby.rs
@@ -0,0 +1,208 @@
+use anyhow::{Result, bail};
+use async_trait::async_trait;
+use collections::FxHashMap;
+use dap::{
+    DebugRequest, StartDebuggingRequestArguments, StartDebuggingRequestArgumentsRequest,
+    adapters::{
+        DapDelegate, DebugAdapter, DebugAdapterBinary, DebugAdapterName, DebugTaskDefinition,
+    },
+};
+use gpui::{AsyncApp, SharedString};
+use language::LanguageName;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+use std::path::PathBuf;
+use std::{ffi::OsStr, sync::Arc};
+use task::{DebugScenario, ZedDebugConfig};
+use util::command::new_smol_command;
+
+#[derive(Default)]
+pub(crate) struct RubyDebugAdapter;
+
+impl RubyDebugAdapter {
+    const ADAPTER_NAME: &'static str = "Ruby";
+}
+
+#[derive(Serialize, Deserialize)]
+struct RubyDebugConfig {
+    script_or_command: Option<String>,
+    script: Option<String>,
+    command: Option<String>,
+    #[serde(default)]
+    args: Vec<String>,
+    #[serde(default)]
+    env: FxHashMap<String, String>,
+    cwd: Option<PathBuf>,
+}
+
+#[async_trait(?Send)]
+impl DebugAdapter for RubyDebugAdapter {
+    fn name(&self) -> DebugAdapterName {
+        DebugAdapterName(Self::ADAPTER_NAME.into())
+    }
+
+    fn adapter_language_name(&self) -> Option<LanguageName> {
+        Some(SharedString::new_static("Ruby").into())
+    }
+
+    async fn request_kind(
+        &self,
+        _: &serde_json::Value,
+    ) -> Result<StartDebuggingRequestArgumentsRequest> {
+        Ok(StartDebuggingRequestArgumentsRequest::Launch)
+    }
+
+    fn dap_schema(&self) -> serde_json::Value {
+        json!({
+            "type": "object",
+            "properties": {
+                "command": {
+                    "type": "string",
+                    "description": "Command name (ruby, rake, bin/rails, bundle exec ruby, etc)",
+                },
+                "script": {
+                    "type": "string",
+                    "description": "Absolute path to a Ruby file."
+                },
+                "cwd": {
+                    "type": "string",
+                    "description": "Directory to execute the program in",
+                    "default": "${ZED_WORKTREE_ROOT}"
+                },
+                "args": {
+                    "type": "array",
+                    "description": "Command line arguments passed to the program",
+                    "items": {
+                        "type": "string"
+                    },
+                    "default": []
+                },
+                "env": {
+                    "type": "object",
+                    "description": "Additional environment variables to pass to the debugging (and debugged) process",
+                    "default": {}
+                },
+            }
+        })
+    }
+
+    async fn config_from_zed_format(&self, zed_scenario: ZedDebugConfig) -> Result<DebugScenario> {
+        match zed_scenario.request {
+            DebugRequest::Launch(launch) => {
+                let config = RubyDebugConfig {
+                    script_or_command: Some(launch.program),
+                    script: None,
+                    command: None,
+                    args: launch.args,
+                    env: launch.env,
+                    cwd: launch.cwd.clone(),
+                };
+
+                let config = serde_json::to_value(config)?;
+
+                Ok(DebugScenario {
+                    adapter: zed_scenario.adapter,
+                    label: zed_scenario.label,
+                    config,
+                    tcp_connection: None,
+                    build: None,
+                })
+            }
+            DebugRequest::Attach(_) => {
+                anyhow::bail!("Attach requests are unsupported");
+            }
+        }
+    }
+
+    async fn get_binary(
+        &self,
+        delegate: &Arc<dyn DapDelegate>,
+        definition: &DebugTaskDefinition,
+        _user_installed_path: Option<PathBuf>,
+        _user_args: Option<Vec<String>>,
+        _cx: &mut AsyncApp,
+    ) -> Result<DebugAdapterBinary> {
+        let adapter_path = paths::debug_adapters_dir().join(self.name().as_ref());
+        let mut rdbg_path = adapter_path.join("rdbg");
+        if !delegate.fs().is_file(&rdbg_path).await {
+            match delegate.which("rdbg".as_ref()).await {
+                Some(path) => rdbg_path = path,
+                None => {
+                    delegate.output_to_console(
+                        "rdbg not found on path, trying `gem install debug`".to_string(),
+                    );
+                    let output = new_smol_command("gem")
+                        .arg("install")
+                        .arg("--no-document")
+                        .arg("--bindir")
+                        .arg(adapter_path)
+                        .arg("debug")
+                        .output()
+                        .await?;
+                    anyhow::ensure!(
+                        output.status.success(),
+                        "Failed to install rdbg:\n{}",
+                        String::from_utf8_lossy(&output.stderr).to_string()
+                    );
+                }
+            }
+        }
+
+        let tcp_connection = definition.tcp_connection.clone().unwrap_or_default();
+        let (host, port, timeout) = crate::configure_tcp_connection(tcp_connection).await?;
+        let ruby_config = serde_json::from_value::<RubyDebugConfig>(definition.config.clone())?;
+
+        let mut arguments = vec![
+            "--open".to_string(),
+            format!("--port={}", port),
+            format!("--host={}", host),
+        ];
+
+        if let Some(script) = &ruby_config.script {
+            arguments.push(script.clone());
+        } else if let Some(command) = &ruby_config.command {
+            arguments.push("--command".to_string());
+            arguments.push(command.clone());
+        } else if let Some(command_or_script) = &ruby_config.script_or_command {
+            if delegate
+                .which(OsStr::new(&command_or_script))
+                .await
+                .is_some()
+            {
+                arguments.push("--command".to_string());
+            }
+            arguments.push(command_or_script.clone());
+        } else {
+            bail!("Ruby debug config must have 'script' or 'command' args");
+        }
+
+        arguments.extend(ruby_config.args);
+
+        let mut configuration = definition.config.clone();
+        if let Some(configuration) = configuration.as_object_mut() {
+            configuration
+                .entry("cwd")
+                .or_insert_with(|| delegate.worktree_root_path().to_string_lossy().into());
+        }
+
+        Ok(DebugAdapterBinary {
+            command: Some(rdbg_path.to_string_lossy().to_string()),
+            arguments,
+            connection: Some(dap::adapters::TcpArguments {
+                host,
+                port,
+                timeout,
+            }),
+            cwd: Some(
+                ruby_config
+                    .cwd
+                    .unwrap_or(delegate.worktree_root_path().to_owned()),
+            ),
+            envs: ruby_config.env.into_iter().collect(),
+            request_args: StartDebuggingRequestArguments {
+                request: self.request_kind(&definition.config).await?,
+                configuration,
+            },
+        })
+    }
+}
--- a/crates/debugger_tools/src/dap_log.rs
+++ b/crates/debugger_tools/src/dap_log.rs
@@ -21,7 +21,7 @@ use project::{
 use settings::Settings as _;
 use std::{
    borrow::Cow,
-    collections::{BTreeMap, HashMap, VecDeque},
+    collections::{HashMap, VecDeque},
    sync::Arc,
 };
 use util::maybe;
@@ -32,6 +32,13 @@ use workspace::{
    ui::{Button, Clickable, ContextMenu, Label, LabelCommon, PopoverMenu, h_flex},
 };

+// TODO:
+// - [x] stop sorting by session ID
+// - [x] pick the most recent session by default (logs if available, RPC messages otherwise)
+// - [ ] dump the launch/attach request somewhere (logs?)
+
+const MAX_SESSIONS: usize = 10;
+
 struct DapLogView {
    editor: Entity<Editor>,
    focus_handle: FocusHandle,
@@ -42,34 +49,14 @@ struct DapLogView {
    _subscriptions: Vec<Subscription>,
 }

-struct LogStoreEntryIdentifier<'a> {
-    session_id: SessionId,
-    project: Cow<'a, WeakEntity<Project>>,
-}
-impl LogStoreEntryIdentifier<'_> {
-    fn to_owned(&self) -> LogStoreEntryIdentifier<'static> {
-        LogStoreEntryIdentifier {
-            session_id: self.session_id,
-            project: Cow::Owned(self.project.as_ref().clone()),
-        }
-    }
-}
-
-struct LogStoreMessage {
-    id: LogStoreEntryIdentifier<'static>,
-    kind: IoKind,
-    command: Option<SharedString>,
-    message: SharedString,
-}
-
 pub struct LogStore {
    projects: HashMap<WeakEntity<Project>, ProjectState>,
-    rpc_tx: UnboundedSender<LogStoreMessage>,
-    adapter_log_tx: UnboundedSender<LogStoreMessage>,
+    debug_sessions: VecDeque<DebugAdapterState>,
+    rpc_tx: UnboundedSender<(SessionId, IoKind, Option<SharedString>, SharedString)>,
+    adapter_log_tx: UnboundedSender<(SessionId, IoKind, Option<SharedString>, SharedString)>,
 }

 struct ProjectState {
-    debug_sessions: BTreeMap<SessionId, DebugAdapterState>,
    _subscriptions: [gpui::Subscription; 2],
 }

@@ -135,12 +122,13 @@ impl DebugAdapterState {

 impl LogStore {
    pub fn new(cx: &Context<Self>) -> Self {
-        let (rpc_tx, mut rpc_rx) = unbounded::<LogStoreMessage>();
+        let (rpc_tx, mut rpc_rx) =
+            unbounded::<(SessionId, IoKind, Option<SharedString>, SharedString)>();
        cx.spawn(async move |this, cx| {
-            while let Some(message) = rpc_rx.next().await {
+            while let Some((session_id, io_kind, command, message)) = rpc_rx.next().await {
                if let Some(this) = this.upgrade() {
                    this.update(cx, |this, cx| {
-                        this.add_debug_adapter_message(message, cx);
+                        this.add_debug_adapter_message(session_id, io_kind, command, message, cx);
                    })?;
                }

@@ -150,12 +138,13 @@ impl LogStore {
        })
        .detach_and_log_err(cx);

-        let (adapter_log_tx, mut adapter_log_rx) = unbounded::<LogStoreMessage>();
+        let (adapter_log_tx, mut adapter_log_rx) =
+            unbounded::<(SessionId, IoKind, Option<SharedString>, SharedString)>();
        cx.spawn(async move |this, cx| {
-            while let Some(message) = adapter_log_rx.next().await {
+            while let Some((session_id, io_kind, _, message)) = adapter_log_rx.next().await {
                if let Some(this) = this.upgrade() {
                    this.update(cx, |this, cx| {
-                        this.add_debug_adapter_log(message, cx);
+                        this.add_debug_adapter_log(session_id, io_kind, message, cx);
                    })?;
                }

@@ -168,76 +157,57 @@ impl LogStore {
            rpc_tx,
            adapter_log_tx,
            projects: HashMap::new(),
+            debug_sessions: Default::default(),
        }
    }

    pub fn add_project(&mut self, project: &Entity<Project>, cx: &mut Context<Self>) {
+        let weak_project = project.downgrade();
        self.projects.insert(
            project.downgrade(),
            ProjectState {
                _subscriptions: [
-                    cx.observe_release(project, {
-                        let weak_project = project.downgrade();
-                        move |this, _, _| {
-                            this.projects.remove(&weak_project);
-                        }
+                    cx.observe_release(project, move |this, _, _| {
+                        this.projects.remove(&weak_project);
                    }),
-                    cx.subscribe(&project.read(cx).dap_store(), {
-                        let weak_project = project.downgrade();
-                        move |this, dap_store, event, cx| match event {
+                    cx.subscribe(
+                        &project.read(cx).dap_store(),
+                        |this, dap_store, event, cx| match event {
                            dap_store::DapStoreEvent::DebugClientStarted(session_id) => {
                                let session = dap_store.read(cx).session_by_id(session_id);
                                if let Some(session) = session {
-                                    this.add_debug_session(
-                                        LogStoreEntryIdentifier {
-                                            project: Cow::Owned(weak_project.clone()),
-                                            session_id: *session_id,
-                                        },
-                                        session,
-                                        cx,
-                                    );
+                                    this.add_debug_session(*session_id, session, cx);
                                }
                            }
                            dap_store::DapStoreEvent::DebugClientShutdown(session_id) => {
-                                let id = LogStoreEntryIdentifier {
-                                    project: Cow::Borrowed(&weak_project),
-                                    session_id: *session_id,
-                                };
-                                if let Some(state) = this.get_debug_adapter_state(&id) {
-                                    state.is_terminated = true;
-                                }
-
+                                this.get_debug_adapter_state(*session_id)
+                                    .iter_mut()
+                                    .for_each(|state| state.is_terminated = true);
                                this.clean_sessions(cx);
                            }
                            _ => {}
-                        }
-                    }),
+                        },
+                    ),
                ],
-                debug_sessions: Default::default(),
            },
        );
    }

-    fn get_debug_adapter_state(
-        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-    ) -> Option<&mut DebugAdapterState> {
-        self.projects
-            .get_mut(&id.project)
-            .and_then(|state| state.debug_sessions.get_mut(&id.session_id))
+    fn get_debug_adapter_state(&mut self, id: SessionId) -> Option<&mut DebugAdapterState> {
+        self.debug_sessions
+            .iter_mut()
+            .find(|adapter_state| adapter_state.id == id)
    }

    fn add_debug_adapter_message(
        &mut self,
-        LogStoreMessage {
-            id,
-            kind: io_kind,
-            command,
-            message,
-        }: LogStoreMessage,
+        id: SessionId,
+        io_kind: IoKind,
+        command: Option<SharedString>,
+        message: SharedString,
        cx: &mut Context<Self>,
    ) {
-        let Some(debug_client_state) = self.get_debug_adapter_state(&id) else {
+        let Some(debug_client_state) = self.get_debug_adapter_state(id) else {
            return;
        };

@@ -259,7 +229,7 @@ impl LogStore {
        if rpc_messages.last_message_kind != Some(kind) {
            Self::get_debug_adapter_entry(
                &mut rpc_messages.messages,
-                id.to_owned(),
+                id,
                kind.label().into(),
                LogKind::Rpc,
                cx,
@@ -269,7 +239,7 @@ impl LogStore {

        let entry = Self::get_debug_adapter_entry(
            &mut rpc_messages.messages,
-            id.to_owned(),
+            id,
            message,
            LogKind::Rpc,
            cx,
@@ -290,15 +260,12 @@ impl LogStore {

    fn add_debug_adapter_log(
        &mut self,
-        LogStoreMessage {
-            id,
-            kind: io_kind,
-            message,
-            ..
-        }: LogStoreMessage,
+        id: SessionId,
+        io_kind: IoKind,
+        message: SharedString,
        cx: &mut Context<Self>,
    ) {
-        let Some(debug_adapter_state) = self.get_debug_adapter_state(&id) else {
+        let Some(debug_adapter_state) = self.get_debug_adapter_state(id) else {
            return;
        };

@@ -309,7 +276,7 @@ impl LogStore {

        Self::get_debug_adapter_entry(
            &mut debug_adapter_state.log_messages,
-            id.to_owned(),
+            id,
            message,
            LogKind::Adapter,
            cx,
@@ -319,17 +286,13 @@ impl LogStore {

    fn get_debug_adapter_entry(
        log_lines: &mut VecDeque<SharedString>,
-        id: LogStoreEntryIdentifier<'static>,
+        id: SessionId,
        message: SharedString,
        kind: LogKind,
        cx: &mut Context<Self>,
    ) -> SharedString {
-        if let Some(excess) = log_lines
-            .len()
-            .checked_sub(RpcMessages::MESSAGE_QUEUE_LIMIT)
-            && excess > 0
-        {
-            log_lines.drain(..excess);
+        while log_lines.len() >= RpcMessages::MESSAGE_QUEUE_LIMIT {
+            log_lines.pop_front();
        }

        let format_messages = DebuggerSettings::get_global(cx).format_dap_log_messages;
@@ -359,116 +322,118 @@ impl LogStore {

    fn add_debug_session(
        &mut self,
-        id: LogStoreEntryIdentifier<'static>,
+        session_id: SessionId,
        session: Entity<Session>,
        cx: &mut Context<Self>,
    ) {
-        maybe!({
-            let project_entry = self.projects.get_mut(&id.project)?;
-            let std::collections::btree_map::Entry::Vacant(state) =
-                project_entry.debug_sessions.entry(id.session_id)
-            else {
-                return None;
-            };
+        if self
+            .debug_sessions
+            .iter_mut()
+            .any(|adapter_state| adapter_state.id == session_id)
+        {
+            return;
+        }

-            let (adapter_name, has_adapter_logs) = session.read_with(cx, |session, _| {
-                (
-                    session.adapter(),
-                    session
-                        .adapter_client()
-                        .map_or(false, |client| client.has_adapter_logs()),
-                )
-            });
-
-            state.insert(DebugAdapterState::new(
-                id.session_id,
-                adapter_name,
-                has_adapter_logs,
-            ));
-
-            self.clean_sessions(cx);
-
-            let io_tx = self.rpc_tx.clone();
-
-            let client = session.read(cx).adapter_client()?;
-            let project = id.project.clone();
-            let session_id = id.session_id;
-            client.add_log_handler(
-                move |kind, command, message| {
-                    io_tx
-                        .unbounded_send(LogStoreMessage {
-                            id: LogStoreEntryIdentifier {
-                                session_id,
-                                project: project.clone(),
-                            },
-                            kind,
-                            command: command.map(|command| command.to_owned().into()),
-                            message: message.to_owned().into(),
-                        })
-                        .ok();
-                },
-                LogKind::Rpc,
-            );
-
-            let log_io_tx = self.adapter_log_tx.clone();
-            let project = id.project;
-            client.add_log_handler(
-                move |kind, command, message| {
-                    log_io_tx
-                        .unbounded_send(LogStoreMessage {
-                            id: LogStoreEntryIdentifier {
-                                session_id,
-                                project: project.clone(),
-                            },
-                            kind,
-                            command: command.map(|command| command.to_owned().into()),
-                            message: message.to_owned().into(),
-                        })
-                        .ok();
-                },
-                LogKind::Adapter,
-            );
-            Some(())
+        let (adapter_name, has_adapter_logs) = session.read_with(cx, |session, _| {
+            (
+                session.adapter(),
+                session
+                    .adapter_client()
+                    .map(|client| client.has_adapter_logs())
+                    .unwrap_or(false),
+            )
        });
+
+        self.debug_sessions.push_back(DebugAdapterState::new(
+            session_id,
+            adapter_name,
+            has_adapter_logs,
+        ));
+
+        self.clean_sessions(cx);
+
+        let io_tx = self.rpc_tx.clone();
+
+        let Some(client) = session.read(cx).adapter_client() else {
+            return;
+        };
+
+        client.add_log_handler(
+            move |io_kind, command, message| {
+                io_tx
+                    .unbounded_send((
+                        session_id,
+                        io_kind,
+                        command.map(|command| command.to_owned().into()),
+                        message.to_owned().into(),
+                    ))
+                    .ok();
+            },
+            LogKind::Rpc,
+        );
+
+        let log_io_tx = self.adapter_log_tx.clone();
+        client.add_log_handler(
+            move |io_kind, command, message| {
+                log_io_tx
+                    .unbounded_send((
+                        session_id,
+                        io_kind,
+                        command.map(|command| command.to_owned().into()),
+                        message.to_owned().into(),
+                    ))
+                    .ok();
+            },
+            LogKind::Adapter,
+        );
    }

    fn clean_sessions(&mut self, cx: &mut Context<Self>) {
-        self.projects.values_mut().for_each(|project| {
-            let mut allowed_terminated_sessions = 10u32;
-            project.debug_sessions.retain(|_, session| {
-                if !session.is_terminated {
-                    return true;
-                }
-                allowed_terminated_sessions = allowed_terminated_sessions.saturating_sub(1);
-                allowed_terminated_sessions > 0
-            });
+        let mut to_remove = self.debug_sessions.len().saturating_sub(MAX_SESSIONS);
+        self.debug_sessions.retain(|session| {
+            if to_remove > 0 && session.is_terminated {
+                to_remove -= 1;
+                return false;
+            }
+            true
        });
-
        cx.notify();
    }

    fn log_messages_for_session(
        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
+        session_id: SessionId,
    ) -> Option<&mut VecDeque<SharedString>> {
-        self.get_debug_adapter_state(id)
+        self.debug_sessions
+            .iter_mut()
+            .find(|session| session.id == session_id)
            .map(|state| &mut state.log_messages)
    }

    fn rpc_messages_for_session(
        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
+        session_id: SessionId,
    ) -> Option<&mut VecDeque<SharedString>> {
-        self.get_debug_adapter_state(id)
-            .map(|state| &mut state.rpc_messages.messages)
+        self.debug_sessions.iter_mut().find_map(|state| {
+            if state.id == session_id {
+                Some(&mut state.rpc_messages.messages)
+            } else {
+                None
+            }
+        })
    }

    fn initialization_sequence_for_session(
        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
-    ) -> Option<&Vec<SharedString>> {
-        self.get_debug_adapter_state(&id)
-            .map(|state| &state.rpc_messages.initialization_sequence)
+        session_id: SessionId,
+    ) -> Option<&mut Vec<SharedString>> {
+        self.debug_sessions.iter_mut().find_map(|state| {
+            if state.id == session_id {
+                Some(&mut state.rpc_messages.initialization_sequence)
+            } else {
+                None
+            }
+        })
    }
 }

@@ -488,11 +453,10 @@ impl Render for DapLogToolbarItemView {
            return Empty.into_any_element();
        };

-        let (menu_rows, current_session_id, project) = log_view.update(cx, |log_view, cx| {
+        let (menu_rows, current_session_id) = log_view.update(cx, |log_view, cx| {
            (
                log_view.menu_items(cx),
                log_view.current_view.map(|(session_id, _)| session_id),
-                log_view.project.downgrade(),
            )
        });

@@ -520,7 +484,6 @@ impl Render for DapLogToolbarItemView {
            .menu(move |mut window, cx| {
                let log_view = log_view.clone();
                let menu_rows = menu_rows.clone();
-                let project = project.clone();
                ContextMenu::build(&mut window, cx, move |mut menu, window, _cx| {
                    for row in menu_rows.into_iter() {
                        menu = menu.custom_row(move |_window, _cx| {
@@ -546,15 +509,8 @@ impl Render for DapLogToolbarItemView {
                                        .child(Label::new(ADAPTER_LOGS))
                                        .into_any_element()
                                },
-                                window.handler_for(&log_view, {
-                                    let project = project.clone();
-                                    let id = LogStoreEntryIdentifier {
-                                        project: Cow::Owned(project),
-                                        session_id: row.session_id,
-                                    };
-                                    move |view, window, cx| {
-                                        view.show_log_messages_for_adapter(&id, window, cx);
-                                    }
+                                window.handler_for(&log_view, move |view, window, cx| {
+                                    view.show_log_messages_for_adapter(row.session_id, window, cx);
                                }),
                            );
                        }
@@ -568,15 +524,8 @@ impl Render for DapLogToolbarItemView {
                                        .child(Label::new(RPC_MESSAGES))
                                        .into_any_element()
                                },
-                                window.handler_for(&log_view, {
-                                    let project = project.clone();
-                                    let id = LogStoreEntryIdentifier {
-                                        project: Cow::Owned(project),
-                                        session_id: row.session_id,
-                                    };
-                                    move |view, window, cx| {
-                                        view.show_rpc_trace_for_server(&id, window, cx);
-                                    }
+                                window.handler_for(&log_view, move |view, window, cx| {
+                                    view.show_rpc_trace_for_server(row.session_id, window, cx);
                                }),
                            )
                            .custom_entry(
@@ -587,17 +536,12 @@ impl Render for DapLogToolbarItemView {
                                        .child(Label::new(INITIALIZATION_SEQUENCE))
                                        .into_any_element()
                                },
-                                window.handler_for(&log_view, {
-                                    let project = project.clone();
-                                    let id = LogStoreEntryIdentifier {
-                                        project: Cow::Owned(project),
-                                        session_id: row.session_id,
-                                    };
-                                    move |view, window, cx| {
-                                        view.show_initialization_sequence_for_server(
-                                            &id, window, cx,
-                                        );
-                                    }
+                                window.handler_for(&log_view, move |view, window, cx| {
+                                    view.show_initialization_sequence_for_server(
+                                        row.session_id,
+                                        window,
+                                        cx,
+                                    );
                                }),
                            );
                    }
@@ -669,9 +613,7 @@ impl DapLogView {

        let events_subscriptions = cx.subscribe(&log_store, |log_view, _, event, cx| match event {
            Event::NewLogEntry { id, entry, kind } => {
-                if log_view.current_view == Some((id.session_id, *kind))
-                    && log_view.project == *id.project
-                {
+                if log_view.current_view == Some((*id, *kind)) {
                    log_view.editor.update(cx, |editor, cx| {
                        editor.set_read_only(false);
                        let last_point = editor.buffer().read(cx).len(cx);
@@ -687,18 +629,12 @@ impl DapLogView {
                }
            }
        });
-        let weak_project = project.downgrade();
+
        let state_info = log_store
            .read(cx)
-            .projects
-            .get(&weak_project)
-            .and_then(|project| {
-                project
-                    .debug_sessions
-                    .values()
-                    .next_back()
-                    .map(|session| (session.id, session.has_adapter_logs))
-            });
+            .debug_sessions
+            .back()
+            .map(|session| (session.id, session.has_adapter_logs));

        let mut this = Self {
            editor,
@@ -711,14 +647,10 @@ impl DapLogView {
        };

        if let Some((session_id, have_adapter_logs)) = state_info {
-            let id = LogStoreEntryIdentifier {
-                session_id,
-                project: Cow::Owned(weak_project),
-            };
            if have_adapter_logs {
-                this.show_log_messages_for_adapter(&id, window, cx);
+                this.show_log_messages_for_adapter(session_id, window, cx);
            } else {
-                this.show_rpc_trace_for_server(&id, window, cx);
+                this.show_rpc_trace_for_server(session_id, window, cx);
            }
        }

@@ -758,38 +690,31 @@ impl DapLogView {
    fn menu_items(&self, cx: &App) -> Vec<DapMenuItem> {
        self.log_store
            .read(cx)
-            .projects
-            .get(&self.project.downgrade())
-            .map_or_else(Vec::new, |state| {
-                state
-                    .debug_sessions
-                    .values()
-                    .rev()
-                    .map(|state| DapMenuItem {
-                        session_id: state.id,
-                        adapter_name: state.adapter_name.clone(),
-                        has_adapter_logs: state.has_adapter_logs,
-                        selected_entry: self
-                            .current_view
-                            .map_or(LogKind::Adapter, |(_, kind)| kind),
-                    })
-                    .collect::<Vec<_>>()
+            .debug_sessions
+            .iter()
+            .rev()
+            .map(|state| DapMenuItem {
+                session_id: state.id,
+                adapter_name: state.adapter_name.clone(),
+                has_adapter_logs: state.has_adapter_logs,
+                selected_entry: self.current_view.map_or(LogKind::Adapter, |(_, kind)| kind),
            })
+            .collect::<Vec<_>>()
    }

    fn show_rpc_trace_for_server(
        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
+        session_id: SessionId,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let rpc_log = self.log_store.update(cx, |log_store, _| {
            log_store
-                .rpc_messages_for_session(id)
+                .rpc_messages_for_session(session_id)
                .map(|state| log_contents(state.iter().cloned()))
        });
        if let Some(rpc_log) = rpc_log {
-            self.current_view = Some((id.session_id, LogKind::Rpc));
+            self.current_view = Some((session_id, LogKind::Rpc));
            let (editor, editor_subscriptions) = Self::editor_for_logs(rpc_log, window, cx);
            let language = self.project.read(cx).languages().language_for_name("JSON");
            editor
@@ -800,7 +725,8 @@ impl DapLogView {
                .expect("log buffer should be a singleton")
                .update(cx, |_, cx| {
                    cx.spawn({
-                        async move |buffer, cx| {
+                        let buffer = cx.entity();
+                        async move |_, cx| {
                            let language = language.await.ok();
                            buffer.update(cx, |buffer, cx| {
                                buffer.set_language(language, cx);
@@ -820,17 +746,17 @@ impl DapLogView {

    fn show_log_messages_for_adapter(
        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
+        session_id: SessionId,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let message_log = self.log_store.update(cx, |log_store, _| {
            log_store
-                .log_messages_for_session(id)
+                .log_messages_for_session(session_id)
                .map(|state| log_contents(state.iter().cloned()))
        });
        if let Some(message_log) = message_log {
-            self.current_view = Some((id.session_id, LogKind::Adapter));
+            self.current_view = Some((session_id, LogKind::Adapter));
            let (editor, editor_subscriptions) = Self::editor_for_logs(message_log, window, cx);
            editor
                .read(cx)
@@ -849,17 +775,17 @@ impl DapLogView {

    fn show_initialization_sequence_for_server(
        &mut self,
-        id: &LogStoreEntryIdentifier<'_>,
+        session_id: SessionId,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let rpc_log = self.log_store.update(cx, |log_store, _| {
            log_store
-                .initialization_sequence_for_session(id)
+                .initialization_sequence_for_session(session_id)
                .map(|state| log_contents(state.iter().cloned()))
        });
        if let Some(rpc_log) = rpc_log {
-            self.current_view = Some((id.session_id, LogKind::Rpc));
+            self.current_view = Some((session_id, LogKind::Rpc));
            let (editor, editor_subscriptions) = Self::editor_for_logs(rpc_log, window, cx);
            let language = self.project.read(cx).languages().language_for_name("JSON");
            editor
@@ -1067,9 +993,9 @@ impl Focusable for DapLogView {
    }
 }

-enum Event {
+pub enum Event {
    NewLogEntry {
-        id: LogStoreEntryIdentifier<'static>,
+        id: SessionId,
        entry: SharedString,
        kind: LogKind,
    },
@@ -1082,30 +1008,31 @@ impl EventEmitter<SearchEvent> for DapLogView {}

 #[cfg(any(test, feature = "test-support"))]
 impl LogStore {
-    pub fn has_projects(&self) -> bool {
-        !self.projects.is_empty()
+    pub fn contained_session_ids(&self) -> Vec<SessionId> {
+        self.debug_sessions
+            .iter()
+            .map(|session| session.id)
+            .collect()
    }

-    pub fn contained_session_ids(&self, project: &WeakEntity<Project>) -> Vec<SessionId> {
-        self.projects.get(project).map_or(vec![], |state| {
-            state.debug_sessions.keys().copied().collect()
-        })
+    pub fn rpc_messages_for_session_id(&self, session_id: SessionId) -> Vec<SharedString> {
+        self.debug_sessions
+            .iter()
+            .find(|adapter_state| adapter_state.id == session_id)
+            .expect("This session should exist if a test is calling")
+            .rpc_messages
+            .messages
+            .clone()
+            .into()
    }

-    pub fn rpc_messages_for_session_id(
-        &self,
-        project: &WeakEntity<Project>,
-        session_id: SessionId,
-    ) -> Vec<SharedString> {
-        self.projects.get(&project).map_or(vec![], |state| {
-            state
-                .debug_sessions
-                .get(&session_id)
-                .expect("This session should exist if a test is calling")
-                .rpc_messages
-                .messages
-                .clone()
-                .into()
-        })
+    pub fn log_messages_for_session_id(&self, session_id: SessionId) -> Vec<SharedString> {
+        self.debug_sessions
+            .iter()
+            .find(|adapter_state| adapter_state.id == session_id)
+            .expect("This session should exist if a test is calling")
+            .log_messages
+            .clone()
+            .into()
    }
 }
--- a/crates/debugger_ui/Cargo.toml
+++ b/crates/debugger_ui/Cargo.toml
@@ -28,7 +28,6 @@ test-support = [
 [dependencies]
 alacritty_terminal.workspace = true
 anyhow.workspace = true
-bitflags.workspace = true
 client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -100,13 +100,7 @@ impl DebugPanel {
                sessions: vec![],
                active_session: None,
                focus_handle,
-                breakpoint_list: BreakpointList::new(
-                    None,
-                    workspace.weak_handle(),
-                    &project,
-                    window,
-                    cx,
-                ),
+                breakpoint_list: BreakpointList::new(None, workspace.weak_handle(), &project, cx),
                project,
                workspace: workspace.weak_handle(),
                context_menu: None,
@@ -868,7 +862,7 @@ impl DebugPanel {
                                        let threads =
                                            running_state.update(cx, |running_state, cx| {
                                                let session = running_state.session();
-                                                session.read(cx).is_started().then(|| {
+                                                session.read(cx).is_running().then(|| {
                                                    session.update(cx, |session, cx| {
                                                        session.threads(cx)
                                                    })
@@ -1298,11 +1292,6 @@ impl Render for DebugPanel {
        }

        v_flex()
-            .when_else(
-                self.position(window, cx) == DockPosition::Bottom,
-                |this| this.max_h(self.size),
-                |this| this.max_w(self.size),
-            )
            .size_full()
            .key_context("DebugPanel")
            .child(h_flex().children(self.top_controls_strip(window, cx)))
@@ -1473,94 +1462,6 @@ impl Render for DebugPanel {
                if has_sessions {
                    this.children(self.active_session.clone())
                } else {
-                    let docked_to_bottom = self.position(window, cx) == DockPosition::Bottom;
-                    let welcome_experience = v_flex()
-                        .when_else(
-                            docked_to_bottom,
-                            |this| this.w_2_3().h_full().pr_8(),
-                            |this| this.w_full().h_1_3(),
-                        )
-                        .items_center()
-                        .justify_center()
-                        .gap_2()
-                        .child(
-                            Button::new("spawn-new-session-empty-state", "New Session")
-                                .icon(IconName::Plus)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::Start)
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(crate::Start.boxed_clone(), cx);
-                                }),
-                        )
-                        .child(
-                            Button::new("edit-debug-settings", "Edit debug.json")
-                                .icon(IconName::Code)
-                                .icon_size(IconSize::XSmall)
-                                .color(Color::Muted)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::Start)
-                                .on_click(|_, window, cx| {
-                                    window.dispatch_action(
-                                        zed_actions::OpenProjectDebugTasks.boxed_clone(),
-                                        cx,
-                                    );
-                                }),
-                        )
-                        .child(
-                            Button::new("open-debugger-docs", "Debugger Docs")
-                                .icon(IconName::Book)
-                                .color(Color::Muted)
-                                .icon_size(IconSize::XSmall)
-                                .icon_color(Color::Muted)
-                                .icon_position(IconPosition::Start)
-                                .on_click(|_, _, cx| cx.open_url("https://zed.dev/docs/debugger")),
-                        )
-                        .child(
-                            Button::new(
-                                "spawn-new-session-install-extensions",
-                                "Debugger Extensions",
-                            )
-                            .icon(IconName::Blocks)
-                            .color(Color::Muted)
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                            .icon_position(IconPosition::Start)
-                            .on_click(|_, window, cx| {
-                                window.dispatch_action(
-                                    zed_actions::Extensions {
-                                        category_filter: Some(
-                                            zed_actions::ExtensionCategoryFilter::DebugAdapters,
-                                        ),
-                                    }
-                                    .boxed_clone(),
-                                    cx,
-                                );
-                            }),
-                        );
-                    let breakpoint_list =
-                        v_flex()
-                            .group("base-breakpoint-list")
-                            .items_start()
-                            .when_else(
-                                docked_to_bottom,
-                                |this| this.min_w_1_3().h_full(),
-                                |this| this.w_full().h_2_3(),
-                            )
-                            .p_1()
-                            .child(
-                                h_flex()
-                                    .pl_1()
-                                    .w_full()
-                                    .justify_between()
-                                    .child(Label::new("Breakpoints").size(LabelSize::Small))
-                                    .child(h_flex().visible_on_hover("base-breakpoint-list").child(
-                                        self.breakpoint_list.read(cx).render_control_strip(),
-                                    ))
-                                    .track_focus(&self.breakpoint_list.focus_handle(cx)),
-                            )
-                            .child(Divider::horizontal())
-                            .child(self.breakpoint_list.clone());
                    this.child(
                        v_flex()
                            .h_full()
@@ -1568,23 +1469,65 @@ impl Render for DebugPanel {
                            .items_center()
                            .justify_center()
                            .child(
-                                div()
-                                    .when_else(docked_to_bottom, Div::h_flex, Div::v_flex)
-                                    .size_full()
-                                    .map(|this| {
-                                        if docked_to_bottom {
-                                            this.items_start()
-                                                .child(breakpoint_list)
-                                                .child(Divider::vertical())
-                                                .child(welcome_experience)
-                                        } else {
-                                            this.items_end()
-                                                .child(welcome_experience)
-                                                .child(Divider::horizontal())
-                                                .child(breakpoint_list)
-                                        }
-                                    }),
-                            ),
+                                h_flex().size_full()
+                                    .items_start()
+
+                                    .child(v_flex().group("base-breakpoint-list").items_start().min_w_1_3().h_full().p_1()
+                                        .child(h_flex().pl_1().w_full().justify_between()
+                                            .child(Label::new("Breakpoints").size(LabelSize::Small))
+                                            .child(h_flex().visible_on_hover("base-breakpoint-list").child(self.breakpoint_list.read(cx).render_control_strip())))
+                                        .child(Divider::horizontal())
+                                        .child(self.breakpoint_list.clone()))
+                                    .child(Divider::vertical())
+                                    .child(
+                                        v_flex().w_2_3().h_full().items_center().justify_center()
+                                            .gap_2()
+                                            .pr_8()
+                                            .child(
+                                                Button::new("spawn-new-session-empty-state", "New Session")
+                                                    .icon(IconName::Plus)
+                                                    .icon_size(IconSize::XSmall)
+                                                    .icon_color(Color::Muted)
+                                                    .icon_position(IconPosition::Start)
+                                                    .on_click(|_, window, cx| {
+                                                        window.dispatch_action(crate::Start.boxed_clone(), cx);
+                                                    })
+                                            )
+                                            .child(
+                                                Button::new("edit-debug-settings", "Edit debug.json")
+                                                    .icon(IconName::Code)
+                                                    .icon_size(IconSize::XSmall)
+                                                    .color(Color::Muted)
+                                                    .icon_color(Color::Muted)
+                                                    .icon_position(IconPosition::Start)
+                                                    .on_click(|_, window, cx| {
+                                                        window.dispatch_action(zed_actions::OpenProjectDebugTasks.boxed_clone(), cx);
+                                                    })
+                                            )
+                                            .child(
+                                                Button::new("open-debugger-docs", "Debugger Docs")
+                                                    .icon(IconName::Book)
+                                                    .color(Color::Muted)
+                                                    .icon_size(IconSize::XSmall)
+                                                    .icon_color(Color::Muted)
+                                                    .icon_position(IconPosition::Start)
+                                                    .on_click(|_, _, cx| {
+                                                        cx.open_url("https://zed.dev/docs/debugger")
+                                                    })
+                                            )
+                                            .child(
+                                                Button::new("spawn-new-session-install-extensions", "Debugger Extensions")
+                                                    .icon(IconName::Blocks)
+                                                    .color(Color::Muted)
+                                                    .icon_size(IconSize::XSmall)
+                                                    .icon_color(Color::Muted)
+                                                    .icon_position(IconPosition::Start)
+                                                    .on_click(|_, window, cx| {
+                                                        window.dispatch_action(zed_actions::Extensions { category_filter: Some(zed_actions::ExtensionCategoryFilter::DebugAdapters)}.boxed_clone(), cx);
+                                                    })
+                                            )
+                                    )
+                            )
                    )
                }
            })
--- a/crates/debugger_ui/src/session/running.rs
+++ b/crates/debugger_ui/src/session/running.rs
@@ -697,13 +697,8 @@ impl RunningState {
            )
        });

-        let breakpoint_list = BreakpointList::new(
-            Some(session.clone()),
-            workspace.clone(),
-            &project,
-            window,
-            cx,
-        );
+        let breakpoint_list =
+            BreakpointList::new(Some(session.clone()), workspace.clone(), &project, cx);

        let _subscriptions = vec![
            cx.on_app_quit(move |this, cx| {
@@ -900,7 +895,7 @@ impl RunningState {


            let config_is_valid = request_type.is_ok();
-            let mut extra_config = Value::Null;
+
            let build_output = if let Some(build) = build {
                let (task_template, locator_name) = match build {
                    BuildTaskDefinition::Template {
@@ -930,7 +925,6 @@ impl RunningState {
                };

                let locator_name = if let Some(locator_name) = locator_name {
-                    extra_config = config.clone();
                    debug_assert!(!config_is_valid);
                    Some(locator_name)
                } else if !config_is_valid {
@@ -946,7 +940,6 @@ impl RunningState {
                        });
                    if let Ok(t) = task {
                        t.await.and_then(|scenario| {
-                            extra_config = scenario.config;
                            match scenario.build {
                                Some(BuildTaskDefinition::Template {
                                    locator_name, ..
@@ -1010,13 +1003,13 @@ impl RunningState {
                if !exit_status.success() {
                    anyhow::bail!("Build failed");
                }
-                Some((task.resolved.clone(), locator_name, extra_config))
+                Some((task.resolved.clone(), locator_name))
            } else {
                None
            };

            if config_is_valid {
-            } else if let Some((task, locator_name, extra_config)) = build_output {
+            } else if let Some((task, locator_name)) = build_output {
                let locator_name =
                    locator_name.with_context(|| {
                        format!("Could not find a valid locator for a build task and configure is invalid with error: {}", request_type.err()
@@ -1041,8 +1034,6 @@ impl RunningState {
                    .with_context(|| anyhow!("{}: is not a valid adapter name", &adapter))?.config_from_zed_format(zed_config)
 .await?;
                config = scenario.config;
-                util::merge_non_null_json_value_into(extra_config, &mut config);
-
                Self::substitute_variables_in_config(&mut config, &task_context);
            } else {
                let Err(e) = request_type else {
--- a/crates/debugger_ui/src/session/running/breakpoint_list.rs
+++ b/crates/debugger_ui/src/session/running/breakpoint_list.rs
@@ -5,11 +5,11 @@ use std::{
    time::Duration,
 };

-use dap::{Capabilities, ExceptionBreakpointsFilter};
+use dap::ExceptionBreakpointsFilter;
 use editor::Editor;
 use gpui::{
-    Action, AppContext, ClickEvent, Entity, FocusHandle, Focusable, MouseButton, ScrollStrategy,
-    Stateful, Task, UniformListScrollHandle, WeakEntity, actions, uniform_list,
+    Action, AppContext, Entity, FocusHandle, Focusable, MouseButton, ScrollStrategy, Stateful,
+    Task, UniformListScrollHandle, WeakEntity, uniform_list,
 };
 use language::Point;
 use project::{
@@ -21,20 +21,16 @@ use project::{
    worktree_store::WorktreeStore,
 };
 use ui::{
-    ActiveTheme, AnyElement, App, ButtonCommon, Clickable, Color, Context, Disableable, Div,
-    Divider, FluentBuilder as _, Icon, IconButton, IconName, IconSize, Indicator,
-    InteractiveElement, IntoElement, Label, LabelCommon, LabelSize, ListItem, ParentElement,
-    Render, RenderOnce, Scrollbar, ScrollbarState, SharedString, StatefulInteractiveElement,
-    Styled, Toggleable, Tooltip, Window, div, h_flex, px, v_flex,
+    AnyElement, App, ButtonCommon, Clickable, Color, Context, Disableable, Div, FluentBuilder as _,
+    Icon, IconButton, IconName, IconSize, Indicator, InteractiveElement, IntoElement, Label,
+    LabelCommon, LabelSize, ListItem, ParentElement, Render, Scrollbar, ScrollbarState,
+    SharedString, StatefulInteractiveElement, Styled, Toggleable, Tooltip, Window, div, h_flex, px,
+    v_flex,
 };
 use util::ResultExt;
 use workspace::Workspace;
 use zed_actions::{ToggleEnableBreakpoint, UnsetBreakpoint};

-actions!(
-    debugger,
-    [PreviousBreakpointProperty, NextBreakpointProperty]
-);
 #[derive(Clone, Copy, PartialEq)]
 pub(crate) enum SelectedBreakpointKind {
    Source,
@@ -52,8 +48,6 @@ pub(crate) struct BreakpointList {
    focus_handle: FocusHandle,
    scroll_handle: UniformListScrollHandle,
    selected_ix: Option<usize>,
-    input: Entity<Editor>,
-    strip_mode: Option<ActiveBreakpointStripMode>,
 }

 impl Focusable for BreakpointList {
@@ -62,19 +56,11 @@ impl Focusable for BreakpointList {
    }
 }

-#[derive(Clone, Copy, PartialEq)]
-enum ActiveBreakpointStripMode {
-    Log,
-    Condition,
-    HitCondition,
-}
-
 impl BreakpointList {
    pub(crate) fn new(
        session: Option<Entity<Session>>,
        workspace: WeakEntity<Workspace>,
        project: &Entity<Project>,
-        window: &mut Window,
        cx: &mut App,
    ) -> Entity<Self> {
        let project = project.read(cx);
@@ -84,7 +70,7 @@ impl BreakpointList {
        let scroll_handle = UniformListScrollHandle::new();
        let scrollbar_state = ScrollbarState::new(scroll_handle.clone());

-        cx.new(|cx| Self {
+        cx.new(|_| Self {
            breakpoint_store,
            worktree_store,
            scrollbar_state,
@@ -96,28 +82,17 @@ impl BreakpointList {
            focus_handle,
            scroll_handle,
            selected_ix: None,
-            input: cx.new(|cx| Editor::single_line(window, cx)),
-            strip_mode: None,
        })
    }

    fn edit_line_breakpoint(
-        &self,
+        &mut self,
        path: Arc<Path>,
        row: u32,
        action: BreakpointEditAction,
-        cx: &mut App,
+        cx: &mut Context<Self>,
    ) {
-        Self::edit_line_breakpoint_inner(&self.breakpoint_store, path, row, action, cx);
-    }
-    fn edit_line_breakpoint_inner(
-        breakpoint_store: &Entity<BreakpointStore>,
-        path: Arc<Path>,
-        row: u32,
-        action: BreakpointEditAction,
-        cx: &mut App,
-    ) {
-        breakpoint_store.update(cx, |breakpoint_store, cx| {
+        self.breakpoint_store.update(cx, |breakpoint_store, cx| {
            if let Some((buffer, breakpoint)) = breakpoint_store.breakpoint_at_row(&path, row, cx) {
                breakpoint_store.toggle_breakpoint(buffer, breakpoint, action, cx);
            } else {
@@ -173,63 +148,16 @@ impl BreakpointList {
        })
    }

-    fn set_active_breakpoint_property(
-        &mut self,
-        prop: ActiveBreakpointStripMode,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        self.strip_mode = Some(prop);
-        let placeholder = match prop {
-            ActiveBreakpointStripMode::Log => "Set Log Message",
-            ActiveBreakpointStripMode::Condition => "Set Condition",
-            ActiveBreakpointStripMode::HitCondition => "Set Hit Condition",
-        };
-        let mut is_exception_breakpoint = true;
-        let active_value = self.selected_ix.and_then(|ix| {
-            self.breakpoints.get(ix).and_then(|bp| {
-                if let BreakpointEntryKind::LineBreakpoint(bp) = &bp.kind {
-                    is_exception_breakpoint = false;
-                    match prop {
-                        ActiveBreakpointStripMode::Log => bp.breakpoint.message.clone(),
-                        ActiveBreakpointStripMode::Condition => bp.breakpoint.condition.clone(),
-                        ActiveBreakpointStripMode::HitCondition => {
-                            bp.breakpoint.hit_condition.clone()
-                        }
-                    }
-                } else {
-                    None
-                }
-            })
-        });
-
-        self.input.update(cx, |this, cx| {
-            this.set_placeholder_text(placeholder, cx);
-            this.set_read_only(is_exception_breakpoint);
-            this.set_text(active_value.as_deref().unwrap_or(""), window, cx);
-        });
-    }
-
-    fn select_ix(&mut self, ix: Option<usize>, window: &mut Window, cx: &mut Context<Self>) {
+    fn select_ix(&mut self, ix: Option<usize>, cx: &mut Context<Self>) {
        self.selected_ix = ix;
        if let Some(ix) = ix {
            self.scroll_handle
                .scroll_to_item(ix, ScrollStrategy::Center);
        }
-        if let Some(mode) = self.strip_mode {
-            self.set_active_breakpoint_property(mode, window, cx);
-        }
-
        cx.notify();
    }

-    fn select_next(&mut self, _: &menu::SelectNext, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
-        }
+    fn select_next(&mut self, _: &menu::SelectNext, _window: &mut Window, cx: &mut Context<Self>) {
        let ix = match self.selected_ix {
            _ if self.breakpoints.len() == 0 => None,
            None => Some(0),
@@ -241,21 +169,15 @@ impl BreakpointList {
                }
            }
        };
-        self.select_ix(ix, window, cx);
+        self.select_ix(ix, cx);
    }

    fn select_previous(
        &mut self,
        _: &menu::SelectPrevious,
-        window: &mut Window,
+        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
-        }
        let ix = match self.selected_ix {
            _ if self.breakpoints.len() == 0 => None,
            None => Some(self.breakpoints.len() - 1),
@@ -267,105 +189,37 @@ impl BreakpointList {
                }
            }
        };
-        self.select_ix(ix, window, cx);
+        self.select_ix(ix, cx);
    }

-    fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
-        }
+    fn select_first(
+        &mut self,
+        _: &menu::SelectFirst,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
        let ix = if self.breakpoints.len() > 0 {
            Some(0)
        } else {
            None
        };
-        self.select_ix(ix, window, cx);
+        self.select_ix(ix, cx);
    }

-    fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
-        }
+    fn select_last(&mut self, _: &menu::SelectLast, _window: &mut Window, cx: &mut Context<Self>) {
        let ix = if self.breakpoints.len() > 0 {
            Some(self.breakpoints.len() - 1)
        } else {
            None
        };
-        self.select_ix(ix, window, cx);
+        self.select_ix(ix, cx);
    }

-    fn dismiss(&mut self, _: &menu::Cancel, window: &mut Window, cx: &mut Context<Self>) {
-        if self.input.focus_handle(cx).contains_focused(window, cx) {
-            self.focus_handle.focus(window);
-        } else if self.strip_mode.is_some() {
-            self.strip_mode.take();
-            cx.notify();
-        } else {
-            cx.propagate();
-        }
-    }
    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
        let Some(entry) = self.selected_ix.and_then(|ix| self.breakpoints.get_mut(ix)) else {
            return;
        };

-        if let Some(mode) = self.strip_mode {
-            let handle = self.input.focus_handle(cx);
-            if handle.is_focused(window) {
-                // Go back to the main strip. Save the result as well.
-                let text = self.input.read(cx).text(cx);
-
-                match mode {
-                    ActiveBreakpointStripMode::Log => match &entry.kind {
-                        BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                            Self::edit_line_breakpoint_inner(
-                                &self.breakpoint_store,
-                                line_breakpoint.breakpoint.path.clone(),
-                                line_breakpoint.breakpoint.row,
-                                BreakpointEditAction::EditLogMessage(Arc::from(text)),
-                                cx,
-                            );
-                        }
-                        _ => {}
-                    },
-                    ActiveBreakpointStripMode::Condition => match &entry.kind {
-                        BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                            Self::edit_line_breakpoint_inner(
-                                &self.breakpoint_store,
-                                line_breakpoint.breakpoint.path.clone(),
-                                line_breakpoint.breakpoint.row,
-                                BreakpointEditAction::EditCondition(Arc::from(text)),
-                                cx,
-                            );
-                        }
-                        _ => {}
-                    },
-                    ActiveBreakpointStripMode::HitCondition => match &entry.kind {
-                        BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                            Self::edit_line_breakpoint_inner(
-                                &self.breakpoint_store,
-                                line_breakpoint.breakpoint.path.clone(),
-                                line_breakpoint.breakpoint.row,
-                                BreakpointEditAction::EditHitCondition(Arc::from(text)),
-                                cx,
-                            );
-                        }
-                        _ => {}
-                    },
-                }
-                self.focus_handle.focus(window);
-            } else {
-                handle.focus(window);
-            }
-
-            return;
-        }
        match &mut entry.kind {
            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
                let path = line_breakpoint.breakpoint.path.clone();
@@ -379,18 +233,12 @@ impl BreakpointList {
    fn toggle_enable_breakpoint(
        &mut self,
        _: &ToggleEnableBreakpoint,
-        window: &mut Window,
+        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
        let Some(entry) = self.selected_ix.and_then(|ix| self.breakpoints.get_mut(ix)) else {
            return;
        };
-        if self.strip_mode.is_some() {
-            if self.input.focus_handle(cx).contains_focused(window, cx) {
-                cx.propagate();
-                return;
-            }
-        }

        match &mut entry.kind {
            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
@@ -431,50 +279,6 @@ impl BreakpointList {
        cx.notify();
    }

-    fn previous_breakpoint_property(
-        &mut self,
-        _: &PreviousBreakpointProperty,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let next_mode = match self.strip_mode {
-            Some(ActiveBreakpointStripMode::Log) => None,
-            Some(ActiveBreakpointStripMode::Condition) => Some(ActiveBreakpointStripMode::Log),
-            Some(ActiveBreakpointStripMode::HitCondition) => {
-                Some(ActiveBreakpointStripMode::Condition)
-            }
-            None => Some(ActiveBreakpointStripMode::HitCondition),
-        };
-        if let Some(mode) = next_mode {
-            self.set_active_breakpoint_property(mode, window, cx);
-        } else {
-            self.strip_mode.take();
-        }
-
-        cx.notify();
-    }
-    fn next_breakpoint_property(
-        &mut self,
-        _: &NextBreakpointProperty,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let next_mode = match self.strip_mode {
-            Some(ActiveBreakpointStripMode::Log) => Some(ActiveBreakpointStripMode::Condition),
-            Some(ActiveBreakpointStripMode::Condition) => {
-                Some(ActiveBreakpointStripMode::HitCondition)
-            }
-            Some(ActiveBreakpointStripMode::HitCondition) => None,
-            None => Some(ActiveBreakpointStripMode::Log),
-        };
-        if let Some(mode) = next_mode {
-            self.set_active_breakpoint_property(mode, window, cx);
-        } else {
-            self.strip_mode.take();
-        }
-        cx.notify();
-    }
-
    fn hide_scrollbar(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        const SCROLLBAR_SHOW_INTERVAL: Duration = Duration::from_secs(1);
        self.hide_scrollbar_task = Some(cx.spawn_in(window, async move |panel, cx| {
@@ -490,31 +294,20 @@ impl BreakpointList {
        }))
    }

-    fn render_list(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render_list(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let selected_ix = self.selected_ix;
        let focus_handle = self.focus_handle.clone();
-        let supported_breakpoint_properties = self
-            .session
-            .as_ref()
-            .map(|session| SupportedBreakpointProperties::from(session.read(cx).capabilities()))
-            .unwrap_or_else(SupportedBreakpointProperties::empty);
-        let strip_mode = self.strip_mode;
        uniform_list(
            "breakpoint-list",
            self.breakpoints.len(),
-            cx.processor(move |this, range: Range<usize>, _, _| {
+            cx.processor(move |this, range: Range<usize>, window, cx| {
                range
                    .clone()
                    .zip(&mut this.breakpoints[range])
                    .map(|(ix, breakpoint)| {
                        breakpoint
-                            .render(
-                                strip_mode,
-                                supported_breakpoint_properties,
-                                ix,
-                                Some(ix) == selected_ix,
-                                focus_handle.clone(),
-                            )
+                            .render(ix, focus_handle.clone(), window, cx)
+                            .toggle_state(Some(ix) == selected_ix)
                            .into_any_element()
                    })
                    .collect()
@@ -650,6 +443,7 @@ impl BreakpointList {

 impl Render for BreakpointList {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl ui::IntoElement {
+        // let old_len = self.breakpoints.len();
        let breakpoints = self.breakpoint_store.read(cx).all_source_breakpoints(cx);
        self.breakpoints.clear();
        let weak = cx.weak_entity();
@@ -729,46 +523,15 @@ impl Render for BreakpointList {
            .on_action(cx.listener(Self::select_previous))
            .on_action(cx.listener(Self::select_first))
            .on_action(cx.listener(Self::select_last))
-            .on_action(cx.listener(Self::dismiss))
            .on_action(cx.listener(Self::confirm))
            .on_action(cx.listener(Self::toggle_enable_breakpoint))
            .on_action(cx.listener(Self::unset_breakpoint))
-            .on_action(cx.listener(Self::next_breakpoint_property))
-            .on_action(cx.listener(Self::previous_breakpoint_property))
            .size_full()
            .m_0p5()
-            .child(
-                v_flex()
-                    .size_full()
-                    .child(self.render_list(cx))
-                    .children(self.render_vertical_scrollbar(cx)),
-            )
-            .when_some(self.strip_mode, |this, _| {
-                this.child(Divider::horizontal()).child(
-                    h_flex()
-                        // .w_full()
-                        .m_0p5()
-                        .p_0p5()
-                        .border_1()
-                        .rounded_sm()
-                        .when(
-                            self.input.focus_handle(cx).contains_focused(window, cx),
-                            |this| {
-                                let colors = cx.theme().colors();
-                                let border = if self.input.read(cx).read_only(cx) {
-                                    colors.border_disabled
-                                } else {
-                                    colors.border_focused
-                                };
-                                this.border_color(border)
-                            },
-                        )
-                        .child(self.input.clone()),
-                )
-            })
+            .child(self.render_list(window, cx))
+            .children(self.render_vertical_scrollbar(cx))
    }
 }
-
 #[derive(Clone, Debug)]
 struct LineBreakpoint {
    name: SharedString,
@@ -780,10 +543,7 @@ struct LineBreakpoint {
 impl LineBreakpoint {
    fn render(
        &mut self,
-        props: SupportedBreakpointProperties,
-        strip_mode: Option<ActiveBreakpointStripMode>,
        ix: usize,
-        is_selected: bool,
        focus_handle: FocusHandle,
        weak: WeakEntity<BreakpointList>,
    ) -> ListItem {
@@ -834,16 +594,15 @@ impl LineBreakpoint {
            })
            .child(Indicator::icon(Icon::new(icon_name)).color(Color::Debugger))
            .on_mouse_down(MouseButton::Left, move |_, _, _| {});
-
        ListItem::new(SharedString::from(format!(
            "breakpoint-ui-item-{:?}/{}:{}",
            self.dir, self.name, self.line
        )))
        .on_click({
            let weak = weak.clone();
-            move |_, window, cx| {
+            move |_, _, cx| {
                weak.update(cx, |breakpoint_list, cx| {
-                    breakpoint_list.select_ix(Some(ix), window, cx);
+                    breakpoint_list.select_ix(Some(ix), cx);
                })
                .ok();
            }
@@ -854,67 +613,39 @@ impl LineBreakpoint {
            cx.stop_propagation();
        })
        .child(
-            h_flex()
-                .w_full()
-                .mr_4()
-                .py_0p5()
+            v_flex()
+                .py_1()
                .gap_1()
                .min_h(px(26.))
-                .justify_between()
+                .justify_center()
                .id(SharedString::from(format!(
                    "breakpoint-ui-on-click-go-to-line-{:?}/{}:{}",
                    self.dir, self.name, self.line
                )))
-                .on_click({
-                    let weak = weak.clone();
-                    move |_, window, cx| {
-                        weak.update(cx, |breakpoint_list, cx| {
-                            breakpoint_list.select_ix(Some(ix), window, cx);
-                            breakpoint_list.go_to_line_breakpoint(path.clone(), row, window, cx);
-                        })
-                        .ok();
-                    }
+                .on_click(move |_, window, cx| {
+                    weak.update(cx, |breakpoint_list, cx| {
+                        breakpoint_list.select_ix(Some(ix), cx);
+                        breakpoint_list.go_to_line_breakpoint(path.clone(), row, window, cx);
+                    })
+                    .ok();
                })
                .cursor_pointer()
                .child(
                    h_flex()
-                        .gap_0p5()
+                        .gap_1()
                        .child(
                            Label::new(format!("{}:{}", self.name, self.line))
                                .size(LabelSize::Small)
                                .line_height_style(ui::LineHeightStyle::UiLabel),
                        )
-                        .children(self.dir.as_ref().and_then(|dir| {
-                            let path_without_root = Path::new(dir.as_ref())
-                                .components()
-                                .skip(1)
-                                .collect::<PathBuf>();
-                            path_without_root.components().next()?;
-                            Some(
-                                Label::new(path_without_root.to_string_lossy().into_owned())
-                                    .color(Color::Muted)
-                                    .size(LabelSize::Small)
-                                    .line_height_style(ui::LineHeightStyle::UiLabel)
-                                    .truncate(),
-                            )
+                        .children(self.dir.clone().map(|dir| {
+                            Label::new(dir)
+                                .color(Color::Muted)
+                                .size(LabelSize::Small)
+                                .line_height_style(ui::LineHeightStyle::UiLabel)
                        })),
-                )
-                .when_some(self.dir.as_ref(), |this, parent_dir| {
-                    this.tooltip(Tooltip::text(format!("Worktree parent path: {parent_dir}")))
-                })
-                .child(BreakpointOptionsStrip {
-                    props,
-                    breakpoint: BreakpointEntry {
-                        kind: BreakpointEntryKind::LineBreakpoint(self.clone()),
-                        weak: weak,
-                    },
-                    is_selected,
-                    focus_handle,
-                    strip_mode,
-                    index: ix,
-                }),
+                ),
        )
-        .toggle_state(is_selected)
    }
 }
 #[derive(Clone, Debug)]
@@ -927,10 +658,7 @@ struct ExceptionBreakpoint {
 impl ExceptionBreakpoint {
    fn render(
        &mut self,
-        props: SupportedBreakpointProperties,
-        strip_mode: Option<ActiveBreakpointStripMode>,
        ix: usize,
-        is_selected: bool,
        focus_handle: FocusHandle,
        list: WeakEntity<BreakpointList>,
    ) -> ListItem {
@@ -941,15 +669,15 @@ impl ExceptionBreakpoint {
        };
        let id = SharedString::from(&self.id);
        let is_enabled = self.is_enabled;
-        let weak = list.clone();
+
        ListItem::new(SharedString::from(format!(
            "exception-breakpoint-ui-item-{}",
            self.id
        )))
        .on_click({
            let list = list.clone();
-            move |_, window, cx| {
-                list.update(cx, |list, cx| list.select_ix(Some(ix), window, cx))
+            move |_, _, cx| {
+                list.update(cx, |list, cx| list.select_ix(Some(ix), cx))
                    .ok();
            }
        })
@@ -963,21 +691,18 @@ impl ExceptionBreakpoint {
                    "exception-breakpoint-ui-item-{}-click-handler",
                    self.id
                )))
-                .tooltip({
-                    let focus_handle = focus_handle.clone();
-                    move |window, cx| {
-                        Tooltip::for_action_in(
-                            if is_enabled {
-                                "Disable Exception Breakpoint"
-                            } else {
-                                "Enable Exception Breakpoint"
-                            },
-                            &ToggleEnableBreakpoint,
-                            &focus_handle,
-                            window,
-                            cx,
-                        )
-                    }
+                .tooltip(move |window, cx| {
+                    Tooltip::for_action_in(
+                        if is_enabled {
+                            "Disable Exception Breakpoint"
+                        } else {
+                            "Enable Exception Breakpoint"
+                        },
+                        &ToggleEnableBreakpoint,
+                        &focus_handle,
+                        window,
+                        cx,
+                    )
                })
                .on_click({
                    let list = list.clone();
@@ -997,40 +722,21 @@ impl ExceptionBreakpoint {
                .child(Indicator::icon(Icon::new(IconName::Flame)).color(color)),
        )
        .child(
-            h_flex()
-                .w_full()
-                .mr_4()
-                .py_0p5()
-                .justify_between()
+            v_flex()
+                .py_1()
+                .gap_1()
+                .min_h(px(26.))
+                .justify_center()
+                .id(("exception-breakpoint-label", ix))
                .child(
-                    v_flex()
-                        .py_1()
-                        .gap_1()
-                        .min_h(px(26.))
-                        .justify_center()
-                        .id(("exception-breakpoint-label", ix))
-                        .child(
-                            Label::new(self.data.label.clone())
-                                .size(LabelSize::Small)
-                                .line_height_style(ui::LineHeightStyle::UiLabel),
-                        )
-                        .when_some(self.data.description.clone(), |el, description| {
-                            el.tooltip(Tooltip::text(description))
-                        }),
+                    Label::new(self.data.label.clone())
+                        .size(LabelSize::Small)
+                        .line_height_style(ui::LineHeightStyle::UiLabel),
                )
-                .child(BreakpointOptionsStrip {
-                    props,
-                    breakpoint: BreakpointEntry {
-                        kind: BreakpointEntryKind::ExceptionBreakpoint(self.clone()),
-                        weak: weak,
-                    },
-                    is_selected,
-                    focus_handle,
-                    strip_mode,
-                    index: ix,
+                .when_some(self.data.description.clone(), |el, description| {
+                    el.tooltip(Tooltip::text(description))
                }),
        )
-        .toggle_state(is_selected)
    }
 }
 #[derive(Clone, Debug)]
@@ -1048,267 +754,18 @@ struct BreakpointEntry {
 impl BreakpointEntry {
    fn render(
        &mut self,
-        strip_mode: Option<ActiveBreakpointStripMode>,
-        props: SupportedBreakpointProperties,
        ix: usize,
-        is_selected: bool,
        focus_handle: FocusHandle,
+        _: &mut Window,
+        _: &mut App,
    ) -> ListItem {
        match &mut self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => line_breakpoint.render(
-                props,
-                strip_mode,
-                ix,
-                is_selected,
-                focus_handle,
-                self.weak.clone(),
-            ),
-            BreakpointEntryKind::ExceptionBreakpoint(exception_breakpoint) => exception_breakpoint
-                .render(
-                    props.for_exception_breakpoints(),
-                    strip_mode,
-                    ix,
-                    is_selected,
-                    focus_handle,
-                    self.weak.clone(),
-                ),
-        }
-    }
-
-    fn id(&self) -> SharedString {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => format!(
-                "source-breakpoint-control-strip-{:?}:{}",
-                line_breakpoint.breakpoint.path, line_breakpoint.breakpoint.row
-            )
-            .into(),
-            BreakpointEntryKind::ExceptionBreakpoint(exception_breakpoint) => format!(
-                "exception-breakpoint-control-strip--{}",
-                exception_breakpoint.id
-            )
-            .into(),
-        }
-    }
-
-    fn has_log(&self) -> bool {
-        match &self.kind {
            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                line_breakpoint.breakpoint.message.is_some()
+                line_breakpoint.render(ix, focus_handle, self.weak.clone())
            }
-            _ => false,
-        }
-    }
-
-    fn has_condition(&self) -> bool {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                line_breakpoint.breakpoint.condition.is_some()
-            }
-            // We don't support conditions on exception breakpoints
-            BreakpointEntryKind::ExceptionBreakpoint(_) => false,
-        }
-    }
-
-    fn has_hit_condition(&self) -> bool {
-        match &self.kind {
-            BreakpointEntryKind::LineBreakpoint(line_breakpoint) => {
-                line_breakpoint.breakpoint.hit_condition.is_some()
-            }
-            _ => false,
-        }
-    }
-}
-bitflags::bitflags! {
-    #[derive(Clone, Copy)]
-    pub struct SupportedBreakpointProperties: u32 {
-        const LOG = 1 << 0;
-        const CONDITION = 1 << 1;
-        const HIT_CONDITION = 1 << 2;
-        // Conditions for exceptions can be set only when exception filters are supported.
-        const EXCEPTION_FILTER_OPTIONS = 1 << 3;
-    }
-}
-
-impl From<&Capabilities> for SupportedBreakpointProperties {
-    fn from(caps: &Capabilities) -> Self {
-        let mut this = Self::empty();
-        for (prop, offset) in [
-            (caps.supports_log_points, Self::LOG),
-            (caps.supports_conditional_breakpoints, Self::CONDITION),
-            (
-                caps.supports_hit_conditional_breakpoints,
-                Self::HIT_CONDITION,
-            ),
-            (
-                caps.supports_exception_options,
-                Self::EXCEPTION_FILTER_OPTIONS,
-            ),
-        ] {
-            if prop.unwrap_or_default() {
-                this.insert(offset);
-            }
-        }
-        this
-    }
-}
-
-impl SupportedBreakpointProperties {
-    fn for_exception_breakpoints(self) -> Self {
-        // TODO: we don't yet support conditions for exception breakpoints at the data layer, hence all props are disabled here.
-        Self::empty()
-    }
-}
-#[derive(IntoElement)]
-struct BreakpointOptionsStrip {
-    props: SupportedBreakpointProperties,
-    breakpoint: BreakpointEntry,
-    is_selected: bool,
-    focus_handle: FocusHandle,
-    strip_mode: Option<ActiveBreakpointStripMode>,
-    index: usize,
-}
-
-impl BreakpointOptionsStrip {
-    fn is_toggled(&self, expected_mode: ActiveBreakpointStripMode) -> bool {
-        self.is_selected && self.strip_mode == Some(expected_mode)
-    }
-    fn on_click_callback(
-        &self,
-        mode: ActiveBreakpointStripMode,
-    ) -> impl for<'a> Fn(&ClickEvent, &mut Window, &'a mut App) + use<> {
-        let list = self.breakpoint.weak.clone();
-        let ix = self.index;
-        move |_, window, cx| {
-            list.update(cx, |this, cx| {
-                if this.strip_mode != Some(mode) {
-                    this.set_active_breakpoint_property(mode, window, cx);
-                } else if this.selected_ix == Some(ix) {
-                    this.strip_mode.take();
-                } else {
-                    cx.propagate();
-                }
-            })
-            .ok();
-        }
-    }
-    fn add_border(
-        &self,
-        kind: ActiveBreakpointStripMode,
-        available: bool,
-        window: &Window,
-        cx: &App,
-    ) -> impl Fn(Div) -> Div {
-        move |this: Div| {
-            // Avoid layout shifts in case there's no colored border
-            let this = this.border_2().rounded_sm();
-            if self.is_selected && self.strip_mode == Some(kind) {
-                let theme = cx.theme().colors();
-                if self.focus_handle.is_focused(window) {
-                    this.border_color(theme.border_selected)
-                } else {
-                    this.border_color(theme.border_disabled)
-                }
-            } else if !available {
-                this.border_color(cx.theme().colors().border_disabled)
-            } else {
-                this
+            BreakpointEntryKind::ExceptionBreakpoint(exception_breakpoint) => {
+                exception_breakpoint.render(ix, focus_handle, self.weak.clone())
            }
        }
    }
 }
-impl RenderOnce for BreakpointOptionsStrip {
-    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
-        let id = self.breakpoint.id();
-        let supports_logs = self.props.contains(SupportedBreakpointProperties::LOG);
-        let supports_condition = self
-            .props
-            .contains(SupportedBreakpointProperties::CONDITION);
-        let supports_hit_condition = self
-            .props
-            .contains(SupportedBreakpointProperties::HIT_CONDITION);
-        let has_logs = self.breakpoint.has_log();
-        let has_condition = self.breakpoint.has_condition();
-        let has_hit_condition = self.breakpoint.has_hit_condition();
-        let style_for_toggle = |mode, is_enabled| {
-            if is_enabled && self.strip_mode == Some(mode) && self.is_selected {
-                ui::ButtonStyle::Filled
-            } else {
-                ui::ButtonStyle::Subtle
-            }
-        };
-        let color_for_toggle = |is_enabled| {
-            if is_enabled {
-                ui::Color::Default
-            } else {
-                ui::Color::Muted
-            }
-        };
-
-        h_flex()
-            .gap_1()
-            .child(
-                div().map(self.add_border(ActiveBreakpointStripMode::Log, supports_logs, window, cx))
-                    .child(
-                        IconButton::new(
-                            SharedString::from(format!("{id}-log-toggle")),
-                            IconName::ScrollText,
-                        )
-                        .icon_size(IconSize::XSmall)
-                        .style(style_for_toggle(ActiveBreakpointStripMode::Log, has_logs))
-                        .icon_color(color_for_toggle(has_logs))
-                        .disabled(!supports_logs)
-                        .toggle_state(self.is_toggled(ActiveBreakpointStripMode::Log))
-                        .on_click(self.on_click_callback(ActiveBreakpointStripMode::Log)).tooltip(|window, cx| Tooltip::with_meta("Set Log Message", None, "Set log message to display (instead of stopping) when a breakpoint is hit", window, cx))
-                    )
-                    .when(!has_logs && !self.is_selected, |this| this.invisible()),
-            )
-            .child(
-                div().map(self.add_border(
-                    ActiveBreakpointStripMode::Condition,
-                    supports_condition,
-                    window, cx
-                ))
-                    .child(
-                        IconButton::new(
-                            SharedString::from(format!("{id}-condition-toggle")),
-                            IconName::SplitAlt,
-                        )
-                        .icon_size(IconSize::XSmall)
-                        .style(style_for_toggle(
-                            ActiveBreakpointStripMode::Condition,
-                            has_condition
-                        ))
-                        .icon_color(color_for_toggle(has_condition))
-                        .disabled(!supports_condition)
-                        .toggle_state(self.is_toggled(ActiveBreakpointStripMode::Condition))
-                        .on_click(self.on_click_callback(ActiveBreakpointStripMode::Condition))
-                        .tooltip(|window, cx| Tooltip::with_meta("Set Condition", None, "Set condition to evaluate when a breakpoint is hit. Program execution will stop only when the condition is met", window, cx))
-                    )
-                    .when(!has_condition && !self.is_selected, |this| this.invisible()),
-            )
-            .child(
-                div().map(self.add_border(
-                    ActiveBreakpointStripMode::HitCondition,
-                    supports_hit_condition,window, cx
-                ))
-                    .child(
-                        IconButton::new(
-                            SharedString::from(format!("{id}-hit-condition-toggle")),
-                            IconName::ArrowDown10,
-                        )
-                        .icon_size(IconSize::XSmall)
-                        .style(style_for_toggle(
-                            ActiveBreakpointStripMode::HitCondition,
-                            has_hit_condition,
-                        ))
-                        .icon_color(color_for_toggle(has_hit_condition))
-                        .disabled(!supports_hit_condition)
-                        .toggle_state(self.is_toggled(ActiveBreakpointStripMode::HitCondition))
-                        .on_click(self.on_click_callback(ActiveBreakpointStripMode::HitCondition)).tooltip(|window, cx| Tooltip::with_meta("Set Hit Condition", None, "Set expression that controls how many hits of the breakpoint are ignored.", window, cx))
-                    )
-                    .when(!has_hit_condition && !self.is_selected, |this| {
-                        this.invisible()
-                    }),
-            )
-    }
-}
--- a/crates/debugger_ui/src/session/running/console.rs
+++ b/crates/debugger_ui/src/session/running/console.rs
@@ -114,7 +114,7 @@ impl Console {
    }

    fn is_running(&self, cx: &Context<Self>) -> bool {
-        self.session.read(cx).is_started()
+        self.session.read(cx).is_running()
    }

    fn handle_stack_frame_list_events(
--- a/crates/debugger_ui/src/stack_trace_view.rs
+++ b/crates/debugger_ui/src/stack_trace_view.rs
@@ -4,7 +4,7 @@ use collections::HashMap;
 use dap::StackFrameId;
 use editor::{
    Anchor, Bias, DebugStackFrameLine, Editor, EditorEvent, ExcerptId, ExcerptRange, MultiBuffer,
-    RowHighlightOptions, SelectionEffects, ToPoint, scroll::Autoscroll,
+    RowHighlightOptions, ToPoint, scroll::Autoscroll,
 };
 use gpui::{
    AnyView, App, AppContext, Entity, EventEmitter, Focusable, IntoElement, Render, SharedString,
@@ -99,11 +99,10 @@ impl StackTraceView {
                            if frame_anchor.excerpt_id
                                != editor.selections.newest_anchor().head().excerpt_id
                            {
-                                let effects = SelectionEffects::scroll(
-                                    Autoscroll::center().for_anchor(frame_anchor),
-                                );
+                                let auto_scroll =
+                                    Some(Autoscroll::center().for_anchor(frame_anchor));

-                                editor.change_selections(effects, window, cx, |selections| {
+                                editor.change_selections(auto_scroll, window, cx, |selections| {
                                    let selection_id = selections.new_selection_id();

                                    let selection = Selection {
--- a/crates/debugger_ui/src/tests/dap_logger.rs
+++ b/crates/debugger_ui/src/tests/dap_logger.rs
@@ -37,23 +37,15 @@ async fn test_dap_logger_captures_all_session_rpc_messages(
    .await;

    assert!(
-        log_store.read_with(cx, |log_store, _| !log_store.has_projects()),
-        "log_store shouldn't contain any projects before any projects were created"
+        log_store.read_with(cx, |log_store, _| log_store
+            .contained_session_ids()
+            .is_empty()),
+        "log_store shouldn't contain any session IDs before any sessions were created"
    );

    let project = Project::test(fs, [path!("/project").as_ref()], cx).await;

    let workspace = init_test_workspace(&project, cx).await;
-    assert!(
-        log_store.read_with(cx, |log_store, _| log_store.has_projects()),
-        "log_store shouldn't contain any projects before any projects were created"
-    );
-    assert!(
-        log_store.read_with(cx, |log_store, _| log_store
-            .contained_session_ids(&project.downgrade())
-            .is_empty()),
-        "log_store shouldn't contain any projects before any projects were created"
-    );
    let cx = &mut VisualTestContext::from_window(*workspace, cx);

    // Start a debug session
@@ -62,22 +54,20 @@ async fn test_dap_logger_captures_all_session_rpc_messages(
    let client = session.update(cx, |session, _| session.adapter_client().unwrap());

    assert_eq!(
-        log_store.read_with(cx, |log_store, _| log_store
-            .contained_session_ids(&project.downgrade())
-            .len()),
+        log_store.read_with(cx, |log_store, _| log_store.contained_session_ids().len()),
        1,
    );

    assert!(
        log_store.read_with(cx, |log_store, _| log_store
-            .contained_session_ids(&project.downgrade())
+            .contained_session_ids()
            .contains(&session_id)),
        "log_store should contain the session IDs of the started session"
    );

    assert!(
        !log_store.read_with(cx, |log_store, _| log_store
-            .rpc_messages_for_session_id(&project.downgrade(), session_id)
+            .rpc_messages_for_session_id(session_id)
            .is_empty()),
        "We should have the initialization sequence in the log store"
    );
--- a/crates/debugger_ui/src/tests/new_process_modal.rs
+++ b/crates/debugger_ui/src/tests/new_process_modal.rs
@@ -267,6 +267,7 @@ async fn test_dap_adapter_config_conversion_and_validation(cx: &mut TestAppConte
        "Debugpy",
        "PHP",
        "JavaScript",
+        "Ruby",
        "Delve",
        "GDB",
        "fake-adapter",
--- a/crates/diagnostics/src/diagnostic_renderer.rs
+++ b/crates/diagnostics/src/diagnostic_renderer.rs
@@ -4,6 +4,7 @@ use editor::{
    Anchor, Editor, EditorSnapshot, ToOffset,
    display_map::{BlockContext, BlockPlacement, BlockProperties, BlockStyle},
    hover_popover::diagnostics_markdown_style,
+    scroll::Autoscroll,
 };
 use gpui::{AppContext, Entity, Focusable, WeakEntity};
 use language::{BufferId, Diagnostic, DiagnosticEntry};
@@ -310,7 +311,7 @@ impl DiagnosticBlock {
        let range = range.start.to_offset(&snapshot)..range.end.to_offset(&snapshot);

        editor.unfold_ranges(&[range.start..range.end], true, false, cx);
-        editor.change_selections(Default::default(), window, cx, |s| {
+        editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
            s.select_ranges([range.start..range.start]);
        });
        window.focus(&editor.focus_handle(cx));
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -12,6 +12,7 @@ use diagnostic_renderer::DiagnosticBlock;
 use editor::{
    DEFAULT_MULTIBUFFER_CONTEXT, Editor, EditorEvent, ExcerptRange, MultiBuffer, PathKey,
    display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId},
+    scroll::Autoscroll,
 };
 use futures::future::join_all;
 use gpui::{
@@ -625,7 +626,7 @@ impl ProjectDiagnosticsEditor {
                    if let Some(anchor_range) = anchor_ranges.first() {
                        let range_to_select = anchor_range.start..anchor_range.start;
                        this.editor.update(cx, |editor, cx| {
-                            editor.change_selections(Default::default(), window, cx, |s| {
+                            editor.change_selections(Some(Autoscroll::fit()), window, cx, |s| {
                                s.select_anchor_ranges([range_to_select]);
                            })
                        });
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -61,7 +61,6 @@ parking_lot.workspace = true
 pretty_assertions.workspace = true
 project.workspace = true
 rand.workspace = true
-regex.workspace = true
 rpc.workspace = true
 schemars.workspace = true
 serde.workspace = true
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -388,6 +388,7 @@ actions!(
        RestartLanguageServer,
        RevealInFileManager,
        ReverseLines,
+        RevertFile,
        ReloadFile,
        Rewrap,
        RunFlycheck,
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -37,9 +37,7 @@ pub use block_map::{
 use block_map::{BlockRow, BlockSnapshot};
 use collections::{HashMap, HashSet};
 pub use crease_map::*;
-pub use fold_map::{
-    ChunkRenderer, ChunkRendererContext, ChunkRendererId, Fold, FoldId, FoldPlaceholder, FoldPoint,
-};
+pub use fold_map::{ChunkRenderer, ChunkRendererContext, Fold, FoldId, FoldPlaceholder, FoldPoint};
 use fold_map::{FoldMap, FoldSnapshot};
 use gpui::{App, Context, Entity, Font, HighlightStyle, LineLayout, Pixels, UnderlineStyle};
 pub use inlay_map::Inlay;
@@ -540,7 +538,7 @@ impl DisplayMap {

    pub fn update_fold_widths(
        &mut self,
-        widths: impl IntoIterator<Item = (ChunkRendererId, Pixels)>,
+        widths: impl IntoIterator<Item = (FoldId, Pixels)>,
        cx: &mut Context<Self>,
    ) -> bool {
        let snapshot = self.buffer.read(cx).snapshot(cx);
@@ -968,22 +966,10 @@ impl DisplaySnapshot {
                .and_then(|id| id.style(&editor_style.syntax));

            if let Some(chunk_highlight) = chunk.highlight_style {
-                // For color inlays, blend the color with the editor background
-                let mut processed_highlight = chunk_highlight;
-                if chunk.is_inlay {
-                    if let Some(inlay_color) = chunk_highlight.color {
-                        // Only blend if the color has transparency (alpha < 1.0)
-                        if inlay_color.a < 1.0 {
-                            let blended_color = editor_style.background.blend(inlay_color);
-                            processed_highlight.color = Some(blended_color);
-                        }
-                    }
-                }
-
                if let Some(highlight_style) = highlight_style.as_mut() {
-                    highlight_style.highlight(processed_highlight);
+                    highlight_style.highlight(chunk_highlight);
                } else {
-                    highlight_style = Some(processed_highlight);
+                    highlight_style = Some(chunk_highlight);
                }
            }

--- a/crates/editor/src/display_map/fold_map.rs
+++ b/crates/editor/src/display_map/fold_map.rs
@@ -1,5 +1,3 @@
-use crate::{InlayId, display_map::inlay_map::InlayChunk};
-
 use super::{
    Highlights,
    inlay_map::{InlayBufferRows, InlayChunks, InlayEdit, InlayOffset, InlayPoint, InlaySnapshot},
@@ -277,16 +275,13 @@ impl FoldMapWriter<'_> {

    pub(crate) fn update_fold_widths(
        &mut self,
-        new_widths: impl IntoIterator<Item = (ChunkRendererId, Pixels)>,
+        new_widths: impl IntoIterator<Item = (FoldId, Pixels)>,
    ) -> (FoldSnapshot, Vec<FoldEdit>) {
        let mut edits = Vec::new();
        let inlay_snapshot = self.0.snapshot.inlay_snapshot.clone();
        let buffer = &inlay_snapshot.buffer;

        for (id, new_width) in new_widths {
-            let ChunkRendererId::Fold(id) = id else {
-                continue;
-            };
            if let Some(metadata) = self.0.snapshot.fold_metadata_by_id.get(&id).cloned() {
                if Some(new_width) != metadata.width {
                    let buffer_start = metadata.range.start.to_offset(buffer);
@@ -532,7 +527,7 @@ impl FoldMap {
                                placeholder: Some(TransformPlaceholder {
                                    text: ELLIPSIS,
                                    renderer: ChunkRenderer {
-                                        id: ChunkRendererId::Fold(fold.id),
+                                        id: fold.id,
                                        render: Arc::new(move |cx| {
                                            (fold.placeholder.render)(
                                                fold_id,
@@ -1065,7 +1060,7 @@ impl sum_tree::Summary for TransformSummary {
 }

 #[derive(Copy, Clone, Eq, PartialEq, Debug, Default, Ord, PartialOrd, Hash)]
-pub struct FoldId(pub(super) usize);
+pub struct FoldId(usize);

 impl From<FoldId> for ElementId {
    fn from(val: FoldId) -> Self {
@@ -1270,17 +1265,11 @@ pub struct Chunk<'a> {
    pub renderer: Option<ChunkRenderer>,
 }

-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub enum ChunkRendererId {
-    Fold(FoldId),
-    Inlay(InlayId),
-}
-
 /// A recipe for how the chunk should be presented.
 #[derive(Clone)]
 pub struct ChunkRenderer {
-    /// The id of the renderer associated with this chunk.
-    pub id: ChunkRendererId,
+    /// The id of the fold associated with this chunk.
+    pub id: FoldId,
    /// Creates a custom element to represent this chunk.
    pub render: Arc<dyn Send + Sync + Fn(&mut ChunkRendererContext) -> AnyElement>,
    /// If true, the element is constrained to the shaped width of the text.
@@ -1322,7 +1311,7 @@ impl DerefMut for ChunkRendererContext<'_, '_> {
 pub struct FoldChunks<'a> {
    transform_cursor: Cursor<'a, Transform, (FoldOffset, InlayOffset)>,
    inlay_chunks: InlayChunks<'a>,
-    inlay_chunk: Option<(InlayOffset, InlayChunk<'a>)>,
+    inlay_chunk: Option<(InlayOffset, language::Chunk<'a>)>,
    inlay_offset: InlayOffset,
    output_offset: FoldOffset,
    max_output_offset: FoldOffset,
@@ -1414,8 +1403,7 @@ impl<'a> Iterator for FoldChunks<'a> {
        }

        // Otherwise, take a chunk from the buffer's text.
-        if let Some((buffer_chunk_start, mut inlay_chunk)) = self.inlay_chunk.clone() {
-            let chunk = &mut inlay_chunk.chunk;
+        if let Some((buffer_chunk_start, mut chunk)) = self.inlay_chunk.clone() {
            let buffer_chunk_end = buffer_chunk_start + InlayOffset(chunk.text.len());
            let transform_end = self.transform_cursor.end(&()).1;
            let chunk_end = buffer_chunk_end.min(transform_end);
@@ -1440,7 +1428,7 @@ impl<'a> Iterator for FoldChunks<'a> {
                is_tab: chunk.is_tab,
                is_inlay: chunk.is_inlay,
                underline: chunk.underline,
-                renderer: inlay_chunk.renderer,
+                renderer: None,
            });
        }

--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -1,4 +1,4 @@
-use crate::{ChunkRenderer, HighlightStyles, InlayId};
+use crate::{HighlightStyles, InlayId};
 use collections::BTreeSet;
 use gpui::{Hsla, Rgba};
 use language::{Chunk, Edit, Point, TextSummary};
@@ -8,13 +8,11 @@ use multi_buffer::{
 use std::{
    cmp,
    ops::{Add, AddAssign, Range, Sub, SubAssign},
-    sync::Arc,
 };
 use sum_tree::{Bias, Cursor, SumTree};
 use text::{Patch, Rope};
-use ui::{ActiveTheme, IntoElement as _, ParentElement as _, Styled as _, div};

-use super::{Highlights, custom_highlights::CustomHighlightsChunks, fold_map::ChunkRendererId};
+use super::{Highlights, custom_highlights::CustomHighlightsChunks};

 /// Decides where the [`Inlay`]s should be displayed.
 ///
@@ -254,13 +252,6 @@ pub struct InlayChunks<'a> {
    snapshot: &'a InlaySnapshot,
 }

-#[derive(Clone)]
-pub struct InlayChunk<'a> {
-    pub chunk: Chunk<'a>,
-    /// Whether the inlay should be customly rendered.
-    pub renderer: Option<ChunkRenderer>,
-}
-
 impl InlayChunks<'_> {
    pub fn seek(&mut self, new_range: Range<InlayOffset>) {
        self.transforms.seek(&new_range.start, Bias::Right, &());
@@ -280,7 +271,7 @@ impl InlayChunks<'_> {
 }

 impl<'a> Iterator for InlayChunks<'a> {
-    type Item = InlayChunk<'a>;
+    type Item = Chunk<'a>;

    fn next(&mut self) -> Option<Self::Item> {
        if self.output_offset == self.max_output_offset {
@@ -305,12 +296,9 @@ impl<'a> Iterator for InlayChunks<'a> {

                chunk.text = suffix;
                self.output_offset.0 += prefix.len();
-                InlayChunk {
-                    chunk: Chunk {
-                        text: prefix,
-                        ..chunk.clone()
-                    },
-                    renderer: None,
+                Chunk {
+                    text: prefix,
+                    ..chunk.clone()
                }
            }
            Transform::Inlay(inlay) => {
@@ -325,7 +313,6 @@ impl<'a> Iterator for InlayChunks<'a> {
                    }
                }

-                let mut renderer = None;
                let mut highlight_style = match inlay.id {
                    InlayId::InlineCompletion(_) => {
                        self.highlight_styles.inline_completion.map(|s| {
@@ -338,31 +325,14 @@ impl<'a> Iterator for InlayChunks<'a> {
                    }
                    InlayId::Hint(_) => self.highlight_styles.inlay_hint,
                    InlayId::DebuggerValue(_) => self.highlight_styles.inlay_hint,
-                    InlayId::Color(_) => {
-                        if let Some(color) = inlay.color {
-                            renderer = Some(ChunkRenderer {
-                                id: ChunkRendererId::Inlay(inlay.id),
-                                render: Arc::new(move |cx| {
-                                    div()
-                                        .relative()
-                                        .size_3p5()
-                                        .child(
-                                            div()
-                                                .absolute()
-                                                .right_1()
-                                                .size_3()
-                                                .border_1()
-                                                .border_color(cx.theme().colors().border)
-                                                .bg(color),
-                                        )
-                                        .into_any_element()
-                                }),
-                                constrain_width: false,
-                                measured_width: None,
-                            });
+                    InlayId::Color(_) => match inlay.color {
+                        Some(color) => {
+                            let style = self.highlight_styles.inlay_hint.get_or_insert_default();
+                            style.color = Some(color);
+                            Some(*style)
                        }
-                        self.highlight_styles.inlay_hint
-                    }
+                        None => self.highlight_styles.inlay_hint,
+                    },
                };
                let next_inlay_highlight_endpoint;
                let offset_in_inlay = self.output_offset - self.transforms.start().0;
@@ -400,14 +370,11 @@ impl<'a> Iterator for InlayChunks<'a> {

                self.output_offset.0 += chunk.len();

-                InlayChunk {
-                    chunk: Chunk {
-                        text: chunk,
-                        highlight_style,
-                        is_inlay: true,
-                        ..Chunk::default()
-                    },
-                    renderer,
+                Chunk {
+                    text: chunk,
+                    highlight_style,
+                    is_inlay: true,
+                    ..Default::default()
                }
            }
        };
@@ -1099,7 +1066,7 @@ impl InlaySnapshot {
    #[cfg(test)]
    pub fn text(&self) -> String {
        self.chunks(Default::default()..self.len(), false, Highlights::default())
-            .map(|chunk| chunk.chunk.text)
+            .map(|chunk| chunk.text)
            .collect()
    }

@@ -1737,7 +1704,7 @@ mod tests {
                            ..Highlights::default()
                        },
                    )
-                    .map(|chunk| chunk.chunk.text)
+                    .map(|chunk| chunk.text)
                    .collect::<String>();
                assert_eq!(
                    actual_text,
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -378,6 +378,7 @@ pub enum SnippetSortOrder {
 }

 #[derive(Clone, Default, Serialize, Deserialize, JsonSchema)]
+#[schemars(deny_unknown_fields)]
 pub struct EditorSettingsContent {
    /// Whether the cursor blinks in the editor.
    ///
--- a/crates/editor/src/editor_settings_controls.rs
+++ b/crates/editor/src/editor_settings_controls.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use gpui::{App, FontFeatures, FontWeight};
 use project::project_settings::{InlineBlameSettings, ProjectSettings};
 use settings::{EditableSettingControl, Settings};
-use theme::{FontFamilyCache, FontFamilyName, ThemeSettings};
+use theme::{FontFamilyCache, ThemeSettings};
 use ui::{
    CheckboxWithLabel, ContextMenu, DropdownMenu, NumericStepper, SettingsContainer, SettingsGroup,
    prelude::*,
@@ -75,7 +75,7 @@ impl EditableSettingControl for BufferFontFamilyControl {
        value: Self::Value,
        _cx: &App,
    ) {
-        settings.buffer_font_family = Some(FontFamilyName(value.into()));
+        settings.buffer_font_family = Some(value.to_string());
    }
 }

--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -12,8 +12,8 @@ use crate::{
    ToggleFold,
    code_context_menus::{CodeActionsMenu, MENU_ASIDE_MAX_WIDTH, MENU_ASIDE_MIN_WIDTH, MENU_GAP},
    display_map::{
-        Block, BlockContext, BlockStyle, ChunkRendererId, DisplaySnapshot, EditorMargins,
-        HighlightKey, HighlightedChunk, ToDisplayPoint,
+        Block, BlockContext, BlockStyle, DisplaySnapshot, EditorMargins, FoldId, HighlightKey,
+        HighlightedChunk, ToDisplayPoint,
    },
    editor_settings::{
        CurrentLineHighlight, DocumentColorsRenderMode, DoubleClickInMultibuffer, Minimap,
@@ -7119,7 +7119,7 @@ pub(crate) struct LineWithInvisibles {
 enum LineFragment {
    Text(ShapedLine),
    Element {
-        id: ChunkRendererId,
+        id: FoldId,
        element: Option<AnyElement>,
        size: Size<Pixels>,
        len: usize,
@@ -8297,7 +8297,7 @@ impl Element for EditorElement {
                        window,
                        cx,
                    );
-                    let new_renrerer_widths = line_layouts
+                    let new_fold_widths = line_layouts
                        .iter()
                        .flat_map(|layout| &layout.fragments)
                        .filter_map(|fragment| {
@@ -8308,7 +8308,7 @@ impl Element for EditorElement {
                            }
                        });
                    if self.editor.update(cx, |editor, cx| {
-                        editor.update_renderer_widths(new_renrerer_widths, cx)
+                        editor.update_fold_widths(new_fold_widths, cx)
                    }) {
                        // If the fold widths have changed, we need to prepaint
                        // the element again to account for any changes in
@@ -10051,7 +10051,7 @@ fn compute_auto_height_layout(
 mod tests {
    use super::*;
    use crate::{
-        Editor, MultiBuffer, SelectionEffects,
+        Editor, MultiBuffer,
        display_map::{BlockPlacement, BlockProperties},
        editor_tests::{init_test, update_test_language_settings},
    };
@@ -10176,7 +10176,7 @@ mod tests {
        window
            .update(cx, |editor, window, cx| {
                editor.cursor_shape = CursorShape::Block;
-                editor.change_selections(SelectionEffects::no_scroll(), window, cx, |s| {
+                editor.change_selections(None, window, cx, |s| {
                    s.select_ranges([
                        Point::new(0, 0)..Point::new(1, 0),
                        Point::new(3, 2)..Point::new(3, 3),
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -1257,7 +1257,7 @@ mod tests {
            let snapshot = editor.buffer().read(cx).snapshot(cx);
            let anchor_range = snapshot.anchor_before(selection_range.start)
                ..snapshot.anchor_after(selection_range.end);
-            editor.change_selections(Default::default(), window, cx, |s| {
+            editor.change_selections(Some(crate::Autoscroll::fit()), window, cx, |s| {
                s.set_pending_anchor_range(anchor_range, crate::SelectMode::Character)
            });
        });
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -3,7 +3,7 @@ use crate::{
    EditorSnapshot, GlobalDiagnosticRenderer, Hover,
    display_map::{InlayOffset, ToDisplayPoint, invisibles::is_invisible},
    hover_links::{InlayHighlight, RangeInEditor},
-    scroll::ScrollAmount,
+    scroll::{Autoscroll, ScrollAmount},
 };
 use anyhow::Context as _;
 use gpui::{
@@ -648,7 +648,7 @@ pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
            ..Default::default()
        },
        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: { cx.theme().players().local().selection },
        heading: StyleRefinement::default()
            .font_weight(FontWeight::BOLD)
            .text_base()
@@ -697,7 +697,7 @@ pub fn diagnostics_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
            ..Default::default()
        },
        syntax: cx.theme().syntax().clone(),
-        selection_background_color: cx.theme().colors().element_selection_background,
+        selection_background_color: { cx.theme().players().local().selection },
        height_is_multiple_of_line_height: true,
        heading: StyleRefinement::default()
            .font_weight(FontWeight::BOLD)
@@ -746,7 +746,7 @@ pub fn open_markdown_url(link: SharedString, window: &mut Window, cx: &mut App)
                        };
                        editor.update_in(cx, |editor, window, cx| {
                            editor.change_selections(
-                                Default::default(),
+                                Some(Autoscroll::fit()),
                                window,
                                cx,
                                |selections| {
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down10-icon lucide-arrow-down-1-0"><path d="m3 16 4 4 4-4"/><path d="M7 20V4"/><path d="M17 10V4h-2"/><path d="M15 10h4"/><rect x="15" y="14" width="4" height="6" ry="2"/></svg>`