WIP jumping into diagnostics

2024-12-19 21:21:17 -07:00
517 changed files with 9828 additions and 22200 deletions
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -7,7 +7,7 @@ runs:
    - name: Install Rust
      shell: bash -euxo pipefail {0}
      run: |
-        cargo install cargo-nextest --locked
+        cargo install cargo-nextest

    - name: Install Node
      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,7 @@ on:
  pull_request:
    branches:
      - "**"
+  merge_group:

 concurrency:
  # Allow only one workflow per any non-`main` branch.
@@ -23,6 +24,23 @@ env:
  RUSTFLAGS: "-D warnings"

 jobs:
+  check_docs_only:
+    runs-on: ubuntu-latest
+    outputs:
+      docs_only: ${{ steps.check_changes.outputs.docs_only }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Check for non-docs changes
+        id: check_changes
+        run: |
+          if git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | grep -qvE '^docs/'; then
+            echo "docs_only=false" >> $GITHUB_OUTPUT
+          else
+            echo "docs_only=true" >> $GITHUB_OUTPUT
+          fi
+
  migration_checks:
    name: Check Postgres and Protobuf migrations, mergability
    if: github.repository_owner == 'zed-industries'
@@ -76,10 +94,6 @@ jobs:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

-      # To support writing comments that they will certainly be revisited.
-      - name: Check for todo! and FIXME comments
-        run: script/check-todos
-
      - name: Run style checks
        uses: ./.github/actions/check_style

@@ -95,6 +109,7 @@ jobs:
    runs-on:
      - self-hosted
      - test
+    needs: check_docs_only
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -102,29 +117,35 @@ jobs:
          clean: false

      - name: cargo clippy
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: ./script/clippy

      - name: Check unused dependencies
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        uses: bnjbvr/cargo-machete@main

      - name: Check licenses
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: |
          script/check-licenses
          script/generate-licenses /tmp/zed_licenses_output

      - name: Check for new vulnerable dependencies
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && needs.check_docs_only.outputs.docs_only == 'false'
        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4
        with:
          license-check: false

      - name: Run tests
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        uses: ./.github/actions/run_tests

      - name: Build collab
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: cargo build -p collab

      - name: Build other binaries and features
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: |
          cargo build --workspace --bins --all-features
          cargo check -p gpui --features "macos-blade"
@@ -138,6 +159,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - buildjet-16vcpu-ubuntu-2204
+    needs: check_docs_only
    steps:
      - name: Add Rust to the PATH
        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
@@ -148,21 +170,26 @@ jobs:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2
+        if: needs.check_docs_only.outputs.docs_only == 'false'
+        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "buildjet"

      - name: Install Linux dependencies
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: ./script/linux

      - name: cargo clippy
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: ./script/clippy

      - name: Run tests
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        uses: ./.github/actions/run_tests

      - name: Build other binaries and features
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: |
          cargo build -p zed
          cargo check -p workspace
@@ -173,6 +200,7 @@ jobs:
    if: github.repository_owner == 'zed-industries'
    runs-on:
      - buildjet-16vcpu-ubuntu-2204
+    needs: check_docs_only
    steps:
      - name: Add Rust to the PATH
        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
@@ -183,15 +211,18 @@ jobs:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2
+        if: needs.check_docs_only.outputs.docs_only == 'false'
+        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "buildjet"

      - name: Install Clang & Mold
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: ./script/remote-server && ./script/install-mold 2.34.0

      - name: Build Remote Server
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: cargo build -p remote_server

  # todo(windows): Actually run the tests
@@ -200,6 +231,7 @@ jobs:
    name: (Windows) Run Clippy and tests
    if: github.repository_owner == 'zed-industries'
    runs-on: hosted-windows-1
+    needs: check_docs_only
    steps:
      # more info here:- https://github.com/rust-lang/cargo/issues/13020
      - name: Enable longer pathnames for git
@@ -210,20 +242,23 @@ jobs:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2
+        if: needs.check_docs_only.outputs.docs_only == 'false'
+        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "github"

      - name: cargo clippy
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        # Windows can't run shell scripts, so we need to use `cargo xtask`.
        run: cargo xtask clippy

      - name: Build Zed
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: cargo build

  bundle-mac:
-    timeout-minutes: 120
+    timeout-minutes: 60
    name: Create a macOS bundle
    runs-on:
      - self-hosted
@@ -275,6 +310,9 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+      - name: Generate license file
+        run: script/generate-licenses
+
      - name: Create macOS app bundle
        run: script/bundle-mac

@@ -312,9 +350,9 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

-  bundle-linux-x86_x64:
+  bundle-linux:
    timeout-minutes: 60
-    name: Linux x86_x64 release bundle
+    name: Create a Linux bundle
    runs-on:
      - buildjet-16vcpu-ubuntu-2004
    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
@@ -322,8 +360,6 @@ jobs:
    env:
      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -362,7 +398,7 @@ jobs:

  bundle-linux-aarch64: # this runs on ubuntu22.04
    timeout-minutes: 60
-    name: Linux arm64 release bundle
+    name: Create arm64 Linux bundle
    runs-on:
      - buildjet-16vcpu-ubuntu-2204-arm
    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
@@ -370,8 +406,6 @@ jobs:
    env:
      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
-      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
-      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -411,7 +445,7 @@ jobs:
  auto-release-preview:
    name: Auto release preview
    if: ${{ startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre') }}
-    needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64]
+    needs: [bundle-mac, bundle-linux, bundle-linux-aarch64]
    runs-on:
      - self-hosted
      - bundle
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -44,7 +44,7 @@ jobs:
      - name: Install cargo nextest
        shell: bash -euxo pipefail {0}
        run: |
-          cargo install cargo-nextest --locked
+          cargo install cargo-nextest

      - name: Limit target directory size
        shell: bash -euxo pipefail {0}
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,6 +7,7 @@ on:
  push:
    branches:
      - main
+  merge_group:

 jobs:
  check_formatting:
--- a/.github/workflows/publish_extension_cli.yml
+++ b/.github/workflows/publish_extension_cli.yml
@@ -21,7 +21,7 @@ jobs:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2
+        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "github"
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -86,6 +86,9 @@ jobs:
          echo "Publishing version: ${version} on release channel nightly"
          echo "nightly" > crates/zed/RELEASE_CHANNEL

+      - name: Generate license file
+        run: script/generate-licenses
+
      - name: Create macOS app bundle
        run: script/bundle-mac

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,6 @@ members = [
    "crates/feedback",
    "crates/file_finder",
    "crates/file_icons",
-    "crates/fireworks",
    "crates/fs",
    "crates/fsevent",
    "crates/fuzzy",
@@ -69,7 +68,6 @@ members = [
    "crates/livekit_client",
    "crates/livekit_client_macos",
    "crates/livekit_server",
-    "crates/lmstudio",
    "crates/lsp",
    "crates/markdown",
    "crates/markdown_preview",
@@ -151,9 +149,12 @@ members = [
    # Extensions
    #

+    "extensions/astro",
+    "extensions/clojure",
    "extensions/csharp",
    "extensions/deno",
    "extensions/elixir",
+    "extensions/elm",
    "extensions/emmet",
    "extensions/erlang",
    "extensions/glsl",
@@ -224,7 +225,6 @@ feature_flags = { path = "crates/feature_flags" }
 feedback = { path = "crates/feedback" }
 file_finder = { path = "crates/file_finder" }
 file_icons = { path = "crates/file_icons" }
-fireworks = { path = "crates/fireworks" }
 fs = { path = "crates/fs" }
 fsevent = { path = "crates/fsevent" }
 fuzzy = { path = "crates/fuzzy" }
@@ -256,7 +256,6 @@ languages = { path = "crates/languages" }
 livekit_client = { path = "crates/livekit_client" }
 livekit_client_macos = { path = "crates/livekit_client_macos" }
 livekit_server = { path = "crates/livekit_server" }
-lmstudio = { path = "crates/lmstudio" }
 lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
@@ -338,7 +337,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = "0.24"
+alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "91d034ff8b53867143c005acfaa14609147c9a2c" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -346,7 +345,7 @@ ashpd = { version = "0.10", default-features = false, features = ["async-std"]}
 async-compat = "0.2.1"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = "0.1"
-async-fs = "2.1"
+async-fs = "1.6"
 async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "82d00a04211cf4e1236029aa03e6b6ce2a74c553" }
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
@@ -356,9 +355,9 @@ async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 base64 = "0.22"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "091a8401033847bb9b6ace3fcf70448d069621c5" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "091a8401033847bb9b6ace3fcf70448d069621c5" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "091a8401033847bb9b6ace3fcf70448d069621c5" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "099555282605c7c4cca9e66a8f40148298347f80" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "099555282605c7c4cca9e66a8f40148298347f80" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "099555282605c7c4cca9e66a8f40148298347f80" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
@@ -393,33 +392,33 @@ hyper = "0.14"
 http = "1.1"
 ignore = "0.4.22"
 image = "0.25.1"
-indexmap = { version = "2.7.0", features = ["serde"] }
+indexmap = { version = "1.6.2", features = ["serde"] }
 indoc = "2"
-itertools = "0.14.0"
+itertools = "0.13.0"
 jsonwebtoken = "9.3"
-jupyter-protocol = { version = "0.6.0" }
-jupyter-websocket-client = { version = "0.9.0" }
+jupyter-protocol = { version = "0.5.0" }
+jupyter-websocket-client = { version = "0.8.0" }
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
-livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev="060964da10574cd9bf06463a53bf6e0769c5c45e", features = ["dispatcher", "services-dispatcher", "rustls-tls-native-roots"], default-features = false }
+livekit = { git = "https://github.com/zed-industries/rust-sdks", rev="799f10133d93ba2a88642cd480d01ec4da53408c", features = ["dispatcher", "services-dispatcher", "rustls-tls-native-roots"], default-features = false }
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 markup5ever_rcdom = "0.3.0"
 nanoid = "0.4"
-nbformat = { version = "0.10.0" }
+nbformat = { version = "0.9.0" }
 nix = "0.29"
 num-format = "0.4.4"
+once_cell = "1.19.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 pathdiff = "0.2"
-pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
-pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
-pet-pixi = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
-pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
-pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0" }
+pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
+pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
+pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
+pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
+pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
+pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = { version = "1.3.0", features = ["unstable"] }
 profiling = "1"
@@ -440,15 +439,14 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f
    "stream",
 ] }
 rsa = "0.9.6"
-runtimelib = { version = "0.25.0", default-features = false, features = [
+runtimelib = { version = "0.24.0", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rustc-demangle = "0.1.23"
 rust-embed = { version = "8.4", features = ["include-exclude"] }
-rustc-hash = "2.1.0"
 rustls = "0.21.12"
 rustls-native-certs = "0.8.0"
-schemars = { version = "0.8", features = ["impl_json_schema", "indexmap2"] }
+schemars = { version = "0.8", features = ["impl_json_schema"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_derive = { version = "1.0", features = ["deserialize_in_place"] }
@@ -465,10 +463,10 @@ signal-hook = "0.3.17"
 similar = "1.3"
 simplelog = "0.12.2"
 smallvec = { version = "1.6", features = ["union"] }
-smol = "2.0"
+smol = "1.2"
 sqlformat = "0.2"
 strsim = "0.11"
-strum = { version = "0.26.0", features = ["derive"] }
+strum = { version = "0.25.0", features = ["derive"] }
 subtle = "2.5.0"
 sys-locale = "0.3.1"
 sysinfo = "0.31.0"
@@ -494,7 +492,7 @@ tree-sitter-css = "0.23"
 tree-sitter-elixir = "0.3"
 tree-sitter-embedded-template = "0.23.0"
 tree-sitter-go = "0.23"
-tree-sitter-go-mod = { git = "https://github.com/camdencheek/tree-sitter-go-mod", rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c", package = "tree-sitter-gomod" }
+tree-sitter-go-mod = { git = "https://github.com/zed-industries/tree-sitter-go-mod", rev = "a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca", package = "tree-sitter-gomod" }
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
 tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
 tree-sitter-diff = "0.1.0"
@@ -527,7 +525,12 @@ wasmtime-wasi = "24"
 which = "6.0.0"
 wit-component = "0.201"
 zstd = "0.11"
-metal = "0.30"
+# Custom metal-rs is only needed for "macos-blade" feature of GPUI
+#TODO: switch to crates once these are published:
+# - https://github.com/gfx-rs/metal-rs/pull/335
+# - https://github.com/gfx-rs/metal-rs/pull/336
+# - https://github.com/gfx-rs/metal-rs/pull/337
+metal = { git = "https://github.com/gfx-rs/metal-rs", rev = "ef768ff9d742ae6a0f4e83ddc8031264e7d460c4" }

 [workspace.dependencies.async-stripe]
 git = "https://github.com/zed-industries/async-stripe"
@@ -616,7 +619,6 @@ image_viewer = { codegen-units = 1 }
 inline_completion_button = { codegen-units = 1 }
 install_cli = { codegen-units = 1 }
 journal = { codegen-units = 1 }
-lmstudio = { codegen-units = 1 }
 menu = { codegen-units = 1 }
 notifications = { codegen-units = 1 }
 ollama = { codegen-units = 1 }
--- a/assets/icons/ai_lm_studio.svg
+++ b/assets/icons/ai_lm_studio.svg
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Artboard</title>
-    <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect id="Rectangle" stroke="black" stroke-width="1.26" x="1.22" y="1.22" width="13.56" height="13.56" rx="2.66"></rect>
-        <g id="Group-7" transform="translate(2.44, 3.03)" fill="black">
-            <g id="Group" transform="translate(0.37, 0)">
-                <rect id="Rectangle" opacity="0.487118676" x="1.9" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-                <rect id="Rectangle" opacity="0.845098586" x="0" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-            </g>
-            <g id="Group-2" transform="translate(2.88, 1.7)">
-                <rect id="Rectangle" opacity="0.487118676" x="1.9" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-                <rect id="Rectangle" opacity="0.845098586" x="0" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-            </g>
-            <g id="Group-3" transform="translate(1.53, 3.38)">
-                <rect id="Rectangle" opacity="0.487118676" x="1.92" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-                <rect id="Rectangle" opacity="0.845098586" x="0" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-            </g>
-            <g id="Group-4" transform="translate(0, 5.09)">
-                <rect id="Rectangle" opacity="0.487118676" x="1.9" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-                <rect id="Rectangle" opacity="0.845098586" x="0" y="0" width="6.28" height="1.43" rx="0.71"></rect>
-            </g>
-            <g id="Group-5" transform="translate(1.64, 6.77)">
-                <rect id="Rectangle" opacity="0.487118676" x="1.94" y="0" width="5.46" height="1.43" rx="0.71"></rect>
-                <rect id="Rectangle" opacity="0.845098586" x="0" y="0" width="5.46" height="1.43" rx="0.71"></rect>
-            </g>
-            <g id="Group-6" transform="translate(4.24, 8.47)">
-                <rect id="Rectangle" opacity="0.487118676" x="2.11" y="0" width="4.56" height="1.43" rx="0.71"></rect>
-                <rect id="Rectangle" opacity="0.845098586" x="0" y="0" width="4.56" height="1.43" rx="0.71"></rect>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/assets/icons/copy.svg
+++ b/assets/icons/copy.svg
@@ -1,4 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M18.4286 9H10.5714C9.70355 9 9 9.70355 9 10.5714V18.4286C9 19.2964 9.70355 20 10.5714 20H18.4286C19.2964 20 20 19.2964 20 18.4286V10.5714C20 9.70355 19.2964 9 18.4286 9Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.57143 15C4.70714 15 4 14.2929 4 13.4286V5.57143C4 4.70714 4.70714 4 5.57143 4H13.4286C14.2929 4 15 4.70714 15 5.57143" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<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-copy"><rect width="14" height="14" x="8" y="8" rx="2" ry="2"/><path d="M4 16c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h10c1.1 0 2 .9 2 2"/></svg>
--- a/assets/icons/file_icons/css.svg
+++ b/assets/icons/file_icons/css.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12.58 2H2.5V12.08C2.5 12.5892 2.70229 13.0776 3.06235 13.4376C3.42242 13.7977 3.91078 14 4.42 14H12.58C13.0892 14 13.5776 13.7977 13.9376 13.4376C14.2977 13.0776 14.5 12.5892 14.5 12.08V3.92C14.5 3.41078 14.2977 2.92242 13.9376 2.56235C13.5776 2.20229 13.0892 2 12.58 2ZM3.358 11.6285C3.34615 12.6668 3.96437 13.2311 4.96636 13.232H4.96621C6.06429 13.2456 6.70951 12.4798 6.63088 11.3867H5.48085C5.4899 11.601 5.47243 11.8974 5.36026 12.0313C5.27992 12.1441 5.16183 12.2005 5.00645 12.2005C4.67402 12.1952 4.50788 11.9534 4.50788 11.4753V9.19488C4.50788 8.94247 4.54407 8.75168 4.61645 8.62283C4.73423 8.38524 5.17961 8.3584 5.34825 8.58663C5.47804 8.71252 5.48974 9.04683 5.48101 9.26757H6.63104C6.66099 8.70582 6.53494 8.10381 6.20079 7.80913C5.65853 7.23521 4.37403 7.26765 3.82039 7.80102C3.51213 8.07495 3.358 8.47525 3.358 9.00159V11.6285ZM7.04116 11.3867C7.01043 12.4573 7.50713 13.2473 8.61739 13.232L8.61723 13.2317C10.1571 13.2967 10.5874 11.592 9.96023 10.4759C9.74995 10.1097 9.16994 9.80702 8.71379 9.62981C8.36155 9.46772 8.21038 9.3086 8.20711 8.92079C8.20711 8.55559 8.35983 8.37291 8.66543 8.37291C8.83688 8.37291 8.95357 8.42939 9.01519 8.54217C9.10317 8.6754 9.12454 9.0409 9.11565 9.26742H10.1612C10.1866 8.71627 10.0554 8.11739 9.75509 7.81303C9.26822 7.22257 7.99791 7.24909 7.5115 7.82504C7.0109 8.29179 6.97783 9.4437 7.3346 9.96848C7.49278 10.205 7.75143 10.409 8.1107 10.5809C8.15897 10.6051 8.21552 10.6314 8.27633 10.6598C8.53247 10.7792 8.86416 10.9338 8.97119 11.1046C9.16073 11.3241 9.13593 11.8913 9.00333 12.0877C8.9336 12.1952 8.81285 12.2489 8.64141 12.2489C8.25703 12.2785 8.09666 11.8534 8.12677 11.3867H7.04116ZM10.5474 11.3867C10.5167 12.4573 11.0134 13.2473 12.1236 13.232L12.1235 13.2317C13.6634 13.2967 14.0936 11.592 13.4665 10.4759C13.2562 10.1097 12.6762 9.80702 12.2201 9.62981C11.8678 9.46772 11.7166 9.3086 11.7134 8.92079C11.7134 8.55559 11.8661 8.37291 12.1717 8.37291C12.3431 8.37291 12.4598 8.42939 12.5214 8.54217C12.6094 8.6754 12.6308 9.0409 12.6219 9.26742H13.6674C13.6928 8.71627 13.5617 8.11739 13.2614 7.81303C12.7745 7.22257 11.5042 7.24909 11.0178 7.82504C10.5172 8.29179 10.4841 9.4437 10.8409 9.96848C10.999 10.205 11.2577 10.409 11.617 10.5809C11.6652 10.6051 11.7218 10.6314 11.7826 10.6598C12.0387 10.7792 12.3704 10.9338 12.4775 11.1046C12.667 11.3241 12.6422 11.8913 12.5096 12.0877C12.4399 12.1952 12.3191 12.2489 12.1477 12.2489C11.7633 12.2785 11.6029 11.8534 11.633 11.3867H10.5474Z" fill="black"/>
+    <path d="M11.7633 4.2078H4.23674L4.3551 5.5189H10.1429L9.99592 6.87645H6.20408L6.33877 8.16255H9.86939L9.66122 9.92379L8 10.3275L6.3102 9.92021L6.20408 8.86633H4.7102L4.87755 10.7955L8 11.6457L11.0694 10.8812L11.7633 4.2078ZM2 2H14L12.9061 12.7818L7.98775 14L3.09388 12.7818L2 2Z" fill="black"/>
 </svg>
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -210,5 +210,208 @@
    "zsh_profile": "terminal",
    "zshenv": "terminal",
    "zshrc": "terminal"
+  },
+  "types": {
+    "astro": {
+      "icon": "icons/file_icons/astro.svg"
+    },
+    "audio": {
+      "icon": "icons/file_icons/audio.svg"
+    },
+    "bun": {
+      "icon": "icons/file_icons/bun.svg"
+    },
+    "c": {
+      "icon": "icons/file_icons/c.svg"
+    },
+    "code": {
+      "icon": "icons/file_icons/code.svg"
+    },
+    "coffeescript": {
+      "icon": "icons/file_icons/coffeescript.svg"
+    },
+    "collapsed_chevron": {
+      "icon": "icons/file_icons/chevron_right.svg"
+    },
+    "collapsed_folder": {
+      "icon": "icons/file_icons/folder.svg"
+    },
+    "cpp": {
+      "icon": "icons/file_icons/cpp.svg"
+    },
+    "css": {
+      "icon": "icons/file_icons/css.svg"
+    },
+    "dart": {
+      "icon": "icons/file_icons/dart.svg"
+    },
+    "default": {
+      "icon": "icons/file_icons/file.svg"
+    },
+    "diff": {
+      "icon": "icons/file_icons/diff.svg"
+    },
+    "docker": {
+      "icon": "icons/file_icons/docker.svg"
+    },
+    "document": {
+      "icon": "icons/file_icons/book.svg"
+    },
+    "elixir": {
+      "icon": "icons/file_icons/elixir.svg"
+    },
+    "elm": {
+      "icon": "icons/file_icons/elm.svg"
+    },
+    "erlang": {
+      "icon": "icons/file_icons/erlang.svg"
+    },
+    "eslint": {
+      "icon": "icons/file_icons/eslint.svg"
+    },
+    "expanded_chevron": {
+      "icon": "icons/file_icons/chevron_down.svg"
+    },
+    "expanded_folder": {
+      "icon": "icons/file_icons/folder_open.svg"
+    },
+    "font": {
+      "icon": "icons/file_icons/font.svg"
+    },
+    "fsharp": {
+      "icon": "icons/file_icons/fsharp.svg"
+    },
+    "gleam": {
+      "icon": "icons/file_icons/gleam.svg"
+    },
+    "go": {
+      "icon": "icons/file_icons/go.svg"
+    },
+    "graphql": {
+      "icon": "icons/file_icons/graphql.svg"
+    },
+    "haskell": {
+      "icon": "icons/file_icons/haskell.svg"
+    },
+    "hcl": {
+      "icon": "icons/file_icons/hcl.svg"
+    },
+    "heroku": {
+      "icon": "icons/file_icons/heroku.svg"
+    },
+    "image": {
+      "icon": "icons/file_icons/image.svg"
+    },
+    "java": {
+      "icon": "icons/file_icons/java.svg"
+    },
+    "javascript": {
+      "icon": "icons/file_icons/javascript.svg"
+    },
+    "julia": {
+      "icon": "icons/file_icons/julia.svg"
+    },
+    "kotlin": {
+      "icon": "icons/file_icons/kotlin.svg"
+    },
+    "lock": {
+      "icon": "icons/file_icons/lock.svg"
+    },
+    "log": {
+      "icon": "icons/file_icons/info.svg"
+    },
+    "lua": {
+      "icon": "icons/file_icons/lua.svg"
+    },
+    "metal": {
+      "icon": "icons/file_icons/metal.svg"
+    },
+    "nim": {
+      "icon": "icons/file_icons/nim.svg"
+    },
+    "nix": {
+      "icon": "icons/file_icons/nix.svg"
+    },
+    "ocaml": {
+      "icon": "icons/file_icons/ocaml.svg"
+    },
+    "phoenix": {
+      "icon": "icons/file_icons/phoenix.svg"
+    },
+    "php": {
+      "icon": "icons/file_icons/php.svg"
+    },
+    "prettier": {
+      "icon": "icons/file_icons/prettier.svg"
+    },
+    "prisma": {
+      "icon": "icons/file_icons/prisma.svg"
+    },
+    "python": {
+      "icon": "icons/file_icons/python.svg"
+    },
+    "r": {
+      "icon": "icons/file_icons/r.svg"
+    },
+    "react": {
+      "icon": "icons/file_icons/react.svg"
+    },
+    "roc": {
+      "icon": "icons/file_icons/roc.svg"
+    },
+    "ruby": {
+      "icon": "icons/file_icons/ruby.svg"
+    },
+    "rust": {
+      "icon": "icons/file_icons/rust.svg"
+    },
+    "sass": {
+      "icon": "icons/file_icons/sass.svg"
+    },
+    "scala": {
+      "icon": "icons/file_icons/scala.svg"
+    },
+    "settings": {
+      "icon": "icons/file_icons/settings.svg"
+    },
+    "storage": {
+      "icon": "icons/file_icons/database.svg"
+    },
+    "swift": {
+      "icon": "icons/file_icons/swift.svg"
+    },
+    "tcl": {
+      "icon": "icons/file_icons/tcl.svg"
+    },
+    "template": {
+      "icon": "icons/file_icons/html.svg"
+    },
+    "terminal": {
+      "icon": "icons/file_icons/terminal.svg"
+    },
+    "terraform": {
+      "icon": "icons/file_icons/terraform.svg"
+    },
+    "toml": {
+      "icon": "icons/file_icons/toml.svg"
+    },
+    "typescript": {
+      "icon": "icons/file_icons/typescript.svg"
+    },
+    "v": {
+      "icon": "icons/file_icons/v.svg"
+    },
+    "vcs": {
+      "icon": "icons/file_icons/git.svg"
+    },
+    "video": {
+      "icon": "icons/file_icons/video.svg"
+    },
+    "vue": {
+      "icon": "icons/file_icons/vue.svg"
+    },
+    "zig": {
+      "icon": "icons/file_icons/zig.svg"
+    }
  }
 }
--- a/assets/icons/file_search.svg
+++ b/assets/icons/file_search.svg
@@ -1,5 +1 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.2345 20.1C5.38772 20.373 5.60794 20.5998 5.87313 20.7577C6.13832 20.9157 6.43919 20.9992 6.74562 21H17.25C17.7141 21 18.1592 20.8104 18.4874 20.4728C18.8156 20.1352 19 19.6774 19 19.2V7.5L14.625 3H6.75C6.28587 3 5.84075 3.18964 5.51256 3.52721C5.18437 3.86477 5 4.32261 5 4.8V6.5" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10 16.8182L8.5 15.3182" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6 15.8182C7.65685 15.8182 9 14.475 9 12.8182C9 11.1613 7.65685 9.81818 6 9.81818C4.34315 9.81818 3 11.1613 3 12.8182C3 14.475 4.34315 15.8182 6 15.8182Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<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-file-search"><path d="M14 2v4a2 2 0 0 0 2 2h4"/><path d="M4.268 21a2 2 0 0 0 1.727 1H18a2 2 0 0 0 2-2V7l-5-5H6a2 2 0 0 0-2 2v3"/><path d="m9 18-1.5-1.5"/><circle cx="5" cy="14" r="3"/></svg>
--- a/assets/icons/filter.svg
+++ b/assets/icons/filter.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.9416 2.99643C13.08 2.79636 12.9568 2.5 12.7352 2.5H3.26475C3.04317 2.5 2.91999 2.79636 3.0584 2.99643L6.04033 7.30646C6.24713 7.60535 6.35981 7.97674 6.35981 8.3596C6.35981 9.18422 6.35981 11.4639 6.35981 12.891C6.35981 13.2285 6.59643 13.5 6.88831 13.5H9.11168C9.40357 13.5 9.64019 13.2285 9.64019 12.891C9.64019 11.4639 9.64019 9.18422 9.64019 8.3596C9.64019 7.97674 9.75289 7.60535 9.95969 7.30646L12.9416 2.99643Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.6749 2.40608C11.8058 2.24239 11.6893 1.99991 11.4796 1.99991H2.51996C2.31033 1.99991 2.19379 2.24239 2.32474 2.40608L5.14583 5.93246C5.34148 6.17701 5.44808 6.48087 5.44808 6.79412C5.44808 7.46881 5.44808 10.334 5.44808 11.5016C5.44808 11.7778 5.67194 11.9999 5.94808 11.9999H8.05153C8.32767 11.9999 8.55153 11.7778 8.55153 11.5016C8.55153 10.334 8.55153 7.46881 8.55153 6.79412C8.55153 6.48087 8.65815 6.17701 8.8538 5.93246L11.6749 2.40608Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/magnifying_glass.svg
+++ b/assets/icons/magnifying_glass.svg
@@ -1,3 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 13L10.4138 10.4138M3 7.31034C3 4.92981 4.92981 3 7.31034 3C9.6909 3 11.6207 4.92981 11.6207 7.31034C11.6207 9.6909 9.6909 11.6207 7.31034 11.6207C4.92981 11.6207 3 9.6909 3 7.31034Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 12L9.41379 9.41379M2 6.31034C2 3.92981 3.92981 2 6.31034 2C8.6909 2 10.6207 3.92981 10.6207 6.31034C10.6207 8.6909 8.6909 10.6207 6.31034 10.6207C3.92981 10.6207 2 8.6909 2 6.31034Z" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
--- a/assets/icons/person_circle.svg
+++ b/assets/icons/person_circle.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-circle-user"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="10" r="3"/><path d="M7 20.662V19a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v1.662"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -172,10 +172,9 @@
    "context": "AssistantPanel",
    "bindings": {
      "ctrl-k c": "assistant::CopyCode",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-g": "search::SelectNextMatch",
      "ctrl-shift-g": "search::SelectPrevMatch",
-      "ctrl-alt-/": "assistant::ToggleModelSelector",
+      "ctrl-shift-m": "assistant::ToggleModelSelector",
      "ctrl-k h": "assistant::DeployHistory",
      "ctrl-k l": "assistant::DeployPromptLibrary",
      "ctrl-n": "assistant::NewContext"
@@ -261,11 +260,9 @@
      "ctrl-f4": "pane::CloseActiveItem",
      "alt-ctrl-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
      "alt-ctrl-shift-w": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
-      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "ctrl-shift-f": "pane::DeploySearch",
+      "ctrl-shift-f": "project_search::ToggleFocus",
      "ctrl-alt-g": "search::SelectNextMatch",
      "ctrl-alt-shift-g": "search::SelectPrevMatch",
      "ctrl-alt-shift-h": "search::ToggleReplace",
@@ -378,7 +375,6 @@
      // Change the default action on `menu::Confirm` by setting the parameter
      // "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
      "alt-ctrl-o": "projects::OpenRecent",
-      "alt-ctrl-shift-o": "projects::OpenRemote",
      "alt-ctrl-shift-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
      "ctrl-s": "workspace::Save",
@@ -412,7 +408,7 @@
      "ctrl-shift-p": "command_palette::Toggle",
      "f1": "command_palette::Toggle",
      "ctrl-shift-m": "diagnostics::Deploy",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
+      "ctrl-shift-e": "pane::RevealInProjectPanel",
      "ctrl-shift-b": "outline_panel::ToggleFocus",
      "ctrl-?": "assistant::ToggleFocus",
      "ctrl-alt-s": "workspace::SaveAll",
@@ -436,13 +432,6 @@
      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
    }
  },
-  {
-    "context": "ApplicationMenu",
-    "bindings": {
-      "left": ["app_menu::NavigateApplicationMenuInDirection", "Left"],
-      "right": ["app_menu::NavigateApplicationMenuInDirection", "Right"]
-    }
-  },
  // Bindings from Sublime Text
  {
    "context": "Editor",
@@ -533,7 +522,6 @@
      "alt-enter": "editor::OpenExcerpts",
      "shift-enter": "editor::ExpandExcerpts",
      "ctrl-k enter": "editor::OpenExcerptsSplit",
-      "ctrl-shift-e": "pane::RevealInProjectPanel",
      "ctrl-f8": "editor::GoToHunk",
      "ctrl-shift-f8": "editor::GoToPrevHunk",
      "ctrl-enter": "assistant::InlineAssist"
@@ -567,41 +555,11 @@
      "alt-enter": "editor::Newline"
    }
  },
-  {
-    "context": "AssistantPanel2",
-    "bindings": {
-      "ctrl-n": "assistant2::NewThread",
-      "ctrl-shift-h": "assistant2::OpenHistory",
-      "ctrl-alt-/": "assistant2::ToggleModelSelector",
-      "ctrl-shift-a": "assistant2::ToggleContextPicker",
-      "ctrl-alt-e": "assistant2::RemoveAllContext"
-    }
-  },
-  {
-    "context": "MessageEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "assistant2::Chat"
-    }
-  },
-  {
-    "context": "ContextStrip",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "assistant2::FocusUp",
-      "right": "assistant2::FocusRight",
-      "left": "assistant2::FocusLeft",
-      "down": "assistant2::FocusDown",
-      "backspace": "assistant2::RemoveFocusedContext",
-      "enter": "assistant2::AcceptSuggestedContext"
-    }
-  },
  {
    "context": "PromptEditor",
    "bindings": {
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
-      "ctrl-]": "assistant::CycleNextInlineAssist",
-      "ctrl-alt-e": "assistant2::RemoveAllContext"
+      "ctrl-]": "assistant::CycleNextInlineAssist"
    }
  },
  {
@@ -644,6 +602,7 @@
      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFileManager",
      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
      "shift-up": "menu::SelectPrev",
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -37,7 +37,6 @@
      "cmd-h": "zed::Hide",
      "alt-cmd-h": "zed::HideOthers",
      "cmd-m": "zed::Minimize",
-      "fn-f": "zed::ToggleFullScreen",
      "ctrl-cmd-f": "zed::ToggleFullScreen"
    }
  },
@@ -197,10 +196,9 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-k c": "assistant::CopyCode",
-      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
      "cmd-shift-g": "search::SelectPrevMatch",
-      "cmd-alt-/": "assistant::ToggleModelSelector",
+      "cmd-shift-m": "assistant::ToggleModelSelector",
      "cmd-k h": "assistant::DeployHistory",
      "cmd-k l": "assistant::DeployPromptLibrary",
      "cmd-n": "assistant::NewContext"
@@ -227,9 +225,8 @@
    "bindings": {
      "cmd-n": "assistant2::NewThread",
      "cmd-shift-h": "assistant2::OpenHistory",
-      "cmd-alt-/": "assistant2::ToggleModelSelector",
-      "cmd-shift-a": "assistant2::ToggleContextPicker",
-      "cmd-alt-e": "assistant2::RemoveAllContext"
+      "cmd-shift-m": "assistant2::ToggleModelSelector",
+      "cmd-shift-a": "assistant2::ToggleContextPicker"
    }
  },
  {
@@ -239,18 +236,6 @@
      "enter": "assistant2::Chat"
    }
  },
-  {
-    "context": "ContextStrip",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "assistant2::FocusUp",
-      "right": "assistant2::FocusRight",
-      "left": "assistant2::FocusLeft",
-      "down": "assistant2::FocusDown",
-      "backspace": "assistant2::RemoveFocusedContext",
-      "enter": "assistant2::AcceptSuggestedContext"
-    }
-  },
  {
    "context": "PromptLibrary",
    "use_key_equivalents": true,
@@ -342,8 +327,6 @@
      "cmd-w": "pane::CloseActiveItem",
      "alt-cmd-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
      "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes",
-      "cmd-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
-      "cmd-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "cmd-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
      "cmd-k cmd-w": ["pane::CloseAllItems", { "close_pinned": false }],
      "cmd-f": "project_search::ToggleFocus",
@@ -449,7 +432,7 @@
      "ctrl--": "pane::GoBack",
      "ctrl-shift--": "pane::GoForward",
      "cmd-shift-t": "pane::ReopenClosedItem",
-      "cmd-shift-f": "pane::DeploySearch"
+      "cmd-shift-f": "project_search::ToggleFocus"
    }
  },
  {
@@ -465,6 +448,7 @@
      "cmd-s": "workspace::Save",
      "cmd-k s": "workspace::SaveWithoutFormat",
      "cmd-shift-s": "workspace::SaveAs",
+      "cmd-n": "workspace::NewFile",
      "cmd-shift-n": "workspace::NewWindow",
      "ctrl-`": "terminal_panel::ToggleFocus",
      "cmd-1": ["workspace::ActivatePane", 0],
@@ -490,7 +474,7 @@
      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "cmd-shift-p": "command_palette::Toggle",
      "cmd-shift-m": "diagnostics::Deploy",
-      "cmd-shift-e": "project_panel::ToggleFocus",
+      "cmd-shift-e": "pane::RevealInProjectPanel",
      "cmd-shift-b": "outline_panel::ToggleFocus",
      "cmd-?": "assistant::ToggleFocus",
      "cmd-alt-s": "workspace::SaveAll",
@@ -511,12 +495,11 @@
    "context": "Workspace && !Terminal",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-n": "workspace::NewFile",
      "cmd-shift-r": "task::Spawn",
      "cmd-alt-r": "task::Rerun",
      "ctrl-alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
      // also possible to spawn tasks by name:
-      // "foo-bar": ["task::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
+      // "foo-bar": ["task_name::Spawn", { "task_name": "MyTask", "reveal_target": "dock" }]
    }
  },
  // Bindings from Sublime Text
@@ -610,7 +593,6 @@
      "alt-enter": "editor::OpenExcerpts",
      "shift-enter": "editor::ExpandExcerpts",
      "cmd-k enter": "editor::OpenExcerptsSplit",
-      "cmd-shift-e": "pane::RevealInProjectPanel",
      "cmd-f8": "editor::GoToHunk",
      "cmd-shift-f8": "editor::GoToPrevHunk",
      "ctrl-enter": "assistant::InlineAssist"
@@ -629,8 +611,6 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-a": "assistant2::ToggleContextPicker",
-      "cmd-alt-/": "assistant2::ToggleModelSelector",
-      "cmd-alt-e": "assistant2::RemoveAllContext",
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
      "ctrl-]": "assistant::CycleNextInlineAssist"
    }
@@ -681,6 +661,7 @@
      "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-cmd-r": "project_panel::RevealInFileManager",
      "ctrl-shift-enter": "project_panel::OpenWithSystem",
+      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "cmd-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
@@ -695,38 +676,6 @@
      "space": "project_panel::Open"
    }
  },
-  {
-    "context": "GitPanel && !CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git_panel::Close"
-    }
-  },
-  {
-    "context": "GitPanel && ChangesList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "up": "menu::SelectPrev",
-      "down": "menu::SelectNext",
-      "cmd-up": "menu::SelectFirst",
-      "cmd-down": "menu::SelectLast",
-      "enter": "menu::Confirm",
-      "space": "git::ToggleStaged",
-      "cmd-shift-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll",
-      "alt-down": "git_panel::FocusEditor"
-    }
-  },
-  {
-    "context": "GitPanel && CommitEditor > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "alt-up": "git_panel::FocusChanges",
-      "escape": "git_panel::FocusChanges",
-      "cmd-enter": "git::CommitChanges",
-      "cmd-alt-enter": "git::CommitAllChanges"
-    }
-  },
  {
    "context": "CollabPanel && not_editing",
    "use_key_equivalents": true,
@@ -812,7 +761,6 @@
      "cmd-v": "terminal::Paste",
      "cmd-a": "editor::SelectAll",
      "cmd-k": "terminal::Clear",
-      "cmd-n": "workspace::NewTerminal",
      "ctrl-enter": "assistant::InlineAssist",
      // Some nice conveniences
      "cmd-backspace": ["terminal::SendText", "\u0015"],
@@ -851,8 +799,7 @@
    "context": "RateCompletionModal",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-shift-enter": "zeta::ThumbsUpActiveCompletion",
-      "cmd-shift-backspace": "zeta::ThumbsDownActiveCompletion",
+      "cmd-enter": "zeta::ThumbsUp",
      "shift-down": "zeta::NextEdit",
      "shift-up": "zeta::PreviousEdit",
      "right": "zeta::PreviewCompletion"
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -3,86 +3,56 @@
 // To see the default key bindings run `zed: open default keymap`
 // from the command palette.
 [
-  {
-    "bindings": {
-      "ctrl-g": "menu::Cancel"
-    }
-  },
  {
    "context": "Editor",
    "bindings": {
      "ctrl-g": "editor::Cancel",
-      "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer
-      "alt-g g": "go_to_line::Toggle", // goto-line
-      "alt-g alt-g": "go_to_line::Toggle", // goto-line
+      "ctrl-shift-g": "go_to_line::Toggle",
      //"ctrl-space": "editor::SetMark",
-      "ctrl-f": "editor::MoveRight", // forward-char
-      "ctrl-b": "editor::MoveLeft", // backward-char
-      "ctrl-n": "editor::MoveDown", // next-line
-      "ctrl-p": "editor::MoveUp", // previous-line
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "alt-f": "editor::MoveToNextSubwordEnd", // forward-word
-      "alt-b": "editor::MoveToPreviousSubwordStart", // backward-word
-      "alt-u": "editor::ConvertToUpperCase", // upcase-word
-      "alt-l": "editor::ConvertToLowerCase", // downcase-word
-      "alt-c": "editor::ConvertToUpperCamelCase", // capitalize-word
-      "ctrl-t": "editor::Transpose", // transpose-chars
-      "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
-      "ctrl-x ctrl-;": "editor::ToggleComments",
-      "alt-.": "editor::GoToDefinition", // xref-find-definitions
-      "alt-,": "pane::GoBack", // xref-pop-marker-stack
-      "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
-      "ctrl-d": "editor::Delete", // delete-char
-      "alt-d": "editor::DeleteToNextWordEnd", // kill-word
-      "ctrl-k": "editor::KillRingCut", // kill-line
-      "ctrl-w": "editor::Cut", // kill-region
-      "alt-w": "editor::Copy", // kill-ring-save
-      "ctrl-y": "editor::KillRingYank", // yank
-      "ctrl-_": "editor::Undo", // undo
-      "ctrl-/": "editor::Undo", // undo
-      "ctrl-x u": "editor::Undo", // undo
-      "ctrl-v": "editor::MovePageDown", // scroll-up
-      "alt-v": "editor::MovePageUp", // scroll-down
-      "ctrl-x [": "editor::MoveToBeginning", // beginning-of-buffer
-      "ctrl-x ]": "editor::MoveToEnd", // end-of-buffer
-      "alt-<": "editor::MoveToBeginning", // beginning-of-buffer
-      "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
+      "ctrl-x u": "editor::Undo",
+      "ctrl-x ctrl-u": "editor::Redo",
+      "ctrl-f": "editor::MoveRight",
+      "ctrl-b": "editor::MoveLeft",
+      "ctrl-n": "editor::MoveDown",
+      "ctrl-p": "editor::MoveUp",
+      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
+      "alt-f": "editor::MoveToNextSubwordEnd",
+      "alt-b": "editor::MoveToPreviousSubwordStart",
+      "ctrl-d": "editor::Delete",
+      "alt-d": "editor::DeleteToNextWordEnd",
+      "ctrl-k": "editor::CutToEndOfLine",
+      "ctrl-w": "editor::Cut",
+      "alt-w": "editor::Copy",
+      "ctrl-y": "editor::Paste",
+      "ctrl-_": "editor::Undo",
+      "ctrl-v": "editor::MovePageDown",
+      "alt-v": "editor::MovePageUp",
+      "ctrl-x ]": "editor::MoveToEnd",
+      "ctrl-x [": "editor::MoveToBeginning",
+      "ctrl-l": "editor::ScrollCursorCenterTopBottom",
+      "ctrl-s": "buffer_search::Deploy",
+      "ctrl-x ctrl-f": "file_finder::Toggle",
+      "ctrl-shift-r": "editor::Rename"
    }
  },
  {
    "context": "Workspace",
    "bindings": {
-      "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal
-      "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame
-      "ctrl-x 5 2": "workspace::NewWindow", // make-frame-command
-      "ctrl-x o": "workspace::ActivateNextPane", // other-window
-      "ctrl-x k": "pane::CloseActiveItem", // kill-buffer
-      "ctrl-x 0": "pane::CloseActiveItem", // delete-window
-      "ctrl-x 1": "pane::CloseInactiveItems", // delete-other-windows
-      "ctrl-x 2": "pane::SplitDown", // split-window-below
-      "ctrl-x 3": "pane::SplitRight", // split-window-right
-      "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
-      "ctrl-x ctrl-s": "workspace::Save", // save-buffer
-      "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
-    }
-  },
-  {
-    // Workaround to enable using emacs in the Zed terminal.
-    // Unbind so Zed ignores these keys and lets emacs handle them.
-    "context": "Terminal",
-    "bindings": {
-      "ctrl-x ctrl-c": null, // save-buffers-kill-terminal
-      "ctrl-x ctrl-f": null, // find-file
-      "ctrl-x ctrl-s": null, // save-buffer
-      "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null // save-some-buffers
+      "ctrl-x k": "pane::CloseActiveItem",
+      "ctrl-x ctrl-c": "workspace::CloseWindow",
+      "ctrl-x o": "workspace::ActivateNextPane",
+      "ctrl-x b": "tab_switcher::Toggle",
+      "ctrl-x 0": "pane::CloseActiveItem",
+      "ctrl-x 1": "pane::CloseInactiveItems",
+      "ctrl-x 2": "pane::SplitVertical",
+      "ctrl-x ctrl-f": "file_finder::Toggle",
+      "ctrl-x ctrl-s": "workspace::Save",
+      "ctrl-x ctrl-w": "workspace::SaveAs",
+      "ctrl-x s": "workspace::SaveAll",
+      "shift shift": "file_finder::Toggle"
    }
  },
  {
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -3,86 +3,56 @@
 // To see the default key bindings run `zed: open default keymap`
 // from the command palette.
 [
-  {
-    "bindings": {
-      "ctrl-g": "menu::Cancel"
-    }
-  },
  {
    "context": "Editor",
    "bindings": {
      "ctrl-g": "editor::Cancel",
-      "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer
-      "alt-g g": "go_to_line::Toggle", // goto-line
-      "alt-g alt-g": "go_to_line::Toggle", // goto-line
+      "ctrl-shift-g": "go_to_line::Toggle",
      //"ctrl-space": "editor::SetMark",
-      "ctrl-f": "editor::MoveRight", // forward-char
-      "ctrl-b": "editor::MoveLeft", // backward-char
-      "ctrl-n": "editor::MoveDown", // next-line
-      "ctrl-p": "editor::MoveUp", // previous-line
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
-      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
-      "alt-f": "editor::MoveToNextSubwordEnd", // forward-word
-      "alt-b": "editor::MoveToPreviousSubwordStart", // backward-word
-      "alt-u": "editor::ConvertToUpperCase", // upcase-word
-      "alt-l": "editor::ConvertToLowerCase", // downcase-word
-      "alt-c": "editor::ConvertToUpperCamelCase", // capitalize-word
-      "ctrl-t": "editor::Transpose", // transpose-chars
-      "alt-;": ["editor::ToggleComments", { "advance_downwards": false }],
-      "ctrl-x ctrl-;": "editor::ToggleComments",
-      "alt-.": "editor::GoToDefinition", // xref-find-definitions
-      "alt-,": "pane::GoBack", // xref-pop-marker-stack
-      "ctrl-x h": "editor::SelectAll", // mark-whole-buffer
-      "ctrl-d": "editor::Delete", // delete-char
-      "alt-d": "editor::DeleteToNextWordEnd", // kill-word
-      "ctrl-k": "editor::KillRingCut", // kill-line
-      "ctrl-w": "editor::Cut", // kill-region
-      "alt-w": "editor::Copy", // kill-ring-save
-      "ctrl-y": "editor::KillRingYank", // yank
-      "ctrl-_": "editor::Undo", // undo
-      "ctrl-/": "editor::Undo", // undo
-      "ctrl-x u": "editor::Undo", // undo
-      "ctrl-v": "editor::MovePageDown", // scroll-up
-      "alt-v": "editor::MovePageUp", // scroll-down
-      "ctrl-x [": "editor::MoveToBeginning", // beginning-of-buffer
-      "ctrl-x ]": "editor::MoveToEnd", // end-of-buffer
-      "alt-<": "editor::MoveToBeginning", // beginning-of-buffer
-      "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
+      "ctrl-x u": "editor::Undo",
+      "ctrl-x ctrl-u": "editor::Redo",
+      "ctrl-f": "editor::MoveRight",
+      "ctrl-b": "editor::MoveLeft",
+      "ctrl-n": "editor::MoveDown",
+      "ctrl-p": "editor::MoveUp",
+      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
+      "alt-f": "editor::MoveToNextSubwordEnd",
+      "alt-b": "editor::MoveToPreviousSubwordStart",
+      "ctrl-d": "editor::Delete",
+      "alt-d": "editor::DeleteToNextWordEnd",
+      "ctrl-k": "editor::CutToEndOfLine",
+      "ctrl-w": "editor::Cut",
+      "alt-w": "editor::Copy",
+      "ctrl-y": "editor::Paste",
+      "ctrl-_": "editor::Undo",
+      "ctrl-v": "editor::MovePageDown",
+      "alt-v": "editor::MovePageUp",
+      "ctrl-x ]": "editor::MoveToEnd",
+      "ctrl-x [": "editor::MoveToBeginning",
+      "ctrl-l": "editor::ScrollCursorCenterTopBottom",
+      "ctrl-s": "buffer_search::Deploy",
+      "ctrl-x ctrl-f": "file_finder::Toggle",
+      "ctrl-shift-r": "editor::Rename"
    }
  },
  {
    "context": "Workspace",
    "bindings": {
-      "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal
-      "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame
-      "ctrl-x 5 2": "workspace::NewWindow", // make-frame-command
-      "ctrl-x o": "workspace::ActivateNextPane", // other-window
-      "ctrl-x k": "pane::CloseActiveItem", // kill-buffer
-      "ctrl-x 0": "pane::CloseActiveItem", // delete-window
-      "ctrl-x 1": "pane::CloseInactiveItems", // delete-other-windows
-      "ctrl-x 2": "pane::SplitDown", // split-window-below
-      "ctrl-x 3": "pane::SplitRight", // split-window-right
-      "ctrl-x ctrl-f": "file_finder::Toggle", // find-file
-      "ctrl-x ctrl-s": "workspace::Save", // save-buffer
-      "ctrl-x ctrl-w": "workspace::SaveAs", // write-file
-      "ctrl-x s": "workspace::SaveAll" // save-some-buffers
-    }
-  },
-  {
-    // Workaround to enable using emacs in the Zed terminal.
-    // Unbind so Zed ignores these keys and lets emacs handle them.
-    "context": "Terminal",
-    "bindings": {
-      "ctrl-x ctrl-c": null, // save-buffers-kill-terminal
-      "ctrl-x ctrl-f": null, // find-file
-      "ctrl-x ctrl-s": null, // save-buffer
-      "ctrl-x ctrl-w": null, // write-file
-      "ctrl-x s": null // save-some-buffers
+      "ctrl-x k": "pane::CloseActiveItem",
+      "ctrl-x ctrl-c": "workspace::CloseWindow",
+      "ctrl-x o": "workspace::ActivateNextPane",
+      "ctrl-x b": "tab_switcher::Toggle",
+      "ctrl-x 0": "pane::CloseActiveItem",
+      "ctrl-x 1": "pane::CloseInactiveItems",
+      "ctrl-x 2": "pane::SplitVertical",
+      "ctrl-x ctrl-f": "file_finder::Toggle",
+      "ctrl-x ctrl-s": "workspace::Save",
+      "ctrl-x ctrl-w": "workspace::SaveAs",
+      "ctrl-x s": "workspace::SaveAll",
+      "shift shift": "file_finder::Toggle"
    }
  },
  {
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -24,8 +24,8 @@
      "ctrl-g": ["editor::SelectNext", { "replace_newest": false }],
      "ctrl-cmd-g": ["editor::SelectPrevious", { "replace_newest": false }],
      "cmd-/": ["editor::ToggleComments", { "advance_downwards": true }],
-      "alt-up": "editor::SelectLargerSyntaxNode",
-      "alt-down": "editor::SelectSmallerSyntaxNode",
+      "cmd-up": "editor::SelectLargerSyntaxNode",
+      "cmd-down": "editor::SelectSmallerSyntaxNode",
      "shift-alt-up": "editor::MoveLineUp",
      "shift-alt-down": "editor::MoveLineDown",
      "cmd-alt-l": "editor::Format",
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -110,7 +110,7 @@
      "g y": "editor::GoToTypeDefinition",
      "g shift-i": "editor::GoToImplementation",
      "g x": "editor::OpenUrl",
-      "g f": "editor::OpenSelectedFilename",
+      "g f": "editor::OpenFile",
      "g n": "vim::SelectNextMatch",
      "g shift-n": "vim::SelectPreviousMatch",
      "g l": "vim::SelectNext",
@@ -197,7 +197,6 @@
      "d": ["vim::PushOperator", "Delete"],
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
-      "g shift-j": "vim::JoinLinesNoWhitespace",
      "y": ["vim::PushOperator", "Yank"],
      "shift-y": "vim::YankLine",
      "i": "vim::InsertBefore",
@@ -260,7 +259,7 @@
      "shift-d": "vim::VisualDeleteLine",
      "shift-x": "vim::VisualDeleteLine",
      "y": "vim::VisualYank",
-      "shift-y": "vim::VisualYankLine",
+      "shift-y": "vim::VisualYank",
      "p": "vim::Paste",
      "shift-p": ["vim::Paste", { "preserveClipboard": true }],
      "s": "vim::Substitute",
@@ -279,7 +278,6 @@
      "g shift-i": "vim::VisualInsertFirstNonWhiteSpace",
      "g shift-a": "vim::VisualInsertEndOfLine",
      "shift-j": "vim::JoinLines",
-      "g shift-j": "vim::JoinLinesNoWhitespace",
      "r": ["vim::PushOperator", "Replace"],
      "ctrl-c": ["vim::SwitchMode", "Normal"],
      "escape": ["vim::SwitchMode", "Normal"],
@@ -391,16 +389,12 @@
    "bindings": {
      "w": "vim::Word",
      "shift-w": ["vim::Word", { "ignorePunctuation": true }],
-      // Subword TextObject
-      // "w": "vim::Subword",
-      // "shift-w": ["vim::Subword", { "ignorePunctuation": true }],
      "t": "vim::Tag",
      "s": "vim::Sentence",
      "p": "vim::Paragraph",
      "'": "vim::Quotes",
      "`": "vim::BackQuotes",
      "\"": "vim::DoubleQuotes",
-      "q": "vim::AnyQuotes",
      "|": "vim::VerticalBars",
      "(": "vim::Parentheses",
      ")": "vim::Parentheses",
--- a/assets/prompts/suggest_edits.hbs
+++ b/assets/prompts/suggest_edits.hbs
@@ -13,15 +13,15 @@ You must describe the change using the following XML structure:
        - <description> (optional) - An arbitrarily-long comment that describes the purpose
          of this edit.
        - <old_text> (optional) - An excerpt from the file's current contents that uniquely
-          identifies a range within the file where the edit should occur. Required for all operations
-          except `create`.
+          identifies a range within the file where the edit should occur. If this tag is not
+          specified, then the entire file will be used as the range.
        - <new_text> (required) - The new text to insert into the file.
        - <operation> (required) - The type of change that should occur at the given range
          of the file. Must be one of the following values:
            - `update`: Replaces the entire range with the new text.
            - `insert_before`: Inserts the new text before the range.
            - `insert_after`: Inserts new text after the range.
-            - `create`: Creates or overwrites a file with the given path and the new text.
+            - `create`: Creates a new file with the given path and the new text.
            - `delete`: Deletes the specified range from the file.

 <guidelines>
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -256,13 +256,8 @@
    "search_results": true,
    // Whether to show selected symbol occurrences in the scrollbar.
    "selected_symbol": true,
-    // Which diagnostic indicators to show in the scrollbar:
-    //  - "none" or false: do not show diagnostics
-    //  - "error": show only errors
-    //  - "warning": show only errors and warnings
-    //  - "information": show only errors, warnings, and information
-    //  - "all" or true: show all diagnostics
-    "diagnostics": "all",
+    // Whether to show diagnostic indicators in the scrollbar.
+    "diagnostics": true,
    /// Forcefully enable or disable the scrollbar for each axis
    "axes": {
      /// When false, forcefully disables the horizontal scrollbar. Otherwise, obey other settings.
@@ -372,8 +367,6 @@
    "default_width": 240,
    // Where to dock the project panel. Can be 'left' or 'right'.
    "dock": "left",
-    // Spacing between worktree entries in the project panel. Can be 'comfortable' or 'standard'.
-    "entry_spacing": "comfortable",
    // Whether to show file icons in the project panel.
    "file_icons": true,
    // Whether to show folder icons or chevrons for directories in the project panel.
@@ -503,17 +496,7 @@
    // Where to the git panel. Can be 'left' or 'right'.
    "dock": "left",
    // Default width of the git panel.
-    "default_width": 360,
-    // Style of the git status indicator in the panel.
-    //
-    // Default: icon
-    "status_style": "icon",
-    "scrollbar": {
-      // When to show the scrollbar in the git panel.
-      //
-      // Default: inherits editor scrollbar settings
-      "show": null
-    }
+    "default_width": 360
  },
  "message_editor": {
    // Whether to automatically replace emoji shortcodes with emoji characters.
@@ -758,7 +741,7 @@
      // Delay is restarted with every cursor movement.
      // "delay_ms": 600
      //
-      // Whether or not to display the git commit summary on the same line.
+      // Whether or not do display the git commit summary on the same line.
      // "show_commit_summary": false
      //
      // The minimum column number to show the inline blame information at
@@ -984,17 +967,11 @@
    },
    "C": {
      "format_on_save": "off",
-      "use_on_type_format": false,
-      "prettier": {
-        "allowed": false
-      }
+      "use_on_type_format": false
    },
    "C++": {
      "format_on_save": "off",
-      "use_on_type_format": false,
-      "prettier": {
-        "allowed": false
-      }
+      "use_on_type_format": false
    },
    "CSS": {
      "prettier": {
@@ -1126,9 +1103,6 @@
      "prettier": {
        "allowed": true
      }
-    },
-    "Zig": {
-      "language_servers": ["zls", "..."]
    }
  },
  // Different settings for specific language models.
@@ -1146,9 +1120,6 @@
    "openai": {
      "version": "1",
      "api_url": "https://api.openai.com/v1"
-    },
-    "lmstudio": {
-      "api_url": "http://localhost:1234/api/v0"
    }
  },
  // Zed's Prettier integration settings.
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -30,8 +30,6 @@ pub enum Model {
    #[default]
    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
    Claude3_5Sonnet,
-    #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
-    Claude3_5Haiku,
    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
    Claude3Opus,
    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-latest")]
@@ -50,8 +48,6 @@ pub enum Model {
        cache_configuration: Option<AnthropicModelCacheConfiguration>,
        max_output_tokens: Option<u32>,
        default_temperature: Option<f32>,
-        #[serde(default)]
-        extra_beta_headers: Vec<String>,
    },
 }

@@ -59,8 +55,6 @@ impl Model {
    pub fn from_id(id: &str) -> Result<Self> {
        if id.starts_with("claude-3-5-sonnet") {
            Ok(Self::Claude3_5Sonnet)
-        } else if id.starts_with("claude-3-5-haiku") {
-            Ok(Self::Claude3_5Haiku)
        } else if id.starts_with("claude-3-opus") {
            Ok(Self::Claude3Opus)
        } else if id.starts_with("claude-3-sonnet") {
@@ -75,7 +69,6 @@ impl Model {
    pub fn id(&self) -> &str {
        match self {
            Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Model::Claude3_5Haiku => "claude-3-5-haiku-latest",
            Model::Claude3Opus => "claude-3-opus-latest",
            Model::Claude3Sonnet => "claude-3-sonnet-latest",
            Model::Claude3Haiku => "claude-3-haiku-latest",
@@ -86,7 +79,6 @@ impl Model {
    pub fn display_name(&self) -> &str {
        match self {
            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
-            Self::Claude3_5Haiku => "Claude 3.5 Haiku",
            Self::Claude3Opus => "Claude 3 Opus",
            Self::Claude3Sonnet => "Claude 3 Sonnet",
            Self::Claude3Haiku => "Claude 3 Haiku",
@@ -98,13 +90,11 @@ impl Model {

    pub fn cache_configuration(&self) -> Option<AnthropicModelCacheConfiguration> {
        match self {
-            Self::Claude3_5Sonnet | Self::Claude3_5Haiku | Self::Claude3Haiku => {
-                Some(AnthropicModelCacheConfiguration {
-                    min_total_token: 2_048,
-                    should_speculate: true,
-                    max_cache_anchors: 4,
-                })
-            }
+            Self::Claude3_5Sonnet | Self::Claude3Haiku => Some(AnthropicModelCacheConfiguration {
+                min_total_token: 2_048,
+                should_speculate: true,
+                max_cache_anchors: 4,
+            }),
            Self::Custom {
                cache_configuration,
                ..
@@ -116,7 +106,6 @@ impl Model {
    pub fn max_token_count(&self) -> usize {
        match self {
            Self::Claude3_5Sonnet
-            | Self::Claude3_5Haiku
            | Self::Claude3Opus
            | Self::Claude3Sonnet
            | Self::Claude3Haiku => 200_000,
@@ -127,7 +116,7 @@ impl Model {
    pub fn max_output_tokens(&self) -> u32 {
        match self {
            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => 4_096,
-            Self::Claude3_5Sonnet | Self::Claude3_5Haiku => 8_192,
+            Self::Claude3_5Sonnet => 8_192,
            Self::Custom {
                max_output_tokens, ..
            } => max_output_tokens.unwrap_or(4_096),
@@ -137,7 +126,6 @@ impl Model {
    pub fn default_temperature(&self) -> f32 {
        match self {
            Self::Claude3_5Sonnet
-            | Self::Claude3_5Haiku
            | Self::Claude3Opus
            | Self::Claude3Sonnet
            | Self::Claude3Haiku => 1.0,
@@ -148,24 +136,6 @@ impl Model {
        }
    }

-    pub fn beta_headers(&self) -> String {
-        let mut headers = vec!["prompt-caching-2024-07-31".to_string()];
-
-        if let Self::Custom {
-            extra_beta_headers, ..
-        } = self
-        {
-            headers.extend(
-                extra_beta_headers
-                    .iter()
-                    .filter(|header| !header.trim().is_empty())
-                    .cloned(),
-            );
-        }
-
-        headers.join(",")
-    }
-
    pub fn tool_model_id(&self) -> &str {
        if let Self::Custom {
            tool_override: Some(tool_override),
@@ -186,12 +156,11 @@ pub async fn complete(
    request: Request,
 ) -> Result<Response, AnthropicError> {
    let uri = format!("{api_url}/v1/messages");
-    let model = Model::from_id(&request.model)?;
    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
        .header("Anthropic-Version", "2023-06-01")
-        .header("Anthropic-Beta", model.beta_headers())
+        .header("Anthropic-Beta", "prompt-caching-2024-07-31")
        .header("X-Api-Key", api_key)
        .header("Content-Type", "application/json");

@@ -302,12 +271,14 @@ pub async fn stream_completion_with_rate_limit_info(
        stream: true,
    };
    let uri = format!("{api_url}/v1/messages");
-    let model = Model::from_id(&request.base.model)?;
    let request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
        .header("Anthropic-Version", "2023-06-01")
-        .header("Anthropic-Beta", model.beta_headers())
+        .header(
+            "Anthropic-Beta",
+            "tools-2024-04-04,prompt-caching-2024-07-31,max-tokens-3-5-sonnet-2024-07-15",
+        )
        .header("X-Api-Key", api_key)
        .header("Content-Type", "application/json");
    let serialized_request =
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -52,7 +52,6 @@ language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
 language_models.workspace = true
-lmstudio = { workspace = true, features = ["schemars"] }
 log.workspace = true
 lsp.workspace = true
 markdown.workspace = true
@@ -80,7 +79,6 @@ similar.workspace = true
 smallvec.workspace = true
 smol.workspace = true
 strum.workspace = true
-telemetry.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
 terminal_view.workspace = true
@@ -105,7 +103,6 @@ pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
 serde_json_lenient.workspace = true
-terminal_view = { workspace = true, features = ["test-support"] }
 text = { workspace = true, features = ["test-support"] }
 tree-sitter-md.workspace = true
 unindent.workspace = true
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -26,7 +26,7 @@ pub use context::*;
 pub use context_store::*;
 use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
-use gpui::impl_internal_actions;
+use gpui::impl_actions;
 use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
 pub(crate) use inline_assistant::*;
 use language_model::{
@@ -37,7 +37,7 @@ pub use prompts::PromptBuilder;
 use prompts::PromptLoadingParams;
 use semantic_index::{CloudEmbeddingProvider, SemanticDb};
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsStore};
+use settings::{update_settings_file, Settings, SettingsStore};
 use slash_command::search_command::SearchSlashCommandFeatureFlag;
 use slash_command::{
    auto_command, cargo_workspace_command, default_command, delta_command, diagnostics_command,
@@ -74,13 +74,13 @@ actions!(
    ]
 );

-#[derive(PartialEq, Clone)]
+#[derive(PartialEq, Clone, Deserialize)]
 pub enum InsertDraggedFiles {
    ProjectPaths(Vec<PathBuf>),
    ExternalFiles(Vec<PathBuf>),
 }

-impl_internal_actions!(assistant, [InsertDraggedFiles]);
+impl_actions!(assistant, [InsertDraggedFiles]);

 const DEFAULT_CONTEXT_LINES: usize = 50;

@@ -199,6 +199,16 @@ pub fn init(
    AssistantSettings::register(cx);
    SlashCommandSettings::register(cx);

+    // TODO: remove this when 0.148.0 is released.
+    if AssistantSettings::get_global(cx).using_outdated_settings_version {
+        update_settings_file::<AssistantSettings>(fs.clone(), cx, {
+            let fs = fs.clone();
+            |content, cx| {
+                content.update_file(fs, cx);
+            }
+        });
+    }
+
    cx.spawn(|mut cx| {
        let client = client.clone();
        async move {
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -122,7 +122,7 @@ pub fn init(cx: &mut AppContext) {
    cx.observe_new_views(
        |terminal_panel: &mut TerminalPanel, cx: &mut ViewContext<TerminalPanel>| {
            let settings = AssistantSettings::get_global(cx);
-            terminal_panel.set_assistant_enabled(settings.enabled, cx);
+            terminal_panel.asssistant_enabled(settings.enabled, cx);
        },
    )
    .detach();
@@ -595,7 +595,7 @@ impl AssistantPanel {
                true
            }

-            pane::Event::ActivateItem { local, .. } => {
+            pane::Event::ActivateItem { local } => {
                if *local {
                    self.workspace
                        .update(cx, |workspace, cx| {
@@ -1458,10 +1458,6 @@ impl Panel for AssistantPanel {
    fn toggle_action(&self) -> Box<dyn Action> {
        Box::new(ToggleFocus)
    }
-
-    fn activation_priority(&self) -> u32 {
-        4
-    }
 }

 impl EventEmitter<PanelEvent> for AssistantPanel {}
@@ -1560,7 +1556,6 @@ impl ContextEditor {
            let mut editor = Editor::for_buffer(context.read(cx).buffer().clone(), None, cx);
            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
            editor.set_show_line_numbers(false, cx);
-            editor.set_show_scrollbars(false, cx);
            editor.set_show_git_diff_gutter(false, cx);
            editor.set_show_code_actions(false, cx);
            editor.set_show_runnables(false, cx);
@@ -3654,7 +3649,7 @@ impl ContextEditor {

        let (style, tooltip) = match token_state(&self.context, cx) {
            Some(TokenState::NoTokensLeft { .. }) => (
-                ButtonStyle::Tinted(TintColor::Error),
+                ButtonStyle::Tinted(TintColor::Negative),
                Some(Tooltip::text("Token limit reached", cx)),
            ),
            Some(TokenState::HasMoreTokens {
@@ -3711,7 +3706,7 @@ impl ContextEditor {

        let (style, tooltip) = match token_state(&self.context, cx) {
            Some(TokenState::NoTokensLeft { .. }) => (
-                ButtonStyle::Tinted(TintColor::Error),
+                ButtonStyle::Tinted(TintColor::Negative),
                Some(Tooltip::text("Token limit reached", cx)),
            ),
            Some(TokenState::HasMoreTokens {
@@ -4272,10 +4267,6 @@ impl Item for ContextEditor {
            None
        }
    }
-
-    fn include_in_nav_history() -> bool {
-        false
-    }
 }

 impl SearchableItem for ContextEditor {
@@ -4974,8 +4965,8 @@ fn fold_toggle(
 ) -> impl Fn(
    MultiBufferRow,
    bool,
-    Arc<dyn Fn(bool, &mut WindowContext) + Send + Sync>,
-    &mut WindowContext,
+    Arc<dyn Fn(bool, &mut WindowContext<'_>) + Send + Sync>,
+    &mut WindowContext<'_>,
 ) -> AnyElement {
    move |row, is_folded, fold, _cx| {
        Disclosure::new((name, row.0 as u64), !is_folded)
--- a/crates/assistant/src/assistant_settings.rs
+++ b/crates/assistant/src/assistant_settings.rs
@@ -3,13 +3,18 @@ use std::sync::Arc;
 use ::open_ai::Model as OpenAiModel;
 use anthropic::Model as AnthropicModel;
 use feature_flags::FeatureFlagAppExt;
+use fs::Fs;
 use gpui::{AppContext, Pixels};
 use language_model::{CloudModel, LanguageModel};
-use lmstudio::Model as LmStudioModel;
+use language_models::{
+    provider::open_ai, AllLanguageModelSettings, AnthropicSettingsContent,
+    AnthropicSettingsContentV1, OllamaSettingsContent, OpenAiSettingsContent,
+    OpenAiSettingsContentV1, VersionedAnthropicSettingsContent, VersionedOpenAiSettingsContent,
+};
 use ollama::Model as OllamaModel;
 use schemars::{schema::Schema, JsonSchema};
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{update_settings_file, Settings, SettingsSources};

 #[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
 #[serde(rename_all = "snake_case")]
@@ -41,10 +46,6 @@ pub enum AssistantProviderContentV1 {
        default_model: Option<OllamaModel>,
        api_url: Option<String>,
    },
-    LmStudio {
-        default_model: Option<LmStudioModel>,
-        api_url: Option<String>,
-    },
 }

 #[derive(Debug, Default)]
@@ -105,6 +106,96 @@ impl AssistantSettingsContent {
        }
    }

+    pub fn update_file(&mut self, fs: Arc<dyn Fs>, cx: &AppContext) {
+        if let AssistantSettingsContent::Versioned(settings) = self {
+            if let VersionedAssistantSettingsContent::V1(settings) = settings {
+                if let Some(provider) = settings.provider.clone() {
+                    match provider {
+                        AssistantProviderContentV1::Anthropic { api_url, .. } => {
+                            update_settings_file::<AllLanguageModelSettings>(
+                                fs,
+                                cx,
+                                move |content, _| {
+                                    if content.anthropic.is_none() {
+                                        content.anthropic =
+                                            Some(AnthropicSettingsContent::Versioned(
+                                                VersionedAnthropicSettingsContent::V1(
+                                                    AnthropicSettingsContentV1 {
+                                                        api_url,
+                                                        available_models: None,
+                                                    },
+                                                ),
+                                            ));
+                                    }
+                                },
+                            )
+                        }
+                        AssistantProviderContentV1::Ollama { api_url, .. } => {
+                            update_settings_file::<AllLanguageModelSettings>(
+                                fs,
+                                cx,
+                                move |content, _| {
+                                    if content.ollama.is_none() {
+                                        content.ollama = Some(OllamaSettingsContent {
+                                            api_url,
+                                            available_models: None,
+                                        });
+                                    }
+                                },
+                            )
+                        }
+                        AssistantProviderContentV1::OpenAi {
+                            api_url,
+                            available_models,
+                            ..
+                        } => update_settings_file::<AllLanguageModelSettings>(
+                            fs,
+                            cx,
+                            move |content, _| {
+                                if content.openai.is_none() {
+                                    let available_models = available_models.map(|models| {
+                                        models
+                                            .into_iter()
+                                            .filter_map(|model| match model {
+                                                OpenAiModel::Custom {
+                                                    name,
+                                                    display_name,
+                                                    max_tokens,
+                                                    max_output_tokens,
+                                                    max_completion_tokens: None,
+                                                } => Some(open_ai::AvailableModel {
+                                                    name,
+                                                    display_name,
+                                                    max_tokens,
+                                                    max_output_tokens,
+                                                    max_completion_tokens: None,
+                                                }),
+                                                _ => None,
+                                            })
+                                            .collect::<Vec<_>>()
+                                    });
+                                    content.openai = Some(OpenAiSettingsContent::Versioned(
+                                        VersionedOpenAiSettingsContent::V1(
+                                            OpenAiSettingsContentV1 {
+                                                api_url,
+                                                available_models,
+                                            },
+                                        ),
+                                    ));
+                                }
+                            },
+                        ),
+                        _ => {}
+                    }
+                }
+            }
+        }
+
+        *self = AssistantSettingsContent::Versioned(VersionedAssistantSettingsContent::V2(
+            self.upgrade(),
+        ));
+    }
+
    fn upgrade(&self) -> AssistantSettingsContentV2 {
        match self {
            AssistantSettingsContent::Versioned(settings) => match settings {
@@ -142,12 +233,6 @@ impl AssistantSettingsContent {
                                    model: model.id().to_string(),
                                })
                            }
-                            AssistantProviderContentV1::LmStudio { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "lmstudio".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
                        }),
                    inline_alternatives: None,
                    enable_experimental_live_diffs: None,
@@ -225,18 +310,6 @@ impl AssistantSettingsContent {
                            api_url,
                        });
                    }
-                    "lmstudio" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::LmStudio {
-                            default_model: Some(lmstudio::Model::new(&model, None, None)),
-                            api_url,
-                        });
-                    }
                    "openai" => {
                        let (api_url, available_models) = match &settings.provider {
                            Some(AssistantProviderContentV1::OpenAi {
@@ -336,7 +409,6 @@ fn providers_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema:
            "anthropic".into(),
            "google".into(),
            "ollama".into(),
-            "lmstudio".into(),
            "openai".into(),
            "zed.dev".into(),
            "copilot_chat".into(),
@@ -379,7 +451,7 @@ pub struct AssistantSettingsContentV1 {
    default_height: Option<f32>,
    /// The provider of the assistant service.
    ///
-    /// This can be "openai", "anthropic", "ollama", "lmstudio", "zed.dev"
+    /// This can be "openai", "anthropic", "ollama", "zed.dev"
    /// each with their respective default models and configurations.
    provider: Option<AssistantProviderContentV1>,
 }
@@ -462,7 +534,6 @@ fn merge<T>(target: &mut T, value: Option<T>) {

 #[cfg(test)]
 mod tests {
-    use fs::Fs;
    use gpui::{ReadGlobal, TestAppContext};

    use super::*;
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -16,9 +16,7 @@ use editor::{
    EditorStyle, ExcerptId, ExcerptRange, GutterDimensions, MultiBuffer, MultiBufferSnapshot,
    ToOffset as _, ToPoint,
 };
-use feature_flags::{
-    Assistant2FeatureFlag, FeatureFlagAppExt as _, FeatureFlagViewExt as _, ZedPro,
-};
+use feature_flags::{FeatureFlagAppExt as _, ZedPro};
 use fs::Fs;
 use futures::{
    channel::mpsc,
@@ -75,16 +73,7 @@ pub fn init(
        let workspace = cx.view().clone();
        InlineAssistant::update_global(cx, |inline_assistant, cx| {
            inline_assistant.register_workspace(&workspace, cx)
-        });
-
-        cx.observe_flag::<Assistant2FeatureFlag, _>({
-            |is_assistant2_enabled, _view, cx| {
-                InlineAssistant::update_global(cx, |inline_assistant, _cx| {
-                    inline_assistant.is_assistant2_enabled = is_assistant2_enabled;
-                });
-            }
        })
-        .detach();
    })
    .detach();
 }
@@ -102,7 +91,6 @@ pub struct InlineAssistant {
    prompt_builder: Arc<PromptBuilder>,
    telemetry: Arc<Telemetry>,
    fs: Arc<dyn Fs>,
-    is_assistant2_enabled: bool,
 }

 impl Global for InlineAssistant {}
@@ -124,7 +112,6 @@ impl InlineAssistant {
            prompt_builder,
            telemetry,
            fs,
-            is_assistant2_enabled: false,
        }
    }

@@ -146,7 +133,7 @@ impl InlineAssistant {
            };
            let enabled = AssistantSettings::get_global(cx).enabled;
            terminal_panel.update(cx, |terminal_panel, cx| {
-                terminal_panel.set_assistant_enabled(enabled, cx)
+                terminal_panel.asssistant_enabled(enabled, cx)
            });
        })
        .detach();
@@ -185,22 +172,15 @@ impl InlineAssistant {
        item: &dyn ItemHandle,
        cx: &mut WindowContext,
    ) {
-        let is_assistant2_enabled = self.is_assistant2_enabled;
-
        if let Some(editor) = item.act_as::<Editor>(cx) {
            editor.update(cx, |editor, cx| {
-                if is_assistant2_enabled {
-                    editor
-                        .remove_code_action_provider(ASSISTANT_CODE_ACTION_PROVIDER_ID.into(), cx);
-                } else {
-                    editor.add_code_action_provider(
-                        Rc::new(AssistantCodeActionProvider {
-                            editor: cx.view().downgrade(),
-                            workspace: workspace.downgrade(),
-                        }),
-                        cx,
-                    );
-                }
+                editor.push_code_action_provider(
+                    Rc::new(AssistantCodeActionProvider {
+                        editor: cx.view().downgrade(),
+                        workspace: workspace.downgrade(),
+                    }),
+                    cx,
+                );
            });
        }
    }
@@ -817,11 +797,10 @@ impl InlineAssistant {
            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                let language_name = assist.editor.upgrade().and_then(|editor| {
                    let multibuffer = editor.read(cx).buffer().read(cx);
-                    let multibuffer_snapshot = multibuffer.snapshot(cx);
-                    let ranges = multibuffer_snapshot.range_to_buffer_ranges(assist.range.clone());
+                    let ranges = multibuffer.range_to_buffer_ranges(assist.range.clone(), cx);
                    ranges
                        .first()
-                        .and_then(|(excerpt, _)| excerpt.buffer().language())
+                        .and_then(|(buffer, _, _)| buffer.read(cx).language())
                        .map(|language| language.name())
                });
                report_assistant_event(
@@ -2636,29 +2615,26 @@ impl EventEmitter<CodegenEvent> for CodegenAlternative {}

 impl CodegenAlternative {
    pub fn new(
-        multi_buffer: Model<MultiBuffer>,
+        buffer: Model<MultiBuffer>,
        range: Range<Anchor>,
        active: bool,
        telemetry: Option<Arc<Telemetry>>,
        builder: Arc<PromptBuilder>,
        cx: &mut ModelContext<Self>,
    ) -> Self {
-        let snapshot = multi_buffer.read(cx).snapshot(cx);
+        let snapshot = buffer.read(cx).snapshot(cx);

-        let (old_excerpt, _) = snapshot
-            .range_to_buffer_ranges(range.clone())
+        let (old_buffer, _, _) = buffer
+            .read(cx)
+            .range_to_buffer_ranges(range.clone(), cx)
            .pop()
            .unwrap();
        let old_buffer = cx.new_model(|cx| {
-            let text = old_excerpt.buffer().as_rope().clone();
-            let line_ending = old_excerpt.buffer().line_ending();
-            let language = old_excerpt.buffer().language().cloned();
-            let language_registry = multi_buffer
-                .read(cx)
-                .buffer(old_excerpt.buffer_id())
-                .unwrap()
-                .read(cx)
-                .language_registry();
+            let old_buffer = old_buffer.read(cx);
+            let text = old_buffer.as_rope().clone();
+            let line_ending = old_buffer.line_ending();
+            let language = old_buffer.language().cloned();
+            let language_registry = old_buffer.language_registry();

            let mut buffer = Buffer::local_normalized(text, line_ending, cx);
            buffer.set_language(language, cx);
@@ -2669,7 +2645,7 @@ impl CodegenAlternative {
        });

        Self {
-            buffer: multi_buffer.clone(),
+            buffer: buffer.clone(),
            old_buffer,
            edit_position: None,
            message_id: None,
@@ -2680,7 +2656,7 @@ impl CodegenAlternative {
            generation: Task::ready(()),
            diff: Diff::default(),
            telemetry,
-            _subscription: cx.subscribe(&multi_buffer, Self::handle_buffer_event),
+            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
            builder,
            active,
            edits: Vec::new(),
@@ -2891,11 +2867,10 @@ impl CodegenAlternative {
        let telemetry = self.telemetry.clone();
        let language_name = {
            let multibuffer = self.buffer.read(cx);
-            let snapshot = multibuffer.snapshot(cx);
-            let ranges = snapshot.range_to_buffer_ranges(self.range.clone());
+            let ranges = multibuffer.range_to_buffer_ranges(self.range.clone(), cx);
            ranges
                .first()
-                .and_then(|(excerpt, _)| excerpt.buffer().language())
+                .and_then(|(buffer, _, _)| buffer.read(cx).language())
                .map(|language| language.name())
        };

@@ -3446,13 +3421,7 @@ struct AssistantCodeActionProvider {
    workspace: WeakView<Workspace>,
 }

-const ASSISTANT_CODE_ACTION_PROVIDER_ID: &str = "assistant";
-
 impl CodeActionProvider for AssistantCodeActionProvider {
-    fn id(&self) -> Arc<str> {
-        ASSISTANT_CODE_ACTION_PROVIDER_ID.into()
-    }
-
    fn code_actions(
        &self,
        buffer: &Model<Buffer>,
--- a/crates/assistant/src/slash_command.rs
+++ b/crates/assistant/src/slash_command.rs
@@ -149,7 +149,6 @@ impl SlashCommandCompletionProvider {
                            server_id: LanguageServerId(0),
                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
                        })
                    })
                    .collect()
@@ -243,7 +242,6 @@ impl SlashCommandCompletionProvider {
                            server_id: LanguageServerId(0),
                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
                        }
                    })
                    .collect())
@@ -332,6 +330,16 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        Task::ready(Ok(true))
    }

+    fn apply_additional_edits_for_completion(
+        &self,
+        _: Model<Buffer>,
+        _: project::Completion,
+        _: bool,
+        _: &mut ViewContext<Editor>,
+    ) -> Task<Result<Option<language::Transaction>>> {
+        Task::ready(Ok(None))
+    }
+
    fn is_completion_trigger(
        &self,
        buffer: &Model<Buffer>,
--- a/crates/assistant/src/slash_command/auto_command.rs
+++ b/crates/assistant/src/slash_command/auto_command.rs
@@ -5,7 +5,7 @@ use assistant_slash_command::{
 };
 use feature_flags::FeatureFlag;
 use futures::StreamExt;
-use gpui::{AppContext, AsyncAppContext, AsyncWindowContext, Task, WeakView, WindowContext};
+use gpui::{AppContext, AsyncAppContext, Task, WeakView};
 use language::{CodeLabel, LspAdapterDelegate};
 use language_model::{
    LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
@@ -14,7 +14,7 @@ use language_model::{
 use semantic_index::{FileSummary, SemanticDb};
 use smol::channel;
 use std::sync::{atomic::AtomicBool, Arc};
-use ui::{prelude::*, BorrowAppContext};
+use ui::{prelude::*, BorrowAppContext, WindowContext};
 use util::ResultExt;
 use workspace::Workspace;

@@ -115,7 +115,7 @@ impl SlashCommand for AutoCommand {
            return Task::ready(Err(anyhow!("no project indexer")));
        };

-        let task = cx.spawn(|cx: AsyncWindowContext| async move {
+        let task = cx.spawn(|cx: gpui::AsyncWindowContext| async move {
            let summaries = project_index
                .read_with(&cx, |project_index, cx| project_index.all_summaries(cx))?
                .await?;
--- a/crates/assistant/src/slash_command/tab_command.rs
+++ b/crates/assistant/src/slash_command/tab_command.rs
@@ -281,7 +281,7 @@ fn tab_items_for_queries(

 fn active_item_buffer(
    workspace: &mut Workspace,
-    cx: &mut ViewContext<Workspace>,
+    cx: &mut ui::ViewContext<Workspace>,
 ) -> anyhow::Result<BufferSnapshot> {
    let active_editor = workspace
        .active_item(cx)
--- a/crates/assistant/src/slash_command_picker.rs
+++ b/crates/assistant/src/slash_command_picker.rs
@@ -27,8 +27,8 @@ enum SlashCommandEntry {
    Info(SlashCommandInfo),
    Advert {
        name: SharedString,
-        renderer: fn(&mut WindowContext) -> AnyElement,
-        on_confirm: fn(&mut WindowContext),
+        renderer: fn(&mut WindowContext<'_>) -> AnyElement,
+        on_confirm: fn(&mut WindowContext<'_>),
    },
 }

--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -18,16 +18,14 @@ anyhow.workspace = true
 assets.workspace = true
 assistant_tool.workspace = true
 async-watch.workspace = true
-chrono.workspace = true
 client.workspace = true
-clock.workspace = true
+chrono.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 context_server.workspace = true
 db.workspace = true
 editor.workspace = true
 feature_flags.workspace = true
-file_icons.workspace = true
 fs.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
@@ -35,7 +33,6 @@ gpui.workspace = true
 handlebars.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
-itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
@@ -46,11 +43,10 @@ markdown.workspace = true
 menu.workspace = true
 multi_buffer.workspace = true
 ollama = { workspace = true, features = ["schemars"] }
-lmstudio = { workspace = true, features = ["schemars"] }
 open_ai = { workspace = true, features = ["schemars"] }
 ordered-float.workspace = true
-parking_lot.workspace = true
 paths.workspace = true
+parking_lot.workspace = true
 picker.workspace = true
 project.workspace = true
 proto.workspace = true
@@ -63,9 +59,9 @@ settings.workspace = true
 similar.workspace = true
 smol.workspace = true
 telemetry_events.workspace = true
-terminal.workspace = true
 terminal_view.workspace = true
 text.workspace = true
+terminal.workspace = true
 theme.workspace = true
 time.workspace = true
 time_format.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -1,20 +1,17 @@
 use std::sync::Arc;
-use std::time::Duration;

 use assistant_tool::ToolWorkingSet;
 use collections::HashMap;
 use gpui::{
-    linear_color_stop, linear_gradient, list, percentage, AbsoluteLength, Animation, AnimationExt,
-    AnyElement, AppContext, DefiniteLength, EdgesRefinement, Empty, FocusHandle, Length,
-    ListAlignment, ListOffset, ListState, Model, StyleRefinement, Subscription,
-    TextStyleRefinement, Transformation, UnderlineStyle, View, WeakView,
+    list, AnyElement, AppContext, Empty, ListAlignment, ListState, Model, StyleRefinement,
+    Subscription, TextStyleRefinement, View, WeakView,
 };
 use language::LanguageRegistry;
 use language_model::Role;
 use markdown::{Markdown, MarkdownStyle};
 use settings::Settings as _;
 use theme::ThemeSettings;
-use ui::{prelude::*, Divider, KeyBinding};
+use ui::prelude::*;
 use workspace::Workspace;

 use crate::thread::{MessageId, Thread, ThreadError, ThreadEvent};
@@ -24,12 +21,11 @@ pub struct ActiveThread {
    workspace: WeakView<Workspace>,
    language_registry: Arc<LanguageRegistry>,
    tools: Arc<ToolWorkingSet>,
-    pub(crate) thread: Model<Thread>,
+    thread: Model<Thread>,
    messages: Vec<MessageId>,
    list_state: ListState,
    rendered_messages_by_id: HashMap<MessageId, View<Markdown>>,
    last_error: Option<ThreadError>,
-    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
 }

@@ -39,7 +35,6 @@ impl ActiveThread {
        workspace: WeakView<Workspace>,
        language_registry: Arc<LanguageRegistry>,
        tools: Arc<ToolWorkingSet>,
-        focus_handle: FocusHandle,
        cx: &mut ViewContext<Self>,
    ) -> Self {
        let subscriptions = vec![
@@ -62,7 +57,6 @@ impl ActiveThread {
                }
            }),
            last_error: None,
-            focus_handle,
            _subscriptions: subscriptions,
        };

@@ -81,16 +75,6 @@ impl ActiveThread {
        self.thread.read(cx).summary()
    }

-    pub fn summary_or_default(&self, cx: &AppContext) -> SharedString {
-        self.thread.read(cx).summary_or_default()
-    }
-
-    pub fn cancel_last_completion(&mut self, cx: &mut AppContext) -> bool {
-        self.last_error.take();
-        self.thread
-            .update(cx, |thread, _cx| thread.cancel_last_completion())
-    }
-
    pub fn last_error(&self) -> Option<ThreadError> {
        self.last_error.clone()
    }
@@ -105,11 +89,10 @@ impl ActiveThread {
        self.list_state.splice(old_len..old_len, 1);

        let theme_settings = ThemeSettings::get_global(cx);
-        let colors = cx.theme().colors();
        let ui_font_size = TextSize::Default.rems(cx);
-        let buffer_font_size = TextSize::Small.rems(cx);
-        let mut text_style = cx.text_style();
+        let buffer_font_size = theme_settings.buffer_font_size;

+        let mut text_style = cx.text_style();
        text_style.refine(&TextStyleRefinement {
            font_family: Some(theme_settings.ui_font.family.clone()),
            font_size: Some(ui_font_size.into()),
@@ -122,26 +105,6 @@ impl ActiveThread {
            syntax: cx.theme().syntax().clone(),
            selection_background_color: cx.theme().players().local().selection,
            code_block: StyleRefinement {
-                margin: EdgesRefinement {
-                    top: Some(Length::Definite(rems(0.).into())),
-                    left: Some(Length::Definite(rems(0.).into())),
-                    right: Some(Length::Definite(rems(0.).into())),
-                    bottom: Some(Length::Definite(rems(0.5).into())),
-                },
-                padding: EdgesRefinement {
-                    top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                    left: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                    right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                    bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
-                },
-                background: Some(colors.editor_background.into()),
-                border_color: Some(colors.border_variant),
-                border_widths: EdgesRefinement {
-                    top: Some(AbsoluteLength::Pixels(Pixels(1.))),
-                    left: Some(AbsoluteLength::Pixels(Pixels(1.))),
-                    right: Some(AbsoluteLength::Pixels(Pixels(1.))),
-                    bottom: Some(AbsoluteLength::Pixels(Pixels(1.))),
-                },
                text: Some(TextStyleRefinement {
                    font_family: Some(theme_settings.buffer_font.family.clone()),
                    font_size: Some(buffer_font_size.into()),
@@ -151,17 +114,8 @@ impl ActiveThread {
            },
            inline_code: TextStyleRefinement {
                font_family: Some(theme_settings.buffer_font.family.clone()),
-                font_size: Some(buffer_font_size.into()),
-                background_color: Some(colors.editor_foreground.opacity(0.1)),
-                ..Default::default()
-            },
-            link: TextStyleRefinement {
-                background_color: Some(colors.editor_foreground.opacity(0.025)),
-                underline: Some(UnderlineStyle {
-                    color: Some(colors.text_accent.opacity(0.5)),
-                    thickness: px(1.),
-                    ..Default::default()
-                }),
+                font_size: Some(ui_font_size.into()),
+                background_color: Some(cx.theme().colors().editor_background),
                ..Default::default()
            },
            ..Default::default()
@@ -177,10 +131,6 @@ impl ActiveThread {
            )
        });
        self.rendered_messages_by_id.insert(*id, markdown);
-        self.list_state.scroll_to(ListOffset {
-            item_ix: old_len,
-            offset_in_item: Pixels(0.0),
-        });
    }

    fn handle_thread_event(
@@ -254,146 +204,58 @@ impl ActiveThread {
        };

        let context = self.thread.read(cx).context_for_message(message_id);
-        let colors = cx.theme().colors();

-        let message_content = v_flex()
-            .child(div().p_2p5().text_ui(cx).child(markdown.clone()))
-            .when_some(context, |parent, context| {
-                if !context.is_empty() {
-                    parent.child(
-                        h_flex().flex_wrap().gap_1().px_1p5().pb_1p5().children(
-                            context
-                                .into_iter()
-                                .map(|context| ContextPill::new_added(context, false, false, None)),
-                        ),
-                    )
-                } else {
-                    parent
-                }
-            });
-
-        let styled_message = match message.role {
-            Role::User => v_flex()
-                .id(("message-container", ix))
-                .py_1()
-                .px_2p5()
-                .child(
-                    v_flex()
-                        .bg(colors.editor_background)
-                        .ml_16()
-                        .rounded_t_lg()
-                        .rounded_bl_lg()
-                        .rounded_br_none()
-                        .border_1()
-                        .border_color(colors.border)
-                        .child(
-                            h_flex()
-                                .py_1()
-                                .px_2()
-                                .bg(colors.editor_foreground.opacity(0.05))
-                                .border_b_1()
-                                .border_color(colors.border)
-                                .justify_between()
-                                .rounded_t(px(6.))
-                                .child(
-                                    h_flex()
-                                        .gap_1p5()
-                                        .child(
-                                            Icon::new(IconName::PersonCircle)
-                                                .size(IconSize::XSmall)
-                                                .color(Color::Muted),
-                                        )
-                                        .child(
-                                            Label::new("You")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        ),
-                                ),
-                        )
-                        .child(message_content),
-                ),
-            Role::Assistant => div().id(("message-container", ix)).child(message_content),
-            Role::System => div().id(("message-container", ix)).py_1().px_2().child(
-                v_flex()
-                    .bg(colors.editor_background)
-                    .rounded_md()
-                    .child(message_content),
-            ),
+        let (role_icon, role_name) = match message.role {
+            Role::User => (IconName::Person, "You"),
+            Role::Assistant => (IconName::ZedAssistant, "Assistant"),
+            Role::System => (IconName::Settings, "System"),
        };

-        styled_message.into_any()
+        div()
+            .id(("message-container", ix))
+            .py_1()
+            .px_2()
+            .child(
+                v_flex()
+                    .border_1()
+                    .border_color(cx.theme().colors().border)
+                    .bg(cx.theme().colors().editor_background)
+                    .rounded_md()
+                    .child(
+                        h_flex()
+                            .justify_between()
+                            .py_1()
+                            .px_2()
+                            .border_b_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .child(
+                                h_flex()
+                                    .gap_1p5()
+                                    .child(
+                                        Icon::new(role_icon)
+                                            .size(IconSize::XSmall)
+                                            .color(Color::Muted),
+                                    )
+                                    .child(Label::new(role_name).size(LabelSize::XSmall)),
+                            ),
+                    )
+                    .child(v_flex().px_2().py_1().text_ui(cx).child(markdown.clone()))
+                    .when_some(context, |parent, context| {
+                        parent.child(
+                            h_flex().flex_wrap().gap_2().p_1p5().children(
+                                context
+                                    .iter()
+                                    .map(|context| ContextPill::new(context.clone())),
+                            ),
+                        )
+                    }),
+            )
+            .into_any()
    }
 }

 impl Render for ActiveThread {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let is_streaming_completion = self.thread.read(cx).is_streaming();
-        let panel_bg = cx.theme().colors().panel_background;
-        let focus_handle = self.focus_handle.clone();
-
-        v_flex()
-            .size_full()
-            .pt_1p5()
-            .child(list(self.list_state.clone()).flex_grow())
-            .when(is_streaming_completion, |parent| {
-                parent.child(
-                    h_flex()
-                        .w_full()
-                        .pb_2p5()
-                        .absolute()
-                        .bottom_0()
-                        .flex_shrink()
-                        .justify_center()
-                        .bg(linear_gradient(
-                            180.,
-                            linear_color_stop(panel_bg.opacity(0.0), 0.),
-                            linear_color_stop(panel_bg, 1.),
-                        ))
-                        .child(
-                            h_flex()
-                                .flex_none()
-                                .p_1p5()
-                                .bg(cx.theme().colors().editor_background)
-                                .border_1()
-                                .border_color(cx.theme().colors().border)
-                                .rounded_md()
-                                .shadow_lg()
-                                .gap_1()
-                                .child(
-                                    Icon::new(IconName::ArrowCircle)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted)
-                                        .with_animation(
-                                            "arrow-circle",
-                                            Animation::new(Duration::from_secs(2)).repeat(),
-                                            |icon, delta| {
-                                                icon.transform(Transformation::rotate(percentage(
-                                                    delta,
-                                                )))
-                                            },
-                                        ),
-                                )
-                                .child(
-                                    Label::new("Generating…")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                )
-                                .child(Divider::vertical())
-                                .child(
-                                    Button::new("cancel-generation", "Cancel")
-                                        .label_size(LabelSize::Small)
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &editor::actions::Cancel,
-                                            &self.focus_handle,
-                                            cx,
-                                        ))
-                                        .on_click(move |_event, cx| {
-                                            focus_handle
-                                                .dispatch_action(&editor::actions::Cancel, cx);
-                                        }),
-                                ),
-                        ),
-                )
-            })
+    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
+        list(self.list_state.clone()).flex_1().py_1()
    }
 }
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -1,5 +1,4 @@
 mod active_thread;
-mod assistant_model_selector;
 mod assistant_panel;
 mod assistant_settings;
 mod buffer_codegen;
@@ -41,17 +40,10 @@ actions!(
        NewThread,
        ToggleContextPicker,
        ToggleModelSelector,
-        RemoveAllContext,
        OpenHistory,
        Chat,
        CycleNextInlineAssist,
-        CyclePreviousInlineAssist,
-        FocusUp,
-        FocusDown,
-        FocusLeft,
-        FocusRight,
-        RemoveFocusedContext,
-        AcceptSuggestedContext
+        CyclePreviousInlineAssist
    ]
 );

--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -1,87 +0,0 @@
-use fs::Fs;
-use gpui::{FocusHandle, View};
-use language_model::LanguageModelRegistry;
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
-use settings::update_settings_file;
-use std::sync::Arc;
-use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};
-
-use crate::{assistant_settings::AssistantSettings, ToggleModelSelector};
-
-pub struct AssistantModelSelector {
-    selector: View<LanguageModelSelector>,
-    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-    focus_handle: FocusHandle,
-}
-
-impl AssistantModelSelector {
-    pub(crate) fn new(
-        fs: Arc<dyn Fs>,
-        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-        focus_handle: FocusHandle,
-        cx: &mut WindowContext,
-    ) -> Self {
-        Self {
-            selector: cx.new_view(|cx| {
-                let fs = fs.clone();
-                LanguageModelSelector::new(
-                    move |model, cx| {
-                        update_settings_file::<AssistantSettings>(
-                            fs.clone(),
-                            cx,
-                            move |settings, _cx| settings.set_model(model.clone()),
-                        );
-                    },
-                    cx,
-                )
-            }),
-            menu_handle,
-            focus_handle,
-        }
-    }
-}
-
-impl Render for AssistantModelSelector {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let active_model = LanguageModelRegistry::read_global(cx).active_model();
-        let focus_handle = self.focus_handle.clone();
-
-        LanguageModelSelectorPopoverMenu::new(
-            self.selector.clone(),
-            ButtonLike::new("active-model")
-                .style(ButtonStyle::Subtle)
-                .child(
-                    h_flex()
-                        .gap_0p5()
-                        .child(
-                            div()
-                                .overflow_x_hidden()
-                                .flex_grow()
-                                .whitespace_nowrap()
-                                .child(match active_model {
-                                    Some(model) => h_flex()
-                                        .child(
-                                            Label::new(model.name().0)
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .into_any_element(),
-                                    _ => Label::new("No model selected")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted)
-                                        .into_any_element(),
-                                }),
-                        )
-                        .child(
-                            Icon::new(IconName::ChevronDown)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        ),
-                )
-                .tooltip(move |cx| {
-                    Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
-                }),
-        )
-        .with_handle(self.menu_handle.clone())
-    }
-}
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -19,7 +19,7 @@ use workspace::Workspace;
 use crate::active_thread::ActiveThread;
 use crate::assistant_settings::{AssistantDockPosition, AssistantSettings};
 use crate::message_editor::MessageEditor;
-use crate::thread::{Thread, ThreadError, ThreadId};
+use crate::thread::{ThreadError, ThreadId};
 use crate::thread_history::{PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
 use crate::{NewThread, OpenHistory, ToggleFocus};
@@ -100,16 +100,6 @@ impl AssistantPanel {
        let workspace = workspace.weak_handle();
        let weak_self = cx.view().downgrade();

-        let message_editor = cx.new_view(|cx| {
-            MessageEditor::new(
-                fs.clone(),
-                workspace.clone(),
-                thread_store.downgrade(),
-                thread.clone(),
-                cx,
-            )
-        });
-
        Self {
            active_view: ActiveView::Thread,
            workspace: workspace.clone(),
@@ -119,14 +109,21 @@ impl AssistantPanel {
            thread: cx.new_view(|cx| {
                ActiveThread::new(
                    thread.clone(),
-                    workspace,
+                    workspace.clone(),
                    language_registry,
                    tools.clone(),
-                    message_editor.focus_handle(cx),
                    cx,
                )
            }),
-            message_editor,
+            message_editor: cx.new_view(|cx| {
+                MessageEditor::new(
+                    fs.clone(),
+                    workspace,
+                    thread_store.downgrade(),
+                    thread.clone(),
+                    cx,
+                )
+            }),
            tools,
            local_timezone: UtcOffset::from_whole_seconds(
                chrono::Local::now().offset().local_minus_utc(),
@@ -146,11 +143,6 @@ impl AssistantPanel {
        &self.thread_store
    }

-    fn cancel(&mut self, _: &editor::actions::Cancel, cx: &mut ViewContext<Self>) {
-        self.thread
-            .update(cx, |thread, cx| thread.cancel_last_completion(cx));
-    }
-
    fn new_thread(&mut self, cx: &mut ViewContext<Self>) {
        let thread = self
            .thread_store
@@ -163,7 +155,6 @@ impl AssistantPanel {
                self.workspace.clone(),
                self.language_registry.clone(),
                self.tools.clone(),
-                self.focus_handle(cx),
                cx,
            )
        });
@@ -200,7 +191,6 @@ impl AssistantPanel {
                self.workspace.clone(),
                self.language_registry.clone(),
                self.tools.clone(),
-                self.focus_handle(cx),
                cx,
            )
        });
@@ -216,10 +206,6 @@ impl AssistantPanel {
        self.message_editor.focus_handle(cx).focus(cx);
    }

-    pub(crate) fn active_thread(&self, cx: &AppContext) -> Model<Thread> {
-        self.thread.read(cx).thread.clone()
-    }
-
    pub(crate) fn delete_thread(&mut self, thread_id: &ThreadId, cx: &mut ViewContext<Self>) {
        self.thread_store
            .update(cx, |this, cx| this.delete_thread(thread_id, cx));
@@ -289,12 +275,7 @@ impl Panel for AssistantPanel {
        Some(proto::PanelId::AssistantPanel)
    }

-    fn icon(&self, cx: &WindowContext) -> Option<IconName> {
-        let settings = AssistantSettings::get_global(cx);
-        if !settings.enabled || !settings.button {
-            return None;
-        }
-
+    fn icon(&self, _cx: &WindowContext) -> Option<IconName> {
        Some(IconName::ZedAssistant2)
    }

@@ -305,41 +286,26 @@ impl Panel for AssistantPanel {
    fn toggle_action(&self) -> Box<dyn Action> {
        Box::new(ToggleFocus)
    }
-
-    fn activation_priority(&self) -> u32 {
-        3
-    }
 }

 impl AssistantPanel {
    fn render_toolbar(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        let focus_handle = self.focus_handle(cx);

-        let thread = self.thread.read(cx);
-
-        let title = if thread.is_empty() {
-            thread.summary_or_default(cx)
-        } else {
-            thread
-                .summary(cx)
-                .unwrap_or_else(|| SharedString::from("Loading Summary…"))
-        };
-
        h_flex()
            .id("assistant-toolbar")
-            .px(DynamicSpacing::Base08.rems(cx))
-            .h(Tab::container_height(cx))
-            .flex_none()
            .justify_between()
            .gap(DynamicSpacing::Base08.rems(cx))
+            .h(Tab::container_height(cx))
+            .px(DynamicSpacing::Base08.rems(cx))
            .bg(cx.theme().colors().tab_bar_background)
            .border_b_1()
            .border_color(cx.theme().colors().border)
-            .child(h_flex().child(Label::new(title)))
+            .child(h_flex().children(self.thread.read(cx).summary(cx).map(Label::new)))
            .child(
                h_flex()
                    .h_full()
-                    .pl_1p5()
+                    .pl_1()
                    .border_l_1()
                    .border_color(cx.theme().colors().border)
                    .gap(DynamicSpacing::Base02.rems(cx))
@@ -621,7 +587,6 @@ impl Render for AssistantPanel {
            .key_context("AssistantPanel2")
            .justify_between()
            .size_full()
-            .on_action(cx.listener(Self::cancel))
            .on_action(cx.listener(|this, _: &NewThread, cx| {
                this.new_thread(cx);
            }))
--- a/crates/assistant2/src/assistant_settings.rs
+++ b/crates/assistant2/src/assistant_settings.rs
@@ -4,7 +4,6 @@ use ::open_ai::Model as OpenAiModel;
 use anthropic::Model as AnthropicModel;
 use gpui::Pixels;
 use language_model::{CloudModel, LanguageModel};
-use lmstudio::Model as LmStudioModel;
 use ollama::Model as OllamaModel;
 use schemars::{schema::Schema, JsonSchema};
 use serde::{Deserialize, Serialize};
@@ -40,11 +39,6 @@ pub enum AssistantProviderContentV1 {
        default_model: Option<OllamaModel>,
        api_url: Option<String>,
    },
-    #[serde(rename = "lmstudio")]
-    LmStudio {
-        default_model: Option<LmStudioModel>,
-        api_url: Option<String>,
-    },
 }

 #[derive(Debug, Default)]
@@ -136,12 +130,6 @@ impl AssistantSettingsContent {
                                    model: model.id().to_string(),
                                })
                            }
-                            AssistantProviderContentV1::LmStudio { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "lmstudio".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
                        }),
                    inline_alternatives: None,
                    enable_experimental_live_diffs: None,
@@ -219,18 +207,6 @@ impl AssistantSettingsContent {
                            api_url,
                        });
                    }
-                    "lmstudio" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::LmStudio {
-                            default_model: Some(lmstudio::Model::new(&model, None, None)),
-                            api_url,
-                        });
-                    }
                    "openai" => {
                        let (api_url, available_models) = match &settings.provider {
                            Some(AssistantProviderContentV1::OpenAi {
@@ -329,7 +305,6 @@ fn providers_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema:
        enum_values: Some(vec![
            "anthropic".into(),
            "google".into(),
-            "lmstudio".into(),
            "ollama".into(),
            "openai".into(),
            "zed.dev".into(),
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -257,20 +257,17 @@ impl CodegenAlternative {
    ) -> Self {
        let snapshot = buffer.read(cx).snapshot(cx);

-        let (old_excerpt, _) = snapshot
-            .range_to_buffer_ranges(range.clone())
+        let (old_buffer, _, _) = buffer
+            .read(cx)
+            .range_to_buffer_ranges(range.clone(), cx)
            .pop()
            .unwrap();
        let old_buffer = cx.new_model(|cx| {
-            let text = old_excerpt.buffer().as_rope().clone();
-            let line_ending = old_excerpt.buffer().line_ending();
-            let language = old_excerpt.buffer().language().cloned();
-            let language_registry = buffer
-                .read(cx)
-                .buffer(old_excerpt.buffer_id())
-                .unwrap()
-                .read(cx)
-                .language_registry();
+            let old_buffer = old_buffer.read(cx);
+            let text = old_buffer.as_rope().clone();
+            let line_ending = old_buffer.line_ending();
+            let language = old_buffer.language().cloned();
+            let language_registry = old_buffer.language_registry();

            let mut buffer = Buffer::local_normalized(text, line_ending, cx);
            buffer.set_language(language, cx);
@@ -421,7 +418,8 @@ impl CodegenAlternative {
        };

        if let Some(context_store) = &self.context_store {
-            attach_context_to_message(&mut request_message, context_store.read(cx).snapshot(cx));
+            let context = context_store.update(cx, |this, _cx| this.context().clone());
+            attach_context_to_message(&mut request_message, context);
        }

        request_message.content.push(prompt.into());
@@ -473,11 +471,10 @@ impl CodegenAlternative {
        let telemetry = self.telemetry.clone();
        let language_name = {
            let multibuffer = self.buffer.read(cx);
-            let snapshot = multibuffer.snapshot(cx);
-            let ranges = snapshot.range_to_buffer_ranges(self.range.clone());
+            let ranges = multibuffer.range_to_buffer_ranges(self.range.clone(), cx);
            ranges
                .first()
-                .and_then(|(excerpt, _)| excerpt.buffer().language())
+                .and_then(|(buffer, _, _)| buffer.read(cx).language())
                .map(|language| language.name())
        };

@@ -1052,7 +1049,7 @@ mod tests {
        stream::{self},
        Stream,
    };
-    use gpui::TestAppContext;
+    use gpui::{Context, TestAppContext};
    use indoc::indoc;
    use language::{
        language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, LanguageMatcher,
--- a/crates/assistant2/src/context.rs
+++ b/crates/assistant2/src/context.rs
@@ -1,17 +1,8 @@
-use std::path::Path;
-use std::rc::Rc;
-
-use file_icons::FileIcons;
-use gpui::{AppContext, Model, SharedString};
-use language::Buffer;
+use gpui::SharedString;
 use language_model::{LanguageModelRequestMessage, MessageContent};
 use serde::{Deserialize, Serialize};
-use text::BufferId;
-use ui::IconName;
 use util::post_inc;

-use crate::{context_store::buffer_path_log_err, thread::Thread};
-
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
 pub struct ContextId(pub(crate) usize);

@@ -23,18 +14,14 @@ impl ContextId {

 /// Some context attached to a message in a thread.
 #[derive(Debug, Clone)]
-pub struct ContextSnapshot {
+pub struct Context {
    pub id: ContextId,
    pub name: SharedString,
-    pub parent: Option<SharedString>,
-    pub tooltip: Option<SharedString>,
-    pub icon_path: Option<SharedString>,
    pub kind: ContextKind,
-    /// Joining these strings separated by \n yields text for model. Not refreshed by `snapshot`.
-    pub text: Box<[SharedString]>,
+    pub text: SharedString,
 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ContextKind {
    File,
    Directory,
@@ -42,293 +29,62 @@ pub enum ContextKind {
    Thread,
 }

-impl ContextKind {
-    pub fn all() -> &'static [ContextKind] {
-        &[
-            ContextKind::File,
-            ContextKind::Directory,
-            ContextKind::FetchedUrl,
-            ContextKind::Thread,
-        ]
-    }
-
-    pub fn label(&self) -> &'static str {
-        match self {
-            ContextKind::File => "File",
-            ContextKind::Directory => "Folder",
-            ContextKind::FetchedUrl => "Fetch",
-            ContextKind::Thread => "Thread",
-        }
-    }
-
-    pub fn icon(&self) -> IconName {
-        match self {
-            ContextKind::File => IconName::File,
-            ContextKind::Directory => IconName::Folder,
-            ContextKind::FetchedUrl => IconName::Globe,
-            ContextKind::Thread => IconName::MessageCircle,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum Context {
-    File(FileContext),
-    Directory(DirectoryContext),
-    FetchedUrl(FetchedUrlContext),
-    Thread(ThreadContext),
-}
-
-impl Context {
-    pub fn id(&self) -> ContextId {
-        match self {
-            Self::File(file) => file.id,
-            Self::Directory(directory) => directory.snapshot.id,
-            Self::FetchedUrl(url) => url.id,
-            Self::Thread(thread) => thread.id,
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct FileContext {
-    pub id: ContextId,
-    pub context_buffer: ContextBuffer,
-}
-
-#[derive(Debug)]
-pub struct DirectoryContext {
-    pub path: Rc<Path>,
-    pub context_buffers: Vec<ContextBuffer>,
-    pub snapshot: ContextSnapshot,
-}
-
-#[derive(Debug)]
-pub struct FetchedUrlContext {
-    pub id: ContextId,
-    pub url: SharedString,
-    pub text: SharedString,
-}
-
-// TODO: Model<Thread> holds onto the thread even if the thread is deleted. Can either handle this
-// explicitly or have a WeakModel<Thread> and remove during snapshot.
-
-#[derive(Debug)]
-pub struct ThreadContext {
-    pub id: ContextId,
-    pub thread: Model<Thread>,
-    pub text: SharedString,
-}
-
-// TODO: Model<Buffer> holds onto the buffer even if the file is deleted and closed. Should remove
-// the context from the message editor in this case.
-
-#[derive(Debug, Clone)]
-pub struct ContextBuffer {
-    pub id: BufferId,
-    pub buffer: Model<Buffer>,
-    pub version: clock::Global,
-    pub text: SharedString,
-}
-
-impl Context {
-    pub fn snapshot(&self, cx: &AppContext) -> Option<ContextSnapshot> {
-        match &self {
-            Self::File(file_context) => file_context.snapshot(cx),
-            Self::Directory(directory_context) => Some(directory_context.snapshot()),
-            Self::FetchedUrl(fetched_url_context) => Some(fetched_url_context.snapshot()),
-            Self::Thread(thread_context) => Some(thread_context.snapshot(cx)),
-        }
-    }
-}
-
-impl FileContext {
-    pub fn snapshot(&self, cx: &AppContext) -> Option<ContextSnapshot> {
-        let buffer = self.context_buffer.buffer.read(cx);
-        let path = buffer_path_log_err(buffer)?;
-        let full_path: SharedString = path.to_string_lossy().into_owned().into();
-        let name = match path.file_name() {
-            Some(name) => name.to_string_lossy().into_owned().into(),
-            None => full_path.clone(),
-        };
-        let parent = path
-            .parent()
-            .and_then(|p| p.file_name())
-            .map(|p| p.to_string_lossy().into_owned().into());
-
-        let icon_path = FileIcons::get_icon(&path, cx);
-
-        Some(ContextSnapshot {
-            id: self.id,
-            name,
-            parent,
-            tooltip: Some(full_path),
-            icon_path,
-            kind: ContextKind::File,
-            text: Box::new([self.context_buffer.text.clone()]),
-        })
-    }
-}
-
-impl DirectoryContext {
-    pub fn new(
-        id: ContextId,
-        path: &Path,
-        context_buffers: Vec<ContextBuffer>,
-    ) -> DirectoryContext {
-        let full_path: SharedString = path.to_string_lossy().into_owned().into();
-
-        let name = match path.file_name() {
-            Some(name) => name.to_string_lossy().into_owned().into(),
-            None => full_path.clone(),
-        };
-
-        let parent = path
-            .parent()
-            .and_then(|p| p.file_name())
-            .map(|p| p.to_string_lossy().into_owned().into());
-
-        // TODO: include directory path in text?
-        let text = context_buffers
-            .iter()
-            .map(|b| b.text.clone())
-            .collect::<Vec<_>>()
-            .into();
-
-        DirectoryContext {
-            path: path.into(),
-            context_buffers,
-            snapshot: ContextSnapshot {
-                id,
-                name,
-                parent,
-                tooltip: Some(full_path),
-                icon_path: None,
-                kind: ContextKind::Directory,
-                text,
-            },
-        }
-    }
-
-    pub fn snapshot(&self) -> ContextSnapshot {
-        self.snapshot.clone()
-    }
-}
-
-impl FetchedUrlContext {
-    pub fn snapshot(&self) -> ContextSnapshot {
-        ContextSnapshot {
-            id: self.id,
-            name: self.url.clone(),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            kind: ContextKind::FetchedUrl,
-            text: Box::new([self.text.clone()]),
-        }
-    }
-}
-
-impl ThreadContext {
-    pub fn snapshot(&self, cx: &AppContext) -> ContextSnapshot {
-        let thread = self.thread.read(cx);
-        ContextSnapshot {
-            id: self.id,
-            name: thread.summary().unwrap_or("New thread".into()),
-            parent: None,
-            tooltip: None,
-            icon_path: None,
-            kind: ContextKind::Thread,
-            text: Box::new([self.text.clone()]),
-        }
-    }
-}
-
 pub fn attach_context_to_message(
    message: &mut LanguageModelRequestMessage,
-    contexts: impl Iterator<Item = ContextSnapshot>,
+    context: impl IntoIterator<Item = Context>,
 ) {
-    let mut file_context = Vec::new();
-    let mut directory_context = Vec::new();
-    let mut fetch_context = Vec::new();
-    let mut thread_context = Vec::new();
+    let mut file_context = String::new();
+    let mut directory_context = String::new();
+    let mut fetch_context = String::new();
+    let mut thread_context = String::new();

-    let mut capacity = 0;
-    for context in contexts {
-        capacity += context.text.len();
+    for context in context.into_iter() {
        match context.kind {
-            ContextKind::File => file_context.push(context),
-            ContextKind::Directory => directory_context.push(context),
-            ContextKind::FetchedUrl => fetch_context.push(context),
-            ContextKind::Thread => thread_context.push(context),
-        }
-    }
-    if !file_context.is_empty() {
-        capacity += 1;
-    }
-    if !directory_context.is_empty() {
-        capacity += 1;
-    }
-    if !fetch_context.is_empty() {
-        capacity += 1 + fetch_context.len();
-    }
-    if !thread_context.is_empty() {
-        capacity += 1 + thread_context.len();
-    }
-    if capacity == 0 {
-        return;
-    }
-
-    let mut context_chunks = Vec::with_capacity(capacity);
-
-    if !file_context.is_empty() {
-        context_chunks.push("The following files are available:\n");
-        for context in &file_context {
-            for chunk in &context.text {
-                context_chunks.push(&chunk);
+            ContextKind::File => {
+                file_context.push_str(&context.text);
+                file_context.push('\n');
+            }
+            ContextKind::Directory => {
+                directory_context.push_str(&context.text);
+                directory_context.push('\n');
+            }
+            ContextKind::FetchedUrl => {
+                fetch_context.push_str(&context.name);
+                fetch_context.push('\n');
+                fetch_context.push_str(&context.text);
+                fetch_context.push('\n');
+            }
+            ContextKind::Thread => {
+                thread_context.push_str(&context.name);
+                thread_context.push('\n');
+                thread_context.push_str(&context.text);
+                thread_context.push('\n');
            }
        }
    }

+    let mut context_text = String::new();
+    if !file_context.is_empty() {
+        context_text.push_str("The following files are available:\n");
+        context_text.push_str(&file_context);
+    }
+
    if !directory_context.is_empty() {
-        context_chunks.push("The following directories are available:\n");
-        for context in &directory_context {
-            for chunk in &context.text {
-                context_chunks.push(&chunk);
-            }
-        }
+        context_text.push_str("The following directories are available:\n");
+        context_text.push_str(&directory_context);
    }

    if !fetch_context.is_empty() {
-        context_chunks.push("The following fetched results are available:\n");
-        for context in &fetch_context {
-            context_chunks.push(&context.name);
-            for chunk in &context.text {
-                context_chunks.push(&chunk);
-            }
-        }
+        context_text.push_str("The following fetched results are available\n");
+        context_text.push_str(&fetch_context);
    }

    if !thread_context.is_empty() {
-        context_chunks.push("The following previous conversation threads are available:\n");
-        for context in &thread_context {
-            context_chunks.push(&context.name);
-            for chunk in &context.text {
-                context_chunks.push(&chunk);
-            }
-        }
+        context_text.push_str("The following previous conversation threads are available\n");
+        context_text.push_str(&thread_context);
    }

-    debug_assert!(
-        context_chunks.len() == capacity,
-        "attach_context_message calculated capacity of {}, but length was {}",
-        capacity,
-        context_chunks.len()
-    );
-
-    if !context_chunks.is_empty() {
-        message
-            .content
-            .push(MessageContent::Text(context_chunks.join("\n")));
+    if !context_text.is_empty() {
+        message.content.push(MessageContent::Text(context_text));
    }
 }
--- a/crates/assistant2/src/context_picker.rs
+++ b/crates/assistant2/src/context_picker.rs
@@ -3,17 +3,15 @@ mod fetch_context_picker;
 mod file_context_picker;
 mod thread_context_picker;

-use std::path::PathBuf;
 use std::sync::Arc;

-use editor::Editor;
-use file_context_picker::render_file_context_entry;
 use gpui::{
-    AppContext, DismissEvent, EventEmitter, FocusHandle, FocusableView, View, WeakModel, WeakView,
+    AppContext, DismissEvent, EventEmitter, FocusHandle, FocusableView, SharedString, Task, View,
+    WeakModel, WeakView,
 };
-use project::ProjectPath;
-use thread_context_picker::{render_thread_context_entry, ThreadContextEntry};
-use ui::{prelude::*, ContextMenu, ContextMenuEntry, ContextMenuItem};
+use picker::{Picker, PickerDelegate};
+use ui::{prelude::*, ListItem, ListItemSpacing};
+use util::ResultExt;
 use workspace::Workspace;

 use crate::context::ContextKind;
@@ -23,7 +21,6 @@ use crate::context_picker::file_context_picker::FileContextPicker;
 use crate::context_picker::thread_context_picker::ThreadContextPicker;
 use crate::context_store::ContextStore;
 use crate::thread_store::ThreadStore;
-use crate::AssistantPanel;

 #[derive(Debug, Clone, Copy)]
 pub enum ConfirmBehavior {
@@ -33,7 +30,7 @@ pub enum ConfirmBehavior {

 #[derive(Debug, Clone)]
 enum ContextPickerMode {
-    Default(View<ContextMenu>),
+    Default,
    File(View<FileContextPicker>),
    Directory(View<DirectoryContextPicker>),
    Fetch(View<FetchContextPicker>),
@@ -42,10 +39,7 @@ enum ContextPickerMode {

 pub(super) struct ContextPicker {
    mode: ContextPickerMode,
-    workspace: WeakView<Workspace>,
-    context_store: WeakModel<ContextStore>,
-    thread_store: Option<WeakModel<ThreadStore>>,
-    confirm_behavior: ConfirmBehavior,
+    picker: View<Picker<ContextPickerDelegate>>,
 }

 impl ContextPicker {
@@ -56,301 +50,54 @@ impl ContextPicker {
        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        ContextPicker {
-            mode: ContextPickerMode::Default(ContextMenu::build(cx, |menu, _cx| menu)),
+        let mut entries = vec![
+            ContextPickerEntry {
+                name: "File".into(),
+                kind: ContextKind::File,
+                icon: IconName::File,
+            },
+            ContextPickerEntry {
+                name: "Folder".into(),
+                kind: ContextKind::Directory,
+                icon: IconName::Folder,
+            },
+            ContextPickerEntry {
+                name: "Fetch".into(),
+                kind: ContextKind::FetchedUrl,
+                icon: IconName::Globe,
+            },
+        ];
+
+        if thread_store.is_some() {
+            entries.push(ContextPickerEntry {
+                name: "Thread".into(),
+                kind: ContextKind::Thread,
+                icon: IconName::MessageCircle,
+            });
+        }
+
+        let delegate = ContextPickerDelegate {
+            context_picker: cx.view().downgrade(),
            workspace,
-            context_store,
            thread_store,
+            context_store,
            confirm_behavior,
-        }
-    }
+            entries,
+            selected_ix: 0,
+        };

-    pub fn init(&mut self, cx: &mut ViewContext<Self>) {
-        self.mode = ContextPickerMode::Default(self.build_menu(cx));
-        cx.notify();
-    }
-
-    fn build_menu(&mut self, cx: &mut ViewContext<Self>) -> View<ContextMenu> {
-        let context_picker = cx.view().clone();
-
-        let menu = ContextMenu::build(cx, move |menu, cx| {
-            let kind_entry = |kind: &'static ContextKind| {
-                let context_picker = context_picker.clone();
-
-                ContextMenuEntry::new(kind.label())
-                    .icon(kind.icon())
-                    .handler(move |cx| {
-                        context_picker.update(cx, |this, cx| this.select_kind(*kind, cx))
-                    })
-            };
-
-            let recent = self.recent_entries(cx);
-            let has_recent = !recent.is_empty();
-            let recent_entries = recent
-                .into_iter()
-                .enumerate()
-                .map(|(ix, entry)| self.recent_menu_item(context_picker.clone(), ix, entry));
-
-            let menu = menu
-                .when(has_recent, |menu| menu.label("Recent"))
-                .extend(recent_entries)
-                .when(has_recent, |menu| menu.separator())
-                .extend(ContextKind::all().into_iter().map(kind_entry));
-
-            match self.confirm_behavior {
-                ConfirmBehavior::KeepOpen => menu.keep_open_on_confirm(),
-                ConfirmBehavior::Close => menu,
-            }
+        let picker = cx.new_view(|cx| {
+            Picker::nonsearchable_uniform_list(delegate, cx).max_height(Some(rems(20.).into()))
        });

-        cx.subscribe(&menu, move |_, _, _: &DismissEvent, cx| {
-            cx.emit(DismissEvent);
-        })
-        .detach();
-
-        menu
-    }
-
-    fn select_kind(&mut self, kind: ContextKind, cx: &mut ViewContext<Self>) {
-        let context_picker = cx.view().downgrade();
-
-        match kind {
-            ContextKind::File => {
-                self.mode = ContextPickerMode::File(cx.new_view(|cx| {
-                    FileContextPicker::new(
-                        context_picker.clone(),
-                        self.workspace.clone(),
-                        self.context_store.clone(),
-                        self.confirm_behavior,
-                        cx,
-                    )
-                }));
-            }
-            ContextKind::Directory => {
-                self.mode = ContextPickerMode::Directory(cx.new_view(|cx| {
-                    DirectoryContextPicker::new(
-                        context_picker.clone(),
-                        self.workspace.clone(),
-                        self.context_store.clone(),
-                        self.confirm_behavior,
-                        cx,
-                    )
-                }));
-            }
-            ContextKind::FetchedUrl => {
-                self.mode = ContextPickerMode::Fetch(cx.new_view(|cx| {
-                    FetchContextPicker::new(
-                        context_picker.clone(),
-                        self.workspace.clone(),
-                        self.context_store.clone(),
-                        self.confirm_behavior,
-                        cx,
-                    )
-                }));
-            }
-            ContextKind::Thread => {
-                if let Some(thread_store) = self.thread_store.as_ref() {
-                    self.mode = ContextPickerMode::Thread(cx.new_view(|cx| {
-                        ThreadContextPicker::new(
-                            thread_store.clone(),
-                            context_picker.clone(),
-                            self.context_store.clone(),
-                            self.confirm_behavior,
-                            cx,
-                        )
-                    }));
-                }
-            }
-        }
-
-        cx.notify();
-        cx.focus_self();
-    }
-
-    fn recent_menu_item(
-        &self,
-        context_picker: View<ContextPicker>,
-        ix: usize,
-        entry: RecentEntry,
-    ) -> ContextMenuItem {
-        match entry {
-            RecentEntry::File {
-                project_path,
-                path_prefix,
-            } => {
-                let context_store = self.context_store.clone();
-                let path = project_path.path.clone();
-
-                ContextMenuItem::custom_entry(
-                    move |cx| {
-                        render_file_context_entry(
-                            ElementId::NamedInteger("ctx-recent".into(), ix),
-                            &path,
-                            &path_prefix,
-                            context_store.clone(),
-                            cx,
-                        )
-                        .into_any()
-                    },
-                    move |cx| {
-                        context_picker.update(cx, |this, cx| {
-                            this.add_recent_file(project_path.clone(), cx);
-                        })
-                    },
-                )
-            }
-            RecentEntry::Thread(thread) => {
-                let context_store = self.context_store.clone();
-                let view_thread = thread.clone();
-
-                ContextMenuItem::custom_entry(
-                    move |cx| {
-                        render_thread_context_entry(&view_thread, context_store.clone(), cx)
-                            .into_any()
-                    },
-                    move |cx| {
-                        context_picker.update(cx, |this, cx| {
-                            this.add_recent_thread(thread.clone(), cx);
-                        })
-                    },
-                )
-            }
+        ContextPicker {
+            mode: ContextPickerMode::Default,
+            picker,
        }
    }

-    fn add_recent_file(&self, project_path: ProjectPath, cx: &mut ViewContext<Self>) {
-        let Some(context_store) = self.context_store.upgrade() else {
-            return;
-        };
-
-        let task = context_store.update(cx, |context_store, cx| {
-            context_store.add_file_from_path(project_path.clone(), cx)
-        });
-
-        let workspace = self.workspace.clone();
-
-        cx.spawn(|_, mut cx| async move {
-            match task.await {
-                Ok(_) => {
-                    return anyhow::Ok(());
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })
-                }
-            }
-        })
-        .detach_and_log_err(cx);
-
-        cx.notify();
-    }
-
-    fn add_recent_thread(&self, thread: ThreadContextEntry, cx: &mut ViewContext<Self>) {
-        let Some(context_store) = self.context_store.upgrade() else {
-            return;
-        };
-
-        let Some(thread) = self
-            .thread_store
-            .clone()
-            .and_then(|this| this.upgrade())
-            .and_then(|this| this.update(cx, |this, cx| this.open_thread(&thread.id, cx)))
-        else {
-            return;
-        };
-
-        context_store.update(cx, |context_store, cx| {
-            context_store.add_thread(thread, cx);
-        });
-
-        cx.notify();
-    }
-
-    fn recent_entries(&self, cx: &mut WindowContext) -> Vec<RecentEntry> {
-        let Some(workspace) = self.workspace.upgrade().map(|w| w.read(cx)) else {
-            return vec![];
-        };
-
-        let Some(context_store) = self.context_store.upgrade().map(|cs| cs.read(cx)) else {
-            return vec![];
-        };
-
-        let mut recent = Vec::with_capacity(6);
-
-        let mut current_files = context_store.file_paths(cx);
-
-        if let Some(active_path) = Self::active_singleton_buffer_path(&workspace, cx) {
-            current_files.insert(active_path);
-        }
-
-        let project = workspace.project().read(cx);
-
-        recent.extend(
-            workspace
-                .recent_navigation_history_iter(cx)
-                .filter(|(path, _)| !current_files.contains(&path.path.to_path_buf()))
-                .take(4)
-                .filter_map(|(project_path, _)| {
-                    project
-                        .worktree_for_id(project_path.worktree_id, cx)
-                        .map(|worktree| RecentEntry::File {
-                            project_path,
-                            path_prefix: worktree.read(cx).root_name().into(),
-                        })
-                }),
-        );
-
-        let mut current_threads = context_store.thread_ids();
-
-        if let Some(active_thread) = workspace
-            .panel::<AssistantPanel>(cx)
-            .map(|panel| panel.read(cx).active_thread(cx))
-        {
-            current_threads.insert(active_thread.read(cx).id().clone());
-        }
-
-        let Some(thread_store) = self
-            .thread_store
-            .as_ref()
-            .and_then(|thread_store| thread_store.upgrade())
-        else {
-            return recent;
-        };
-
-        thread_store.update(cx, |thread_store, cx| {
-            recent.extend(
-                thread_store
-                    .threads(cx)
-                    .into_iter()
-                    .filter(|thread| !current_threads.contains(thread.read(cx).id()))
-                    .take(2)
-                    .map(|thread| {
-                        let thread = thread.read(cx);
-
-                        RecentEntry::Thread(ThreadContextEntry {
-                            id: thread.id().clone(),
-                            summary: thread.summary_or_default(),
-                        })
-                    }),
-            )
-        });
-
-        recent
-    }
-
-    fn active_singleton_buffer_path(workspace: &Workspace, cx: &AppContext) -> Option<PathBuf> {
-        let active_item = workspace.active_item(cx)?;
-
-        let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
-        let buffer = editor.buffer().read(cx).as_singleton()?;
-
-        let path = buffer.read(cx).file()?.path().to_path_buf();
-        Some(path)
+    pub fn reset_mode(&mut self) {
+        self.mode = ContextPickerMode::Default;
    }
 }

@@ -359,7 +106,7 @@ impl EventEmitter<DismissEvent> for ContextPicker {}
 impl FocusableView for ContextPicker {
    fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
        match &self.mode {
-            ContextPickerMode::Default(menu) => menu.focus_handle(cx),
+            ContextPickerMode::Default => self.picker.focus_handle(cx),
            ContextPickerMode::File(file_picker) => file_picker.focus_handle(cx),
            ContextPickerMode::Directory(directory_picker) => directory_picker.focus_handle(cx),
            ContextPickerMode::Fetch(fetch_picker) => fetch_picker.focus_handle(cx),
@@ -374,7 +121,7 @@ impl Render for ContextPicker {
            .w(px(400.))
            .min_w(px(400.))
            .map(|parent| match &self.mode {
-                ContextPickerMode::Default(menu) => parent.child(menu.clone()),
+                ContextPickerMode::Default => parent.child(self.picker.clone()),
                ContextPickerMode::File(file_picker) => parent.child(file_picker.clone()),
                ContextPickerMode::Directory(directory_picker) => {
                    parent.child(directory_picker.clone())
@@ -384,10 +131,140 @@ impl Render for ContextPicker {
            })
    }
 }
-enum RecentEntry {
-    File {
-        project_path: ProjectPath,
-        path_prefix: Arc<str>,
-    },
-    Thread(ThreadContextEntry),
+
+#[derive(Clone)]
+struct ContextPickerEntry {
+    name: SharedString,
+    kind: ContextKind,
+    icon: IconName,
+}
+
+pub(crate) struct ContextPickerDelegate {
+    context_picker: WeakView<ContextPicker>,
+    workspace: WeakView<Workspace>,
+    thread_store: Option<WeakModel<ThreadStore>>,
+    context_store: WeakModel<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
+    entries: Vec<ContextPickerEntry>,
+    selected_ix: usize,
+}
+
+impl PickerDelegate for ContextPickerDelegate {
+    type ListItem = ListItem;
+
+    fn match_count(&self) -> usize {
+        self.entries.len()
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_ix
+    }
+
+    fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
+        self.selected_ix = ix.min(self.entries.len().saturating_sub(1));
+        cx.notify();
+    }
+
+    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
+        "Select a context source…".into()
+    }
+
+    fn update_matches(&mut self, _query: String, _cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
+        Task::ready(())
+    }
+
+    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
+        if let Some(entry) = self.entries.get(self.selected_ix) {
+            self.context_picker
+                .update(cx, |this, cx| {
+                    match entry.kind {
+                        ContextKind::File => {
+                            this.mode = ContextPickerMode::File(cx.new_view(|cx| {
+                                FileContextPicker::new(
+                                    self.context_picker.clone(),
+                                    self.workspace.clone(),
+                                    self.context_store.clone(),
+                                    self.confirm_behavior,
+                                    cx,
+                                )
+                            }));
+                        }
+                        ContextKind::Directory => {
+                            this.mode = ContextPickerMode::Directory(cx.new_view(|cx| {
+                                DirectoryContextPicker::new(
+                                    self.context_picker.clone(),
+                                    self.workspace.clone(),
+                                    self.context_store.clone(),
+                                    self.confirm_behavior,
+                                    cx,
+                                )
+                            }));
+                        }
+                        ContextKind::FetchedUrl => {
+                            this.mode = ContextPickerMode::Fetch(cx.new_view(|cx| {
+                                FetchContextPicker::new(
+                                    self.context_picker.clone(),
+                                    self.workspace.clone(),
+                                    self.context_store.clone(),
+                                    self.confirm_behavior,
+                                    cx,
+                                )
+                            }));
+                        }
+                        ContextKind::Thread => {
+                            if let Some(thread_store) = self.thread_store.as_ref() {
+                                this.mode = ContextPickerMode::Thread(cx.new_view(|cx| {
+                                    ThreadContextPicker::new(
+                                        thread_store.clone(),
+                                        self.context_picker.clone(),
+                                        self.context_store.clone(),
+                                        self.confirm_behavior,
+                                        cx,
+                                    )
+                                }));
+                            }
+                        }
+                    }
+
+                    cx.focus_self();
+                })
+                .log_err();
+        }
+    }
+
+    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
+        self.context_picker
+            .update(cx, |this, cx| match this.mode {
+                ContextPickerMode::Default => cx.emit(DismissEvent),
+                ContextPickerMode::File(_)
+                | ContextPickerMode::Directory(_)
+                | ContextPickerMode::Fetch(_)
+                | ContextPickerMode::Thread(_) => {}
+            })
+            .log_err();
+    }
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _cx: &mut ViewContext<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        let entry = &self.entries[ix];
+
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .spacing(ListItemSpacing::Dense)
+                .toggle_state(selected)
+                .child(
+                    h_flex()
+                        .min_w(px(250.))
+                        .max_w(px(400.))
+                        .gap_2()
+                        .child(Icon::new(entry.icon).size(IconSize::Small))
+                        .child(Label::new(entry.name.clone()).single_line()),
+                ),
+        )
+    }
 }
--- a/crates/assistant2/src/context_picker/directory_context_picker.rs
+++ b/crates/assistant2/src/context_picker/directory_context_picker.rs
@@ -1,11 +1,12 @@
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
+// TODO: Remove this once we've implemented the functionality.
+#![allow(unused)]
+
 use std::sync::Arc;

 use fuzzy::PathMatch;
 use gpui::{AppContext, DismissEvent, FocusHandle, FocusableView, Task, View, WeakModel, WeakView};
 use picker::{Picker, PickerDelegate};
-use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
+use project::{PathMatchCandidateSet, WorktreeId};
 use ui::{prelude::*, ListItem};
 use util::ResultExt as _;
 use workspace::Workspace;
@@ -74,65 +75,6 @@ impl DirectoryContextPickerDelegate {
            selected_index: 0,
        }
    }
-
-    fn search(
-        &mut self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: &View<Workspace>,
-        cx: &mut ViewContext<Picker<Self>>,
-    ) -> Task<Vec<PathMatch>> {
-        if query.is_empty() {
-            let workspace = workspace.read(cx);
-            let project = workspace.project().read(cx);
-            let directory_matches = project.worktrees(cx).flat_map(|worktree| {
-                let worktree = worktree.read(cx);
-                let path_prefix: Arc<str> = worktree.root_name().into();
-                worktree.directories(false, 0).map(move |entry| PathMatch {
-                    score: 0.,
-                    positions: Vec::new(),
-                    worktree_id: worktree.id().to_usize(),
-                    path: entry.path.clone(),
-                    path_prefix: path_prefix.clone(),
-                    distance_to_relative_ancestor: 0,
-                    is_dir: true,
-                })
-            });
-
-            Task::ready(directory_matches.collect())
-        } else {
-            let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-            let candidate_sets = worktrees
-                .into_iter()
-                .map(|worktree| {
-                    let worktree = worktree.read(cx);
-
-                    PathMatchCandidateSet {
-                        snapshot: worktree.snapshot(),
-                        include_ignored: worktree
-                            .root_entry()
-                            .map_or(false, |entry| entry.is_ignored),
-                        include_root_name: true,
-                        candidates: project::Candidates::Directories,
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let executor = cx.background_executor().clone();
-            cx.foreground_executor().spawn(async move {
-                fuzzy::match_path_sets(
-                    candidate_sets.as_slice(),
-                    query.as_str(),
-                    None,
-                    false,
-                    100,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await
-            })
-        }
-    }
 }

 impl PickerDelegate for DirectoryContextPickerDelegate {
@@ -146,7 +88,7 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
        self.selected_index
    }

-    fn set_selected_index(&mut self, ix: usize, _cx: &mut ViewContext<Picker<Self>>) {
+    fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
        self.selected_index = ix;
    }

@@ -154,74 +96,23 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
        "Search folders…".into()
    }

-    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
-        let Some(workspace) = self.workspace.upgrade() else {
-            return Task::ready(());
-        };
-
-        let search_task = self.search(query, Arc::<AtomicBool>::default(), &workspace, cx);
-
-        cx.spawn(|this, mut cx| async move {
-            let mut paths = search_task.await;
-            let empty_path = Path::new("");
-            paths.retain(|path_match| path_match.path.as_ref() != empty_path);
-
-            this.update(&mut cx, |this, _cx| {
-                this.delegate.matches = paths;
-            })
-            .log_err();
-        })
+    fn update_matches(&mut self, _query: String, _cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
+        // TODO: Implement this once we fix the issues with the file context picker.
+        Task::ready(())
    }

    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        let Some(mat) = self.matches.get(self.selected_index) else {
-            return;
-        };
-
-        let project_path = ProjectPath {
-            worktree_id: WorktreeId::from_usize(mat.worktree_id),
-            path: mat.path.clone(),
-        };
-
-        let Some(task) = self
-            .context_store
-            .update(cx, |context_store, cx| {
-                context_store.add_directory(project_path, cx)
-            })
-            .ok()
-        else {
-            return;
-        };
-
-        let workspace = self.workspace.clone();
-        let confirm_behavior = self.confirm_behavior;
-        cx.spawn(|this, mut cx| async move {
-            match task.await {
-                Ok(()) => {
-                    this.update(&mut cx, |this, cx| match confirm_behavior {
-                        ConfirmBehavior::KeepOpen => {}
-                        ConfirmBehavior::Close => this.delegate.dismissed(cx),
-                    })?;
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })?;
-                }
-            }
-
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
+        // TODO: Implement this once we fix the issues with the file context picker.
+        match self.confirm_behavior {
+            ConfirmBehavior::KeepOpen => {}
+            ConfirmBehavior::Close => self.dismissed(cx),
+        }
    }

    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
        self.context_picker
-            .update(cx, |_, cx| {
+            .update(cx, |this, cx| {
+                this.reset_mode();
                cx.emit(DismissEvent);
            })
            .ok();
@@ -229,37 +120,10 @@ impl PickerDelegate for DirectoryContextPickerDelegate {

    fn render_match(
        &self,
-        ix: usize,
-        selected: bool,
-        cx: &mut ViewContext<Picker<Self>>,
+        _ix: usize,
+        _selected: bool,
+        _cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        let path_match = &self.matches[ix];
-        let directory_name = path_match.path.to_string_lossy().to_string();
-
-        let added = self.context_store.upgrade().map_or(false, |context_store| {
-            context_store
-                .read(cx)
-                .includes_directory(&path_match.path)
-                .is_some()
-        });
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .toggle_state(selected)
-                .child(h_flex().gap_2().child(Label::new(directory_name)))
-                .when(added, |el| {
-                    el.end_slot(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                Icon::new(IconName::Check)
-                                    .size(IconSize::Small)
-                                    .color(Color::Success),
-                            )
-                            .child(Label::new("Added").size(LabelSize::Small)),
-                    )
-                }),
-        )
+        None
    }
 }
--- a/crates/assistant2/src/context_picker/fetch_context_picker.rs
+++ b/crates/assistant2/src/context_picker/fetch_context_picker.rs
@@ -11,6 +11,7 @@ use picker::{Picker, PickerDelegate};
 use ui::{prelude::*, ListItem, ViewContext};
 use workspace::Workspace;

+use crate::context::ContextKind;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;

@@ -81,12 +82,11 @@ impl FetchContextPickerDelegate {
        }
    }

-    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: String) -> Result<String> {
-        let url = if !url.starts_with("https://") && !url.starts_with("http://") {
-            format!("https://{url}")
-        } else {
-            url
-        };
+    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<String> {
+        let mut url = url.to_owned();
+        if !url.starts_with("https://") && !url.starts_with("http://") {
+            url = format!("https://{url}");
+        }

        let mut response = http_client.get(&url, AsyncBody::default(), true).await?;

@@ -176,7 +176,7 @@ impl PickerDelegate for FetchContextPickerDelegate {

    fn set_selected_index(&mut self, _ix: usize, _cx: &mut ViewContext<Picker<Self>>) {}

-    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
+    fn placeholder_text(&self, _cx: &mut ui::WindowContext) -> Arc<str> {
        "Enter a URL…".into()
    }

@@ -195,16 +195,13 @@ impl PickerDelegate for FetchContextPickerDelegate {
        let url = self.url.clone();
        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
-            let text = cx
-                .background_executor()
-                .spawn(Self::build_message(http_client, url.clone()))
-                .await?;
+            let text = Self::build_message(http_client, &url).await?;

            this.update(&mut cx, |this, cx| {
                this.delegate
                    .context_store
                    .update(cx, |context_store, _cx| {
-                        context_store.add_fetched_url(url, text);
+                        context_store.insert_context(ContextKind::FetchedUrl, url, text);
                    })?;

                match confirm_behavior {
@@ -222,7 +219,8 @@ impl PickerDelegate for FetchContextPickerDelegate {

    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
        self.context_picker
-            .update(cx, |_, cx| {
+            .update(cx, |this, cx| {
+                this.reset_mode();
                cx.emit(DismissEvent);
            })
            .ok();
@@ -232,29 +230,13 @@ impl PickerDelegate for FetchContextPickerDelegate {
        &self,
        ix: usize,
        selected: bool,
-        cx: &mut ViewContext<Picker<Self>>,
+        _cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        let added = self.context_store.upgrade().map_or(false, |context_store| {
-            context_store.read(cx).includes_url(&self.url).is_some()
-        });
-
        Some(
            ListItem::new(ix)
                .inset(true)
                .toggle_state(selected)
-                .child(Label::new(self.url.clone()))
-                .when(added, |child| {
-                    child.disabled(true).end_slot(
-                        h_flex()
-                            .gap_1()
-                            .child(
-                                Icon::new(IconName::Check)
-                                    .size(IconSize::Small)
-                                    .color(Color::Success),
-                            )
-                            .child(Label::new("Added").size(LabelSize::Small)),
-                    )
-                }),
+                .child(Label::new(self.url.clone())),
        )
    }
 }
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -1,20 +1,20 @@
+use std::fmt::Write as _;
+use std::ops::RangeInclusive;
 use std::path::Path;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

-use file_icons::FileIcons;
 use fuzzy::PathMatch;
-use gpui::{
-    AppContext, DismissEvent, FocusHandle, FocusableView, Stateful, Task, View, WeakModel, WeakView,
-};
+use gpui::{AppContext, DismissEvent, FocusHandle, FocusableView, Task, View, WeakModel, WeakView};
 use picker::{Picker, PickerDelegate};
-use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
-use ui::{prelude::*, ListItem, Tooltip};
+use project::{PathMatchCandidateSet, WorktreeId};
+use ui::{prelude::*, ListItem};
 use util::ResultExt as _;
 use workspace::Workspace;

+use crate::context::ContextKind;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
-use crate::context_store::{ContextStore, FileInclusion};
+use crate::context_store::ContextStore;

 pub struct FileContextPicker {
    picker: View<Picker<FileContextPickerDelegate>>,
@@ -192,45 +192,57 @@ impl PickerDelegate for FileContextPickerDelegate {
    }

    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        let Some(mat) = self.matches.get(self.selected_index) else {
-            return;
-        };
+        let mat = &self.matches[self.selected_index];

-        let project_path = ProjectPath {
-            worktree_id: WorktreeId::from_usize(mat.worktree_id),
-            path: mat.path.clone(),
-        };
-
-        let Some(task) = self
-            .context_store
-            .update(cx, |context_store, cx| {
-                context_store.add_file_from_path(project_path, cx)
-            })
-            .ok()
+        let workspace = self.workspace.clone();
+        let Some(project) = workspace
+            .upgrade()
+            .map(|workspace| workspace.read(cx).project().clone())
        else {
            return;
        };
-
-        let workspace = self.workspace.clone();
+        let path = mat.path.clone();
+        let worktree_id = WorktreeId::from_usize(mat.worktree_id);
        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
-            match task.await {
-                Ok(()) => {
-                    this.update(&mut cx, |this, cx| match confirm_behavior {
-                        ConfirmBehavior::KeepOpen => {}
-                        ConfirmBehavior::Close => this.delegate.dismissed(cx),
-                    })?;
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
+            let Some(open_buffer_task) = project
+                .update(&mut cx, |project, cx| {
+                    project.open_buffer((worktree_id, path.clone()), cx)
+                })
+                .ok()
+            else {
+                return anyhow::Ok(());
+            };

-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
+            let buffer = open_buffer_task.await?;
+
+            this.update(&mut cx, |this, cx| {
+                this.delegate
+                    .context_store
+                    .update(cx, |context_store, cx| {
+                        let mut text = String::new();
+                        text.push_str(&codeblock_fence_for_path(Some(&path), None));
+                        text.push_str(&buffer.read(cx).text());
+                        if !text.ends_with('\n') {
+                            text.push('\n');
+                        }
+
+                        text.push_str("```\n");
+
+                        context_store.insert_context(
+                            ContextKind::File,
+                            path.to_string_lossy().to_string(),
+                            text,
+                        );
                    })?;
+
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
                }
-            }
+
+                anyhow::Ok(())
+            })??;

            anyhow::Ok(())
        })
@@ -239,7 +251,8 @@ impl PickerDelegate for FileContextPickerDelegate {

    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
        self.context_picker
-            .update(cx, |_, cx| {
+            .update(cx, |this, cx| {
+                this.reset_mode();
                cx.emit(DismissEvent);
            })
            .ok();
@@ -249,101 +262,67 @@ impl PickerDelegate for FileContextPickerDelegate {
        &self,
        ix: usize,
        selected: bool,
-        cx: &mut ViewContext<Picker<Self>>,
+        _cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        let path_match = &self.matches[ix];

+        let (file_name, directory) = if path_match.path.as_ref() == Path::new("") {
+            (SharedString::from(path_match.path_prefix.clone()), None)
+        } else {
+            let file_name = path_match
+                .path
+                .file_name()
+                .unwrap_or_default()
+                .to_string_lossy()
+                .to_string()
+                .into();
+
+            let mut directory = format!("{}/", path_match.path_prefix);
+            if let Some(parent) = path_match
+                .path
+                .parent()
+                .filter(|parent| parent != &Path::new(""))
+            {
+                directory.push_str(&parent.to_string_lossy());
+                directory.push('/');
+            }
+
+            (file_name, Some(directory))
+        };
+
        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .toggle_state(selected)
-                .child(render_file_context_entry(
-                    ElementId::NamedInteger("file-ctx-picker".into(), ix),
-                    &path_match.path,
-                    &path_match.path_prefix,
-                    self.context_store.clone(),
-                    cx,
-                )),
+            ListItem::new(ix).inset(true).toggle_state(selected).child(
+                h_flex()
+                    .gap_2()
+                    .child(Label::new(file_name))
+                    .children(directory.map(|directory| {
+                        Label::new(directory)
+                            .size(LabelSize::Small)
+                            .color(Color::Muted)
+                    })),
+            ),
        )
    }
 }

-pub fn render_file_context_entry(
-    id: ElementId,
-    path: &Path,
-    path_prefix: &Arc<str>,
-    context_store: WeakModel<ContextStore>,
-    cx: &WindowContext,
-) -> Stateful<Div> {
-    let (file_name, directory) = if path == Path::new("") {
-        (SharedString::from(path_prefix.clone()), None)
-    } else {
-        let file_name = path
-            .file_name()
-            .unwrap_or_default()
-            .to_string_lossy()
-            .to_string()
-            .into();
+fn codeblock_fence_for_path(path: Option<&Path>, row_range: Option<RangeInclusive<u32>>) -> String {
+    let mut text = String::new();
+    write!(text, "```").unwrap();

-        let mut directory = format!("{}/", path_prefix);
-
-        if let Some(parent) = path.parent().filter(|parent| parent != &Path::new("")) {
-            directory.push_str(&parent.to_string_lossy());
-            directory.push('/');
+    if let Some(path) = path {
+        if let Some(extension) = path.extension().and_then(|ext| ext.to_str()) {
+            write!(text, "{} ", extension).unwrap();
        }

-        (file_name, Some(directory))
-    };
+        write!(text, "{}", path.display()).unwrap();
+    } else {
+        write!(text, "untitled").unwrap();
+    }

-    let added = context_store
-        .upgrade()
-        .and_then(|context_store| context_store.read(cx).will_include_file_path(path, cx));
+    if let Some(row_range) = row_range {
+        write!(text, ":{}-{}", row_range.start() + 1, row_range.end() + 1).unwrap();
+    }

-    let file_icon = FileIcons::get_icon(&path, cx)
-        .map(Icon::from_path)
-        .unwrap_or_else(|| Icon::new(IconName::File));
-
-    h_flex()
-        .id(id)
-        .gap_1()
-        .w_full()
-        .child(file_icon.size(IconSize::Small))
-        .child(
-            h_flex()
-                .gap_2()
-                .child(Label::new(file_name))
-                .children(directory.map(|directory| {
-                    Label::new(directory)
-                        .size(LabelSize::Small)
-                        .color(Color::Muted)
-                })),
-        )
-        .child(div().w_full())
-        .when_some(added, |el, added| match added {
-            FileInclusion::Direct(_) => el.child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::new(IconName::Check)
-                            .size(IconSize::Small)
-                            .color(Color::Success),
-                    )
-                    .child(Label::new("Added").size(LabelSize::Small)),
-            ),
-            FileInclusion::InDirectory(dir_name) => {
-                let dir_name = dir_name.to_string_lossy().into_owned();
-
-                el.child(
-                    h_flex()
-                        .gap_1()
-                        .child(
-                            Icon::new(IconName::Check)
-                                .size(IconSize::Small)
-                                .color(Color::Success),
-                        )
-                        .child(Label::new("Included").size(LabelSize::Small)),
-                )
-                .tooltip(move |cx| Tooltip::text(format!("in {dir_name}"), cx))
-            }
-        })
+    text.push('\n');
+    text
 }
--- a/crates/assistant2/src/context_picker/thread_context_picker.rs
+++ b/crates/assistant2/src/context_picker/thread_context_picker.rs
@@ -5,8 +5,9 @@ use gpui::{AppContext, DismissEvent, FocusHandle, FocusableView, Task, View, Wea
 use picker::{Picker, PickerDelegate};
 use ui::{prelude::*, ListItem};

+use crate::context::ContextKind;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
-use crate::context_store::{self, ContextStore};
+use crate::context_store;
 use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;

@@ -47,9 +48,9 @@ impl Render for ThreadContextPicker {
 }

 #[derive(Debug, Clone)]
-pub struct ThreadContextEntry {
-    pub id: ThreadId,
-    pub summary: SharedString,
+struct ThreadContextEntry {
+    id: ThreadId,
+    summary: SharedString,
 }

 pub struct ThreadContextPickerDelegate {
@@ -103,8 +104,10 @@ impl PickerDelegate for ThreadContextPickerDelegate {
            this.threads(cx)
                .into_iter()
                .map(|thread| {
+                    const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");
+
                    let id = thread.read(cx).id().clone();
-                    let summary = thread.read(cx).summary_or_default();
+                    let summary = thread.read(cx).summary().unwrap_or(DEFAULT_SUMMARY);
                    ThreadContextEntry { id, summary }
                })
                .collect::<Vec<_>>()
@@ -151,9 +154,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
    }

    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        let Some(entry) = self.matches.get(self.selected_index) else {
-            return;
-        };
+        let entry = &self.matches[self.selected_index];

        let Some(thread_store) = self.thread_store.upgrade() else {
            return;
@@ -165,7 +166,27 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        };

        self.context_store
-            .update(cx, |context_store, cx| context_store.add_thread(thread, cx))
+            .update(cx, |context_store, cx| {
+                let text = thread.update(cx, |thread, _cx| {
+                    let mut text = String::new();
+
+                    for message in thread.messages() {
+                        text.push_str(match message.role {
+                            language_model::Role::User => "User:",
+                            language_model::Role::Assistant => "Assistant:",
+                            language_model::Role::System => "System:",
+                        });
+                        text.push('\n');
+
+                        text.push_str(&message.text);
+                        text.push('\n');
+                    }
+
+                    text
+                });
+
+                context_store.insert_context(ContextKind::Thread, entry.summary.clone(), text);
+            })
            .ok();

        match self.confirm_behavior {
@@ -176,7 +197,8 @@ impl PickerDelegate for ThreadContextPickerDelegate {

    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
        self.context_picker
-            .update(cx, |_, cx| {
+            .update(cx, |this, cx| {
+                this.reset_mode();
                cx.emit(DismissEvent);
            })
            .ok();
@@ -186,41 +208,15 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        &self,
        ix: usize,
        selected: bool,
-        cx: &mut ViewContext<Picker<Self>>,
+        _cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        let thread = &self.matches[ix];

-        Some(ListItem::new(ix).inset(true).toggle_state(selected).child(
-            render_thread_context_entry(thread, self.context_store.clone(), cx),
-        ))
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .toggle_state(selected)
+                .child(thread.summary.clone()),
+        )
    }
 }
-
-pub fn render_thread_context_entry(
-    thread: &ThreadContextEntry,
-    context_store: WeakModel<ContextStore>,
-    cx: &mut WindowContext,
-) -> Div {
-    let added = context_store.upgrade().map_or(false, |ctx_store| {
-        ctx_store.read(cx).includes_thread(&thread.id).is_some()
-    });
-
-    h_flex()
-        .gap_1()
-        .w_full()
-        .child(Icon::new(IconName::MessageCircle).size(IconSize::Small))
-        .child(Label::new(thread.summary.clone()))
-        .child(div().w_full())
-        .when(added, |el| {
-            el.child(
-                h_flex()
-                    .gap_1()
-                    .child(
-                        Icon::new(IconName::Check)
-                            .size(IconSize::Small)
-                            .color(Color::Success),
-                    )
-                    .child(Label::new("Added").size(LabelSize::Small)),
-            )
-        })
-}
--- a/crates/assistant2/src/context_store.rs
+++ b/crates/assistant2/src/context_store.rs
@@ -1,654 +1,47 @@
-use std::path::{Path, PathBuf};
-use std::sync::Arc;
+use gpui::SharedString;

-use anyhow::{anyhow, bail, Result};
-use collections::{BTreeMap, HashMap, HashSet};
-use futures::{self, future, Future, FutureExt};
-use gpui::{AppContext, AsyncAppContext, Model, ModelContext, SharedString, Task, WeakView};
-use language::Buffer;
-use project::{ProjectPath, Worktree};
-use rope::Rope;
-use text::BufferId;
-use workspace::Workspace;
-
-use crate::context::{
-    Context, ContextBuffer, ContextId, ContextSnapshot, DirectoryContext, FetchedUrlContext,
-    FileContext, ThreadContext,
-};
-use crate::context_strip::SuggestedContext;
-use crate::thread::{Thread, ThreadId};
+use crate::context::{Context, ContextId, ContextKind};

 pub struct ContextStore {
-    workspace: WeakView<Workspace>,
    context: Vec<Context>,
-    // TODO: If an EntityId is used for all context types (like BufferId), can remove ContextId.
    next_context_id: ContextId,
-    files: BTreeMap<BufferId, ContextId>,
-    directories: HashMap<PathBuf, ContextId>,
-    threads: HashMap<ThreadId, ContextId>,
-    fetched_urls: HashMap<String, ContextId>,
 }

 impl ContextStore {
-    pub fn new(workspace: WeakView<Workspace>) -> Self {
+    pub fn new() -> Self {
        Self {
-            workspace,
            context: Vec::new(),
            next_context_id: ContextId(0),
-            files: BTreeMap::default(),
-            directories: HashMap::default(),
-            threads: HashMap::default(),
-            fetched_urls: HashMap::default(),
        }
    }

-    pub fn snapshot<'a>(
-        &'a self,
-        cx: &'a AppContext,
-    ) -> impl Iterator<Item = ContextSnapshot> + 'a {
-        self.context()
-            .iter()
-            .flat_map(|context| context.snapshot(cx))
-    }
-
    pub fn context(&self) -> &Vec<Context> {
        &self.context
    }

+    pub fn drain(&mut self) -> Vec<Context> {
+        self.context.drain(..).collect()
+    }
+
    pub fn clear(&mut self) {
        self.context.clear();
-        self.files.clear();
-        self.directories.clear();
-        self.threads.clear();
-        self.fetched_urls.clear();
    }

-    pub fn add_file_from_path(
+    pub fn insert_context(
        &mut self,
-        project_path: ProjectPath,
-        cx: &mut ModelContext<Self>,
-    ) -> Task<Result<()>> {
-        let workspace = self.workspace.clone();
-
-        let Some(project) = workspace
-            .upgrade()
-            .map(|workspace| workspace.read(cx).project().clone())
-        else {
-            return Task::ready(Err(anyhow!("failed to read project")));
-        };
-
-        cx.spawn(|this, mut cx| async move {
-            let open_buffer_task = project.update(&mut cx, |project, cx| {
-                project.open_buffer(project_path.clone(), cx)
-            })?;
-
-            let buffer_model = open_buffer_task.await?;
-            let buffer_id = this.update(&mut cx, |_, cx| buffer_model.read(cx).remote_id())?;
-
-            let already_included = this.update(&mut cx, |this, _cx| {
-                match this.will_include_buffer(buffer_id, &project_path.path) {
-                    Some(FileInclusion::Direct(context_id)) => {
-                        this.remove_context(context_id);
-                        true
-                    }
-                    Some(FileInclusion::InDirectory(_)) => true,
-                    None => false,
-                }
-            })?;
-
-            if already_included {
-                return anyhow::Ok(());
-            }
-
-            let (buffer_info, text_task) = this.update(&mut cx, |_, cx| {
-                let buffer = buffer_model.read(cx);
-                collect_buffer_info_and_text(
-                    project_path.path.clone(),
-                    buffer_model,
-                    buffer,
-                    cx.to_async(),
-                )
-            })?;
-
-            let text = text_task.await;
-
-            this.update(&mut cx, |this, _cx| {
-                this.insert_file(make_context_buffer(buffer_info, text));
-            })?;
-
-            anyhow::Ok(())
-        })
-    }
-
-    pub fn add_file_from_buffer(
-        &mut self,
-        buffer_model: Model<Buffer>,
-        cx: &mut ModelContext<Self>,
-    ) -> Task<Result<()>> {
-        cx.spawn(|this, mut cx| async move {
-            let (buffer_info, text_task) = this.update(&mut cx, |_, cx| {
-                let buffer = buffer_model.read(cx);
-                let Some(file) = buffer.file() else {
-                    return Err(anyhow!("Buffer has no path."));
-                };
-                Ok(collect_buffer_info_and_text(
-                    file.path().clone(),
-                    buffer_model,
-                    buffer,
-                    cx.to_async(),
-                ))
-            })??;
-
-            let text = text_task.await;
-
-            this.update(&mut cx, |this, _cx| {
-                this.insert_file(make_context_buffer(buffer_info, text))
-            })?;
-
-            anyhow::Ok(())
-        })
-    }
-
-    fn insert_file(&mut self, context_buffer: ContextBuffer) {
-        let id = self.next_context_id.post_inc();
-        self.files.insert(context_buffer.id, id);
-        self.context
-            .push(Context::File(FileContext { id, context_buffer }));
-    }
-
-    pub fn add_directory(
-        &mut self,
-        project_path: ProjectPath,
-        cx: &mut ModelContext<Self>,
-    ) -> Task<Result<()>> {
-        let workspace = self.workspace.clone();
-        let Some(project) = workspace
-            .upgrade()
-            .map(|workspace| workspace.read(cx).project().clone())
-        else {
-            return Task::ready(Err(anyhow!("failed to read project")));
-        };
-
-        let already_included = if let Some(context_id) = self.includes_directory(&project_path.path)
-        {
-            self.remove_context(context_id);
-            true
-        } else {
-            false
-        };
-        if already_included {
-            return Task::ready(Ok(()));
-        }
-
-        let worktree_id = project_path.worktree_id;
-        cx.spawn(|this, mut cx| async move {
-            let worktree = project.update(&mut cx, |project, cx| {
-                project
-                    .worktree_for_id(worktree_id, cx)
-                    .ok_or_else(|| anyhow!("no worktree found for {worktree_id:?}"))
-            })??;
-
-            let files = worktree.update(&mut cx, |worktree, _cx| {
-                collect_files_in_path(worktree, &project_path.path)
-            })?;
-
-            let open_buffers_task = project.update(&mut cx, |project, cx| {
-                let tasks = files.iter().map(|file_path| {
-                    project.open_buffer(
-                        ProjectPath {
-                            worktree_id,
-                            path: file_path.clone(),
-                        },
-                        cx,
-                    )
-                });
-                future::join_all(tasks)
-            })?;
-
-            let buffers = open_buffers_task.await;
-
-            let mut buffer_infos = Vec::new();
-            let mut text_tasks = Vec::new();
-            this.update(&mut cx, |_, cx| {
-                for (path, buffer_model) in files.into_iter().zip(buffers) {
-                    let buffer_model = buffer_model?;
-                    let buffer = buffer_model.read(cx);
-                    let (buffer_info, text_task) =
-                        collect_buffer_info_and_text(path, buffer_model, buffer, cx.to_async());
-                    buffer_infos.push(buffer_info);
-                    text_tasks.push(text_task);
-                }
-                anyhow::Ok(())
-            })??;
-
-            let buffer_texts = future::join_all(text_tasks).await;
-            let context_buffers = buffer_infos
-                .into_iter()
-                .zip(buffer_texts)
-                .map(|(info, text)| make_context_buffer(info, text))
-                .collect::<Vec<_>>();
-
-            if context_buffers.is_empty() {
-                bail!("No text files found in {}", &project_path.path.display());
-            }
-
-            this.update(&mut cx, |this, _| {
-                this.insert_directory(&project_path.path, context_buffers);
-            })?;
-
-            anyhow::Ok(())
-        })
-    }
-
-    fn insert_directory(&mut self, path: &Path, context_buffers: Vec<ContextBuffer>) {
-        let id = self.next_context_id.post_inc();
-        self.directories.insert(path.to_path_buf(), id);
-
-        self.context.push(Context::Directory(DirectoryContext::new(
-            id,
-            path,
-            context_buffers,
-        )));
-    }
-
-    pub fn add_thread(&mut self, thread: Model<Thread>, cx: &mut ModelContext<Self>) {
-        if let Some(context_id) = self.includes_thread(&thread.read(cx).id()) {
-            self.remove_context(context_id);
-        } else {
-            self.insert_thread(thread, cx);
-        }
-    }
-
-    fn insert_thread(&mut self, thread: Model<Thread>, cx: &AppContext) {
-        let id = self.next_context_id.post_inc();
-        let text = thread.read(cx).text().into();
-
-        self.threads.insert(thread.read(cx).id().clone(), id);
-        self.context
-            .push(Context::Thread(ThreadContext { id, thread, text }));
-    }
-
-    pub fn add_fetched_url(&mut self, url: String, text: impl Into<SharedString>) {
-        if self.includes_url(&url).is_none() {
-            self.insert_fetched_url(url, text);
-        }
-    }
-
-    fn insert_fetched_url(&mut self, url: String, text: impl Into<SharedString>) {
-        let id = self.next_context_id.post_inc();
-
-        self.fetched_urls.insert(url.clone(), id);
-        self.context.push(Context::FetchedUrl(FetchedUrlContext {
-            id,
-            url: url.into(),
+        kind: ContextKind,
+        name: impl Into<SharedString>,
+        text: impl Into<SharedString>,
+    ) {
+        self.context.push(Context {
+            id: self.next_context_id.post_inc(),
+            name: name.into(),
+            kind,
            text: text.into(),
-        }));
+        });
    }

-    pub fn accept_suggested_context(
-        &mut self,
-        suggested: &SuggestedContext,
-        cx: &mut ModelContext<ContextStore>,
-    ) -> Task<Result<()>> {
-        match suggested {
-            SuggestedContext::File {
-                buffer,
-                icon_path: _,
-                name: _,
-            } => {
-                if let Some(buffer) = buffer.upgrade() {
-                    return self.add_file_from_buffer(buffer, cx);
-                };
-            }
-            SuggestedContext::Thread { thread, name: _ } => {
-                if let Some(thread) = thread.upgrade() {
-                    self.insert_thread(thread, cx);
-                };
-            }
-        }
-        Task::ready(Ok(()))
-    }
-
-    pub fn remove_context(&mut self, id: ContextId) {
-        let Some(ix) = self.context.iter().position(|context| context.id() == id) else {
-            return;
-        };
-
-        match self.context.remove(ix) {
-            Context::File(_) => {
-                self.files.retain(|_, context_id| *context_id != id);
-            }
-            Context::Directory(_) => {
-                self.directories.retain(|_, context_id| *context_id != id);
-            }
-            Context::FetchedUrl(_) => {
-                self.fetched_urls.retain(|_, context_id| *context_id != id);
-            }
-            Context::Thread(_) => {
-                self.threads.retain(|_, context_id| *context_id != id);
-            }
-        }
-    }
-
-    /// Returns whether the buffer is already included directly in the context, or if it will be
-    /// included in the context via a directory. Directory inclusion is based on paths rather than
-    /// buffer IDs as the directory will be re-scanned.
-    pub fn will_include_buffer(&self, buffer_id: BufferId, path: &Path) -> Option<FileInclusion> {
-        if let Some(context_id) = self.files.get(&buffer_id) {
-            return Some(FileInclusion::Direct(*context_id));
-        }
-
-        self.will_include_file_path_via_directory(path)
-    }
-
-    /// Returns whether this file path is already included directly in the context, or if it will be
-    /// included in the context via a directory.
-    pub fn will_include_file_path(&self, path: &Path, cx: &AppContext) -> Option<FileInclusion> {
-        if !self.files.is_empty() {
-            let found_file_context = self.context.iter().find(|context| match &context {
-                Context::File(file_context) => {
-                    let buffer = file_context.context_buffer.buffer.read(cx);
-                    if let Some(file_path) = buffer_path_log_err(buffer) {
-                        *file_path == *path
-                    } else {
-                        false
-                    }
-                }
-                _ => false,
-            });
-            if let Some(context) = found_file_context {
-                return Some(FileInclusion::Direct(context.id()));
-            }
-        }
-
-        self.will_include_file_path_via_directory(path)
-    }
-
-    fn will_include_file_path_via_directory(&self, path: &Path) -> Option<FileInclusion> {
-        if self.directories.is_empty() {
-            return None;
-        }
-
-        let mut buf = path.to_path_buf();
-
-        while buf.pop() {
-            if let Some(_) = self.directories.get(&buf) {
-                return Some(FileInclusion::InDirectory(buf));
-            }
-        }
-
-        None
-    }
-
-    pub fn includes_directory(&self, path: &Path) -> Option<ContextId> {
-        self.directories.get(path).copied()
-    }
-
-    pub fn includes_thread(&self, thread_id: &ThreadId) -> Option<ContextId> {
-        self.threads.get(thread_id).copied()
-    }
-
-    pub fn includes_url(&self, url: &str) -> Option<ContextId> {
-        self.fetched_urls.get(url).copied()
-    }
-
-    /// Replaces the context that matches the ID of the new context, if any match.
-    fn replace_context(&mut self, new_context: Context) {
-        let id = new_context.id();
-        for context in self.context.iter_mut() {
-            if context.id() == id {
-                *context = new_context;
-                break;
-            }
-        }
-    }
-
-    pub fn file_paths(&self, cx: &AppContext) -> HashSet<PathBuf> {
-        self.context
-            .iter()
-            .filter_map(|context| match context {
-                Context::File(file) => {
-                    let buffer = file.context_buffer.buffer.read(cx);
-                    buffer_path_log_err(buffer).map(|p| p.to_path_buf())
-                }
-                Context::Directory(_) | Context::FetchedUrl(_) | Context::Thread(_) => None,
-            })
-            .collect()
-    }
-
-    pub fn thread_ids(&self) -> HashSet<ThreadId> {
-        self.threads.keys().cloned().collect()
-    }
-}
-
-pub enum FileInclusion {
-    Direct(ContextId),
-    InDirectory(PathBuf),
-}
-
-// ContextBuffer without text.
-struct BufferInfo {
-    buffer_model: Model<Buffer>,
-    id: BufferId,
-    version: clock::Global,
-}
-
-fn make_context_buffer(info: BufferInfo, text: SharedString) -> ContextBuffer {
-    ContextBuffer {
-        id: info.id,
-        buffer: info.buffer_model,
-        version: info.version,
-        text,
-    }
-}
-
-fn collect_buffer_info_and_text(
-    path: Arc<Path>,
-    buffer_model: Model<Buffer>,
-    buffer: &Buffer,
-    cx: AsyncAppContext,
-) -> (BufferInfo, Task<SharedString>) {
-    let buffer_info = BufferInfo {
-        id: buffer.remote_id(),
-        buffer_model,
-        version: buffer.version(),
-    };
-    // Important to collect version at the same time as content so that staleness logic is correct.
-    let content = buffer.as_rope().clone();
-    let text_task = cx
-        .background_executor()
-        .spawn(async move { to_fenced_codeblock(&path, content) });
-    (buffer_info, text_task)
-}
-
-pub fn buffer_path_log_err(buffer: &Buffer) -> Option<Arc<Path>> {
-    if let Some(file) = buffer.file() {
-        Some(file.path().clone())
-    } else {
-        log::error!("Buffer that had a path unexpectedly no longer has a path.");
-        None
-    }
-}
-
-fn to_fenced_codeblock(path: &Path, content: Rope) -> SharedString {
-    let path_extension = path.extension().and_then(|ext| ext.to_str());
-    let path_string = path.to_string_lossy();
-    let capacity = 3
-        + path_extension.map_or(0, |extension| extension.len() + 1)
-        + path_string.len()
-        + 1
-        + content.len()
-        + 5;
-    let mut buffer = String::with_capacity(capacity);
-
-    buffer.push_str("```");
-
-    if let Some(extension) = path_extension {
-        buffer.push_str(extension);
-        buffer.push(' ');
-    }
-    buffer.push_str(&path_string);
-
-    buffer.push('\n');
-    for chunk in content.chunks() {
-        buffer.push_str(&chunk);
-    }
-
-    if !buffer.ends_with('\n') {
-        buffer.push('\n');
-    }
-
-    buffer.push_str("```\n");
-
-    debug_assert!(
-        buffer.len() == capacity - 1 || buffer.len() == capacity,
-        "to_fenced_codeblock calculated capacity of {}, but length was {}",
-        capacity,
-        buffer.len(),
-    );
-
-    buffer.into()
-}
-
-fn collect_files_in_path(worktree: &Worktree, path: &Path) -> Vec<Arc<Path>> {
-    let mut files = Vec::new();
-
-    for entry in worktree.child_entries(path) {
-        if entry.is_dir() {
-            files.extend(collect_files_in_path(worktree, &entry.path));
-        } else if entry.is_file() {
-            files.push(entry.path.clone());
-        }
-    }
-
-    files
-}
-
-pub fn refresh_context_store_text(
-    context_store: Model<ContextStore>,
-    cx: &AppContext,
-) -> impl Future<Output = ()> {
-    let mut tasks = Vec::new();
-    for context in &context_store.read(cx).context {
-        match context {
-            Context::File(file_context) => {
-                let context_store = context_store.clone();
-                if let Some(task) = refresh_file_text(context_store, file_context, cx) {
-                    tasks.push(task);
-                }
-            }
-            Context::Directory(directory_context) => {
-                let context_store = context_store.clone();
-                if let Some(task) = refresh_directory_text(context_store, directory_context, cx) {
-                    tasks.push(task);
-                }
-            }
-            Context::Thread(thread_context) => {
-                let context_store = context_store.clone();
-                tasks.push(refresh_thread_text(context_store, thread_context, cx));
-            }
-            // Intentionally omit refreshing fetched URLs as it doesn't seem all that useful,
-            // and doing the caching properly could be tricky (unless it's already handled by
-            // the HttpClient?).
-            Context::FetchedUrl(_) => {}
-        }
-    }
-
-    future::join_all(tasks).map(|_| ())
-}
-
-fn refresh_file_text(
-    context_store: Model<ContextStore>,
-    file_context: &FileContext,
-    cx: &AppContext,
-) -> Option<Task<()>> {
-    let id = file_context.id;
-    let task = refresh_context_buffer(&file_context.context_buffer, cx);
-    if let Some(task) = task {
-        Some(cx.spawn(|mut cx| async move {
-            let context_buffer = task.await;
-            context_store
-                .update(&mut cx, |context_store, _| {
-                    let new_file_context = FileContext { id, context_buffer };
-                    context_store.replace_context(Context::File(new_file_context));
-                })
-                .ok();
-        }))
-    } else {
-        None
-    }
-}
-
-fn refresh_directory_text(
-    context_store: Model<ContextStore>,
-    directory_context: &DirectoryContext,
-    cx: &AppContext,
-) -> Option<Task<()>> {
-    let mut stale = false;
-    let futures = directory_context
-        .context_buffers
-        .iter()
-        .map(|context_buffer| {
-            if let Some(refresh_task) = refresh_context_buffer(context_buffer, cx) {
-                stale = true;
-                future::Either::Left(refresh_task)
-            } else {
-                future::Either::Right(future::ready((*context_buffer).clone()))
-            }
-        })
-        .collect::<Vec<_>>();
-
-    if !stale {
-        return None;
-    }
-
-    let context_buffers = future::join_all(futures);
-
-    let id = directory_context.snapshot.id;
-    let path = directory_context.path.clone();
-    Some(cx.spawn(|mut cx| async move {
-        let context_buffers = context_buffers.await;
-        context_store
-            .update(&mut cx, |context_store, _| {
-                let new_directory_context = DirectoryContext::new(id, &path, context_buffers);
-                context_store.replace_context(Context::Directory(new_directory_context));
-            })
-            .ok();
-    }))
-}
-
-fn refresh_thread_text(
-    context_store: Model<ContextStore>,
-    thread_context: &ThreadContext,
-    cx: &AppContext,
-) -> Task<()> {
-    let id = thread_context.id;
-    let thread = thread_context.thread.clone();
-    cx.spawn(move |mut cx| async move {
-        context_store
-            .update(&mut cx, |context_store, cx| {
-                let text = thread.read(cx).text().into();
-                context_store.replace_context(Context::Thread(ThreadContext { id, thread, text }));
-            })
-            .ok();
-    })
-}
-
-fn refresh_context_buffer(
-    context_buffer: &ContextBuffer,
-    cx: &AppContext,
-) -> Option<impl Future<Output = ContextBuffer>> {
-    let buffer = context_buffer.buffer.read(cx);
-    let path = buffer_path_log_err(buffer)?;
-    if buffer.version.changed_since(&context_buffer.version) {
-        let (buffer_info, text_task) = collect_buffer_info_and_text(
-            path,
-            context_buffer.buffer.clone(),
-            buffer,
-            cx.to_async(),
-        );
-        Some(text_task.map(move |text| make_context_buffer(buffer_info, text)))
-    } else {
-        None
+    pub fn remove_context(&mut self, id: &ContextId) {
+        self.context.retain(|context| context.id != *id);
    }
 }
--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -1,38 +1,20 @@
 use std::rc::Rc;

-use collections::HashSet;
-use editor::Editor;
-use file_icons::FileIcons;
-use gpui::{
-    AppContext, Bounds, DismissEvent, EventEmitter, FocusHandle, FocusableView, Model,
-    Subscription, View, WeakModel, WeakView,
-};
-use itertools::Itertools;
-use language::Buffer;
-use ui::{prelude::*, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip};
+use gpui::{FocusHandle, Model, View, WeakModel, WeakView};
+use ui::{prelude::*, PopoverMenu, PopoverMenuHandle, Tooltip};
 use workspace::Workspace;

-use crate::context::ContextKind;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
-use crate::thread::Thread;
 use crate::thread_store::ThreadStore;
 use crate::ui::ContextPill;
-use crate::{
-    AcceptSuggestedContext, AssistantPanel, FocusDown, FocusLeft, FocusRight, FocusUp,
-    RemoveAllContext, RemoveFocusedContext, ToggleContextPicker,
-};
+use crate::ToggleContextPicker;

 pub struct ContextStrip {
    context_store: Model<ContextStore>,
-    pub context_picker: View<ContextPicker>,
+    context_picker: View<ContextPicker>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    focus_handle: FocusHandle,
-    suggest_context_kind: SuggestContextKind,
-    workspace: WeakView<Workspace>,
-    _subscriptions: Vec<Subscription>,
-    focused_index: Option<usize>,
-    children_bounds: Option<Vec<Bounds<Pixels>>>,
 }

 impl ContextStrip {
@@ -40,513 +22,85 @@ impl ContextStrip {
        context_store: Model<ContextStore>,
        workspace: WeakView<Workspace>,
        thread_store: Option<WeakModel<ThreadStore>>,
+        focus_handle: FocusHandle,
        context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-        suggest_context_kind: SuggestContextKind,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let context_picker = cx.new_view(|cx| {
-            ContextPicker::new(
-                workspace.clone(),
-                thread_store.clone(),
-                context_store.downgrade(),
-                ConfirmBehavior::KeepOpen,
-                cx,
-            )
-        });
-
-        let focus_handle = cx.focus_handle();
-
-        let subscriptions = vec![
-            cx.subscribe(&context_picker, Self::handle_context_picker_event),
-            cx.on_focus(&focus_handle, Self::handle_focus),
-            cx.on_blur(&focus_handle, Self::handle_blur),
-        ];
-
        Self {
            context_store: context_store.clone(),
-            context_picker,
+            context_picker: cx.new_view(|cx| {
+                ContextPicker::new(
+                    workspace.clone(),
+                    thread_store.clone(),
+                    context_store.downgrade(),
+                    ConfirmBehavior::KeepOpen,
+                    cx,
+                )
+            }),
            context_picker_menu_handle,
            focus_handle,
-            suggest_context_kind,
-            workspace,
-            _subscriptions: subscriptions,
-            focused_index: None,
-            children_bounds: None,
        }
    }
-
-    fn suggested_context(&self, cx: &ViewContext<Self>) -> Option<SuggestedContext> {
-        match self.suggest_context_kind {
-            SuggestContextKind::File => self.suggested_file(cx),
-            SuggestContextKind::Thread => self.suggested_thread(cx),
-        }
-    }
-
-    fn suggested_file(&self, cx: &ViewContext<Self>) -> Option<SuggestedContext> {
-        let workspace = self.workspace.upgrade()?;
-        let active_item = workspace.read(cx).active_item(cx)?;
-
-        let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
-        let active_buffer_model = editor.buffer().read(cx).as_singleton()?;
-        let active_buffer = active_buffer_model.read(cx);
-
-        let path = active_buffer.file()?.path();
-
-        if self
-            .context_store
-            .read(cx)
-            .will_include_buffer(active_buffer.remote_id(), path)
-            .is_some()
-        {
-            return None;
-        }
-
-        let name = match path.file_name() {
-            Some(name) => name.to_string_lossy().into_owned().into(),
-            None => path.to_string_lossy().into_owned().into(),
-        };
-
-        let icon_path = FileIcons::get_icon(path, cx);
-
-        Some(SuggestedContext::File {
-            name,
-            buffer: active_buffer_model.downgrade(),
-            icon_path,
-        })
-    }
-
-    fn suggested_thread(&self, cx: &ViewContext<Self>) -> Option<SuggestedContext> {
-        let workspace = self.workspace.upgrade()?;
-        let active_thread = workspace
-            .read(cx)
-            .panel::<AssistantPanel>(cx)?
-            .read(cx)
-            .active_thread(cx);
-        let weak_active_thread = active_thread.downgrade();
-
-        let active_thread = active_thread.read(cx);
-
-        if self
-            .context_store
-            .read(cx)
-            .includes_thread(active_thread.id())
-            .is_some()
-        {
-            return None;
-        }
-
-        Some(SuggestedContext::Thread {
-            name: active_thread.summary_or_default(),
-            thread: weak_active_thread,
-        })
-    }
-
-    fn handle_context_picker_event(
-        &mut self,
-        _picker: View<ContextPicker>,
-        _event: &DismissEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        cx.emit(ContextStripEvent::PickerDismissed);
-    }
-
-    fn handle_focus(&mut self, cx: &mut ViewContext<Self>) {
-        self.focused_index = self.last_pill_index();
-        cx.notify();
-    }
-
-    fn handle_blur(&mut self, cx: &mut ViewContext<Self>) {
-        self.focused_index = None;
-        cx.notify();
-    }
-
-    fn focus_left(&mut self, _: &FocusLeft, cx: &mut ViewContext<Self>) {
-        self.focused_index = match self.focused_index {
-            Some(index) if index > 0 => Some(index - 1),
-            _ => self.last_pill_index(),
-        };
-
-        cx.notify();
-    }
-
-    fn focus_right(&mut self, _: &FocusRight, cx: &mut ViewContext<Self>) {
-        let Some(last_index) = self.last_pill_index() else {
-            return;
-        };
-
-        self.focused_index = match self.focused_index {
-            Some(index) if index < last_index => Some(index + 1),
-            _ => Some(0),
-        };
-
-        cx.notify();
-    }
-
-    fn focus_up(&mut self, _: &FocusUp, cx: &mut ViewContext<Self>) {
-        let Some(focused_index) = self.focused_index else {
-            return;
-        };
-
-        if focused_index == 0 {
-            return cx.emit(ContextStripEvent::BlurredUp);
-        }
-
-        let Some((focused, pills)) = self.focused_bounds(focused_index) else {
-            return;
-        };
-
-        let iter = pills[..focused_index].iter().enumerate().rev();
-        self.focused_index = Self::find_best_horizontal_match(focused, iter).or(Some(0));
-        cx.notify();
-    }
-
-    fn focus_down(&mut self, _: &FocusDown, cx: &mut ViewContext<Self>) {
-        let Some(focused_index) = self.focused_index else {
-            return;
-        };
-
-        let last_index = self.last_pill_index();
-
-        if self.focused_index == last_index {
-            return cx.emit(ContextStripEvent::BlurredDown);
-        }
-
-        let Some((focused, pills)) = self.focused_bounds(focused_index) else {
-            return;
-        };
-
-        let iter = pills.iter().enumerate().skip(focused_index + 1);
-        self.focused_index = Self::find_best_horizontal_match(focused, iter).or(last_index);
-        cx.notify();
-    }
-
-    fn focused_bounds(&self, focused: usize) -> Option<(&Bounds<Pixels>, &[Bounds<Pixels>])> {
-        let pill_bounds = self.pill_bounds()?;
-        let focused = pill_bounds.get(focused)?;
-
-        Some((focused, pill_bounds))
-    }
-
-    fn pill_bounds(&self) -> Option<&[Bounds<Pixels>]> {
-        let bounds = self.children_bounds.as_ref()?;
-        let eraser = if bounds.len() < 3 { 0 } else { 1 };
-        let pills = &bounds[1..bounds.len() - eraser];
-
-        if pills.is_empty() {
-            None
-        } else {
-            Some(pills)
-        }
-    }
-
-    fn last_pill_index(&self) -> Option<usize> {
-        Some(self.pill_bounds()?.len() - 1)
-    }
-
-    fn find_best_horizontal_match<'a>(
-        focused: &'a Bounds<Pixels>,
-        iter: impl Iterator<Item = (usize, &'a Bounds<Pixels>)>,
-    ) -> Option<usize> {
-        let mut best = None;
-
-        let focused_left = focused.left();
-        let focused_right = focused.right();
-
-        for (index, probe) in iter {
-            if probe.origin.y == focused.origin.y {
-                continue;
-            }
-
-            let overlap = probe.right().min(focused_right) - probe.left().max(focused_left);
-
-            best = match best {
-                Some((_, prev_overlap, y)) if probe.origin.y != y || prev_overlap > overlap => {
-                    break;
-                }
-                Some(_) | None => Some((index, overlap, probe.origin.y)),
-            };
-        }
-
-        best.map(|(index, _, _)| index)
-    }
-
-    fn remove_focused_context(&mut self, _: &RemoveFocusedContext, cx: &mut ViewContext<Self>) {
-        if let Some(index) = self.focused_index {
-            let mut is_empty = false;
-
-            self.context_store.update(cx, |this, _cx| {
-                if let Some(item) = this.context().get(index) {
-                    this.remove_context(item.id());
-                }
-
-                is_empty = this.context().is_empty();
-            });
-
-            if is_empty {
-                cx.emit(ContextStripEvent::BlurredEmpty);
-            } else {
-                self.focused_index = Some(index.saturating_sub(1));
-                cx.notify();
-            }
-        }
-    }
-
-    fn is_suggested_focused<T>(&self, context: &Vec<T>) -> bool {
-        // We only suggest one item after the actual context
-        self.focused_index == Some(context.len())
-    }
-
-    fn accept_suggested_context(&mut self, _: &AcceptSuggestedContext, cx: &mut ViewContext<Self>) {
-        if let Some(suggested) = self.suggested_context(cx) {
-            let context_store = self.context_store.read(cx);
-
-            if self.is_suggested_focused(context_store.context()) {
-                self.add_suggested_context(&suggested, cx);
-            }
-        }
-    }
-
-    fn add_suggested_context(&mut self, suggested: &SuggestedContext, cx: &mut ViewContext<Self>) {
-        let task = self.context_store.update(cx, |context_store, cx| {
-            context_store.accept_suggested_context(&suggested, cx)
-        });
-
-        let workspace = self.workspace.clone();
-
-        cx.spawn(|this, mut cx| async move {
-            match task.await {
-                Ok(()) => {
-                    if let Some(this) = this.upgrade() {
-                        this.update(&mut cx, |_, cx| cx.notify())?;
-                    }
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })?;
-                }
-            }
-            anyhow::Ok(())
-        })
-        .detach_and_log_err(cx);
-
-        cx.notify();
-    }
-}
-
-impl FocusableView for ContextStrip {
-    fn focus_handle(&self, _cx: &AppContext) -> FocusHandle {
-        self.focus_handle.clone()
-    }
 }

 impl Render for ContextStrip {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let context_store = self.context_store.read(cx);
-        let context = context_store
-            .context()
-            .iter()
-            .flat_map(|context| context.snapshot(cx))
-            .collect::<Vec<_>>();
+        let context = self.context_store.read(cx).context();
        let context_picker = self.context_picker.clone();
        let focus_handle = self.focus_handle.clone();

-        let suggested_context = self.suggested_context(cx);
-
-        let dupe_names = context
-            .iter()
-            .map(|context| context.name.clone())
-            .sorted()
-            .tuple_windows()
-            .filter(|(a, b)| a == b)
-            .map(|(a, _)| a)
-            .collect::<HashSet<SharedString>>();
-
        h_flex()
            .flex_wrap()
            .gap_1()
-            .track_focus(&focus_handle)
-            .key_context("ContextStrip")
-            .on_action(cx.listener(Self::focus_up))
-            .on_action(cx.listener(Self::focus_right))
-            .on_action(cx.listener(Self::focus_down))
-            .on_action(cx.listener(Self::focus_left))
-            .on_action(cx.listener(Self::remove_focused_context))
-            .on_action(cx.listener(Self::accept_suggested_context))
-            .on_children_prepainted({
-                let view = cx.view().downgrade();
-                move |children_bounds, cx| {
-                    view.update(cx, |this, _| {
-                        this.children_bounds = Some(children_bounds);
-                    })
-                    .ok();
-                }
-            })
            .child(
                PopoverMenu::new("context-picker")
-                    .menu(move |cx| {
-                        context_picker.update(cx, |this, cx| {
-                            this.init(cx);
-                        });
-
-                        Some(context_picker.clone())
-                    })
+                    .menu(move |_cx| Some(context_picker.clone()))
                    .trigger(
                        IconButton::new("add-context", IconName::Plus)
                            .icon_size(IconSize::Small)
                            .style(ui::ButtonStyle::Filled)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-
-                                move |cx| {
-                                    Tooltip::for_action_in(
-                                        "Add Context",
-                                        &ToggleContextPicker,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
+                            .tooltip(move |cx| {
+                                Tooltip::for_action_in(
+                                    "Add Context",
+                                    &ToggleContextPicker,
+                                    &focus_handle,
+                                    cx,
+                                )
                            }),
                    )
                    .attach(gpui::Corner::TopLeft)
                    .anchor(gpui::Corner::BottomLeft)
                    .offset(gpui::Point {
                        x: px(0.0),
-                        y: px(-2.0),
+                        y: px(-16.0),
                    })
                    .with_handle(self.context_picker_menu_handle.clone()),
            )
-            .when(context.is_empty() && suggested_context.is_none(), {
-                |parent| {
-                    parent.child(
-                        h_flex()
-                            .ml_1p5()
-                            .gap_2()
-                            .child(
-                                Label::new("Add Context")
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted),
-                            )
-                            .opacity(0.5)
-                            .children(
-                                KeyBinding::for_action_in(&ToggleContextPicker, &focus_handle, cx)
-                                    .map(|binding| binding.into_any_element()),
-                            ),
-                    )
-                }
-            })
-            .children(context.iter().enumerate().map(|(i, context)| {
-                ContextPill::new_added(
-                    context.clone(),
-                    dupe_names.contains(&context.name),
-                    self.focused_index == Some(i),
-                    Some({
-                        let id = context.id;
-                        let context_store = self.context_store.clone();
-                        Rc::new(cx.listener(move |_this, _event, cx| {
-                            context_store.update(cx, |this, _cx| {
-                                this.remove_context(id);
-                            });
-                            cx.notify();
-                        }))
-                    }),
-                )
-                .on_click(Rc::new(cx.listener(move |this, _, cx| {
-                    this.focused_index = Some(i);
-                    cx.notify();
-                })))
+            .children(context.iter().map(|context| {
+                ContextPill::new(context.clone()).on_remove({
+                    let context = context.clone();
+                    let context_store = self.context_store.clone();
+                    Rc::new(cx.listener(move |_this, _event, cx| {
+                        context_store.update(cx, |this, _cx| {
+                            this.remove_context(&context.id);
+                        });
+                        cx.notify();
+                    }))
+                })
            }))
-            .when_some(suggested_context, |el, suggested| {
-                el.child(
-                    ContextPill::new_suggested(
-                        suggested.name().clone(),
-                        suggested.icon_path(),
-                        suggested.kind(),
-                        self.is_suggested_focused(&context),
-                    )
-                    .on_click(Rc::new(cx.listener(move |this, _event, cx| {
-                        this.add_suggested_context(&suggested, cx);
-                    }))),
+            .when(!context.is_empty(), |parent| {
+                parent.child(
+                    IconButton::new("remove-all-context", IconName::Eraser)
+                        .icon_size(IconSize::Small)
+                        .tooltip(move |cx| Tooltip::text("Remove All Context", cx))
+                        .on_click({
+                            let context_store = self.context_store.clone();
+                            cx.listener(move |_this, _event, cx| {
+                                context_store.update(cx, |this, _cx| this.clear());
+                                cx.notify();
+                            })
+                        }),
                )
            })
-            .when(!context.is_empty(), {
-                move |parent| {
-                    parent.child(
-                        IconButton::new("remove-all-context", IconName::Eraser)
-                            .icon_size(IconSize::Small)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |cx| {
-                                    Tooltip::for_action_in(
-                                        "Remove All Context",
-                                        &RemoveAllContext,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click(cx.listener({
-                                let focus_handle = focus_handle.clone();
-                                move |_this, _event, cx| {
-                                    focus_handle.dispatch_action(&RemoveAllContext, cx);
-                                }
-                            })),
-                    )
-                }
-            })
-    }
-}
-
-pub enum ContextStripEvent {
-    PickerDismissed,
-    BlurredEmpty,
-    BlurredDown,
-    BlurredUp,
-}
-
-impl EventEmitter<ContextStripEvent> for ContextStrip {}
-
-pub enum SuggestContextKind {
-    File,
-    Thread,
-}
-
-#[derive(Clone)]
-pub enum SuggestedContext {
-    File {
-        name: SharedString,
-        icon_path: Option<SharedString>,
-        buffer: WeakModel<Buffer>,
-    },
-    Thread {
-        name: SharedString,
-        thread: WeakModel<Thread>,
-    },
-}
-
-impl SuggestedContext {
-    pub fn name(&self) -> &SharedString {
-        match self {
-            Self::File { name, .. } => name,
-            Self::Thread { name, .. } => name,
-        }
-    }
-
-    pub fn icon_path(&self) -> Option<SharedString> {
-        match self {
-            Self::File { icon_path, .. } => icon_path.clone(),
-            Self::Thread { .. } => None,
-        }
-    }
-
-    pub fn kind(&self) -> ContextKind {
-        match self {
-            Self::File { .. } => ContextKind::File,
-            Self::Thread { .. } => ContextKind::Thread,
-        }
    }
 }
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -19,7 +19,6 @@ use editor::{
    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorEvent, ExcerptId, ExcerptRange,
    GutterDimensions, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint,
 };
-use feature_flags::{Assistant2FeatureFlag, FeatureFlagViewExt as _};
 use fs::Fs;
 use util::ResultExt;

@@ -54,16 +53,7 @@ pub fn init(
        let workspace = cx.view().clone();
        InlineAssistant::update_global(cx, |inline_assistant, cx| {
            inline_assistant.register_workspace(&workspace, cx)
-        });
-
-        cx.observe_flag::<Assistant2FeatureFlag, _>({
-            |is_assistant2_enabled, _view, cx| {
-                InlineAssistant::update_global(cx, |inline_assistant, _cx| {
-                    inline_assistant.is_assistant2_enabled = is_assistant2_enabled;
-                });
-            }
        })
-        .detach();
    })
    .detach();
 }
@@ -86,7 +76,6 @@ pub struct InlineAssistant {
    prompt_builder: Arc<PromptBuilder>,
    telemetry: Arc<Telemetry>,
    fs: Arc<dyn Fs>,
-    is_assistant2_enabled: bool,
 }

 impl Global for InlineAssistant {}
@@ -108,7 +97,6 @@ impl InlineAssistant {
            prompt_builder,
            telemetry,
            fs,
-            is_assistant2_enabled: false,
        }
    }

@@ -130,7 +118,7 @@ impl InlineAssistant {
            };
            let enabled = AssistantSettings::get_global(cx).enabled;
            terminal_panel.update(cx, |terminal_panel, cx| {
-                terminal_panel.set_assistant_enabled(enabled, cx)
+                terminal_panel.asssistant_enabled(enabled, cx)
            });
        })
        .detach();
@@ -169,31 +157,21 @@ impl InlineAssistant {
        item: &dyn ItemHandle,
        cx: &mut WindowContext,
    ) {
-        let is_assistant2_enabled = self.is_assistant2_enabled;
-
        if let Some(editor) = item.act_as::<Editor>(cx) {
            editor.update(cx, |editor, cx| {
-                if is_assistant2_enabled {
-                    let thread_store = workspace
-                        .read(cx)
-                        .panel::<AssistantPanel>(cx)
-                        .map(|assistant_panel| assistant_panel.read(cx).thread_store().downgrade());
+                let thread_store = workspace
+                    .read(cx)
+                    .panel::<AssistantPanel>(cx)
+                    .map(|assistant_panel| assistant_panel.read(cx).thread_store().downgrade());

-                    editor.add_code_action_provider(
-                        Rc::new(AssistantCodeActionProvider {
-                            editor: cx.view().downgrade(),
-                            workspace: workspace.downgrade(),
-                            thread_store,
-                        }),
-                        cx,
-                    );
-
-                    // Remove the Assistant1 code action provider, as it still might be registered.
-                    editor.remove_code_action_provider("assistant".into(), cx);
-                } else {
-                    editor
-                        .remove_code_action_provider(ASSISTANT_CODE_ACTION_PROVIDER_ID.into(), cx);
-                }
+                editor.push_code_action_provider(
+                    Rc::new(AssistantCodeActionProvider {
+                        editor: cx.view().downgrade(),
+                        workspace: workspace.downgrade(),
+                        thread_store,
+                    }),
+                    cx,
+                );
            });
        }
    }
@@ -357,7 +335,7 @@ impl InlineAssistant {
        let mut assist_to_focus = None;
        for range in codegen_ranges {
            let assist_id = self.next_assist_id.post_inc();
-            let context_store = cx.new_model(|_cx| ContextStore::new(workspace.clone()));
+            let context_store = cx.new_model(|_cx| ContextStore::new());
            let codegen = cx.new_model(|cx| {
                BufferCodegen::new(
                    editor.read(cx).buffer().clone(),
@@ -467,7 +445,7 @@ impl InlineAssistant {
            range.end = range.end.bias_right(&snapshot);
        }

-        let context_store = cx.new_model(|_cx| ContextStore::new(workspace.clone()));
+        let context_store = cx.new_model(|_cx| ContextStore::new());

        let codegen = cx.new_model(|cx| {
            BufferCodegen::new(
@@ -893,11 +871,10 @@ impl InlineAssistant {
            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
                let language_name = assist.editor.upgrade().and_then(|editor| {
                    let multibuffer = editor.read(cx).buffer().read(cx);
-                    let snapshot = multibuffer.snapshot(cx);
-                    let ranges = snapshot.range_to_buffer_ranges(assist.range.clone());
+                    let ranges = multibuffer.range_to_buffer_ranges(assist.range.clone(), cx);
                    ranges
                        .first()
-                        .and_then(|(excerpt, _)| excerpt.buffer().language())
+                        .and_then(|(buffer, _, _)| buffer.read(cx).language())
                        .map(|language| language.name())
                });
                report_assistant_event(
@@ -1595,13 +1572,7 @@ struct AssistantCodeActionProvider {
    thread_store: Option<WeakModel<ThreadStore>>,
 }

-const ASSISTANT_CODE_ACTION_PROVIDER_ID: &str = "assistant2";
-
 impl CodeActionProvider for AssistantCodeActionProvider {
-    fn id(&self) -> Arc<str> {
-        ASSISTANT_CODE_ACTION_PROVIDER_ID.into()
-    }
-
    fn code_actions(
        &self,
        buffer: &Model<Buffer>,
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -1,12 +1,13 @@
-use crate::assistant_model_selector::AssistantModelSelector;
 use crate::buffer_codegen::BufferCodegen;
 use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
-use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
+use crate::context_strip::ContextStrip;
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::ThreadStore;
-use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
-use crate::{RemoveAllContext, ToggleContextPicker, ToggleModelSelector};
+use crate::ToggleContextPicker;
+use crate::{
+    assistant_settings::AssistantSettings, CycleNextInlineAssist, CyclePreviousInlineAssist,
+};
 use client::ErrorExt;
 use collections::VecDeque;
 use editor::{
@@ -21,13 +22,12 @@ use gpui::{
    WeakModel, WeakView, WindowContext,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
-use language_model_selector::LanguageModelSelector;
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use parking_lot::Mutex;
-use settings::Settings;
+use settings::{update_settings_file, Settings};
 use std::cmp;
 use std::sync::Arc;
 use theme::ThemeSettings;
-use ui::utils::WithRemSize;
 use ui::{
    prelude::*, CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, PopoverMenuHandle, Tooltip,
 };
@@ -37,18 +37,15 @@ use workspace::Workspace;
 pub struct PromptEditor<T> {
    pub editor: View<Editor>,
    mode: PromptEditorMode,
-    context_store: Model<ContextStore>,
    context_strip: View<ContextStrip>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    model_selector: View<AssistantModelSelector>,
-    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
+    language_model_selector: View<LanguageModelSelector>,
    edited_since_done: bool,
    prompt_history: VecDeque<String>,
    prompt_history_ix: Option<usize>,
    pending_prompt: String,
    _codegen_subscription: Subscription,
    editor_subscriptions: Vec<Subscription>,
-    _context_strip_subscription: Subscription,
    show_rate_limit_notice: bool,
    _phantom: std::marker::PhantomData<T>,
 }
@@ -57,10 +54,9 @@ impl<T: 'static> EventEmitter<PromptEditorEvent> for PromptEditor<T> {}

 impl<T: 'static> Render for PromptEditor<T> {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size;
        let mut buttons = Vec::new();

-        let left_gutter_width = match &self.mode {
+        let spacing = match &self.mode {
            PromptEditorMode::Buffer {
                id: _,
                codegen,
@@ -76,54 +72,55 @@ impl<T: 'static> Render for PromptEditor<T> {

                gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0)
            }
-            PromptEditorMode::Terminal { .. } => {
-                // Give the equivalent of the same left-padding that we're using on the right
-                Pixels::from(40.0)
-            }
-        };
-
-        let bottom_padding = match &self.mode {
-            PromptEditorMode::Buffer { .. } => Pixels::from(0.),
-            PromptEditorMode::Terminal { .. } => Pixels::from(8.0),
+            PromptEditorMode::Terminal { .. } => Pixels::ZERO,
        };

        buttons.extend(self.render_buttons(cx));

        v_flex()
-            .key_context("PromptEditor")
-            .bg(cx.theme().colors().editor_background)
-            .block_mouse_down()
-            .gap_0p5()
            .border_y_1()
            .border_color(cx.theme().status().info_border)
            .size_full()
-            .pt_0p5()
-            .pb(bottom_padding)
-            .pr_6()
+            .py(cx.line_height() / 2.5)
            .child(
                h_flex()
-                    .items_start()
+                    .key_context("PromptEditor")
+                    .bg(cx.theme().colors().editor_background)
+                    .block_mouse_down()
                    .cursor(CursorStyle::Arrow)
                    .on_action(cx.listener(Self::toggle_context_picker))
-                    .on_action(cx.listener(Self::toggle_model_selector))
                    .on_action(cx.listener(Self::confirm))
                    .on_action(cx.listener(Self::cancel))
                    .on_action(cx.listener(Self::move_up))
                    .on_action(cx.listener(Self::move_down))
-                    .on_action(cx.listener(Self::remove_all_context))
                    .capture_action(cx.listener(Self::cycle_prev))
                    .capture_action(cx.listener(Self::cycle_next))
                    .child(
-                        WithRemSize::new(ui_font_size)
-                            .flex()
-                            .flex_row()
-                            .flex_shrink_0()
-                            .items_center()
-                            .h_full()
-                            .w(left_gutter_width)
+                        h_flex()
+                            .w(spacing)
                            .justify_center()
                            .gap_2()
-                            .child(self.render_close_button(cx))
+                            .child(LanguageModelSelectorPopoverMenu::new(
+                                self.language_model_selector.clone(),
+                                IconButton::new("context", IconName::SettingsAlt)
+                                    .shape(IconButtonShape::Square)
+                                    .icon_size(IconSize::Small)
+                                    .icon_color(Color::Muted)
+                                    .tooltip(move |cx| {
+                                        Tooltip::with_meta(
+                                            format!(
+                                                "Using {}",
+                                                LanguageModelRegistry::read_global(cx)
+                                                    .active_model()
+                                                    .map(|model| model.name().0)
+                                                    .unwrap_or_else(|| "No model selected".into()),
+                                            ),
+                                            None,
+                                            "Change Model",
+                                            cx,
+                                        )
+                                    }),
+                            ))
                            .map(|el| {
                                let CodegenStatus::Error(error) = self.codegen_status(cx) else {
                                    return el;
@@ -175,36 +172,13 @@ impl<T: 'static> Render for PromptEditor<T> {
                                }
                            }),
                    )
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .justify_between()
-                            .child(div().flex_1().child(self.render_editor(cx)))
-                            .child(
-                                WithRemSize::new(ui_font_size)
-                                    .flex()
-                                    .flex_row()
-                                    .items_center()
-                                    .gap_1()
-                                    .children(buttons),
-                            ),
-                    ),
+                    .child(div().flex_1().child(self.render_editor(cx)))
+                    .child(h_flex().gap_2().pr_6().children(buttons)),
            )
            .child(
-                WithRemSize::new(ui_font_size)
-                    .flex()
-                    .flex_row()
-                    .items_center()
-                    .child(h_flex().flex_shrink_0().w(left_gutter_width))
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .pl_1()
-                            .items_start()
-                            .justify_between()
-                            .child(self.context_strip.clone())
-                            .child(self.model_selector.clone()),
-                    ),
+                h_flex()
+                    .child(h_flex().w(spacing).justify_center().gap_2())
+                    .child(self.context_strip.clone()),
            )
    }
 }
@@ -337,15 +311,6 @@ impl<T: 'static> PromptEditor<T> {
        self.context_picker_menu_handle.toggle(cx);
    }

-    fn toggle_model_selector(&mut self, _: &ToggleModelSelector, cx: &mut ViewContext<Self>) {
-        self.model_selector_menu_handle.toggle(cx);
-    }
-
-    pub fn remove_all_context(&mut self, _: &RemoveAllContext, cx: &mut ViewContext<Self>) {
-        self.context_store.update(cx, |store, _cx| store.clear());
-        cx.notify();
-    }
-
    fn cancel(&mut self, _: &editor::actions::Cancel, cx: &mut ViewContext<Self>) {
        match self.codegen_status(cx) {
            CodegenStatus::Idle | CodegenStatus::Done | CodegenStatus::Error(_) => {
@@ -415,8 +380,6 @@ impl<T: 'static> PromptEditor<T> {
                    editor.move_to_end(&Default::default(), cx)
                });
            }
-        } else {
-            cx.focus_view(&self.context_strip);
        }
    }

@@ -437,45 +400,73 @@ impl<T: 'static> PromptEditor<T> {

        match codegen_status {
            CodegenStatus::Idle => {
-                vec![Button::new("start", mode.start_label())
-                    .label_size(LabelSize::Small)
-                    .icon(IconName::Return)
-                    .icon_size(IconSize::XSmall)
-                    .icon_color(Color::Muted)
-                    .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::StartRequested)))
-                    .into_any_element()]
+                vec![
+                    IconButton::new("cancel", IconName::Close)
+                        .icon_color(Color::Muted)
+                        .shape(IconButtonShape::Square)
+                        .tooltip(|cx| Tooltip::for_action("Cancel Assist", &menu::Cancel, cx))
+                        .on_click(
+                            cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)),
+                        )
+                        .into_any_element(),
+                    Button::new("start", mode.start_label())
+                        .icon(IconName::Return)
+                        .icon_color(Color::Muted)
+                        .on_click(
+                            cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::StartRequested)),
+                        )
+                        .into_any_element(),
+                ]
            }
-            CodegenStatus::Pending => vec![IconButton::new("stop", IconName::Stop)
-                .icon_color(Color::Error)
-                .shape(IconButtonShape::Square)
-                .tooltip(move |cx| {
-                    Tooltip::with_meta(
-                        mode.tooltip_interrupt(),
-                        Some(&menu::Cancel),
-                        "Changes won't be discarded",
-                        cx,
-                    )
-                })
-                .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::StopRequested)))
-                .into_any_element()],
+            CodegenStatus::Pending => vec![
+                IconButton::new("cancel", IconName::Close)
+                    .icon_color(Color::Muted)
+                    .shape(IconButtonShape::Square)
+                    .tooltip(|cx| Tooltip::text("Cancel Assist", cx))
+                    .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)))
+                    .into_any_element(),
+                IconButton::new("stop", IconName::Stop)
+                    .icon_color(Color::Error)
+                    .shape(IconButtonShape::Square)
+                    .tooltip(move |cx| {
+                        Tooltip::with_meta(
+                            mode.tooltip_interrupt(),
+                            Some(&menu::Cancel),
+                            "Changes won't be discarded",
+                            cx,
+                        )
+                    })
+                    .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::StopRequested)))
+                    .into_any_element(),
+            ],
            CodegenStatus::Done | CodegenStatus::Error(_) => {
+                let cancel = IconButton::new("cancel", IconName::Close)
+                    .icon_color(Color::Muted)
+                    .shape(IconButtonShape::Square)
+                    .tooltip(|cx| Tooltip::for_action("Cancel Assist", &menu::Cancel, cx))
+                    .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)))
+                    .into_any_element();
+
                let has_error = matches!(codegen_status, CodegenStatus::Error(_));
                if has_error || self.edited_since_done {
-                    vec![IconButton::new("restart", IconName::RotateCw)
-                        .icon_color(Color::Info)
-                        .shape(IconButtonShape::Square)
-                        .tooltip(move |cx| {
-                            Tooltip::with_meta(
-                                mode.tooltip_restart(),
-                                Some(&menu::Confirm),
-                                "Changes will be discarded",
-                                cx,
-                            )
-                        })
-                        .on_click(cx.listener(|_, _, cx| {
-                            cx.emit(PromptEditorEvent::StartRequested);
-                        }))
-                        .into_any_element()]
+                    vec![
+                        cancel,
+                        IconButton::new("restart", IconName::RotateCw)
+                            .icon_color(Color::Info)
+                            .shape(IconButtonShape::Square)
+                            .tooltip(move |cx| {
+                                Tooltip::with_meta(
+                                    mode.tooltip_restart(),
+                                    Some(&menu::Confirm),
+                                    "Changes will be discarded",
+                                    cx,
+                                )
+                            })
+                            .on_click(cx.listener(|_, _, cx| {
+                                cx.emit(PromptEditorEvent::StartRequested);
+                            }))
+                            .into_any_element(),
+                    ]
                } else {
                    let accept = IconButton::new("accept", IconName::Check)
                        .icon_color(Color::Info)
@@ -491,6 +482,7 @@ impl<T: 'static> PromptEditor<T> {
                    match &self.mode {
                        PromptEditorMode::Terminal { .. } => vec![
                            accept,
+                            cancel,
                            IconButton::new("confirm", IconName::Play)
                                .icon_color(Color::Info)
                                .shape(IconButtonShape::Square)
@@ -506,7 +498,7 @@ impl<T: 'static> PromptEditor<T> {
                                }))
                                .into_any_element(),
                        ],
-                        PromptEditorMode::Buffer { .. } => vec![accept],
+                        PromptEditorMode::Buffer { .. } => vec![accept, cancel],
                    }
                }
            }
@@ -535,15 +527,6 @@ impl<T: 'static> PromptEditor<T> {
        }
    }

-    fn render_close_button(&self, cx: &ViewContext<Self>) -> AnyElement {
-        IconButton::new("cancel", IconName::Close)
-            .icon_color(Color::Muted)
-            .shape(IconButtonShape::Square)
-            .tooltip(|cx| Tooltip::text("Close Assistant", cx))
-            .on_click(cx.listener(|_, _, cx| cx.emit(PromptEditorEvent::CancelRequested)))
-            .into_any_element()
-    }
-
    fn render_cycle_controls(&self, codegen: &BufferCodegen, cx: &ViewContext<Self>) -> AnyElement {
        let disabled = matches!(codegen.status(cx), CodegenStatus::Idle);

@@ -707,19 +690,20 @@ impl<T: 'static> PromptEditor<T> {
        let font_size = TextSize::Default.rems(cx);
        let line_height = font_size.to_pixels(cx.rem_size()) * 1.3;

-        div()
-            .key_context("InlineAssistEditor")
+        v_flex()
+            .key_context("MessageEditor")
            .size_full()
+            .gap_2()
            .p_2()
-            .pl_1()
            .bg(cx.theme().colors().editor_background)
            .child({
                let settings = ThemeSettings::get_global(cx);
                let text_style = TextStyle {
                    color: cx.theme().colors().editor_foreground,
-                    font_family: settings.buffer_font.family.clone(),
-                    font_features: settings.buffer_font.features.clone(),
+                    font_family: settings.ui_font.family.clone(),
+                    font_features: settings.ui_font.features.clone(),
                    font_size: font_size.into(),
+                    font_weight: settings.ui_font.weight,
                    line_height: line_height.into(),
                    ..Default::default()
                };
@@ -736,23 +720,6 @@ impl<T: 'static> PromptEditor<T> {
            })
            .into_any_element()
    }
-
-    fn handle_context_strip_event(
-        &mut self,
-        _context_strip: View<ContextStrip>,
-        event: &ContextStripEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ContextStripEvent::PickerDismissed
-            | ContextStripEvent::BlurredEmpty
-            | ContextStripEvent::BlurredUp => {
-                let editor_focus_handle = self.editor.focus_handle(cx);
-                cx.focus(&editor_focus_handle);
-            }
-            ContextStripEvent::BlurredDown => {}
-        }
-    }
 }

 pub enum PromptEditorMode {
@@ -828,43 +795,39 @@ impl PromptEditor<BufferCodegen> {
            editor
        });
        let context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();
-
-        let context_strip = cx.new_view(|cx| {
-            ContextStrip::new(
-                context_store.clone(),
-                workspace.clone(),
-                thread_store.clone(),
-                context_picker_menu_handle.clone(),
-                SuggestContextKind::Thread,
-                cx,
-            )
-        });
-
-        let context_strip_subscription =
-            cx.subscribe(&context_strip, Self::handle_context_strip_event);

        let mut this: PromptEditor<BufferCodegen> = PromptEditor {
            editor: prompt_editor.clone(),
-            context_store,
-            context_strip,
-            context_picker_menu_handle,
-            model_selector: cx.new_view(|cx| {
-                AssistantModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
+            context_strip: cx.new_view(|cx| {
+                ContextStrip::new(
+                    context_store,
+                    workspace.clone(),
+                    thread_store.clone(),
                    prompt_editor.focus_handle(cx),
+                    context_picker_menu_handle.clone(),
+                    cx,
+                )
+            }),
+            context_picker_menu_handle,
+            language_model_selector: cx.new_view(|cx| {
+                let fs = fs.clone();
+                LanguageModelSelector::new(
+                    move |model, cx| {
+                        update_settings_file::<AssistantSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _| settings.set_model(model.clone()),
+                        );
+                    },
                    cx,
                )
            }),
-            model_selector_menu_handle,
            edited_since_done: false,
            prompt_history,
            prompt_history_ix: None,
            pending_prompt: String::new(),
            _codegen_subscription: codegen_subscription,
            editor_subscriptions: Vec::new(),
-            _context_strip_subscription: context_strip_subscription,
            show_rate_limit_notice: false,
            mode,
            _phantom: Default::default(),
@@ -979,43 +942,39 @@ impl PromptEditor<TerminalCodegen> {
            editor
        });
        let context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();
-
-        let context_strip = cx.new_view(|cx| {
-            ContextStrip::new(
-                context_store.clone(),
-                workspace.clone(),
-                thread_store.clone(),
-                context_picker_menu_handle.clone(),
-                SuggestContextKind::Thread,
-                cx,
-            )
-        });
-
-        let context_strip_subscription =
-            cx.subscribe(&context_strip, Self::handle_context_strip_event);

        let mut this = Self {
            editor: prompt_editor.clone(),
-            context_store,
-            context_strip,
-            context_picker_menu_handle,
-            model_selector: cx.new_view(|cx| {
-                AssistantModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
+            context_strip: cx.new_view(|cx| {
+                ContextStrip::new(
+                    context_store,
+                    workspace.clone(),
+                    thread_store.clone(),
                    prompt_editor.focus_handle(cx),
+                    context_picker_menu_handle.clone(),
+                    cx,
+                )
+            }),
+            context_picker_menu_handle,
+            language_model_selector: cx.new_view(|cx| {
+                let fs = fs.clone();
+                LanguageModelSelector::new(
+                    move |model, cx| {
+                        update_settings_file::<AssistantSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _| settings.set_model(model.clone()),
+                        );
+                    },
                    cx,
                )
            }),
-            model_selector_menu_handle,
            edited_since_done: false,
            prompt_history,
            prompt_history_ix: None,
            pending_prompt: String::new(),
            _codegen_subscription: codegen_subscription,
            editor_subscriptions: Vec::new(),
-            _context_strip_subscription: context_strip_subscription,
            mode,
            show_rate_limit_notice: false,
            _phantom: Default::default(),
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -1,6 +1,5 @@
 use std::sync::Arc;

-use editor::actions::MoveUp;
 use editor::{Editor, EditorElement, EditorEvent, EditorStyle};
 use fs::Fs;
 use gpui::{
@@ -8,23 +7,23 @@ use gpui::{
    WeakView,
 };
 use language_model::{LanguageModelRegistry, LanguageModelRequestTool};
-use language_model_selector::LanguageModelSelector;
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use rope::Point;
-use settings::Settings;
-use theme::{get_ui_font_size, ThemeSettings};
+use settings::{update_settings_file, Settings};
+use theme::ThemeSettings;
 use ui::{
-    prelude::*, ButtonLike, ElevationIndex, KeyBinding, PopoverMenu, PopoverMenuHandle,
-    SwitchWithLabel,
+    prelude::*, ButtonLike, CheckboxWithLabel, ElevationIndex, KeyBinding, PopoverMenu,
+    PopoverMenuHandle, Tooltip,
 };
 use workspace::Workspace;

-use crate::assistant_model_selector::AssistantModelSelector;
+use crate::assistant_settings::AssistantSettings;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
-use crate::context_store::{refresh_context_store_text, ContextStore};
-use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
+use crate::context_store::ContextStore;
+use crate::context_strip::ContextStrip;
 use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
-use crate::{Chat, RemoveAllContext, ToggleContextPicker, ToggleModelSelector};
+use crate::{Chat, ToggleContextPicker, ToggleModelSelector};

 pub struct MessageEditor {
    thread: Model<Thread>,
@@ -34,8 +33,8 @@ pub struct MessageEditor {
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
    inline_context_picker: View<ContextPicker>,
    inline_context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    model_selector: View<AssistantModelSelector>,
-    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
+    language_model_selector: View<LanguageModelSelector>,
+    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    use_tools: bool,
    _subscriptions: Vec<Subscription>,
 }
@@ -48,19 +47,17 @@ impl MessageEditor {
        thread: Model<Thread>,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let context_store = cx.new_model(|_cx| ContextStore::new(workspace.clone()));
+        let context_store = cx.new_model(|_cx| ContextStore::new());
        let context_picker_menu_handle = PopoverMenuHandle::default();
        let inline_context_picker_menu_handle = PopoverMenuHandle::default();
-        let model_selector_menu_handle = PopoverMenuHandle::default();

        let editor = cx.new_view(|cx| {
            let mut editor = Editor::auto_height(10, cx);
-            editor.set_placeholder_text("Ask anything…", cx);
+            editor.set_placeholder_text("Ask anything, @ to add context", cx);
            editor.set_show_indent_guides(false, cx);

            editor
        });
-
        let inline_context_picker = cx.new_view(|cx| {
            ContextPicker::new(
                workspace.clone(),
@@ -70,118 +67,107 @@ impl MessageEditor {
                cx,
            )
        });
-
-        let context_strip = cx.new_view(|cx| {
-            ContextStrip::new(
-                context_store.clone(),
-                workspace.clone(),
-                Some(thread_store.clone()),
-                context_picker_menu_handle.clone(),
-                SuggestContextKind::File,
-                cx,
-            )
-        });
-
        let subscriptions = vec![
            cx.subscribe(&editor, Self::handle_editor_event),
            cx.subscribe(
                &inline_context_picker,
                Self::handle_inline_context_picker_event,
            ),
-            cx.subscribe(&context_strip, Self::handle_context_strip_event),
        ];

        Self {
            thread,
            editor: editor.clone(),
-            context_store,
-            context_strip,
-            context_picker_menu_handle,
-            inline_context_picker,
-            inline_context_picker_menu_handle,
-            model_selector: cx.new_view(|cx| {
-                AssistantModelSelector::new(
-                    fs,
-                    model_selector_menu_handle.clone(),
+            context_store: context_store.clone(),
+            context_strip: cx.new_view(|cx| {
+                ContextStrip::new(
+                    context_store,
+                    workspace.clone(),
+                    Some(thread_store.clone()),
                    editor.focus_handle(cx),
+                    context_picker_menu_handle.clone(),
                    cx,
                )
            }),
-            model_selector_menu_handle,
+            context_picker_menu_handle,
+            inline_context_picker,
+            inline_context_picker_menu_handle,
+            language_model_selector: cx.new_view(|cx| {
+                let fs = fs.clone();
+                LanguageModelSelector::new(
+                    move |model, cx| {
+                        update_settings_file::<AssistantSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _cx| settings.set_model(model.clone()),
+                        );
+                    },
+                    cx,
+                )
+            }),
+            language_model_selector_menu_handle: PopoverMenuHandle::default(),
            use_tools: false,
            _subscriptions: subscriptions,
        }
    }

    fn toggle_model_selector(&mut self, _: &ToggleModelSelector, cx: &mut ViewContext<Self>) {
-        self.model_selector_menu_handle.toggle(cx)
+        self.language_model_selector_menu_handle.toggle(cx);
    }

    fn toggle_context_picker(&mut self, _: &ToggleContextPicker, cx: &mut ViewContext<Self>) {
        self.context_picker_menu_handle.toggle(cx);
    }

-    pub fn remove_all_context(&mut self, _: &RemoveAllContext, cx: &mut ViewContext<Self>) {
-        self.context_store.update(cx, |store, _cx| store.clear());
-        cx.notify();
-    }
-
    fn chat(&mut self, _: &Chat, cx: &mut ViewContext<Self>) {
        self.send_to_model(RequestKind::Chat, cx);
    }

-    fn send_to_model(&mut self, request_kind: RequestKind, cx: &mut ViewContext<Self>) {
+    fn send_to_model(
+        &mut self,
+        request_kind: RequestKind,
+        cx: &mut ViewContext<Self>,
+    ) -> Option<()> {
        let provider = LanguageModelRegistry::read_global(cx).active_provider();
        if provider
            .as_ref()
            .map_or(false, |provider| provider.must_accept_terms(cx))
        {
            cx.notify();
-            return;
+            return None;
        }

        let model_registry = LanguageModelRegistry::read_global(cx);
-        let Some(model) = model_registry.active_model() else {
-            return;
-        };
+        let model = model_registry.active_model()?;

        let user_message = self.editor.update(cx, |editor, cx| {
            let text = editor.text(cx);
            editor.clear(cx);
            text
        });
+        let context = self.context_store.update(cx, |this, _cx| this.drain());

-        let refresh_task = refresh_context_store_text(self.context_store.clone(), cx);
+        self.thread.update(cx, |thread, cx| {
+            thread.insert_user_message(user_message, context, cx);
+            let mut request = thread.to_completion_request(request_kind, cx);

-        let thread = self.thread.clone();
-        let context_store = self.context_store.clone();
-        let use_tools = self.use_tools;
-        cx.spawn(move |_, mut cx| async move {
-            refresh_task.await;
-            thread
-                .update(&mut cx, |thread, cx| {
-                    let context = context_store.read(cx).snapshot(cx).collect::<Vec<_>>();
-                    thread.insert_user_message(user_message, context, cx);
-                    let mut request = thread.to_completion_request(request_kind, cx);
+            if self.use_tools {
+                request.tools = thread
+                    .tools()
+                    .tools(cx)
+                    .into_iter()
+                    .map(|tool| LanguageModelRequestTool {
+                        name: tool.name(),
+                        description: tool.description(),
+                        input_schema: tool.input_schema(),
+                    })
+                    .collect();
+            }

-                    if use_tools {
-                        request.tools = thread
-                            .tools()
-                            .tools(cx)
-                            .into_iter()
-                            .map(|tool| LanguageModelRequestTool {
-                                name: tool.name(),
-                                description: tool.description(),
-                                input_schema: tool.input_schema(),
-                            })
-                            .collect();
-                    }
+            thread.stream_completion(request, model, cx)
+        });

-                    thread.stream_completion(request, model, cx)
-                })
-                .ok();
-        })
-        .detach();
+        None
    }

    fn handle_editor_event(
@@ -218,29 +204,48 @@ impl MessageEditor {
        cx.focus(&editor_focus_handle);
    }

-    fn handle_context_strip_event(
-        &mut self,
-        _context_strip: View<ContextStrip>,
-        event: &ContextStripEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            ContextStripEvent::PickerDismissed
-            | ContextStripEvent::BlurredEmpty
-            | ContextStripEvent::BlurredDown => {
-                let editor_focus_handle = self.editor.focus_handle(cx);
-                cx.focus(&editor_focus_handle);
-            }
-            ContextStripEvent::BlurredUp => {}
-        }
-    }
+    fn render_language_model_selector(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+        let focus_handle = self.language_model_selector.focus_handle(cx).clone();

-    fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
-        if self.context_picker_menu_handle.is_deployed() {
-            cx.propagate();
-        } else {
-            cx.focus_view(&self.context_strip);
-        }
+        LanguageModelSelectorPopoverMenu::new(
+            self.language_model_selector.clone(),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .w_full()
+                        .gap_0p5()
+                        .child(
+                            div()
+                                .overflow_x_hidden()
+                                .flex_grow()
+                                .whitespace_nowrap()
+                                .child(match active_model {
+                                    Some(model) => h_flex()
+                                        .child(
+                                            Label::new(model.name().0)
+                                                .size(LabelSize::Small)
+                                                .color(Color::Muted),
+                                        )
+                                        .into_any_element(),
+                                    _ => Label::new("No model selected")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                        .into_any_element(),
+                                }),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                )
+                .tooltip(move |cx| {
+                    Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
+                }),
+        )
+        .with_handle(self.language_model_selector_menu_handle.clone())
    }
 }

@@ -263,85 +268,74 @@ impl Render for MessageEditor {
            .on_action(cx.listener(Self::chat))
            .on_action(cx.listener(Self::toggle_model_selector))
            .on_action(cx.listener(Self::toggle_context_picker))
-            .on_action(cx.listener(Self::remove_all_context))
-            .on_action(cx.listener(Self::move_up))
            .size_full()
            .gap_2()
            .p_2()
            .bg(bg_color)
            .child(self.context_strip.clone())
+            .child({
+                let settings = ThemeSettings::get_global(cx);
+                let text_style = TextStyle {
+                    color: cx.theme().colors().editor_foreground,
+                    font_family: settings.ui_font.family.clone(),
+                    font_features: settings.ui_font.features.clone(),
+                    font_size: font_size.into(),
+                    font_weight: settings.ui_font.weight,
+                    line_height: line_height.into(),
+                    ..Default::default()
+                };
+
+                EditorElement::new(
+                    &self.editor,
+                    EditorStyle {
+                        background: bg_color,
+                        local_player: cx.theme().players().local(),
+                        text: text_style,
+                        ..Default::default()
+                    },
+                )
+            })
            .child(
-                v_flex()
-                    .gap_4()
-                    .child({
-                        let settings = ThemeSettings::get_global(cx);
-                        let text_style = TextStyle {
-                            color: cx.theme().colors().text,
-                            font_family: settings.ui_font.family.clone(),
-                            font_features: settings.ui_font.features.clone(),
-                            font_size: font_size.into(),
-                            font_weight: settings.ui_font.weight,
-                            line_height: line_height.into(),
-                            ..Default::default()
-                        };
-
-                        EditorElement::new(
-                            &self.editor,
-                            EditorStyle {
-                                background: bg_color,
-                                local_player: cx.theme().players().local(),
-                                text: text_style,
-                                ..Default::default()
-                            },
-                        )
+                PopoverMenu::new("inline-context-picker")
+                    .menu(move |_cx| Some(inline_context_picker.clone()))
+                    .attach(gpui::Corner::TopLeft)
+                    .anchor(gpui::Corner::BottomLeft)
+                    .offset(gpui::Point {
+                        x: px(0.0),
+                        y: px(-16.0),
                    })
-                    .child(
-                        PopoverMenu::new("inline-context-picker")
-                            .menu(move |cx| {
-                                inline_context_picker.update(cx, |this, cx| {
-                                    this.init(cx);
-                                });
-
-                                Some(inline_context_picker.clone())
-                            })
-                            .attach(gpui::Corner::TopLeft)
-                            .anchor(gpui::Corner::BottomLeft)
-                            .offset(gpui::Point {
-                                x: px(0.0),
-                                y: (-get_ui_font_size(cx) * 2) - px(4.0),
-                            })
-                            .with_handle(self.inline_context_picker_menu_handle.clone()),
-                    )
+                    .with_handle(self.inline_context_picker_menu_handle.clone()),
+            )
+            .child(
+                h_flex()
+                    .justify_between()
+                    .child(CheckboxWithLabel::new(
+                        "use-tools",
+                        Label::new("Tools"),
+                        self.use_tools.into(),
+                        cx.listener(|this, selection, _cx| {
+                            this.use_tools = match selection {
+                                ToggleState::Selected => true,
+                                ToggleState::Unselected | ToggleState::Indeterminate => false,
+                            };
+                        }),
+                    ))
                    .child(
                        h_flex()
-                            .justify_between()
-                            .child(SwitchWithLabel::new(
-                                "use-tools",
-                                Label::new("Tools").size(LabelSize::Small),
-                                self.use_tools.into(),
-                                cx.listener(|this, selection, _cx| {
-                                    this.use_tools = match selection {
-                                        ToggleState::Selected => true,
-                                        ToggleState::Unselected | ToggleState::Indeterminate => {
-                                            false
-                                        }
-                                    };
-                                }),
-                            ))
+                            .gap_1()
+                            .child(self.render_language_model_selector(cx))
                            .child(
-                                h_flex().gap_1().child(self.model_selector.clone()).child(
-                                    ButtonLike::new("chat")
-                                        .style(ButtonStyle::Filled)
-                                        .layer(ElevationIndex::ModalSurface)
-                                        .child(Label::new("Submit").size(LabelSize::Small))
-                                        .children(
-                                            KeyBinding::for_action_in(&Chat, &focus_handle, cx)
-                                                .map(|binding| binding.into_any_element()),
-                                        )
-                                        .on_click(move |_event, cx| {
-                                            focus_handle.dispatch_action(&Chat, cx);
-                                        }),
-                                ),
+                                ButtonLike::new("chat")
+                                    .style(ButtonStyle::Filled)
+                                    .layer(ElevationIndex::ModalSurface)
+                                    .child(Label::new("Submit"))
+                                    .children(
+                                        KeyBinding::for_action_in(&Chat, &focus_handle, cx)
+                                            .map(|binding| binding.into_any_element()),
+                                    )
+                                    .on_click(move |_event, cx| {
+                                        focus_handle.dispatch_action(&Chat, cx);
+                                    }),
                            ),
                    ),
            )
--- a/crates/assistant2/src/terminal_inline_assistant.rs
+++ b/crates/assistant2/src/terminal_inline_assistant.rs
@@ -78,7 +78,7 @@ impl TerminalInlineAssistant {
        let prompt_buffer = cx.new_model(|cx| {
            MultiBuffer::singleton(cx.new_model(|cx| Buffer::local(String::new(), cx)), cx)
        });
-        let context_store = cx.new_model(|_cx| ContextStore::new(workspace.clone()));
+        let context_store = cx.new_model(|_cx| ContextStore::new());
        let codegen = cx.new_model(|_| TerminalCodegen::new(terminal, self.telemetry.clone()));

        let prompt_editor = cx.new_view(|cx| {
@@ -245,10 +245,10 @@ impl TerminalInlineAssistant {
            cache: false,
        };

-        attach_context_to_message(
-            &mut request_message,
-            assist.context_store.read(cx).snapshot(cx),
-        );
+        let context = assist
+            .context_store
+            .update(cx, |this, _cx| this.context().clone());
+        attach_context_to_message(&mut request_message, context);

        request_message.content.push(prompt.into());

--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -3,7 +3,7 @@ use std::sync::Arc;
 use anyhow::Result;
 use assistant_tool::ToolWorkingSet;
 use chrono::{DateTime, Utc};
-use collections::{BTreeMap, HashMap, HashSet};
+use collections::HashMap;
 use futures::future::Shared;
 use futures::{FutureExt as _, StreamExt as _};
 use gpui::{AppContext, EventEmitter, ModelContext, SharedString, Task};
@@ -17,7 +17,7 @@ use serde::{Deserialize, Serialize};
 use util::{post_inc, TryFutureExt as _};
 use uuid::Uuid;

-use crate::context::{attach_context_to_message, ContextId, ContextSnapshot};
+use crate::context::{attach_context_to_message, Context};

 #[derive(Debug, Clone, Copy)]
 pub enum RequestKind {
@@ -64,8 +64,7 @@ pub struct Thread {
    pending_summary: Task<Option<()>>,
    messages: Vec<Message>,
    next_message_id: MessageId,
-    context: BTreeMap<ContextId, ContextSnapshot>,
-    context_by_message: HashMap<MessageId, Vec<ContextId>>,
+    context_by_message: HashMap<MessageId, Vec<Context>>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
    tools: Arc<ToolWorkingSet>,
@@ -83,7 +82,6 @@ impl Thread {
            pending_summary: Task::ready(None),
            messages: Vec::new(),
            next_message_id: MessageId(0),
-            context: BTreeMap::default(),
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
@@ -114,11 +112,6 @@ impl Thread {
        self.summary.clone()
    }

-    pub fn summary_or_default(&self) -> SharedString {
-        const DEFAULT: SharedString = SharedString::new_static("New Thread");
-        self.summary.clone().unwrap_or(DEFAULT)
-    }
-
    pub fn set_summary(&mut self, summary: impl Into<SharedString>, cx: &mut ModelContext<Self>) {
        self.summary = Some(summary.into());
        cx.emit(ThreadEvent::SummaryChanged);
@@ -132,23 +125,12 @@ impl Thread {
        self.messages.iter()
    }

-    pub fn is_streaming(&self) -> bool {
-        !self.pending_completions.is_empty()
-    }
-
    pub fn tools(&self) -> &Arc<ToolWorkingSet> {
        &self.tools
    }

-    pub fn context_for_message(&self, id: MessageId) -> Option<Vec<ContextSnapshot>> {
-        let context = self.context_by_message.get(&id)?;
-        Some(
-            context
-                .into_iter()
-                .filter_map(|context_id| self.context.get(&context_id))
-                .cloned()
-                .collect::<Vec<_>>(),
-        )
+    pub fn context_for_message(&self, id: MessageId) -> Option<&Vec<Context>> {
+        self.context_by_message.get(&id)
    }

    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
@@ -158,14 +140,11 @@ impl Thread {
    pub fn insert_user_message(
        &mut self,
        text: impl Into<String>,
-        context: Vec<ContextSnapshot>,
+        context: Vec<Context>,
        cx: &mut ModelContext<Self>,
    ) {
        let message_id = self.insert_message(Role::User, text, cx);
-        let context_ids = context.iter().map(|context| context.id).collect::<Vec<_>>();
-        self.context
-            .extend(context.into_iter().map(|context| (context.id, context)));
-        self.context_by_message.insert(message_id, context_ids);
+        self.context_by_message.insert(message_id, context);
    }

    pub fn insert_message(
@@ -185,27 +164,6 @@ impl Thread {
        id
    }

-    /// Returns the representation of this [`Thread`] in a textual form.
-    ///
-    /// This is the representation we use when attaching a thread as context to another thread.
-    pub fn text(&self) -> String {
-        let mut text = String::new();
-
-        for message in &self.messages {
-            text.push_str(match message.role {
-                language_model::Role::User => "User:",
-                language_model::Role::Assistant => "Assistant:",
-                language_model::Role::System => "System:",
-            });
-            text.push('\n');
-
-            text.push_str(&message.text);
-            text.push('\n');
-        }
-
-        text
-    }
-
    pub fn to_completion_request(
        &self,
        _request_kind: RequestKind,
@@ -218,13 +176,7 @@ impl Thread {
            temperature: None,
        };

-        let mut referenced_context_ids = HashSet::default();
-
        for message in &self.messages {
-            if let Some(context_ids) = self.context_by_message.get(&message.id) {
-                referenced_context_ids.extend(context_ids);
-            }
-
            let mut request_message = LanguageModelRequestMessage {
                role: message.role,
                content: Vec::new(),
@@ -239,6 +191,10 @@ impl Thread {
                }
            }

+            if let Some(context) = self.context_for_message(message.id) {
+                attach_context_to_message(&mut request_message, context.clone());
+            }
+
            if !message.text.is_empty() {
                request_message
                    .content
@@ -256,22 +212,6 @@ impl Thread {
            request.messages.push(request_message);
        }

-        if !referenced_context_ids.is_empty() {
-            let mut context_message = LanguageModelRequestMessage {
-                role: Role::User,
-                content: Vec::new(),
-                cache: false,
-            };
-
-            let referenced_context = referenced_context_ids
-                .into_iter()
-                .filter_map(|context_id| self.context.get(context_id))
-                .cloned();
-            attach_context_to_message(&mut context_message, referenced_context);
-
-            request.messages.push(context_message);
-        }
-
        request
    }

@@ -361,7 +301,7 @@ impl Thread {
            let result = stream_completion.await;

            thread
-                .update(&mut cx, |thread, cx| match result.as_ref() {
+                .update(&mut cx, |_thread, cx| match result.as_ref() {
                    Ok(stop_reason) => match stop_reason {
                        StopReason::ToolUse => {
                            cx.emit(ThreadEvent::UsePendingTools);
@@ -384,8 +324,6 @@ impl Thread {
                                SharedString::from(error_message.clone()),
                            )));
                        }
-
-                        thread.cancel_last_completion();
                    }
                })
                .ok();
@@ -508,17 +446,6 @@ impl Thread {
            };
        }
    }
-
-    /// Cancels the last pending completion, if there are any pending.
-    ///
-    /// Returns whether a completion was canceled.
-    pub fn cancel_last_completion(&mut self) -> bool {
-        if let Some(_last_completion) = self.pending_completions.pop() {
-            true
-        } else {
-            false
-        }
-    }
 }

 #[derive(Debug, Clone)]
--- a/crates/assistant2/src/thread_history.rs
+++ b/crates/assistant2/src/thread_history.rs
@@ -100,8 +100,12 @@ impl PastThread {
 impl RenderOnce for PastThread {
    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
        let (id, summary) = {
+            const DEFAULT_SUMMARY: SharedString = SharedString::new_static("New Thread");
            let thread = self.thread.read(cx);
-            (thread.id().clone(), thread.summary_or_default())
+            (
+                thread.id().clone(),
+                thread.summary().unwrap_or(DEFAULT_SUMMARY),
+            )
        };

        let thread_timestamp = time_format::format_localized_timestamp(
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -238,46 +238,5 @@ impl ThreadStore {
        Async programming in Rust provides a powerful way to write concurrent code that's both safe and efficient. It's particularly useful for servers, network programming, and any application that deals with many concurrent operations.".unindent(), cx);
            thread
        }));
-
-        self.threads.push(cx.new_model(|cx| {
-            let mut thread = Thread::new(self.tools.clone(), cx);
-            thread.set_summary("Rust code with long lines", cx);
-            thread.insert_user_message("Could you write me some Rust code with long lines?", Vec::new(), cx);
-            thread.insert_message(Role::Assistant, r#"Here's some Rust code with some intentionally long lines:
-            ```rust
-            use std::collections::{HashMap, HashSet};
-            use std::sync::{Arc, Mutex};
-            use std::thread;
-
-            fn main() {
-                let very_long_vector = vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25];
-
-                let complicated_hashmap: HashMap<String, Vec<(i32, f64, String)>> = [("key1".to_string(), vec![(1, 1.1, "value1".to_string()), (2, 2.2, "value2".to_string())]), ("key2".to_string(), vec![(3, 3.3, "value3".to_string()), (4, 4.4, "value4".to_string())])].iter().cloned().collect();
-
-                let nested_structure = Arc::new(Mutex::new(HashMap::new()));
-
-                let long_closure = |x: i32, y: i32, z: i32| -> i32 { let result = x * y + z; println!("The result of the long closure calculation is: {}", result); result };
-
-                let thread_handles: Vec<_> = (0..10).map(|i| {
-                    let nested_structure_clone = Arc::clone(&nested_structure);
-                    thread::spawn(move || {
-                        let mut lock = nested_structure_clone.lock().unwrap();
-                        lock.entry(format!("thread_{}", i)).or_insert_with(|| HashSet::new()).insert(i * i);
-                    })
-                }).collect();
-
-                for handle in thread_handles {
-                    handle.join().unwrap();
-                }
-
-                println!("The final state of the nested structure is: {:?}", nested_structure.lock().unwrap());
-
-                let complex_expression = very_long_vector.iter().filter(|&&x| x % 2 == 0).map(|&x| x * x).fold(0, |acc, x| acc + x) + long_closure(5, 10, 15);
-
-                println!("The result of the complex expression is: {}", complex_expression);
-            }
-            ```"#.unindent(), cx);
-            thread
-        }));
    }
 }
--- a/crates/assistant2/src/ui/context_pill.rs
+++ b/crates/assistant2/src/ui/context_pill.rs
@@ -1,205 +1,52 @@
 use std::rc::Rc;

 use gpui::ClickEvent;
-use ui::{prelude::*, IconButtonShape, Tooltip};
+use ui::{prelude::*, IconButtonShape};

-use crate::context::{ContextKind, ContextSnapshot};
+use crate::context::Context;

 #[derive(IntoElement)]
-pub enum ContextPill {
-    Added {
-        context: ContextSnapshot,
-        dupe_name: bool,
-        focused: bool,
-        on_click: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext)>>,
-        on_remove: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext)>>,
-    },
-    Suggested {
-        name: SharedString,
-        icon_path: Option<SharedString>,
-        kind: ContextKind,
-        focused: bool,
-        on_click: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext)>>,
-    },
+pub struct ContextPill {
+    context: Context,
+    on_remove: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext)>>,
 }

 impl ContextPill {
-    pub fn new_added(
-        context: ContextSnapshot,
-        dupe_name: bool,
-        focused: bool,
-        on_remove: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext)>>,
-    ) -> Self {
-        Self::Added {
+    pub fn new(context: Context) -> Self {
+        Self {
            context,
-            dupe_name,
-            on_remove,
-            focused,
-            on_click: None,
+            on_remove: None,
        }
    }

-    pub fn new_suggested(
-        name: SharedString,
-        icon_path: Option<SharedString>,
-        kind: ContextKind,
-        focused: bool,
-    ) -> Self {
-        Self::Suggested {
-            name,
-            icon_path,
-            kind,
-            focused,
-            on_click: None,
-        }
-    }
-
-    pub fn on_click(mut self, listener: Rc<dyn Fn(&ClickEvent, &mut WindowContext)>) -> Self {
-        match &mut self {
-            ContextPill::Added { on_click, .. } => {
-                *on_click = Some(listener);
-            }
-            ContextPill::Suggested { on_click, .. } => {
-                *on_click = Some(listener);
-            }
-        }
+    pub fn on_remove(mut self, on_remove: Rc<dyn Fn(&ClickEvent, &mut WindowContext)>) -> Self {
+        self.on_remove = Some(on_remove);
        self
    }
-
-    pub fn id(&self) -> ElementId {
-        match self {
-            Self::Added { context, .. } => {
-                ElementId::NamedInteger("context-pill".into(), context.id.0)
-            }
-            Self::Suggested { .. } => "suggested-context-pill".into(),
-        }
-    }
-
-    pub fn icon(&self) -> Icon {
-        match self {
-            Self::Added { context, .. } => match &context.icon_path {
-                Some(icon_path) => Icon::from_path(icon_path),
-                None => Icon::new(context.kind.icon()),
-            },
-            Self::Suggested {
-                icon_path: Some(icon_path),
-                ..
-            } => Icon::from_path(icon_path),
-            Self::Suggested {
-                kind,
-                icon_path: None,
-                ..
-            } => Icon::new(kind.icon()),
-        }
-    }
 }

 impl RenderOnce for ContextPill {
    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        let color = cx.theme().colors();
-
-        let base_pill = h_flex()
-            .id(self.id())
-            .pl_1()
+        h_flex()
+            .gap_1()
+            .pl_1p5()
+            .pr_0p5()
            .pb(px(1.))
            .border_1()
+            .border_color(cx.theme().colors().border.opacity(0.5))
+            .bg(cx.theme().colors().element_background)
            .rounded_md()
-            .gap_1()
-            .child(self.icon().size(IconSize::XSmall).color(Color::Muted));
-
-        match &self {
-            ContextPill::Added {
-                context,
-                dupe_name,
-                on_remove,
-                focused,
-                on_click,
-            } => base_pill
-                .bg(color.element_background)
-                .border_color(if *focused {
-                    color.border_focused
-                } else {
-                    color.border.opacity(0.5)
-                })
-                .pr(if on_remove.is_some() { px(2.) } else { px(4.) })
-                .child(
-                    h_flex()
-                        .id("context-data")
-                        .gap_1()
-                        .child(Label::new(context.name.clone()).size(LabelSize::Small))
-                        .when_some(context.parent.as_ref(), |element, parent_name| {
-                            if *dupe_name {
-                                element.child(
-                                    Label::new(parent_name.clone())
-                                        .size(LabelSize::XSmall)
-                                        .color(Color::Muted),
-                                )
-                            } else {
-                                element
-                            }
-                        })
-                        .when_some(context.tooltip.clone(), |element, tooltip| {
-                            element.tooltip(move |cx| Tooltip::text(tooltip.clone(), cx))
+            .child(Label::new(self.context.name.clone()).size(LabelSize::Small))
+            .when_some(self.on_remove, |parent, on_remove| {
+                parent.child(
+                    IconButton::new(("remove", self.context.id.0), IconName::Close)
+                        .shape(IconButtonShape::Square)
+                        .icon_size(IconSize::XSmall)
+                        .on_click({
+                            let on_remove = on_remove.clone();
+                            move |event, cx| on_remove(event, cx)
                        }),
                )
-                .when_some(on_remove.as_ref(), |element, on_remove| {
-                    element.child(
-                        IconButton::new(("remove", context.id.0), IconName::Close)
-                            .shape(IconButtonShape::Square)
-                            .icon_size(IconSize::XSmall)
-                            .tooltip(|cx| Tooltip::text("Remove Context", cx))
-                            .on_click({
-                                let on_remove = on_remove.clone();
-                                move |event, cx| on_remove(event, cx)
-                            }),
-                    )
-                })
-                .when_some(on_click.as_ref(), |element, on_click| {
-                    let on_click = on_click.clone();
-                    element.on_click(move |event, cx| on_click(event, cx))
-                }),
-            ContextPill::Suggested {
-                name,
-                icon_path: _,
-                kind,
-                focused,
-                on_click,
-            } => base_pill
-                .cursor_pointer()
-                .pr_1()
-                .border_color(if *focused {
-                    color.border_focused
-                } else {
-                    color.border_variant.opacity(0.5)
-                })
-                .hover(|style| style.bg(color.element_hover.opacity(0.5)))
-                .child(
-                    Label::new(name.clone())
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                )
-                .child(
-                    div().px_0p5().child(
-                        Label::new(match kind {
-                            ContextKind::File => "Active Tab",
-                            ContextKind::Thread
-                            | ContextKind::Directory
-                            | ContextKind::FetchedUrl => "Active",
-                        })
-                        .size(LabelSize::XSmall)
-                        .color(Color::Muted),
-                    ),
-                )
-                .child(
-                    Icon::new(IconName::Plus)
-                        .size(IconSize::XSmall)
-                        .into_any_element(),
-                )
-                .tooltip(|cx| Tooltip::with_meta("Suggested Context", None, "Click to add it", cx))
-                .when_some(on_click.as_ref(), |element, on_click| {
-                    let on_click = on_click.clone();
-                    element.on_click(move |event, cx| on_click(event, cx))
-                }),
-        }
+            })
    }
 }
--- a/crates/auto_update_ui/src/update_notification.rs
+++ b/crates/auto_update_ui/src/update_notification.rs
@@ -18,7 +18,7 @@ pub struct UpdateNotification {
 impl EventEmitter<DismissEvent> for UpdateNotification {}

 impl Render for UpdateNotification {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+    fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
        let app_name = ReleaseChannel::global(cx).display_name();

        v_flex()
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -16,10 +16,10 @@ doctest = false
 editor.workspace = true
 gpui.workspace = true
 itertools.workspace = true
+outline.workspace = true
 theme.workspace = true
 ui.workspace = true
 workspace.workspace = true
-zed_actions.workspace = true

 [dev-dependencies]
 editor = { workspace = true, features = ["test-support"] }
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -39,17 +39,10 @@ impl EventEmitter<ToolbarItemEvent> for Breadcrumbs {}
 impl Render for Breadcrumbs {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        const MAX_SEGMENTS: usize = 12;
-
-        let element = h_flex()
-            .id("breadcrumb-container")
-            .flex_grow()
-            .overflow_x_scroll()
-            .text_ui(cx);
-
+        let element = h_flex().text_ui(cx);
        let Some(active_item) = self.active_item.as_ref() else {
            return element;
        };
-
        let Some(mut segments) = active_item.breadcrumbs(cx.theme(), cx) else {
            return element;
        };
@@ -59,7 +52,6 @@ impl Render for Breadcrumbs {
            prefix_end_ix,
            segments.len().saturating_sub(MAX_SEGMENTS / 2),
        );
-
        if suffix_start_ix > prefix_end_ix {
            segments.splice(
                prefix_end_ix..suffix_start_ix,
@@ -90,7 +82,6 @@ impl Render for Breadcrumbs {
        });

        let breadcrumbs_stack = h_flex().gap_1().children(breadcrumbs);
-
        match active_item
            .downcast::<Editor>()
            .map(|editor| editor.downgrade())
@@ -102,11 +93,8 @@ impl Render for Breadcrumbs {
                    .on_click({
                        let editor = editor.clone();
                        move |_, cx| {
-                            if let Some((editor, callback)) = editor
-                                .upgrade()
-                                .zip(zed_actions::outline::TOGGLE_OUTLINE.get())
-                            {
-                                callback(editor.to_any(), cx);
+                            if let Some(editor) = editor.upgrade() {
+                                outline::toggle(editor, &editor::actions::ToggleOutline, cx)
                            }
                        }
                    })
@@ -114,15 +102,15 @@ impl Render for Breadcrumbs {
                        if let Some(editor) = editor.upgrade() {
                            let focus_handle = editor.read(cx).focus_handle(cx);
                            Tooltip::for_action_in(
-                                "Show Symbol Outline",
-                                &zed_actions::outline::ToggleOutline,
+                                "Show symbol outline",
+                                &editor::actions::ToggleOutline,
                                &focus_handle,
                                cx,
                            )
                        } else {
                            Tooltip::for_action(
-                                "Show Symbol Outline",
-                                &zed_actions::outline::ToggleOutline,
+                                "Show symbol outline",
+                                &editor::actions::ToggleOutline,
                                cx,
                            )
                        }
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -25,6 +25,7 @@ anyhow.workspace = true
 clap.workspace = true
 collections.workspace = true
 ipc-channel = "0.19"
+once_cell.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 release_channel.workspace = true
--- a/crates/cli/build.rs
+++ b/crates/cli/build.rs
@@ -2,10 +2,4 @@ fn main() {
    if std::env::var("ZED_UPDATE_EXPLANATION").is_ok() {
        println!(r#"cargo:rustc-cfg=feature="no-bundled-uninstall""#);
    }
-
-    if cfg!(target_os = "macos") {
-        println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.15.7");
-        // Weakly link ScreenCaptureKit to ensure can be used on macOS 10.15+.
-        println!("cargo:rustc-link-arg=-Wl,-weak_framework,ScreenCaptureKit");
-    }
 }
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -18,9 +18,6 @@ use std::{
 use tempfile::NamedTempFile;
 use util::paths::PathWithPosition;

-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
-use std::io::IsTerminal;
-
 struct Detect;

 trait InstalledApp {
@@ -76,7 +73,7 @@ fn parse_path_with_position(argument_str: &str) -> anyhow::Result<String> {
        Ok(existing_path) => PathWithPosition::from_path(existing_path),
        Err(_) => {
            let path = PathWithPosition::parse_str(argument_str);
-            let curdir = env::current_dir().context("retrieving current directory")?;
+            let curdir = env::current_dir().context("reteiving current directory")?;
            path.map_path(|path| match fs::canonicalize(&path) {
                Ok(path) => Ok(path),
                Err(e) => {
@@ -164,25 +161,7 @@ fn main() -> Result<()> {
        None
    };

-    let env = {
-        #[cfg(any(target_os = "linux", target_os = "freebsd"))]
-        {
-            // On Linux, the desktop entry uses `cli` to spawn `zed`.
-            // We need to handle env vars correctly since std::env::vars() may not contain
-            // project-specific vars (e.g. those set by direnv).
-            // By setting env to None here, the LSP will use worktree env vars instead,
-            // which is what we want.
-            if !std::io::stdout().is_terminal() {
-                None
-            } else {
-                Some(std::env::vars().collect::<HashMap<_, _>>())
-            }
-        }
-
-        #[cfg(not(any(target_os = "linux", target_os = "freebsd")))]
-        Some(std::env::vars().collect::<HashMap<_, _>>())
-    };
-
+    let env = Some(std::env::vars().collect::<HashMap<_, _>>());
    let exit_status = Arc::new(Mutex::new(None));
    let mut paths = vec![];
    let mut urls = vec![];
@@ -283,7 +262,6 @@ mod linux {
        os::unix::net::{SocketAddr, UnixDatagram},
        path::{Path, PathBuf},
        process::{self, ExitStatus},
-        sync::LazyLock,
        thread,
        time::Duration,
    };
@@ -291,11 +269,12 @@ mod linux {
    use anyhow::anyhow;
    use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
    use fork::Fork;
+    use once_cell::sync::Lazy;

    use crate::{Detect, InstalledApp};

-    static RELEASE_CHANNEL: LazyLock<String> =
-        LazyLock::new(|| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string());
+    static RELEASE_CHANNEL: Lazy<String> =
+        Lazy::new(|| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string());

    struct App(PathBuf);

--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -27,6 +27,7 @@ futures.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 log.workspace = true
+once_cell.workspace = true
 paths.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1958,8 +1958,8 @@ mod tests {
        });
        let server = FakeServer::for_client(user_id, &client, cx).await;

-        let (done_tx1, done_rx1) = smol::channel::unbounded();
-        let (done_tx2, done_rx2) = smol::channel::unbounded();
+        let (done_tx1, mut done_rx1) = smol::channel::unbounded();
+        let (done_tx2, mut done_rx2) = smol::channel::unbounded();
        AnyProtoClient::from(client.clone()).add_model_message_handler(
            move |model: Model<TestModel>, _: TypedEnvelope<proto::JoinProject>, mut cx| {
                match model.update(&mut cx, |model, _| model.id).unwrap() {
@@ -2001,8 +2001,8 @@ mod tests {

        server.send(proto::JoinProject { project_id: 1 });
        server.send(proto::JoinProject { project_id: 2 });
-        done_rx1.recv().await.unwrap();
-        done_rx2.recv().await.unwrap();
+        done_rx1.next().await.unwrap();
+        done_rx2.next().await.unwrap();
    }

    #[gpui::test]
@@ -2020,7 +2020,7 @@ mod tests {

        let model = cx.new_model(|_| TestModel::default());
        let (done_tx1, _done_rx1) = smol::channel::unbounded();
-        let (done_tx2, done_rx2) = smol::channel::unbounded();
+        let (done_tx2, mut done_rx2) = smol::channel::unbounded();
        let subscription1 = client.add_message_handler(
            model.downgrade(),
            move |_, _: TypedEnvelope<proto::Ping>, _| {
@@ -2037,7 +2037,7 @@ mod tests {
            },
        );
        server.send(proto::Ping {});
-        done_rx2.recv().await.unwrap();
+        done_rx2.next().await.unwrap();
    }

    #[gpui::test]
@@ -2054,7 +2054,7 @@ mod tests {
        let server = FakeServer::for_client(user_id, &client, cx).await;

        let model = cx.new_model(|_| TestModel::default());
-        let (done_tx, done_rx) = smol::channel::unbounded();
+        let (done_tx, mut done_rx) = smol::channel::unbounded();
        let subscription = client.add_message_handler(
            model.clone().downgrade(),
            move |model: Model<TestModel>, _: TypedEnvelope<proto::Ping>, mut cx| {
@@ -2069,7 +2069,7 @@ mod tests {
            model.subscription = Some(subscription);
        });
        server.send(proto::Ping {});
-        done_rx.recv().await.unwrap();
+        done_rx.next().await.unwrap();
    }

    #[derive(Default)]
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -1,6 +1,6 @@
 mod event_coalescer;

-use crate::TelemetrySettings;
+use crate::{ChannelId, TelemetrySettings};
 use anyhow::Result;
 use clock::SystemClock;
 use collections::{HashMap, HashSet};
@@ -8,17 +8,18 @@ use futures::channel::mpsc;
 use futures::{Future, StreamExt};
 use gpui::{AppContext, BackgroundExecutor, Task};
 use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
+use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
 use settings::{Settings, SettingsStore};
 use sha2::{Digest, Sha256};
 use std::fs::File;
 use std::io::Write;
-use std::sync::LazyLock;
 use std::time::Instant;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use telemetry_events::{
-    AppEvent, AssistantEvent, AssistantPhase, EditEvent, Event, EventRequestBody, EventWrapper,
+    AppEvent, AssistantEvent, CallEvent, EditEvent, Event, EventRequestBody, EventWrapper,
+    InlineCompletionEvent,
 };
 use util::{ResultExt, TryFutureExt};
 use worktree::{UpdatedEntriesSet, WorktreeId};
@@ -83,7 +84,7 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(1);

 #[cfg(not(debug_assertions))]
 const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
-static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {
+static ZED_CLIENT_CHECKSUM_SEED: Lazy<Option<Vec<u8>>> = Lazy::new(|| {
    option_env!("ZED_CLIENT_CHECKSUM_SEED")
        .map(|s| s.as_bytes().into())
        .or_else(|| {
@@ -333,26 +334,38 @@ impl Telemetry {
        drop(state);
    }

-    pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEvent) {
-        let event_type = match event.phase {
-            AssistantPhase::Response => "Assistant Responded",
-            AssistantPhase::Invoked => "Assistant Invoked",
-            AssistantPhase::Accepted => "Assistant Response Accepted",
-            AssistantPhase::Rejected => "Assistant Response Rejected",
-        };
+    pub fn report_inline_completion_event(
+        self: &Arc<Self>,
+        provider: String,
+        suggestion_accepted: bool,
+        file_extension: Option<String>,
+    ) {
+        let event = Event::InlineCompletion(InlineCompletionEvent {
+            provider,
+            suggestion_accepted,
+            file_extension,
+        });

-        telemetry::event!(
-            event_type,
-            conversation_id = event.conversation_id,
-            kind = event.kind,
-            phase = event.phase,
-            message_id = event.message_id,
-            model = event.model,
-            model_provider = event.model_provider,
-            response_latency = event.response_latency,
-            error_message = event.error_message,
-            language_name = event.language_name,
-        );
+        self.report_event(event)
+    }
+
+    pub fn report_assistant_event(self: &Arc<Self>, event: AssistantEvent) {
+        self.report_event(Event::Assistant(event));
+    }
+
+    pub fn report_call_event(
+        self: &Arc<Self>,
+        operation: &'static str,
+        room_id: Option<u64>,
+        channel_id: Option<ChannelId>,
+    ) {
+        let event = Event::Call(CallEvent {
+            operation: operation.to_string(),
+            room_id,
+            channel_id: channel_id.map(|cid| cid.0),
+        });
+
+        self.report_event(event)
    }

    pub fn report_app_event(self: &Arc<Self>, operation: String) -> Event {
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -34,7 +34,6 @@ collections.workspace = true
 dashmap.workspace = true
 derive_more.workspace = true
 envy = "0.4.2"
-fireworks.workspace = true
 futures.workspace = true
 google_ai.workspace = true
 hex.workspace = true
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -252,7 +252,7 @@ spec:
              value: "${AUTO_JOIN_CHANNEL_ID}"
          securityContext:
            capabilities:
-              # TODO - Switch to the more restrictive `PERFMON` capability.
+              # FIXME - Switch to the more restrictive `PERFMON` capability.
              # This capability isn't yet available in a stable version of Debian.
              add: ["SYS_ADMIN"]
      terminationGracePeriodSeconds: 10
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -106,22 +106,6 @@ CREATE TABLE "worktree_repositories" (
 CREATE INDEX "index_worktree_repositories_on_project_id" ON "worktree_repositories" ("project_id");
 CREATE INDEX "index_worktree_repositories_on_project_id_and_worktree_id" ON "worktree_repositories" ("project_id", "worktree_id");

-CREATE TABLE "worktree_repository_statuses" (
-    "project_id" INTEGER NOT NULL,
-    "worktree_id" INT8 NOT NULL,
-    "work_directory_id" INT8 NOT NULL,
-    "repo_path" VARCHAR NOT NULL,
-    "status" INT8 NOT NULL,
-    "scan_id" INT8 NOT NULL,
-    "is_deleted" BOOL NOT NULL,
-    PRIMARY KEY(project_id, worktree_id, work_directory_id, repo_path),
-    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
-    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
-);
-CREATE INDEX "index_wt_repos_statuses_on_project_id" ON "worktree_repository_statuses" ("project_id");
-CREATE INDEX "index_wt_repos_statuses_on_project_id_and_wt_id" ON "worktree_repository_statuses" ("project_id", "worktree_id");
-CREATE INDEX "index_wt_repos_statuses_on_project_id_and_wt_id_and_wd_id" ON "worktree_repository_statuses" ("project_id", "worktree_id", "work_directory_id");
-
 CREATE TABLE "worktree_settings_files" (
    "project_id" INTEGER NOT NULL,
    "worktree_id" INTEGER NOT NULL,
@@ -438,8 +422,7 @@ CREATE TABLE IF NOT EXISTS billing_subscriptions (
    billing_customer_id INTEGER NOT NULL REFERENCES billing_customers(id),
    stripe_subscription_id TEXT NOT NULL,
    stripe_subscription_status TEXT NOT NULL,
-    stripe_cancel_at TIMESTAMP,
-    stripe_cancellation_reason TEXT
+    stripe_cancel_at TIMESTAMP
 );

 CREATE INDEX "ix_billing_subscriptions_on_billing_customer_id" ON billing_subscriptions (billing_customer_id);
--- a/crates/collab/migrations/20250108184547_add_stripe_cancellation_reason_to_billing_subscriptions.sql
+++ b/crates/collab/migrations/20250108184547_add_stripe_cancellation_reason_to_billing_subscriptions.sql
@@ -1,2 +0,0 @@
-alter table billing_subscriptions
-add column stripe_cancellation_reason text;
--- a/crates/collab/src/api/billing.rs
+++ b/crates/collab/src/api/billing.rs
@@ -12,8 +12,8 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use std::{str::FromStr, sync::Arc, time::Duration};
 use stripe::{
-    BillingPortalSession, CancellationDetailsReason, CreateBillingPortalSession,
-    CreateBillingPortalSessionFlowData, CreateBillingPortalSessionFlowDataAfterCompletion,
+    BillingPortalSession, CreateBillingPortalSession, CreateBillingPortalSessionFlowData,
+    CreateBillingPortalSessionFlowDataAfterCompletion,
    CreateBillingPortalSessionFlowDataAfterCompletionRedirect,
    CreateBillingPortalSessionFlowDataType, CreateCustomer, Customer, CustomerId, EventObject,
    EventType, Expandable, ListEvents, Subscription, SubscriptionId, SubscriptionStatus,
@@ -21,10 +21,8 @@ use stripe::{
 use util::ResultExt;

 use crate::api::events::SnowflakeRow;
-use crate::db::billing_subscription::{StripeCancellationReason, StripeSubscriptionStatus};
 use crate::llm::{DEFAULT_MAX_MONTHLY_SPEND, FREE_TIER_MONTHLY_SPENDING_LIMIT};
 use crate::rpc::{ResultExt as _, Server};
-use crate::{db::UserId, llm::db::LlmDatabase};
 use crate::{
    db::{
        billing_customer, BillingSubscriptionId, CreateBillingCustomerParams,
@@ -34,6 +32,10 @@ use crate::{
    },
    stripe_billing::StripeBilling,
 };
+use crate::{
+    db::{billing_subscription::StripeSubscriptionStatus, UserId},
+    llm::db::LlmDatabase,
+};
 use crate::{AppState, Cents, Error, Result};

 pub fn router() -> Router {
@@ -249,13 +251,6 @@ async fn create_billing_subscription(
        ));
    }

-    if app.db.has_overdue_billing_subscriptions(user.id).await? {
-        return Err(Error::http(
-            StatusCode::PAYMENT_REQUIRED,
-            "user has overdue billing subscriptions".into(),
-        ));
-    }
-
    let customer_id =
        if let Some(existing_customer) = app.db.get_billing_customer_by_user_id(user.id).await? {
            CustomerId::from_str(&existing_customer.stripe_customer_id)
@@ -684,12 +679,6 @@ async fn handle_customer_subscription_event(
                            .and_then(|cancel_at| DateTime::from_timestamp(cancel_at, 0))
                            .map(|time| time.naive_utc()),
                    ),
-                    stripe_cancellation_reason: ActiveValue::set(
-                        subscription
-                            .cancellation_details
-                            .and_then(|details| details.reason)
-                            .map(|reason| reason.into()),
-                    ),
                },
            )
            .await?;
@@ -726,10 +715,6 @@ async fn handle_customer_subscription_event(
                billing_customer_id: billing_customer.id,
                stripe_subscription_id: subscription.id.to_string(),
                stripe_subscription_status: subscription.status.into(),
-                stripe_cancellation_reason: subscription
-                    .cancellation_details
-                    .and_then(|details| details.reason)
-                    .map(|reason| reason.into()),
            })
            .await?;
    }
@@ -806,16 +791,6 @@ impl From<SubscriptionStatus> for StripeSubscriptionStatus {
    }
 }

-impl From<CancellationDetailsReason> for StripeCancellationReason {
-    fn from(value: CancellationDetailsReason) -> Self {
-        match value {
-            CancellationDetailsReason::CancellationRequested => Self::CancellationRequested,
-            CancellationDetailsReason::PaymentDisputed => Self::PaymentDisputed,
-            CancellationDetailsReason::PaymentFailed => Self::PaymentFailed,
-        }
-    }
-}
-
 /// Finds or creates a billing customer using the provided customer.
 async fn find_or_create_billing_customer(
    app: &Arc<AppState>,
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -279,7 +279,6 @@ pub async fn post_panic(

    let report: telemetry_events::PanicRequest = serde_json::from_slice(&body)
        .map_err(|_| Error::http(StatusCode::BAD_REQUEST, "invalid json".into()))?;
-    let incident_id = uuid::Uuid::new_v4().to_string();
    let panic = report.panic;

    if panic.os_name == "Linux" && panic.os_version == Some("1.0.0".to_string()) {
@@ -289,37 +288,11 @@ pub async fn post_panic(
        ))?;
    }

-    if let Some(blob_store_client) = app.blob_store_client.as_ref() {
-        let response = blob_store_client
-            .head_object()
-            .bucket(CRASH_REPORTS_BUCKET)
-            .key(incident_id.clone() + ".json")
-            .send()
-            .await;
-
-        if response.is_ok() {
-            log::info!("We've already uploaded this crash");
-            return Ok(());
-        }
-
-        blob_store_client
-            .put_object()
-            .bucket(CRASH_REPORTS_BUCKET)
-            .key(incident_id.clone() + ".json")
-            .acl(aws_sdk_s3::types::ObjectCannedAcl::PublicRead)
-            .body(ByteStream::from(body.to_vec()))
-            .send()
-            .await
-            .map_err(|e| log::error!("Failed to upload crash: {}", e))
-            .ok();
-    }
-
    tracing::error!(
        service = "client",
        version = %panic.app_version,
        os_name = %panic.os_name,
        os_version = %panic.os_version.clone().unwrap_or_default(),
-        incident_id = %incident_id,
        installation_id = %panic.installation_id.clone().unwrap_or_default(),
        description = %panic.payload,
        backtrace = %panic.backtrace.join("\n"),
@@ -358,19 +331,10 @@ pub async fn post_panic(
                        panic.app_version
                    )))
                    .add_field({
-                        let hostname = app.config.blob_store_url.clone().unwrap_or_default();
-                        let hostname = hostname.strip_prefix("https://").unwrap_or_else(|| {
-                            hostname.strip_prefix("http://").unwrap_or_default()
-                        });
-
                        slack::Text::markdown(format!(
-                            "*{} {}:*\n<https://{}.{}/{}.json|{}…>",
+                            "*OS:*\n{} {}",
                            panic.os_name,
-                            panic.os_version.unwrap_or_default(),
-                            CRASH_REPORTS_BUCKET,
-                            hostname,
-                            incident_id,
-                            incident_id.chars().take(8).collect::<String>(),
+                            panic.os_version.unwrap_or_default()
                        ))
                    })
                })
@@ -397,12 +361,6 @@ pub async fn post_panic(
 }

 fn report_to_slack(panic: &Panic) -> bool {
-    // Panics on macOS should make their way to Slack as a crash report,
-    // so we don't need to send them a second time via this channel.
-    if panic.os_name == "macOS" {
-        return false;
-    }
-
    if panic.payload.contains("ERROR_SURFACE_LOST_KHR") {
        return false;
    }
--- a/crates/collab/src/db/queries/billing_subscriptions.rs
+++ b/crates/collab/src/db/queries/billing_subscriptions.rs
@@ -1,4 +1,4 @@
-use crate::db::billing_subscription::{StripeCancellationReason, StripeSubscriptionStatus};
+use crate::db::billing_subscription::StripeSubscriptionStatus;

 use super::*;

@@ -7,7 +7,6 @@ pub struct CreateBillingSubscriptionParams {
    pub billing_customer_id: BillingCustomerId,
    pub stripe_subscription_id: String,
    pub stripe_subscription_status: StripeSubscriptionStatus,
-    pub stripe_cancellation_reason: Option<StripeCancellationReason>,
 }

 #[derive(Debug, Default)]
@@ -16,7 +15,6 @@ pub struct UpdateBillingSubscriptionParams {
    pub stripe_subscription_id: ActiveValue<String>,
    pub stripe_subscription_status: ActiveValue<StripeSubscriptionStatus>,
    pub stripe_cancel_at: ActiveValue<Option<DateTime>>,
-    pub stripe_cancellation_reason: ActiveValue<Option<StripeCancellationReason>>,
 }

 impl Database {
@@ -30,7 +28,6 @@ impl Database {
                billing_customer_id: ActiveValue::set(params.billing_customer_id),
                stripe_subscription_id: ActiveValue::set(params.stripe_subscription_id.clone()),
                stripe_subscription_status: ActiveValue::set(params.stripe_subscription_status),
-                stripe_cancellation_reason: ActiveValue::set(params.stripe_cancellation_reason),
                ..Default::default()
            })
            .exec_without_returning(&*tx)
@@ -54,7 +51,6 @@ impl Database {
                stripe_subscription_id: params.stripe_subscription_id.clone(),
                stripe_subscription_status: params.stripe_subscription_status.clone(),
                stripe_cancel_at: params.stripe_cancel_at.clone(),
-                stripe_cancellation_reason: params.stripe_cancellation_reason.clone(),
                ..Default::default()
            })
            .exec(&*tx)
@@ -170,40 +166,4 @@ impl Database {
        })
        .await
    }
-
-    /// Returns whether the user has any overdue billing subscriptions.
-    pub async fn has_overdue_billing_subscriptions(&self, user_id: UserId) -> Result<bool> {
-        Ok(self.count_overdue_billing_subscriptions(user_id).await? > 0)
-    }
-
-    /// Returns the count of the overdue billing subscriptions for the user with the specified ID.
-    ///
-    /// This includes subscriptions:
-    /// - Whose status is `past_due`
-    /// - Whose status is `canceled` and the cancellation reason is `payment_failed`
-    pub async fn count_overdue_billing_subscriptions(&self, user_id: UserId) -> Result<usize> {
-        self.transaction(|tx| async move {
-            let past_due = billing_subscription::Column::StripeSubscriptionStatus
-                .eq(StripeSubscriptionStatus::PastDue);
-            let payment_failed = billing_subscription::Column::StripeSubscriptionStatus
-                .eq(StripeSubscriptionStatus::Canceled)
-                .and(
-                    billing_subscription::Column::StripeCancellationReason
-                        .eq(StripeCancellationReason::PaymentFailed),
-                );
-
-            let count = billing_subscription::Entity::find()
-                .inner_join(billing_customer::Entity)
-                .filter(
-                    billing_customer::Column::UserId
-                        .eq(user_id)
-                        .and(past_due.or(payment_failed)),
-                )
-                .count(&*tx)
-                .await?;
-
-            Ok(count as usize)
-        })
-        .await
-    }
 }
--- a/crates/collab/src/db/queries/projects.rs
+++ b/crates/collab/src/db/queries/projects.rs
@@ -1,5 +1,4 @@
 use anyhow::Context as _;
-
 use util::ResultExt;

 use super::*;
@@ -275,8 +274,8 @@ impl Database {
                        mtime_nanos: ActiveValue::set(mtime.nanos as i32),
                        canonical_path: ActiveValue::set(entry.canonical_path.clone()),
                        is_ignored: ActiveValue::set(entry.is_ignored),
-                        git_status: ActiveValue::set(None),
                        is_external: ActiveValue::set(entry.is_external),
+                        git_status: ActiveValue::set(entry.git_status.map(|status| status as i64)),
                        is_deleted: ActiveValue::set(false),
                        scan_id: ActiveValue::set(update.scan_id as i64),
                        is_fifo: ActiveValue::set(entry.is_fifo),
@@ -296,6 +295,7 @@ impl Database {
                        worktree_entry::Column::MtimeNanos,
                        worktree_entry::Column::CanonicalPath,
                        worktree_entry::Column::IsIgnored,
+                        worktree_entry::Column::GitStatus,
                        worktree_entry::Column::ScanId,
                    ])
                    .to_owned(),
@@ -349,79 +349,6 @@ impl Database {
                )
                .exec(&*tx)
                .await?;
-
-                let has_any_statuses = update
-                    .updated_repositories
-                    .iter()
-                    .any(|repository| !repository.updated_statuses.is_empty());
-
-                if has_any_statuses {
-                    worktree_repository_statuses::Entity::insert_many(
-                        update.updated_repositories.iter().flat_map(
-                            |repository: &proto::RepositoryEntry| {
-                                repository.updated_statuses.iter().map(|status_entry| {
-                                    worktree_repository_statuses::ActiveModel {
-                                        project_id: ActiveValue::set(project_id),
-                                        worktree_id: ActiveValue::set(worktree_id),
-                                        work_directory_id: ActiveValue::set(
-                                            repository.work_directory_id as i64,
-                                        ),
-                                        scan_id: ActiveValue::set(update.scan_id as i64),
-                                        is_deleted: ActiveValue::set(false),
-                                        repo_path: ActiveValue::set(status_entry.repo_path.clone()),
-                                        status: ActiveValue::set(status_entry.status as i64),
-                                    }
-                                })
-                            },
-                        ),
-                    )
-                    .on_conflict(
-                        OnConflict::columns([
-                            worktree_repository_statuses::Column::ProjectId,
-                            worktree_repository_statuses::Column::WorktreeId,
-                            worktree_repository_statuses::Column::WorkDirectoryId,
-                            worktree_repository_statuses::Column::RepoPath,
-                        ])
-                        .update_columns([
-                            worktree_repository_statuses::Column::ScanId,
-                            worktree_repository_statuses::Column::Status,
-                        ])
-                        .to_owned(),
-                    )
-                    .exec(&*tx)
-                    .await?;
-                }
-
-                let has_any_removed_statuses = update
-                    .updated_repositories
-                    .iter()
-                    .any(|repository| !repository.removed_statuses.is_empty());
-
-                if has_any_removed_statuses {
-                    worktree_repository_statuses::Entity::update_many()
-                        .filter(
-                            worktree_repository_statuses::Column::ProjectId
-                                .eq(project_id)
-                                .and(
-                                    worktree_repository_statuses::Column::WorktreeId
-                                        .eq(worktree_id),
-                                )
-                                .and(
-                                    worktree_repository_statuses::Column::RepoPath.is_in(
-                                        update.updated_repositories.iter().flat_map(|repository| {
-                                            repository.removed_statuses.iter()
-                                        }),
-                                    ),
-                                ),
-                        )
-                        .set(worktree_repository_statuses::ActiveModel {
-                            is_deleted: ActiveValue::Set(true),
-                            scan_id: ActiveValue::Set(update.scan_id as i64),
-                            ..Default::default()
-                        })
-                        .exec(&*tx)
-                        .await?;
-                }
            }

            if !update.removed_repositories.is_empty() {
@@ -716,6 +643,7 @@ impl Database {
                        canonical_path: db_entry.canonical_path,
                        is_ignored: db_entry.is_ignored,
                        is_external: db_entry.is_external,
+                        git_status: db_entry.git_status.map(|status| status as i32),
                        // This is only used in the summarization backlog, so if it's None,
                        // that just means we won't be able to detect when to resummarize
                        // based on total number of backlogged bytes - instead, we'd go
@@ -729,49 +657,23 @@ impl Database {

        // Populate repository entries.
        {
-            let db_repository_entries = worktree_repository::Entity::find()
+            let mut db_repository_entries = worktree_repository::Entity::find()
                .filter(
                    Condition::all()
                        .add(worktree_repository::Column::ProjectId.eq(project.id))
                        .add(worktree_repository::Column::IsDeleted.eq(false)),
                )
-                .all(tx)
+                .stream(tx)
                .await?;
-            for db_repository_entry in db_repository_entries {
+            while let Some(db_repository_entry) = db_repository_entries.next().await {
+                let db_repository_entry = db_repository_entry?;
                if let Some(worktree) = worktrees.get_mut(&(db_repository_entry.worktree_id as u64))
                {
-                    let mut repository_statuses = worktree_repository_statuses::Entity::find()
-                        .filter(
-                            Condition::all()
-                                .add(worktree_repository_statuses::Column::ProjectId.eq(project.id))
-                                .add(
-                                    worktree_repository_statuses::Column::WorktreeId
-                                        .eq(worktree.id),
-                                )
-                                .add(
-                                    worktree_repository_statuses::Column::WorkDirectoryId
-                                        .eq(db_repository_entry.work_directory_id),
-                                )
-                                .add(worktree_repository_statuses::Column::IsDeleted.eq(false)),
-                        )
-                        .stream(tx)
-                        .await?;
-                    let mut updated_statuses = Vec::new();
-                    while let Some(status_entry) = repository_statuses.next().await {
-                        let status_entry: worktree_repository_statuses::Model = status_entry?;
-                        updated_statuses.push(proto::StatusEntry {
-                            repo_path: status_entry.repo_path,
-                            status: status_entry.status as i32,
-                        });
-                    }
-
                    worktree.repository_entries.insert(
                        db_repository_entry.work_directory_id as u64,
                        proto::RepositoryEntry {
                            work_directory_id: db_repository_entry.work_directory_id as u64,
                            branch: db_repository_entry.branch,
-                            updated_statuses,
-                            removed_statuses: Vec::new(),
                        },
                    );
                }
--- a/crates/collab/src/db/queries/rooms.rs
+++ b/crates/collab/src/db/queries/rooms.rs
@@ -662,6 +662,7 @@ impl Database {
                            canonical_path: db_entry.canonical_path,
                            is_ignored: db_entry.is_ignored,
                            is_external: db_entry.is_external,
+                            git_status: db_entry.git_status.map(|status| status as i32),
                            // This is only used in the summarization backlog, so if it's None,
                            // that just means we won't be able to detect when to resummarize
                            // based on total number of backlogged bytes - instead, we'd go
@@ -681,69 +682,26 @@ impl Database {
                    worktree_repository::Column::IsDeleted.eq(false)
                };

-                let db_repositories = worktree_repository::Entity::find()
+                let mut db_repositories = worktree_repository::Entity::find()
                    .filter(
                        Condition::all()
                            .add(worktree_repository::Column::ProjectId.eq(project.id))
                            .add(worktree_repository::Column::WorktreeId.eq(worktree.id))
                            .add(repository_entry_filter),
                    )
-                    .all(tx)
+                    .stream(tx)
                    .await?;

-                for db_repository in db_repositories.into_iter() {
+                while let Some(db_repository) = db_repositories.next().await {
+                    let db_repository = db_repository?;
                    if db_repository.is_deleted {
                        worktree
                            .removed_repositories
                            .push(db_repository.work_directory_id as u64);
                    } else {
-                        let status_entry_filter = if let Some(rejoined_worktree) = rejoined_worktree
-                        {
-                            worktree_repository_statuses::Column::ScanId
-                                .gt(rejoined_worktree.scan_id)
-                        } else {
-                            worktree_repository_statuses::Column::IsDeleted.eq(false)
-                        };
-
-                        let mut db_statuses = worktree_repository_statuses::Entity::find()
-                            .filter(
-                                Condition::all()
-                                    .add(
-                                        worktree_repository_statuses::Column::ProjectId
-                                            .eq(project.id),
-                                    )
-                                    .add(
-                                        worktree_repository_statuses::Column::WorktreeId
-                                            .eq(worktree.id),
-                                    )
-                                    .add(
-                                        worktree_repository_statuses::Column::WorkDirectoryId
-                                            .eq(db_repository.work_directory_id),
-                                    )
-                                    .add(status_entry_filter),
-                            )
-                            .stream(tx)
-                            .await?;
-                        let mut removed_statuses = Vec::new();
-                        let mut updated_statuses = Vec::new();
-
-                        while let Some(db_status) = db_statuses.next().await {
-                            let db_status: worktree_repository_statuses::Model = db_status?;
-                            if db_status.is_deleted {
-                                removed_statuses.push(db_status.repo_path);
-                            } else {
-                                updated_statuses.push(proto::StatusEntry {
-                                    repo_path: db_status.repo_path,
-                                    status: db_status.status as i32,
-                                });
-                            }
-                        }
-
                        worktree.updated_repositories.push(proto::RepositoryEntry {
                            work_directory_id: db_repository.work_directory_id as u64,
                            branch: db_repository.branch,
-                            updated_statuses,
-                            removed_statuses,
                        });
                    }
                }
--- a/crates/collab/src/db/tables/billing_subscription.rs
+++ b/crates/collab/src/db/tables/billing_subscription.rs
@@ -12,7 +12,6 @@ pub struct Model {
    pub stripe_subscription_id: String,
    pub stripe_subscription_status: StripeSubscriptionStatus,
    pub stripe_cancel_at: Option<DateTime>,
-    pub stripe_cancellation_reason: Option<StripeCancellationReason>,
    pub created_at: DateTime,
 }

@@ -74,18 +73,3 @@ impl StripeSubscriptionStatus {
        }
    }
 }
-
-/// The cancellation reason for a Stripe subscription.
-///
-/// [Stripe docs](https://docs.stripe.com/api/subscriptions/object#subscription_object-cancellation_details-reason)
-#[derive(Eq, PartialEq, Copy, Clone, Debug, EnumIter, DeriveActiveEnum, Hash, Serialize)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum StripeCancellationReason {
-    #[sea_orm(string_value = "cancellation_requested")]
-    CancellationRequested,
-    #[sea_orm(string_value = "payment_disputed")]
-    PaymentDisputed,
-    #[sea_orm(string_value = "payment_failed")]
-    PaymentFailed,
-}
--- a/crates/collab/src/db/tests/billing_subscription_tests.rs
+++ b/crates/collab/src/db/tests/billing_subscription_tests.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;

-use crate::db::billing_subscription::{StripeCancellationReason, StripeSubscriptionStatus};
+use crate::db::billing_subscription::StripeSubscriptionStatus;
 use crate::db::tests::new_test_user;
 use crate::db::{CreateBillingCustomerParams, CreateBillingSubscriptionParams};
 use crate::test_both_dbs;
@@ -41,7 +41,6 @@ async fn test_get_active_billing_subscriptions(db: &Arc<Database>) {
            billing_customer_id: customer.id,
            stripe_subscription_id: "sub_active_user".into(),
            stripe_subscription_status: StripeSubscriptionStatus::Active,
-            stripe_cancellation_reason: None,
        })
        .await
        .unwrap();
@@ -76,7 +75,6 @@ async fn test_get_active_billing_subscriptions(db: &Arc<Database>) {
            billing_customer_id: customer.id,
            stripe_subscription_id: "sub_past_due_user".into(),
            stripe_subscription_status: StripeSubscriptionStatus::PastDue,
-            stripe_cancellation_reason: None,
        })
        .await
        .unwrap();
@@ -88,113 +86,3 @@ async fn test_get_active_billing_subscriptions(db: &Arc<Database>) {
        assert_eq!(subscription_count, 0);
    }
 }
-
-test_both_dbs!(
-    test_count_overdue_billing_subscriptions,
-    test_count_overdue_billing_subscriptions_postgres,
-    test_count_overdue_billing_subscriptions_sqlite
-);
-
-async fn test_count_overdue_billing_subscriptions(db: &Arc<Database>) {
-    // A user with no subscription has no overdue billing subscriptions.
-    {
-        let user_id = new_test_user(db, "no-subscription-user@example.com").await;
-        let subscription_count = db
-            .count_overdue_billing_subscriptions(user_id)
-            .await
-            .unwrap();
-
-        assert_eq!(subscription_count, 0);
-    }
-
-    // A user with a past-due subscription has an overdue billing subscription.
-    {
-        let user_id = new_test_user(db, "past-due-user@example.com").await;
-        let customer = db
-            .create_billing_customer(&CreateBillingCustomerParams {
-                user_id,
-                stripe_customer_id: "cus_past_due_user".into(),
-            })
-            .await
-            .unwrap();
-        assert_eq!(customer.stripe_customer_id, "cus_past_due_user".to_string());
-
-        db.create_billing_subscription(&CreateBillingSubscriptionParams {
-            billing_customer_id: customer.id,
-            stripe_subscription_id: "sub_past_due_user".into(),
-            stripe_subscription_status: StripeSubscriptionStatus::PastDue,
-            stripe_cancellation_reason: None,
-        })
-        .await
-        .unwrap();
-
-        let subscription_count = db
-            .count_overdue_billing_subscriptions(user_id)
-            .await
-            .unwrap();
-        assert_eq!(subscription_count, 1);
-    }
-
-    // A user with a canceled subscription with a reason of `payment_failed` has an overdue billing subscription.
-    {
-        let user_id =
-            new_test_user(db, "canceled-subscription-payment-failed-user@example.com").await;
-        let customer = db
-            .create_billing_customer(&CreateBillingCustomerParams {
-                user_id,
-                stripe_customer_id: "cus_canceled_subscription_payment_failed_user".into(),
-            })
-            .await
-            .unwrap();
-        assert_eq!(
-            customer.stripe_customer_id,
-            "cus_canceled_subscription_payment_failed_user".to_string()
-        );
-
-        db.create_billing_subscription(&CreateBillingSubscriptionParams {
-            billing_customer_id: customer.id,
-            stripe_subscription_id: "sub_canceled_subscription_payment_failed_user".into(),
-            stripe_subscription_status: StripeSubscriptionStatus::Canceled,
-            stripe_cancellation_reason: Some(StripeCancellationReason::PaymentFailed),
-        })
-        .await
-        .unwrap();
-
-        let subscription_count = db
-            .count_overdue_billing_subscriptions(user_id)
-            .await
-            .unwrap();
-        assert_eq!(subscription_count, 1);
-    }
-
-    // A user with a canceled subscription with a reason of `cancellation_requested` has no overdue billing subscriptions.
-    {
-        let user_id = new_test_user(db, "canceled-subscription-user@example.com").await;
-        let customer = db
-            .create_billing_customer(&CreateBillingCustomerParams {
-                user_id,
-                stripe_customer_id: "cus_canceled_subscription_user".into(),
-            })
-            .await
-            .unwrap();
-        assert_eq!(
-            customer.stripe_customer_id,
-            "cus_canceled_subscription_user".to_string()
-        );
-
-        db.create_billing_subscription(&CreateBillingSubscriptionParams {
-            billing_customer_id: customer.id,
-            stripe_subscription_id: "sub_canceled_subscription_user".into(),
-            stripe_subscription_status: StripeSubscriptionStatus::Canceled,
-            stripe_cancellation_reason: Some(StripeCancellationReason::CancellationRequested),
-        })
-        .await
-        .unwrap();
-
-        let subscription_count = db
-            .count_overdue_billing_subscriptions(user_id)
-            .await
-            .unwrap();
-        assert_eq!(subscription_count, 0);
-    }
-}
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -440,11 +440,8 @@ async fn predict_edits(
    _country_code_header: Option<TypedHeader<CloudflareIpCountryHeader>>,
    Json(params): Json<PredictEditsParams>,
 ) -> Result<impl IntoResponse> {
-    if !claims.is_staff && !claims.has_predict_edits_feature_flag {
-        return Err(Error::http(
-            StatusCode::FORBIDDEN,
-            "no access to Zed's edit prediction feature".to_string(),
-        ));
+    if !claims.is_staff {
+        return Err(anyhow!("not found"))?;
    }

    let api_url = state
@@ -462,66 +459,29 @@ async fn predict_edits(
        .prediction_model
        .as_ref()
        .context("no PREDICTION_MODEL configured on the server")?;
-
-    let outline_prefix = params
-        .outline
-        .as_ref()
-        .map(|outline| format!("### Outline for current file:\n{}\n", outline))
-        .unwrap_or_default();
-
    let prompt = include_str!("./llm/prediction_prompt.md")
-        .replace("<outline>", &outline_prefix)
        .replace("<events>", &params.input_events)
        .replace("<excerpt>", &params.input_excerpt);
-
-    let request_start = std::time::Instant::now();
-    let mut response = fireworks::complete(
+    let mut response = open_ai::complete_text(
        &state.http_client,
        api_url,
        api_key,
-        fireworks::CompletionRequest {
+        open_ai::CompletionRequest {
            model: model.to_string(),
            prompt: prompt.clone(),
-            max_tokens: 2048,
+            max_tokens: 1024,
            temperature: 0.,
-            prediction: Some(fireworks::Prediction::Content {
+            prediction: Some(open_ai::Prediction::Content {
                content: params.input_excerpt,
            }),
            rewrite_speculation: Some(true),
        },
    )
    .await?;
-    let duration = request_start.elapsed();
-
    let choice = response
-        .completion
        .choices
        .pop()
        .context("no output from completion response")?;
-
-    state.executor.spawn_detached({
-        let kinesis_client = state.kinesis_client.clone();
-        let kinesis_stream = state.config.kinesis_stream.clone();
-        let model = model.clone();
-        async move {
-            SnowflakeRow::new(
-                "Fireworks Completion Requested",
-                claims.metrics_id,
-                claims.is_staff,
-                claims.system_id.clone(),
-                json!({
-                    "model": model.to_string(),
-                    "headers": response.headers,
-                    "usage": response.completion.usage,
-                    "duration": duration.as_secs_f64(),
-                }),
-            )
-            .write(&kinesis_client, &kinesis_stream)
-            .await
-            .log_err();
-        }
-    });
-
    Ok(Json(PredictEditsResponse {
        output_excerpt: choice.text,
    }))
--- a/crates/collab/src/llm/prediction_prompt.md
+++ b/crates/collab/src/llm/prediction_prompt.md
@@ -1,4 +1,3 @@
-<outline>## Task
 Below is an instruction that describes a task, paired with an input that provides further context. Write a response that appropriately completes the request.

 ### Instruction:
--- a/crates/collab/src/llm/token.rs
+++ b/crates/collab/src/llm/token.rs
@@ -22,8 +22,6 @@ pub struct LlmTokenClaims {
    pub github_user_login: String,
    pub is_staff: bool,
    pub has_llm_closed_beta_feature_flag: bool,
-    #[serde(default)]
-    pub has_predict_edits_feature_flag: bool,
    pub has_llm_subscription: bool,
    pub max_monthly_spend_in_cents: u32,
    pub custom_llm_monthly_allowance_in_cents: Option<u32>,
@@ -39,7 +37,6 @@ impl LlmTokenClaims {
        is_staff: bool,
        billing_preferences: Option<billing_preference::Model>,
        has_llm_closed_beta_feature_flag: bool,
-        has_predict_edits_feature_flag: bool,
        has_llm_subscription: bool,
        plan: rpc::proto::Plan,
        system_id: Option<String>,
@@ -61,7 +58,6 @@ impl LlmTokenClaims {
            github_user_login: user.github_login.clone(),
            is_staff,
            has_llm_closed_beta_feature_flag,
-            has_predict_edits_feature_flag,
            has_llm_subscription,
            max_monthly_spend_in_cents: billing_preferences
                .map_or(DEFAULT_MAX_MONTHLY_SPEND.0, |preferences| {
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -4025,7 +4025,6 @@ async fn get_llm_api_token(
    let flags = db.get_user_flags(session.user_id()).await?;
    let has_language_models_feature_flag = flags.iter().any(|flag| flag == "language-models");
    let has_llm_closed_beta_feature_flag = flags.iter().any(|flag| flag == "llm-closed-beta");
-    let has_predict_edits_feature_flag = flags.iter().any(|flag| flag == "predict-edits");

    if !session.is_staff() && !has_language_models_feature_flag {
        Err(anyhow!("permission denied"))?
@@ -4062,7 +4061,6 @@ async fn get_llm_api_token(
        session.is_staff(),
        billing_preferences,
        has_llm_closed_beta_feature_flag,
-        has_predict_edits_feature_flag,
        has_llm_subscription,
        session.current_plan(&db).await?,
        session.system_id.clone(),
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -1007,7 +1007,7 @@ async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut Tes
    fake_language_server.start_progress("the-token").await;

    executor.advance_clock(SERVER_PROGRESS_THROTTLE_TIMEOUT);
-    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
            lsp::WorkDoneProgressReport {
@@ -1041,7 +1041,7 @@ async fn test_language_server_statuses(cx_a: &mut TestAppContext, cx_b: &mut Tes
    });

    executor.advance_clock(SERVER_PROGRESS_THROTTLE_TIMEOUT);
-    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Report(
            lsp::WorkDoneProgressReport {
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -27,10 +27,10 @@ use language::{
 };
 use lsp::LanguageServerId;
 use parking_lot::Mutex;
+use project::lsp_store::FormatTarget;
 use project::{
-    lsp_store::{FormatTrigger, LspFormatTarget},
-    search::{SearchQuery, SearchResult},
-    DiagnosticSummary, HoverBlockKind, Project, ProjectPath,
+    lsp_store::FormatTrigger, search::SearchQuery, search::SearchResult, DiagnosticSummary,
+    HoverBlockKind, Project, ProjectPath,
 };
 use rand::prelude::*;
 use serde_json::json;
@@ -2925,6 +2925,8 @@ async fn test_git_status_sync(
        assert_eq!(snapshot.status_for_file(file), status);
    }

+    // Smoke test status reading
+
    project_local.read_with(cx_a, |project, cx| {
        assert_status(&Path::new(A_TXT), Some(GitFileStatus::Added), project, cx);
        assert_status(&Path::new(B_TXT), Some(GitFileStatus::Added), project, cx);
@@ -3900,7 +3902,7 @@ async fn test_collaborating_with_diagnostics(
        .receive_notification::<lsp::notification::DidOpenTextDocument>()
        .await;
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        &lsp::PublishDiagnosticsParams {
+        lsp::PublishDiagnosticsParams {
            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
@@ -3920,7 +3922,7 @@ async fn test_collaborating_with_diagnostics(
        .await
        .unwrap();
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        &lsp::PublishDiagnosticsParams {
+        lsp::PublishDiagnosticsParams {
            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
@@ -3994,7 +3996,7 @@ async fn test_collaborating_with_diagnostics(

    // Simulate a language server reporting more errors for a file.
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        &lsp::PublishDiagnosticsParams {
+        lsp::PublishDiagnosticsParams {
            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![
@@ -4088,7 +4090,7 @@ async fn test_collaborating_with_diagnostics(

    // Simulate a language server reporting no errors for a file.
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-        &lsp::PublishDiagnosticsParams {
+        lsp::PublishDiagnosticsParams {
            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![],
@@ -4183,7 +4185,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
        })
        .await
        .unwrap();
-    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
            lsp::WorkDoneProgressBegin {
@@ -4194,7 +4196,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
    });
    for file_name in file_names {
        fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
-            &lsp::PublishDiagnosticsParams {
+            lsp::PublishDiagnosticsParams {
                uri: lsp::Url::from_file_path(Path::new("/test").join(file_name)).unwrap(),
                version: None,
                diagnostics: vec![lsp::Diagnostic {
@@ -4206,9 +4208,8 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
                }],
            },
        );
-        executor.run_until_parked();
    }
-    fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
+    fake_language_server.notify::<lsp::notification::Progress>(lsp::ProgressParams {
        token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
        value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
            lsp::WorkDoneProgressEnd { message: None },
@@ -4401,9 +4402,9 @@ async fn test_formatting_buffer(
        .update(cx_b, |project, cx| {
            project.format(
                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
                true,
                FormatTrigger::Save,
+                FormatTarget::Buffer,
                cx,
            )
        })
@@ -4437,9 +4438,9 @@ async fn test_formatting_buffer(
        .update(cx_b, |project, cx| {
            project.format(
                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
                true,
                FormatTrigger::Save,
+                FormatTarget::Buffer,
                cx,
            )
        })
@@ -4547,9 +4548,9 @@ async fn test_prettier_formatting_buffer(
        .update(cx_b, |project, cx| {
            project.format(
                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
                true,
                FormatTrigger::Save,
+                FormatTarget::Buffer,
                cx,
            )
        })
@@ -4567,9 +4568,9 @@ async fn test_prettier_formatting_buffer(
        .update(cx_a, |project, cx| {
            project.format(
                HashSet::from_iter([buffer_a.clone()]),
-                LspFormatTarget::Buffers,
                true,
                FormatTrigger::Manual,
+                FormatTarget::Buffer,
                cx,
            )
        })
@@ -4937,7 +4938,7 @@ async fn test_project_search(

    // Perform a search as the guest.
    let mut results = HashMap::default();
-    let search_rx = project_b.update(cx_b, |project, cx| {
+    let mut search_rx = project_b.update(cx_b, |project, cx| {
        project.search(
            SearchQuery::text(
                "world",
@@ -4952,7 +4953,7 @@ async fn test_project_search(
            cx,
        )
    });
-    while let Ok(result) = search_rx.recv().await {
+    while let Some(result) = search_rx.next().await {
        match result {
            SearchResult::Buffer { buffer, ranges } => {
                results.entry(buffer).or_insert(ranges);
@@ -6668,10 +6669,6 @@ async fn test_remote_git_branches(
    client_a
        .fs()
        .insert_branches(Path::new("/project/.git"), &branches);
-    let branches_set = branches
-        .into_iter()
-        .map(ToString::to_string)
-        .collect::<HashSet<_>>();

    let (project_a, worktree_id) = client_a.build_local_project("/project", cx_a).await;
    let project_id = active_call_a
@@ -6693,10 +6690,10 @@ async fn test_remote_git_branches(

    let branches_b = branches_b
        .into_iter()
-        .map(|branch| branch.name.to_string())
-        .collect::<HashSet<_>>();
+        .map(|branch| branch.name)
+        .collect::<Vec<_>>();

-    assert_eq!(branches_b, branches_set);
+    assert_eq!(&branches_b, &branches);

    cx_b.update(|cx| {
        project_b.update(cx, |project, cx| {
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -6,6 +6,7 @@ use call::ActiveCall;
 use collections::{BTreeMap, HashMap};
 use editor::Bias;
 use fs::{FakeFs, Fs as _};
+use futures::StreamExt;
 use git::repository::GitFileStatus;
 use gpui::{BackgroundExecutor, Model, TestAppContext};
 use language::{
@@ -872,7 +873,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                    if detach { "detaching" } else { "awaiting" }
                );

-                let search = project.update(cx, |project, cx| {
+                let mut search = project.update(cx, |project, cx| {
                    project.search(
                        SearchQuery::text(
                            query,
@@ -890,7 +891,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                drop(project);
                let search = cx.executor().spawn(async move {
                    let mut results = HashMap::default();
-                    while let Ok(result) = search.recv().await {
+                    while let Some(result) = search.next().await {
                        if let SearchResult::Buffer { buffer, ranges } = result {
                            results.entry(buffer).or_insert(ranges);
                        }
@@ -1133,7 +1134,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    let end = PointUtf16::new(end_row, end_column);
                                    let range = if start > end { end..start } else { start..end };
                                    highlights.push(lsp::DocumentHighlight {
-                                        range: range_to_lsp(range.clone()).unwrap(),
+                                        range: range_to_lsp(range.clone()),
                                        kind: Some(lsp::DocumentHighlightKind::READ),
                                    });
                                }
@@ -1221,7 +1222,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                        id,
                                        guest_project.remote_id(),
                                    );
-                                    assert_eq!(guest_snapshot.repositories().iter().collect::<Vec<_>>(), host_snapshot.repositories().iter().collect::<Vec<_>>(),
+                                    assert_eq!(guest_snapshot.repositories().collect::<Vec<_>>(), host_snapshot.repositories().collect::<Vec<_>>(),
                                        "{} has different repositories than the host for worktree {:?} and project {:?}",
                                        client.username,
                                        host_snapshot.abs_path(),
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -16,7 +16,7 @@ use language::{
 };
 use node_runtime::NodeRuntime;
 use project::{
-    lsp_store::{FormatTrigger, LspFormatTarget},
+    lsp_store::{FormatTarget, FormatTrigger},
    ProjectPath,
 };
 use remote::SshRemoteClient;
@@ -229,10 +229,6 @@ async fn test_ssh_collaboration_git_branches(
        .await;

    let branches = ["main", "dev", "feature-1"];
-    let branches_set = branches
-        .iter()
-        .map(ToString::to_string)
-        .collect::<HashSet<_>>();
    remote_fs.insert_branches(Path::new("/project/.git"), &branches);

    // User A connects to the remote project via SSH.
@@ -285,10 +281,10 @@ async fn test_ssh_collaboration_git_branches(

    let branches_b = branches_b
        .into_iter()
-        .map(|branch| branch.name.to_string())
-        .collect::<HashSet<_>>();
+        .map(|branch| branch.name)
+        .collect::<Vec<_>>();

-    assert_eq!(&branches_b, &branches_set);
+    assert_eq!(&branches_b, &branches);

    cx_b.update(|cx| {
        project_b.update(cx, |project, cx| {
@@ -472,9 +468,9 @@ async fn test_ssh_collaboration_formatting_with_prettier(
        .update(cx_b, |project, cx| {
            project.format(
                HashSet::from_iter([buffer_b.clone()]),
-                LspFormatTarget::Buffers,
                true,
                FormatTrigger::Save,
+                FormatTarget::Buffer,
                cx,
            )
        })
@@ -509,9 +505,9 @@ async fn test_ssh_collaboration_formatting_with_prettier(
        .update(cx_a, |project, cx| {
            project.format(
                HashSet::from_iter([buffer_a.clone()]),
-                LspFormatTarget::Buffers,
                true,
                FormatTrigger::Manual,
+                FormatTarget::Buffer,
                cx,
            )
        })
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -1096,7 +1096,7 @@ impl FocusableView for ChatPanel {
 }

 impl Panel for ChatPanel {
-    fn position(&self, cx: &WindowContext) -> DockPosition {
+    fn position(&self, cx: &gpui::WindowContext) -> DockPosition {
        ChatPanelSettings::get_global(cx).dock
    }

@@ -1112,7 +1112,7 @@ impl Panel for ChatPanel {
        );
    }

-    fn size(&self, cx: &WindowContext) -> Pixels {
+    fn size(&self, cx: &gpui::WindowContext) -> Pixels {
        self.width
            .unwrap_or_else(|| ChatPanelSettings::get_global(cx).default_width)
    }
@@ -1135,20 +1135,14 @@ impl Panel for ChatPanel {
    }

    fn icon(&self, cx: &WindowContext) -> Option<ui::IconName> {
-        let show_icon = match ChatPanelSettings::get_global(cx).button {
-            ChatPanelButton::Never => false,
-            ChatPanelButton::Always => true,
-            ChatPanelButton::WhenInCall => {
-                let is_in_call = ActiveCall::global(cx)
-                    .read(cx)
-                    .room()
-                    .map_or(false, |room| room.read(cx).contains_guests());
-
-                self.active || is_in_call
-            }
-        };
-
-        show_icon.then(|| ui::IconName::MessageBubbles)
+        match ChatPanelSettings::get_global(cx).button {
+            ChatPanelButton::Never => None,
+            ChatPanelButton::Always => Some(ui::IconName::MessageBubbles),
+            ChatPanelButton::WhenInCall => ActiveCall::global(cx)
+                .read(cx)
+                .room()
+                .map(|_| ui::IconName::MessageBubbles),
+        }
    }

    fn icon_tooltip(&self, _cx: &WindowContext) -> Option<&'static str> {
@@ -1165,10 +1159,6 @@ impl Panel for ChatPanel {
            .room()
            .is_some_and(|room| room.read(cx).contains_guests())
    }
-
-    fn activation_priority(&self) -> u32 {
-        7
-    }
 }

 impl EventEmitter<PanelEvent> for ChatPanel {}
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -79,6 +79,16 @@ impl CompletionProvider for MessageEditorCompletionProvider {
        Task::ready(Ok(false))
    }

+    fn apply_additional_edits_for_completion(
+        &self,
+        _buffer: Model<Buffer>,
+        _completion: Completion,
+        _push_to_history: bool,
+        _cx: &mut ViewContext<Editor>,
+    ) -> Task<Result<Option<language::Transaction>>> {
+        Task::ready(Ok(None))
+    }
+
    fn is_completion_trigger(
        &self,
        _buffer: &Model<Buffer>,
@@ -309,7 +319,6 @@ impl MessageEditor {
                    server_id: LanguageServerId(0), // TODO: Make this optional or something?
                    lsp_completion: Default::default(), // TODO: Make this optional or something?
                    confirm: None,
-                    resolved: true,
                }
            })
            .collect()
--- a/crates/collab_ui/src/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -2719,7 +2719,7 @@ impl Render for CollabPanel {
 impl EventEmitter<PanelEvent> for CollabPanel {}

 impl Panel for CollabPanel {
-    fn position(&self, cx: &WindowContext) -> DockPosition {
+    fn position(&self, cx: &gpui::WindowContext) -> DockPosition {
        CollaborationPanelSettings::get_global(cx).dock
    }

@@ -2735,7 +2735,7 @@ impl Panel for CollabPanel {
        );
    }

-    fn size(&self, cx: &WindowContext) -> Pixels {
+    fn size(&self, cx: &gpui::WindowContext) -> Pixels {
        self.width
            .unwrap_or_else(|| CollaborationPanelSettings::get_global(cx).default_width)
    }
@@ -2746,7 +2746,7 @@ impl Panel for CollabPanel {
        cx.notify();
    }

-    fn icon(&self, cx: &WindowContext) -> Option<ui::IconName> {
+    fn icon(&self, cx: &gpui::WindowContext) -> Option<ui::IconName> {
        CollaborationPanelSettings::get_global(cx)
            .button
            .then_some(ui::IconName::UserGroup)
@@ -2763,10 +2763,6 @@ impl Panel for CollabPanel {
    fn persistent_name() -> &'static str {
        "CollabPanel"
    }
-
-    fn activation_priority(&self) -> u32 {
-        6
-    }
 }

 impl FocusableView for CollabPanel {
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -662,7 +662,7 @@ impl Panel for NotificationPanel {
        "NotificationPanel"
    }

-    fn position(&self, cx: &WindowContext) -> DockPosition {
+    fn position(&self, cx: &gpui::WindowContext) -> DockPosition {
        NotificationPanelSettings::get_global(cx).dock
    }

@@ -678,7 +678,7 @@ impl Panel for NotificationPanel {
        );
    }

-    fn size(&self, cx: &WindowContext) -> Pixels {
+    fn size(&self, cx: &gpui::WindowContext) -> Pixels {
        self.width
            .unwrap_or_else(|| NotificationPanelSettings::get_global(cx).default_width)
    }
@@ -702,7 +702,7 @@ impl Panel for NotificationPanel {
        }
    }

-    fn icon(&self, cx: &WindowContext) -> Option<IconName> {
+    fn icon(&self, cx: &gpui::WindowContext) -> Option<IconName> {
        let show_button = NotificationPanelSettings::get_global(cx).button;
        if !show_button {
            return None;
@@ -731,10 +731,6 @@ impl Panel for NotificationPanel {
    fn toggle_action(&self) -> Box<dyn gpui::Action> {
        Box::new(ToggleFocus)
    }
-
-    fn activation_priority(&self) -> u32 {
-        8
-    }
 }

 pub struct NotificationToast {
--- a/crates/collections/Cargo.toml
+++ b/crates/collections/Cargo.toml
@@ -16,5 +16,4 @@ doctest = false
 test-support = []

 [dependencies]
-indexmap.workspace = true
-rustc-hash.workspace = true
+rustc-hash = "1.1"
--- a/crates/collections/src/collections.rs
+++ b/crates/collections/src/collections.rs
@@ -4,24 +4,12 @@ pub type HashMap<K, V> = FxHashMap<K, V>;
 #[cfg(feature = "test-support")]
 pub type HashSet<T> = FxHashSet<T>;

-#[cfg(feature = "test-support")]
-pub type IndexMap<K, V> = indexmap::IndexMap<K, V, rustc_hash::FxBuildHasher>;
-
-#[cfg(feature = "test-support")]
-pub type IndexSet<T> = indexmap::IndexSet<T, rustc_hash::FxBuildHasher>;
-
 #[cfg(not(feature = "test-support"))]
 pub type HashMap<K, V> = std::collections::HashMap<K, V>;

 #[cfg(not(feature = "test-support"))]
 pub type HashSet<T> = std::collections::HashSet<T>;

-#[cfg(not(feature = "test-support"))]
-pub type IndexMap<K, V> = indexmap::IndexMap<K, V>;
-
-#[cfg(not(feature = "test-support"))]
-pub type IndexSet<T> = indexmap::IndexSet<T>;
-
 pub use rustc_hash::FxHasher;
 pub use rustc_hash::{FxHashMap, FxHashSet};
 pub use std::collections::*;
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -28,6 +28,7 @@ serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+ui.workspace = true
 url = { workspace = true, features = ["serde"] }
 util.workspace = true
 workspace.workspace = true
--- a/crates/context_server/src/context_server_tool.rs
+++ b/crates/context_server/src/context_server_tool.rs
@@ -2,7 +2,7 @@ use std::sync::Arc;

 use anyhow::{anyhow, bail};
 use assistant_tool::Tool;
-use gpui::{Model, Task, WindowContext};
+use gpui::{Model, Task};

 use crate::manager::ContextServerManager;
 use crate::types;
@@ -52,7 +52,7 @@ impl Tool for ContextServerTool {
        self: std::sync::Arc<Self>,
        input: serde_json::Value,
        _workspace: gpui::WeakView<workspace::Workspace>,
-        cx: &mut WindowContext,
+        cx: &mut ui::WindowContext,
    ) -> gpui::Task<gpui::Result<String>> {
        if let Some(server) = self.server_manager.read(cx).get_server(&self.server_id) {
            cx.foreground_executor().spawn({
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -270,7 +270,7 @@ impl RegisteredBuffer {
                            server
                                .lsp
                                .notify::<lsp::notification::DidChangeTextDocument>(
-                                    &lsp::DidChangeTextDocumentParams {
+                                    lsp::DidChangeTextDocumentParams {
                                        text_document: lsp::VersionedTextDocumentIdentifier::new(
                                            buffer.uri.clone(),
                                            buffer.snapshot_version,
@@ -460,14 +460,7 @@ impl Copilot {
            server
                .on_notification::<StatusNotification, _>(|_, _| { /* Silence the notification */ })
                .detach();
-
-            let initialize_params = None;
-            let configuration = lsp::DidChangeConfigurationParams {
-                settings: Default::default(),
-            };
-            let server = cx
-                .update(|cx| server.initialize(initialize_params, configuration.into(), cx))?
-                .await?;
+            let server = cx.update(|cx| server.initialize(None, cx))?.await?;

            let status = server
                .request::<request::CheckStatus>(request::CheckStatusParams {
@@ -666,7 +659,7 @@ impl Copilot {
                    let snapshot = buffer.read(cx).snapshot();
                    server
                        .notify::<lsp::notification::DidOpenTextDocument>(
-                            &lsp::DidOpenTextDocumentParams {
+                            lsp::DidOpenTextDocumentParams {
                                text_document: lsp::TextDocumentItem {
                                    uri: uri.clone(),
                                    language_id: language_id.clone(),
@@ -714,7 +707,7 @@ impl Copilot {
                        server
                            .lsp
                            .notify::<lsp::notification::DidSaveTextDocument>(
-                                &lsp::DidSaveTextDocumentParams {
+                                lsp::DidSaveTextDocumentParams {
                                    text_document: lsp::TextDocumentIdentifier::new(
                                        registered_buffer.uri.clone(),
                                    ),
@@ -734,14 +727,14 @@ impl Copilot {
                            server
                                .lsp
                                .notify::<lsp::notification::DidCloseTextDocument>(
-                                    &lsp::DidCloseTextDocumentParams {
+                                    lsp::DidCloseTextDocumentParams {
                                        text_document: lsp::TextDocumentIdentifier::new(old_uri),
                                    },
                                )?;
                            server
                                .lsp
                                .notify::<lsp::notification::DidOpenTextDocument>(
-                                    &lsp::DidOpenTextDocumentParams {
+                                    lsp::DidOpenTextDocumentParams {
                                        text_document: lsp::TextDocumentItem::new(
                                            registered_buffer.uri.clone(),
                                            registered_buffer.language_id.clone(),
@@ -766,7 +759,7 @@ impl Copilot {
                server
                    .lsp
                    .notify::<lsp::notification::DidCloseTextDocument>(
-                        &lsp::DidCloseTextDocumentParams {
+                        lsp::DidCloseTextDocumentParams {
                            text_document: lsp::TextDocumentIdentifier::new(buffer.uri),
                        },
                    )
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -34,9 +34,9 @@ pub enum Model {
    Gpt4,
    #[serde(alias = "gpt-3.5-turbo", rename = "gpt-3.5-turbo")]
    Gpt3_5Turbo,
-    #[serde(alias = "o1", rename = "o1")]
-    O1,
-    #[serde(alias = "o1-mini", rename = "o1-mini")]
+    #[serde(alias = "o1-preview", rename = "o1-preview-2024-09-12")]
+    O1Preview,
+    #[serde(alias = "o1-mini", rename = "o1-mini-2024-09-12")]
    O1Mini,
    #[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")]
    Claude3_5Sonnet,
@@ -46,7 +46,7 @@ impl Model {
    pub fn uses_streaming(&self) -> bool {
        match self {
            Self::Gpt4o | Self::Gpt4 | Self::Gpt3_5Turbo | Self::Claude3_5Sonnet => true,
-            Self::O1Mini | Self::O1 => false,
+            Self::O1Mini | Self::O1Preview => false,
        }
    }

@@ -55,7 +55,7 @@ impl Model {
            "gpt-4o" => Ok(Self::Gpt4o),
            "gpt-4" => Ok(Self::Gpt4),
            "gpt-3.5-turbo" => Ok(Self::Gpt3_5Turbo),
-            "o1" => Ok(Self::O1),
+            "o1-preview" => Ok(Self::O1Preview),
            "o1-mini" => Ok(Self::O1Mini),
            "claude-3-5-sonnet" => Ok(Self::Claude3_5Sonnet),
            _ => Err(anyhow!("Invalid model id: {}", id)),
@@ -68,7 +68,7 @@ impl Model {
            Self::Gpt4 => "gpt-4",
            Self::Gpt4o => "gpt-4o",
            Self::O1Mini => "o1-mini",
-            Self::O1 => "o1",
+            Self::O1Preview => "o1-preview",
            Self::Claude3_5Sonnet => "claude-3-5-sonnet",
        }
    }
@@ -79,7 +79,7 @@ impl Model {
            Self::Gpt4 => "GPT-4",
            Self::Gpt4o => "GPT-4o",
            Self::O1Mini => "o1-mini",
-            Self::O1 => "o1",
+            Self::O1Preview => "o1-preview",
            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
        }
    }
@@ -90,7 +90,7 @@ impl Model {
            Self::Gpt4 => 32768,
            Self::Gpt3_5Turbo => 12288,
            Self::O1Mini => 20000,
-            Self::O1 => 20000,
+            Self::O1Preview => 20000,
            Self::Claude3_5Sonnet => 200_000,
        }
    }
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -17,8 +17,8 @@ pub struct CopilotCompletionProvider {
    completions: Vec<Completion>,
    active_completion_index: usize,
    file_extension: Option<String>,
-    pending_refresh: Option<Task<Result<()>>>,
-    pending_cycling_refresh: Option<Task<Result<()>>>,
+    pending_refresh: Task<Result<()>>,
+    pending_cycling_refresh: Task<Result<()>>,
    copilot: Model<Copilot>,
 }

@@ -30,8 +30,8 @@ impl CopilotCompletionProvider {
            completions: Vec::new(),
            active_completion_index: 0,
            file_extension: None,
-            pending_refresh: None,
-            pending_cycling_refresh: None,
+            pending_refresh: Task::ready(Ok(())),
+            pending_cycling_refresh: Task::ready(Ok(())),
            copilot,
        }
    }
@@ -63,14 +63,6 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
        false
    }

-    fn show_completions_in_normal_mode() -> bool {
-        false
-    }
-
-    fn is_refreshing(&self) -> bool {
-        self.pending_refresh.is_some()
-    }
-
    fn is_enabled(
        &self,
        buffer: &Model<Buffer>,
@@ -96,7 +88,7 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
        cx: &mut ModelContext<Self>,
    ) {
        let copilot = self.copilot.clone();
-        self.pending_refresh = Some(cx.spawn(|this, mut cx| async move {
+        self.pending_refresh = cx.spawn(|this, mut cx| async move {
            if debounce {
                cx.background_executor()
                    .timer(COPILOT_DEBOUNCE_TIMEOUT)
@@ -112,8 +104,7 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
            this.update(&mut cx, |this, cx| {
                if !completions.is_empty() {
                    this.cycled = false;
-                    this.pending_refresh = None;
-                    this.pending_cycling_refresh = None;
+                    this.pending_cycling_refresh = Task::ready(Ok(()));
                    this.completions.clear();
                    this.active_completion_index = 0;
                    this.buffer_id = Some(buffer.entity_id());
@@ -134,7 +125,7 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
            })?;

            Ok(())
-        }));
+        });
    }

    fn cycle(
@@ -166,7 +157,7 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
            cx.notify();
        } else {
            let copilot = self.copilot.clone();
-            self.pending_cycling_refresh = Some(cx.spawn(|this, mut cx| async move {
+            self.pending_cycling_refresh = cx.spawn(|this, mut cx| async move {
                let completions = copilot
                    .update(&mut cx, |copilot, cx| {
                        copilot.completions_cycling(&buffer, cursor_position, cx)
@@ -190,7 +181,7 @@ impl InlineCompletionProvider for CopilotCompletionProvider {
                })?;

                Ok(())
-            }));
+            });
        }
    }

--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -12,7 +12,8 @@ use editor::{
    display_map::{BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock},
    highlight_diagnostic_message,
    scroll::Autoscroll,
-    Editor, EditorEvent, ExcerptId, ExcerptRange, MultiBuffer, ToOffset,
+    Anchor, AnchorRangeExt, Editor, EditorEvent, ExcerptId, ExcerptRange, MultiBuffer,
+    RangeToAnchorExt, ToOffset,
 };
 use gpui::{
    actions, div, svg, AnyElement, AnyView, AppContext, Context, EventEmitter, FocusHandle,
@@ -21,8 +22,8 @@ use gpui::{
    WeakView, WindowContext,
 };
 use language::{
-    Bias, Buffer, BufferRow, BufferSnapshot, Diagnostic, DiagnosticEntry, DiagnosticSeverity,
-    Point, Selection, SelectionGoal, ToTreeSitterPoint,
+    Bias, Buffer, BufferId, Diagnostic, DiagnosticEntry, DiagnosticSeverity, OffsetRangeExt, Point,
+    Selection, SelectionGoal,
 };
 use lsp::LanguageServerId;
 use project::{DiagnosticSummary, Project, ProjectPath};
@@ -30,24 +31,23 @@ use project_diagnostics_settings::ProjectDiagnosticsSettings;
 use settings::Settings;
 use std::{
    any::{Any, TypeId},
-    cmp,
    cmp::Ordering,
    mem,
-    ops::{Range, RangeInclusive},
+    ops::Range,
    sync::Arc,
    time::Duration,
 };
 use theme::ActiveTheme;
 pub use toolbar_controls::ToolbarControls;
 use ui::{h_flex, prelude::*, Icon, IconName, Label};
-use util::ResultExt;
+use util::{maybe, RangeExt, ResultExt};
 use workspace::{
    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
    searchable::SearchableItemHandle,
    ItemNavHistory, ToolbarItemLocation, Workspace,
 };

-actions!(diagnostics, [Deploy, ToggleWarnings, ToggleFullDiagnostic]);
+actions!(diagnostics, [Deploy, ToggleWarnings]);

 struct IncludeWarnings(bool);
 impl Global for IncludeWarnings {}
@@ -95,7 +95,6 @@ impl Render for ProjectDiagnosticsEditor {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        let child = if self.path_states.is_empty() {
            div()
-                .key_context("EmptyPane")
                .bg(cx.theme().colors().editor_background)
                .flex()
                .items_center()
@@ -107,8 +106,10 @@ impl Render for ProjectDiagnosticsEditor {
        };

        div()
-            .key_context("Diagnostics")
            .track_focus(&self.focus_handle(cx))
+            .when(self.path_states.is_empty(), |el| {
+                el.key_context("EmptyPane")
+            })
            .size_full()
            .on_action(cx.listener(Self::toggle_warnings))
            .child(child)
@@ -117,49 +118,7 @@ impl Render for ProjectDiagnosticsEditor {

 impl ProjectDiagnosticsEditor {
    fn register(workspace: &mut Workspace, _: &mut ViewContext<Workspace>) {
-        workspace
-            .register_action(Self::deploy)
-            .register_action(Self::toggle_full);
-    }
-
-    fn toggle_full(
-        workspace: &mut Workspace,
-        _: &ToggleFullDiagnostic,
-        cx: &mut ViewContext<Workspace>,
-    ) {
-        // 1. Figure out which editor/buffer we're targeting
-        let Some(editor) = workspace
-            .active_item(cx)
-            .and_then(|item| item.downcast::<Editor>())
-        else {
-            eprintln!("active item is not an editor");
-            return;
-        };
-        editor.update(cx, |editor, cx| {
-            let anchor = editor.selections.newest_anchor().head();
-
-            let diagnostic = Diagnostic {
-                source: None,
-                code: None,
-                severity: DiagnosticSeverity::ERROR,
-                message: "hello!".to_owned(),
-                group_id: 17,
-                is_primary: true,
-                is_disk_based: true,
-                is_unnecessary: false,
-                data: None,
-            };
-
-            // 2. Update the BlockMap of the target editor's buffer
-            let block_properties = BlockProperties {
-                render: diagnostic_block_renderer(diagnostic, None, true, true),
-                placement: BlockPlacement::Below(anchor),
-                height: 1,
-                style: BlockStyle::Fixed,
-                priority: 0,
-            };
-            editor.insert_blocks([block_properties], None, cx);
-        });
+        workspace.register_action(Self::deploy);
    }

    fn new_with_context(
@@ -206,7 +165,7 @@ impl ProjectDiagnosticsEditor {
        let excerpts = cx.new_model(|cx| MultiBuffer::new(project_handle.read(cx).capability()));
        let editor = cx.new_view(|cx| {
            let mut editor =
-                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), true, cx);
+                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), false, cx);
            editor.set_vertical_scroll_margin(5, cx);
            editor
        });
@@ -299,26 +258,69 @@ impl ProjectDiagnosticsEditor {
    }

    fn deploy(workspace: &mut Workspace, _: &Deploy, cx: &mut ViewContext<Workspace>) {
-        if let Some(existing) = workspace.item_of_type::<ProjectDiagnosticsEditor>(cx) {
-            workspace.activate_item(&existing, true, true, cx);
-        } else {
-            let workspace_handle = cx.view().downgrade();
+        let diagnostic_to_select = maybe!({
+            let active_item = workspace.active_item(cx)?;
+            // Already on diagnostics, so don't update position / selection within.
+            if active_item.downcast::<ProjectDiagnosticsEditor>().is_some() {
+                None
+            } else {
+                let active_editor = active_item.act_as::<Editor>(cx)?.read(cx);
+                let snapshot = active_editor.buffer().read(cx).snapshot(cx);
+                let newest_selection = active_editor.selections.newest::<usize>(cx).range();
+                let mut diagnostics =
+                    snapshot.diagnostics_in_range(newest_selection.clone(), false);
+                let diagnostic_entry: DiagnosticEntry<usize> = dbg!(diagnostics.next())?;
+                let buffer_id = diagnostic_entry
+                    .range
+                    .to_anchors(&snapshot)
+                    .start
+                    .buffer_id?;
+                Some((buffer_id, diagnostic_entry.range, newest_selection))
+            }
+        });

-            let include_warnings = match cx.try_global::<IncludeWarnings>() {
-                Some(include_warnings) => include_warnings.0,
-                None => ProjectDiagnosticsSettings::get_global(cx).include_warnings,
+        let diagnostics =
+            if let Some(diagnostics) = workspace.item_of_type::<ProjectDiagnosticsEditor>(cx) {
+                // todo! dedupe
+                if let Some((buffer_id, diagnostic_range, selection_range)) = diagnostic_to_select {
+                    diagnostics.update(cx, |diagnostics, cx| {
+                        diagnostics.set_selection_that_intersects_diagnostic(
+                            buffer_id,
+                            diagnostic_range,
+                            selection_range,
+                            cx,
+                        )
+                    });
+                }
+                workspace.activate_item(&diagnostics, true, true, cx);
+            } else {
+                let workspace_handle = cx.view().downgrade();
+
+                let include_warnings = match cx.try_global::<IncludeWarnings>() {
+                    Some(include_warnings) => include_warnings.0,
+                    None => ProjectDiagnosticsSettings::get_global(cx).include_warnings,
+                };
+
+                let diagnostics = cx.new_view(|cx| {
+                    ProjectDiagnosticsEditor::new(
+                        workspace.project().clone(),
+                        include_warnings,
+                        workspace_handle,
+                        cx,
+                    )
+                });
+                if let Some((buffer_id, diagnostic_range, selection_range)) = diagnostic_to_select {
+                    diagnostics.update(cx, |diagnostics, cx| {
+                        diagnostics.set_selection_that_intersects_diagnostic(
+                            buffer_id,
+                            diagnostic_range,
+                            selection_range,
+                            cx,
+                        )
+                    });
+                }
+                workspace.add_item_to_active_pane(Box::new(diagnostics), None, true, cx);
            };
-
-            let diagnostics = cx.new_view(|cx| {
-                ProjectDiagnosticsEditor::new(
-                    workspace.project().clone(),
-                    include_warnings,
-                    workspace_handle,
-                    cx,
-                )
-            });
-            workspace.add_item_to_active_pane(Box::new(diagnostics), None, true, cx);
-        }
    }

    fn toggle_warnings(&mut self, _: &ToggleWarnings, cx: &mut ViewContext<Self>) {
@@ -465,28 +467,31 @@ impl ProjectDiagnosticsEditor {
                        blocks: Default::default(),
                        block_count: 0,
                    };
-                    let mut pending_range: Option<(Range<Point>, Range<Point>, usize)> = None;
+                    let mut pending_range: Option<(Range<Point>, usize)> = None;
                    let mut is_first_excerpt_for_group = true;
                    for (ix, entry) in group.entries.iter().map(Some).chain([None]).enumerate() {
                        let resolved_entry = entry.map(|e| e.resolve::<Point>(&snapshot));
-                        let expanded_range = resolved_entry.as_ref().map(|entry| {
-                            context_range_for_entry(entry, self.context, &snapshot, cx)
-                        });
-                        if let Some((range, context_range, start_ix)) = &mut pending_range {
-                            if let Some(expanded_range) = expanded_range.clone() {
-                                // If the entries are overlapping or next to each-other, merge them into one excerpt.
-                                if context_range.end.row + 1 >= expanded_range.start.row {
-                                    context_range.end = context_range.end.max(expanded_range.end);
+                        if let Some((range, start_ix)) = &mut pending_range {
+                            if let Some(entry) = resolved_entry.as_ref() {
+                                if entry.range.start.row <= range.end.row + 1 + self.context * 2 {
+                                    range.end = range.end.max(entry.range.end);
                                    continue;
                                }
                            }

+                            let excerpt_start =
+                                Point::new(range.start.row.saturating_sub(self.context), 0);
+                            let excerpt_end = snapshot.clip_point(
+                                Point::new(range.end.row + self.context, u32::MAX),
+                                Bias::Left,
+                            );
+
                            let excerpt_id = excerpts
                                .insert_excerpts_after(
                                    prev_excerpt_id,
                                    buffer.clone(),
                                    [ExcerptRange {
-                                        context: context_range.clone(),
+                                        context: excerpt_start..excerpt_end,
                                        primary: Some(range.clone()),
                                    }],
                                    cx,
@@ -543,9 +548,8 @@ impl ProjectDiagnosticsEditor {
                            pending_range.take();
                        }

-                        if let Some(entry) = resolved_entry.as_ref() {
-                            let range = entry.range.clone();
-                            pending_range = Some((range, expanded_range.unwrap(), ix));
+                        if let Some(entry) = resolved_entry {
+                            pending_range = Some((entry.range.clone(), ix));
                        }
                    }

@@ -673,6 +677,30 @@ impl ProjectDiagnosticsEditor {
        cx.notify();
    }

+    fn set_selection_that_intersects_diagnostic(
+        &self,
+        buffer_id: BufferId,
+        diagnostic_range: Range<usize>,
+        selection_range: Range<usize>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        self.editor.update(cx, |editor, cx| {
+            let buffer = editor.buffer().read(cx);
+            let snapshot = buffer.snapshot(cx);
+            snapshot.excerpts_for_range(range)
+            /*
+            let excerpts = buffer.excerpts_for_buffer_id(buffer_id, cx);
+            for (excerpt_id, excerpt_range) in excerpts {
+                let excerpt_range = excerpt_range.context.to_offset(snapshot.excerpt_containing(range));
+                if excerpt_range.contains_inclusive(&diagnostic_range.to_offset(&snapshot)) {}
+            }
+            */
+            // editor.change_selections(Some(Autoscroll::center()), cx, |selections| {
+            //     selections.select_ranges(vec![diagnostic_range]);
+            // })
+        });
+    }
+
    #[cfg(test)]
    fn check_invariants(&self, cx: &mut ViewContext<Self>) {
        let mut excerpts = Vec::new();
@@ -876,23 +904,19 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
    let (message, code_ranges) = highlight_diagnostic_message(&diagnostic, None);
    let message: SharedString = message;
    Arc::new(move |cx| {
-        let color = cx.theme().colors();
-        let highlight_style: HighlightStyle = color.text_accent.into();
-
+        let highlight_style: HighlightStyle = cx.theme().colors().text_accent.into();
        h_flex()
            .id(DIAGNOSTIC_HEADER)
            .block_mouse_down()
            .h(2. * cx.line_height())
+            .pl_10()
+            .pr_5()
            .w_full()
-            .px_9()
            .justify_between()
            .gap_2()
            .child(
                h_flex()
-                    .gap_2()
-                    .px_1()
-                    .rounded_md()
-                    .bg(color.surface_background.opacity(0.5))
+                    .gap_3()
                    .map(|stack| {
                        stack.child(
                            svg()
@@ -924,18 +948,22 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
                                stack.child(
                                    div()
                                        .child(SharedString::from(format!("({code})")))
-                                        .text_color(color.text_muted),
+                                        .text_color(cx.theme().colors().text_muted),
                                )
                            }),
                    ),
            )
-            .when_some(diagnostic.source.as_ref(), |stack, source| {
-                stack.child(
-                    div()
-                        .child(SharedString::from(source.clone()))
-                        .text_color(color.text_muted),
-                )
-            })
+            .child(
+                h_flex()
+                    .gap_1()
+                    .when_some(diagnostic.source.as_ref(), |stack, source| {
+                        stack.child(
+                            div()
+                                .child(SharedString::from(source.clone()))
+                                .text_color(cx.theme().colors().text_muted),
+                        )
+                    }),
+            )
            .into_any_element()
    })
 }
@@ -964,167 +992,3 @@ fn compare_diagnostics(
        })
        .then_with(|| old.diagnostic.message.cmp(&new.diagnostic.message))
 }
-
-const DIAGNOSTIC_EXPANSION_ROW_LIMIT: u32 = 32;
-
-fn context_range_for_entry(
-    entry: &DiagnosticEntry<Point>,
-    context: u32,
-    snapshot: &BufferSnapshot,
-    cx: &AppContext,
-) -> Range<Point> {
-    if let Some(rows) = heuristic_syntactic_expand(
-        entry.range.clone(),
-        DIAGNOSTIC_EXPANSION_ROW_LIMIT,
-        snapshot,
-        cx,
-    ) {
-        return Range {
-            start: Point::new(*rows.start(), 0),
-            end: snapshot.clip_point(Point::new(*rows.end(), u32::MAX), Bias::Left),
-        };
-    }
-    Range {
-        start: Point::new(entry.range.start.row.saturating_sub(context), 0),
-        end: snapshot.clip_point(
-            Point::new(entry.range.end.row + context, u32::MAX),
-            Bias::Left,
-        ),
-    }
-}
-
-/// Expands the input range using syntax information from TreeSitter. This expansion will be limited
-/// to the specified `max_row_count`.
-///
-/// If there is a containing outline item that is less than `max_row_count`, it will be returned.
-/// Otherwise fairly arbitrary heuristics are applied to attempt to return a logical block of code.
-fn heuristic_syntactic_expand<'a>(
-    input_range: Range<Point>,
-    max_row_count: u32,
-    snapshot: &'a BufferSnapshot,
-    cx: &'a AppContext,
-) -> Option<RangeInclusive<BufferRow>> {
-    let input_row_count = input_range.end.row - input_range.start.row;
-    if input_row_count > max_row_count {
-        return None;
-    }
-
-    // If the outline node contains the diagnostic and is small enough, just use that.
-    let outline_range = snapshot.outline_range_containing(input_range.clone());
-    if let Some(outline_range) = outline_range.clone() {
-        // Remove blank lines from start and end
-        if let Some(start_row) = (outline_range.start.row..outline_range.end.row)
-            .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
-        {
-            if let Some(end_row) = (outline_range.start.row..outline_range.end.row + 1)
-                .rev()
-                .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
-            {
-                let row_count = end_row.saturating_sub(start_row);
-                if row_count <= max_row_count {
-                    return Some(RangeInclusive::new(
-                        outline_range.start.row,
-                        outline_range.end.row,
-                    ));
-                }
-            }
-        }
-    }
-
-    let mut node = snapshot.syntax_ancestor(input_range.clone())?;
-    loop {
-        let node_start = Point::from_ts_point(node.start_position());
-        let node_end = Point::from_ts_point(node.end_position());
-        let node_range = node_start..node_end;
-        let row_count = node_end.row - node_start.row + 1;
-
-        // Stop if we've exceeded the row count or reached an outline node. Then, find the interval
-        // of node children which contains the query range. For example, this allows just returning
-        // the header of a declaration rather than the entire declaration.
-        if row_count > max_row_count || outline_range == Some(node_range.clone()) {
-            let mut cursor = node.walk();
-            let mut included_child_start = None;
-            let mut included_child_end = None;
-            let mut previous_end = node_start;
-            if cursor.goto_first_child() {
-                loop {
-                    let child_node = cursor.node();
-                    let child_range = previous_end..Point::from_ts_point(child_node.end_position());
-                    if included_child_start.is_none() && child_range.contains(&input_range.start) {
-                        included_child_start = Some(child_range.start);
-                    }
-                    if child_range.contains(&input_range.end) {
-                        included_child_end = Some(child_range.end);
-                    }
-                    previous_end = child_range.end;
-                    if !cursor.goto_next_sibling() {
-                        break;
-                    }
-                }
-            }
-            let end = included_child_end.unwrap_or(node_range.end);
-            if let Some(start) = included_child_start {
-                let row_count = end.row - start.row;
-                if row_count < max_row_count {
-                    return Some(RangeInclusive::new(start.row, end.row));
-                }
-            }
-
-            log::info!(
-                "Expanding to ancestor started on {} node exceeding row limit of {max_row_count}.",
-                node.grammar_name()
-            );
-            return None;
-        }
-
-        let node_name = node.grammar_name();
-        let node_row_range = RangeInclusive::new(node_range.start.row, node_range.end.row);
-        if node_name.ends_with("block") {
-            return Some(node_row_range);
-        } else if node_name.ends_with("statement") || node_name.ends_with("declaration") {
-            // Expand to the nearest dedent or blank line for statements and declarations.
-            let tab_size = snapshot.settings_at(node_range.start, cx).tab_size.get();
-            let indent_level = snapshot
-                .line_indent_for_row(node_range.start.row)
-                .len(tab_size);
-            let rows_remaining = max_row_count.saturating_sub(row_count);
-            let Some(start_row) = (node_range.start.row.saturating_sub(rows_remaining)
-                ..node_range.start.row)
-                .rev()
-                .find(|row| is_line_blank_or_indented_less(indent_level, *row, tab_size, snapshot))
-            else {
-                return Some(node_row_range);
-            };
-            let rows_remaining = max_row_count.saturating_sub(node_range.end.row - start_row);
-            let Some(end_row) = (node_range.end.row + 1
-                ..cmp::min(
-                    node_range.end.row + rows_remaining + 1,
-                    snapshot.row_count(),
-                ))
-                .find(|row| is_line_blank_or_indented_less(indent_level, *row, tab_size, snapshot))
-            else {
-                return Some(node_row_range);
-            };
-            return Some(RangeInclusive::new(start_row, end_row));
-        }
-
-        // TODO: doing this instead of walking a cursor as that doesn't work - why?
-        let Some(parent) = node.parent() else {
-            log::info!(
-                "Expanding to ancestor reached the top node, so using default context line count.",
-            );
-            return None;
-        };
-        node = parent;
-    }
-}
-
-fn is_line_blank_or_indented_less(
-    indent_level: u32,
-    row: u32,
-    tab_size: u32,
-    snapshot: &BufferSnapshot,
-) -> bool {
-    let line_indent = snapshot.line_indent_for_row(row);
-    line_indent.is_line_blank() || line_indent.len(tab_size) < indent_level
-}
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -167,10 +167,10 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(16), EXCERPT_HEADER.into()),
-            (DisplayRow(18), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(27), EXCERPT_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(15), EXCERPT_HEADER.into()),
+            (DisplayRow(16), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(25), EXCERPT_HEADER.into()),
        ]
    );
    assert_eq!(
@@ -184,7 +184,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n", // primary message
            "\n", // padding
-            "\n", // expand
            "    let x = vec![];\n",
            "    let y = vec![];\n",
            "\n", // supporting diagnostic
@@ -196,7 +195,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            "    c(y);\n",
            "\n", // supporting diagnostic
            "    d(x);\n",
-            "\n", // expand
            "\n", // context ellipsis
            // diagnostic group 2
            "\n", // primary message
@@ -208,13 +206,11 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            "    a(x);\n",
            "\n", // supporting diagnostic
            "    b(y);\n",
-            "\n", // expand
            "\n", // context ellipsis
            "    c(y);\n",
            "    d(x);\n",
            "\n", // supporting diagnostic
-            "}",
-            "\n", // expand
+            "}"
        )
    );

@@ -222,7 +218,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
    editor.update(cx, |editor, cx| {
        assert_eq!(
            editor.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(13), 6)..DisplayPoint::new(DisplayRow(13), 6)]
+            [DisplayPoint::new(DisplayRow(12), 6)..DisplayPoint::new(DisplayRow(12), 6)]
        );
    });

@@ -257,12 +253,12 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(8), FILE_HEADER.into()),
-            (DisplayRow(12), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(25), EXCERPT_HEADER.into()),
-            (DisplayRow(27), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(36), EXCERPT_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(7), FILE_HEADER.into()),
+            (DisplayRow(9), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(22), EXCERPT_HEADER.into()),
+            (DisplayRow(23), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(32), EXCERPT_HEADER.into()),
        ]
    );

@@ -277,7 +273,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n", // primary message
            "\n", // padding
-            "\n", // expand
            "const a: i32 = 'a';\n",
            "\n", // supporting diagnostic
            "const b: i32 = c;\n",
@@ -289,8 +284,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n", // primary message
            "\n", // padding
-            "\n", // expand
-            "\n", // expand
            "    let x = vec![];\n",
            "    let y = vec![];\n",
            "\n", // supporting diagnostic
@@ -306,7 +299,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 2
            "\n", // primary message
            "\n", // filename
-            "\n", // expand
            "fn main() {\n",
            "    let x = vec![];\n",
            "\n", // supporting diagnostic
@@ -314,13 +306,11 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            "    a(x);\n",
            "\n", // supporting diagnostic
            "    b(y);\n",
-            "\n", // expand
            "\n", // context ellipsis
            "    c(y);\n",
            "    d(x);\n",
            "\n", // supporting diagnostic
-            "}",
-            "\n", // expand
+            "}"
        )
    );

@@ -328,7 +318,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
    editor.update(cx, |editor, cx| {
        assert_eq!(
            editor.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(22), 6)..DisplayPoint::new(DisplayRow(22), 6)]
+            [DisplayPoint::new(DisplayRow(19), 6)..DisplayPoint::new(DisplayRow(19), 6)]
        );
    });

@@ -376,14 +366,14 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(8), EXCERPT_HEADER.into()),
-            (DisplayRow(10), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(15), FILE_HEADER.into()),
-            (DisplayRow(19), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(32), EXCERPT_HEADER.into()),
-            (DisplayRow(34), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(43), EXCERPT_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(7), EXCERPT_HEADER.into()),
+            (DisplayRow(8), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(13), FILE_HEADER.into()),
+            (DisplayRow(15), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(28), EXCERPT_HEADER.into()),
+            (DisplayRow(29), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(38), EXCERPT_HEADER.into()),
        ]
    );

@@ -398,7 +388,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n", // primary message
            "\n", // padding
-            "\n", // expand
            "const a: i32 = 'a';\n",
            "\n", // supporting diagnostic
            "const b: i32 = c;\n",
@@ -406,7 +395,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 2
            "\n", // primary message
            "\n", // padding
-            "\n", // expand
            "const a: i32 = 'a';\n",
            "const b: i32 = c;\n",
            "\n", // supporting diagnostic
@@ -418,8 +406,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n", // primary message
            "\n", // padding
-            "\n", // expand
-            "\n", // expand
            "    let x = vec![];\n",
            "    let y = vec![];\n",
            "\n", // supporting diagnostic
@@ -435,7 +421,6 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 2
            "\n", // primary message
            "\n", // filename
-            "\n", // expand
            "fn main() {\n",
            "    let x = vec![];\n",
            "\n", // supporting diagnostic
@@ -443,13 +428,11 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            "    a(x);\n",
            "\n", // supporting diagnostic
            "    b(y);\n",
-            "\n", // expand
            "\n", // context ellipsis
            "    c(y);\n",
            "    d(x);\n",
            "\n", // supporting diagnostic
-            "}",
-            "\n", // expand
+            "}"
        )
    );
 }
@@ -530,7 +513,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
        ]
    );
    assert_eq!(
@@ -541,9 +524,8 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n",     // primary message
            "\n",     // padding
-            "\n",     // expand
            "a();\n", //
-            "b();", "\n", // expand
+            "b();",
        )
    );

@@ -579,9 +561,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(7), EXCERPT_HEADER.into()),
-            (DisplayRow(9), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(6), EXCERPT_HEADER.into()),
+            (DisplayRow(7), DIAGNOSTIC_HEADER.into()),
        ]
    );
    assert_eq!(
@@ -592,10 +574,8 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n",     // primary message
            "\n",     // padding
-            "\n",     // expand
            "a();\n", // location
            "b();\n", //
-            "\n",     // expand
            "\n",     // collapsed context
            // diagnostic group 2
            "\n",     // primary message
@@ -603,7 +583,6 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            "a();\n", // context
            "b();\n", //
            "c();",   // context
-            "\n",     // expand
        )
    );

@@ -650,9 +629,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(8), EXCERPT_HEADER.into()),
-            (DisplayRow(10), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(7), EXCERPT_HEADER.into()),
+            (DisplayRow(8), DIAGNOSTIC_HEADER.into()),
        ]
    );
    assert_eq!(
@@ -663,11 +642,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n",     // primary message
            "\n",     // padding
-            "\n",     // expand
            "a();\n", // location
            "b();\n", //
            "c();\n", // context
-            "\n",     // expand
            "\n",     // collapsed context
            // diagnostic group 2
            "\n",     // primary message
@@ -675,7 +652,6 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            "b();\n", // context
            "c();\n", //
            "d();",   // context
-            "\n",     // expand
        )
    );

@@ -711,9 +687,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(8), EXCERPT_HEADER.into()),
-            (DisplayRow(10), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(7), EXCERPT_HEADER.into()),
+            (DisplayRow(8), DIAGNOSTIC_HEADER.into()),
        ]
    );
    assert_eq!(
@@ -724,11 +700,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n",     // primary message
            "\n",     // padding
-            "\n",     // expand
            "b();\n", // location
            "c();\n", //
            "d();\n", // context
-            "\n",     // expand
            "\n",     // collapsed context
            // diagnostic group 2
            "\n",     // primary message
@@ -736,7 +710,6 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
            "c();\n", // context
            "d();\n", //
            "e();",   // context
-            "\n",     // expand
        )
    );
 }
--- a/crates/diagnostics/src/items.rs
+++ b/crates/diagnostics/src/items.rs
@@ -1,11 +1,11 @@
 use std::time::Duration;

-use editor::{AnchorRangeExt, Editor};
+use editor::Editor;
 use gpui::{
    EventEmitter, IntoElement, ParentElement, Render, Styled, Subscription, Task, View,
    ViewContext, WeakView,
 };
-use language::{Diagnostic, DiagnosticEntry};
+use language::Diagnostic;
 use ui::{h_flex, prelude::*, Button, ButtonLike, Color, Icon, IconName, Label, Tooltip};
 use workspace::{item::ItemHandle, StatusItemView, ToolbarItemEvent, Workspace};

@@ -148,11 +148,7 @@ impl DiagnosticIndicator {
            (buffer, cursor_position)
        });
        let new_diagnostic = buffer
-            .diagnostics_in_range(cursor_position..cursor_position, false)
-            .map(|DiagnosticEntry { diagnostic, range }| DiagnosticEntry {
-                diagnostic,
-                range: range.to_offset(&buffer),
-            })
+            .diagnostics_in_range::<_, usize>(cursor_position..cursor_position, false)
            .filter(|entry| !entry.range.is_empty())
            .min_by_key(|entry| (entry.diagnostic.severity, entry.range.len()))
            .map(|entry| entry.diagnostic);
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -1,84 +1,82 @@
 //! This module contains all actions supported by [`Editor`].
 use super::*;
-use gpui::{action_as, action_with_deprecated_aliases};
-use schemars::JsonSchema;
+use gpui::action_as;
 use util::serde::default_true;

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectNext {
    #[serde(default)]
    pub replace_newest: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectPrevious {
    #[serde(default)]
    pub replace_newest: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MoveToBeginningOfLine {
    #[serde(default = "default_true")]
    pub stop_at_soft_wraps: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectToBeginningOfLine {
    #[serde(default)]
    pub(super) stop_at_soft_wraps: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MovePageUp {
    #[serde(default)]
    pub(super) center_cursor: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MovePageDown {
    #[serde(default)]
    pub(super) center_cursor: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MoveToEndOfLine {
    #[serde(default = "default_true")]
    pub stop_at_soft_wraps: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectToEndOfLine {
    #[serde(default)]
    pub(super) stop_at_soft_wraps: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ToggleCodeActions {
    // Display row from which the action was deployed.
    #[serde(default)]
-    #[serde(skip)]
    pub deployed_from_indicator: Option<DisplayRow>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ConfirmCompletion {
    #[serde(default)]
    pub item_ix: Option<usize>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ComposeCompletion {
    #[serde(default)]
    pub item_ix: Option<usize>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ConfirmCodeAction {
    #[serde(default)]
    pub item_ix: Option<usize>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ToggleComments {
    #[serde(default)]
    pub advance_downwards: bool,
@@ -86,87 +84,84 @@ pub struct ToggleComments {
    pub ignore_indent: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct FoldAt {
-    #[serde(skip)]
    pub buffer_row: MultiBufferRow,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct UnfoldAt {
-    #[serde(skip)]
    pub buffer_row: MultiBufferRow,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MoveUpByLines {
    #[serde(default)]
    pub(super) lines: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct MoveDownByLines {
    #[serde(default)]
    pub(super) lines: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectUpByLines {
    #[serde(default)]
    pub(super) lines: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SelectDownByLines {
    #[serde(default)]
    pub(super) lines: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ExpandExcerpts {
    #[serde(default)]
    pub(super) lines: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ExpandExcerptsUp {
    #[serde(default)]
    pub(super) lines: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ExpandExcerptsDown {
    #[serde(default)]
    pub(super) lines: u32,
 }
-
-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct ShowCompletions {
    #[serde(default)]
    pub(super) trigger: Option<String>,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct HandleInput(pub String);

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct DeleteToNextWordEnd {
    #[serde(default)]
    pub ignore_newlines: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct DeleteToPreviousWordStart {
    #[serde(default)]
    pub ignore_newlines: bool,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct FoldAtLevel {
    pub level: u32,
 }

-#[derive(PartialEq, Clone, Deserialize, Default, JsonSchema)]
+#[derive(PartialEq, Clone, Deserialize, Default)]
 pub struct SpawnNearestTask {
    #[serde(default)]
    pub reveal: task::RevealStrategy,
@@ -209,7 +204,7 @@ impl_actions!(
        ToggleCodeActions,
        ToggleComments,
        UnfoldAt,
-        FoldAtLevel,
+        FoldAtLevel
    ]
 );

@@ -316,6 +311,7 @@ gpui::actions!(
        OpenExcerpts,
        OpenExcerptsSplit,
        OpenProposedChangesEditor,
+        OpenFile,
        OpenDocs,
        OpenPermalinkToLine,
        OpenUrl,
@@ -392,6 +388,6 @@ gpui::actions!(
    ]
 );

-action_as!(go_to_line, ToggleGoToLine as Toggle);
+action_as!(outline, ToggleOutline as Toggle);

-action_with_deprecated_aliases!(editor, OpenSelectedFilename, ["editor::OpenFile"]);
+action_as!(go_to_line, ToggleGoToLine as Toggle);
--- 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-circle-user"><circle cx="12" cy="12" r="10"/><circle cx="12" cy="10" r="3"/><path d="M7 20.662V19a2 2 0 0 1 2-2h6a2 2 0 0 1 2 2v1.662"/></svg>`