Refactor multibuffer methods for multibuffer range -> buffer range

* Renames `excerpts_for_ranges` to `disjoint_ranges_to_buffer_ranges`, and modifies it to return `MultiBufferExcerpt` since it provides more information and was already being built. * `range_to_buffer_ranges` now returns an iterator, should improve efficiency in a few places. Now implemented by just calling `disjoint_ranges_to_buffer_ranges`.
2025-01-06 19:05:57 -07:00
194 changed files with 2769 additions and 5396 deletions
--- 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,28 @@ 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          fetch-depth: 0
+      - name: Check for non-docs changes
+        id: check_changes
+        run: |
+          if [ "${{ github.event_name }}" == "merge_group" ]; then
+            # When we're running in a merge queue, never assume that the changes
+            # are docs-only, as there could be other PRs in the group that
+            # contain non-docs changes.
+            echo "docs_only=false" >> $GITHUB_OUTPUT
+          elif 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'
@@ -95,6 +118,7 @@ jobs:
    runs-on:
      - self-hosted
      - test
+    needs: check_docs_only
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -102,29 +126,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 +168,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 +179,26 @@ jobs:
          clean: false

      - name: Cache dependencies
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # 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 +209,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 +220,18 @@ jobs:
          clean: false

      - name: Cache dependencies
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # 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 +240,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 +251,23 @@ jobs:
          clean: false

      - name: Cache dependencies
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # 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 +319,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 +359,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') }}
@@ -362,7 +409,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') }}
@@ -411,7 +458,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/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,6 +7,7 @@ on:
  push:
    branches:
      - main
+  merge_group:

 jobs:
  check_formatting:
--- 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
@@ -2666,7 +2666,6 @@ dependencies = [
 "envy",
 "extension",
 "file_finder",
- "fireworks",
 "fs",
 "futures 0.3.31",
 "git",
@@ -4591,17 +4590,6 @@ dependencies = [
 "windows-sys 0.59.0",
 ]

-[[package]]
-name = "fireworks"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "http_client",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -4806,11 +4794,13 @@ dependencies = [
 "rope",
 "serde",
 "serde_json",
+ "shlex",
 "smol",
 "tempfile",
 "text",
 "time",
 "util",
+ "which 6.0.3",
 "windows 0.58.0",
 ]

@@ -5189,6 +5179,7 @@ dependencies = [
 "collections",
 "db",
 "editor",
+ "futures 0.3.31",
 "git",
 "gpui",
 "language",
@@ -5199,7 +5190,6 @@ dependencies = [
 "serde_derive",
 "serde_json",
 "settings",
- "theme",
 "ui",
 "util",
 "windows 0.58.0",
@@ -6307,7 +6297,6 @@ dependencies = [
 "futures 0.3.31",
 "gpui",
 "indoc",
- "inline_completion",
 "language",
 "lsp",
 "paths",
@@ -8422,7 +8411,8 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 [[package]]
 name = "oo7"
 version = "0.3.3"
-source = "git+https://github.com/zed-industries/oo7?branch=avoid-crypto-panic#9d5d5fcd7e4e0add9b420ffb58f67661b0b37568"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24"
 dependencies = [
 "aes",
 "async-fs 2.1.2",
@@ -8964,7 +8954,7 @@ dependencies = [
 [[package]]
 name = "pet"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "clap",
 "env_logger 0.10.2",
@@ -8983,7 +8973,6 @@ dependencies = [
 "pet-mac-python-org",
 "pet-mac-xcode",
 "pet-pipenv",
- "pet-pixi",
 "pet-poetry",
 "pet-pyenv",
 "pet-python-utils",
@@ -9001,7 +8990,7 @@ dependencies = [
 [[package]]
 name = "pet-conda"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "env_logger 0.10.2",
 "lazy_static",
@@ -9020,7 +9009,7 @@ dependencies = [
 [[package]]
 name = "pet-core"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "clap",
 "lazy_static",
@@ -9035,7 +9024,7 @@ dependencies = [
 [[package]]
 name = "pet-env-var-path"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "lazy_static",
 "log",
@@ -9051,7 +9040,7 @@ dependencies = [
 [[package]]
 name = "pet-fs"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9060,7 +9049,7 @@ dependencies = [
 [[package]]
 name = "pet-global-virtualenvs"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9073,7 +9062,7 @@ dependencies = [
 [[package]]
 name = "pet-homebrew"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "lazy_static",
 "log",
@@ -9091,7 +9080,7 @@ dependencies = [
 [[package]]
 name = "pet-jsonrpc"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "env_logger 0.10.2",
 "log",
@@ -9104,7 +9093,7 @@ dependencies = [
 [[package]]
 name = "pet-linux-global-python"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9117,7 +9106,7 @@ dependencies = [
 [[package]]
 name = "pet-mac-commandlinetools"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9130,7 +9119,7 @@ dependencies = [
 [[package]]
 name = "pet-mac-python-org"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9143,7 +9132,7 @@ dependencies = [
 [[package]]
 name = "pet-mac-xcode"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9156,7 +9145,7 @@ dependencies = [
 [[package]]
 name = "pet-pipenv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9166,22 +9155,10 @@ dependencies = [
 "pet-virtualenv",
 ]

-[[package]]
-name = "pet-pixi"
-version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
-dependencies = [
- "log",
- "msvc_spectre_libs",
- "pet-conda",
- "pet-core",
- "pet-python-utils",
-]
-
 [[package]]
 name = "pet-poetry"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "base64 0.22.1",
 "lazy_static",
@@ -9202,7 +9179,7 @@ dependencies = [
 [[package]]
 name = "pet-pyenv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "lazy_static",
 "log",
@@ -9220,7 +9197,7 @@ dependencies = [
 [[package]]
 name = "pet-python-utils"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "env_logger 0.10.2",
 "lazy_static",
@@ -9237,7 +9214,7 @@ dependencies = [
 [[package]]
 name = "pet-reporter"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "env_logger 0.10.2",
 "log",
@@ -9251,7 +9228,7 @@ dependencies = [
 [[package]]
 name = "pet-telemetry"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "env_logger 0.10.2",
 "lazy_static",
@@ -9266,7 +9243,7 @@ dependencies = [
 [[package]]
 name = "pet-venv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9278,7 +9255,7 @@ dependencies = [
 [[package]]
 name = "pet-virtualenv"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9290,7 +9267,7 @@ dependencies = [
 [[package]]
 name = "pet-virtualenvwrapper"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "log",
 "msvc_spectre_libs",
@@ -9303,7 +9280,7 @@ dependencies = [
 [[package]]
 name = "pet-windows-registry"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "lazy_static",
 "log",
@@ -9321,7 +9298,7 @@ dependencies = [
 [[package]]
 name = "pet-windows-store"
 version = "0.1.0"
-source = "git+https://github.com/microsoft/python-environment-tools.git?rev=1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0#1abe5cec5ebfbe97ca71746a4cfc7fe89bddf8e0"
+source = "git+https://github.com/microsoft/python-environment-tools.git?rev=ffcbf3f28c46633abd5448a52b1f396c322e0d6c#ffcbf3f28c46633abd5448a52b1f396c322e0d6c"
 dependencies = [
 "lazy_static",
 "log",
@@ -10366,6 +10343,7 @@ dependencies = [
 "futures 0.3.31",
 "fuzzy",
 "gpui",
+ "itertools 0.13.0",
 "language",
 "log",
 "markdown",
@@ -13838,9 +13816,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter-python"
-version = "0.23.6"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d065aaa27f3aaceaf60c1f0e0ac09e1cb9eb8ed28e7bcdaa52129cffc7f4b04"
+checksum = "70beaa47e19e1529e8787fc0a80ebbae5a9fdaefc5fcc8972c885c9abf6ab0f0"
 dependencies = [
 "cc",
 "tree-sitter-language",
@@ -16210,7 +16188,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.169.2"
+version = "0.169.0"
 dependencies = [
 "activity_indicator",
 "anyhow",
@@ -16664,7 +16642,6 @@ dependencies = [
 "tree-sitter-go",
 "tree-sitter-rust",
 "ui",
- "util",
 "uuid",
 "workspace",
 "worktree",
--- 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",
@@ -223,7 +222,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" }
@@ -411,13 +409,12 @@ 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"
--- 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/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/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -172,7 +172,6 @@
    "context": "AssistantPanel",
    "bindings": {
      "ctrl-k c": "assistant::CopyCode",
-      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-g": "search::SelectNextMatch",
      "ctrl-shift-g": "search::SelectPrevMatch",
      "ctrl-shift-m": "assistant::ToggleModelSelector",
@@ -265,7 +264,7 @@
      "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",
@@ -412,7 +411,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",
@@ -533,7 +532,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"
@@ -614,6 +612,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
@@ -196,7 +196,6 @@
    "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-shift-m": "assistant::ToggleModelSelector",
@@ -227,8 +226,7 @@
      "cmd-n": "assistant2::NewThread",
      "cmd-shift-h": "assistant2::OpenHistory",
      "cmd-shift-m": "assistant2::ToggleModelSelector",
-      "cmd-shift-a": "assistant2::ToggleContextPicker",
-      "cmd-alt-e": "assistant2::RemoveAllContext"
+      "cmd-shift-a": "assistant2::ToggleContextPicker"
    }
  },
  {
@@ -436,7 +434,7 @@
      "ctrl--": "pane::GoBack",
      "ctrl-shift--": "pane::GoForward",
      "cmd-shift-t": "pane::ReopenClosedItem",
-      "cmd-shift-f": "pane::DeploySearch"
+      "cmd-shift-f": "project_search::ToggleFocus"
    }
  },
  {
@@ -477,7 +475,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",
@@ -597,7 +595,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"
@@ -616,7 +613,6 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-a": "assistant2::ToggleContextPicker",
-      "cmd-alt-e": "assistant2::RemoveAllContext",
      "ctrl-[": "assistant::CyclePreviousInlineAssist",
      "ctrl-]": "assistant::CycleNextInlineAssist"
    }
@@ -667,6 +663,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",
@@ -805,8 +802,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
@@ -55,11 +55,9 @@
    }
  },
  {
-    "context": "Workspace",
+    "context": "Workspace && !Terminal",
    "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 ctrl-c": "workspace::CloseWindow", // kill-emacs
      "ctrl-x o": "workspace::ActivateNextPane", // other-window
      "ctrl-x k": "pane::CloseActiveItem", // kill-buffer
      "ctrl-x 0": "pane::CloseActiveItem", // delete-window
@@ -72,18 +70,6 @@
      "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
-    }
-  },
  {
    "context": "BufferSearchBar > Editor",
    "bindings": {
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -55,11 +55,9 @@
    }
  },
  {
-    "context": "Workspace",
+    "context": "Workspace && !Terminal",
    "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 ctrl-c": "workspace::CloseWindow", // kill-emacs
      "ctrl-x o": "workspace::ActivateNextPane", // other-window
      "ctrl-x k": "pane::CloseActiveItem", // kill-buffer
      "ctrl-x 0": "pane::CloseActiveItem", // delete-window
@@ -72,18 +70,6 @@
      "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
-    }
-  },
  {
    "context": "BufferSearchBar > Editor",
    "bindings": {
--- 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"],
@@ -397,7 +395,6 @@
      "'": "vim::Quotes",
      "`": "vim::BackQuotes",
      "\"": "vim::DoubleQuotes",
-      "q": "vim::AnyQuotes",
      "|": "vim::VerticalBars",
      "(": "vim::Parentheses",
      ")": "vim::Parentheses",
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -103,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_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -3654,7 +3654,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 +3711,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 {
--- 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,
        }
    }

@@ -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,
+                );
            });
        }
    }
@@ -248,19 +228,20 @@ impl InlineAssistant {
        let newest_selection = newest_selection.unwrap();

        let mut codegen_ranges = Vec::new();
-        for (excerpt_id, buffer, buffer_range) in
-            snapshot.excerpts_in_ranges(selections.iter().map(|selection| {
+        for (excerpt, buffer_range) in
+            snapshot.disjoint_ranges_to_buffer_ranges(selections.iter().map(|selection| {
                snapshot.anchor_before(selection.start)..snapshot.anchor_after(selection.end)
            }))
        {
+            let buffer = excerpt.buffer();
            let start = Anchor {
                buffer_id: Some(buffer.remote_id()),
-                excerpt_id,
+                excerpt_id: excerpt.id(),
                text_anchor: buffer.anchor_before(buffer_range.start),
            };
            let end = Anchor {
                buffer_id: Some(buffer.remote_id()),
-                excerpt_id,
+                excerpt_id: excerpt.id(),
                text_anchor: buffer.anchor_after(buffer_range.end),
            };
            codegen_ranges.push(start..end);
@@ -818,9 +799,10 @@ impl InlineAssistant {
                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 mut ranges =
+                        multibuffer_snapshot.range_to_buffer_ranges(assist.range.clone());
                    ranges
-                        .first()
+                        .next()
                        .and_then(|(excerpt, _)| excerpt.buffer().language())
                        .map(|language| language.name())
                });
@@ -2645,9 +2627,10 @@ impl CodegenAlternative {
    ) -> Self {
        let snapshot = multi_buffer.read(cx).snapshot(cx);

+        // TODO: Could be made more efficient by using a reverse iterator.
        let (old_excerpt, _) = snapshot
            .range_to_buffer_ranges(range.clone())
-            .pop()
+            .last()
            .unwrap();
        let old_buffer = cx.new_model(|cx| {
            let text = old_excerpt.buffer().as_rope().clone();
@@ -2892,9 +2875,9 @@ impl CodegenAlternative {
        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 mut ranges = snapshot.range_to_buffer_ranges(self.range.clone());
            ranges
-                .first()
+                .next()
                .and_then(|(excerpt, _)| excerpt.buffer().language())
                .map(|language| language.name())
        };
@@ -3446,13 +3429,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/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -137,7 +137,7 @@ 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)),
+                background_color: Some(colors.editor_foreground.opacity(0.01)),
                ..Default::default()
            },
            link: TextStyleRefinement {
@@ -282,11 +282,13 @@ impl ActiveThread {
                    .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.iter().map(|context| {
-                                    ContextPill::new_added(context.clone(), false, None)
-                                }),
-                            ))
+                            parent.child(
+                                h_flex().flex_wrap().gap_1().px_1p5().pb_1p5().children(
+                                    context
+                                        .iter()
+                                        .map(|context| ContextPill::new(context.clone())),
+                                ),
+                            )
                        } else {
                            parent
                        }
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -41,7 +41,6 @@ actions!(
        NewThread,
        ToggleContextPicker,
        ToggleModelSelector,
-        RemoveAllContext,
        OpenHistory,
        Chat,
        CycleNextInlineAssist,
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -300,30 +300,20 @@ impl AssistantPanel {
    fn render_toolbar(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        let focus_handle = self.focus_handle(cx);

-        let title = if self.thread.read(cx).is_empty() {
-            SharedString::from("New Thread")
-        } else {
-            self.thread
-                .read(cx)
-                .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))
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -257,9 +257,10 @@ impl CodegenAlternative {
    ) -> Self {
        let snapshot = buffer.read(cx).snapshot(cx);

+        // TODO: Could be more efficient by using a reverse iterator.
        let (old_excerpt, _) = snapshot
            .range_to_buffer_ranges(range.clone())
-            .pop()
+            .last()
            .unwrap();
        let old_buffer = cx.new_model(|cx| {
            let text = old_excerpt.buffer().as_rope().clone();
@@ -475,9 +476,9 @@ impl CodegenAlternative {
        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 mut ranges = snapshot.range_to_buffer_ranges(self.range.clone());
            ranges
-                .first()
+                .next()
                .and_then(|(excerpt, _)| excerpt.buffer().language())
                .map(|language| language.name())
        };
--- a/crates/assistant2/src/context.rs
+++ b/crates/assistant2/src/context.rs
@@ -1,8 +1,11 @@
 use gpui::SharedString;
 use language_model::{LanguageModelRequestMessage, MessageContent};
+use project::ProjectEntryId;
 use serde::{Deserialize, Serialize};
 use util::post_inc;

+use crate::thread::ThreadId;
+
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, Serialize, Deserialize)]
 pub struct ContextId(pub(crate) usize);

@@ -17,18 +20,16 @@ impl ContextId {
 pub struct Context {
    pub id: ContextId,
    pub name: SharedString,
-    pub parent: Option<SharedString>,
-    pub tooltip: Option<SharedString>,
    pub kind: ContextKind,
    pub text: SharedString,
 }

 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum ContextKind {
-    File,
+    File(ProjectEntryId),
    Directory,
    FetchedUrl,
-    Thread,
+    Thread(ThreadId),
 }

 pub fn attach_context_to_message(
@@ -42,7 +43,7 @@ pub fn attach_context_to_message(

    for context in context.into_iter() {
        match context.kind {
-            ContextKind::File { .. } => {
+            ContextKind::File(_) => {
                file_context.push_str(&context.text);
                file_context.push('\n');
            }
@@ -56,7 +57,7 @@ pub fn attach_context_to_message(
                fetch_context.push_str(&context.text);
                fetch_context.push('\n');
            }
-            ContextKind::Thread => {
+            ContextKind::Thread(_) => {
                thread_context.push_str(&context.name);
                thread_context.push('\n');
                thread_context.push_str(&context.text);
--- a/crates/assistant2/src/context_picker.rs
+++ b/crates/assistant2/src/context_picker.rs
@@ -14,7 +14,6 @@ use ui::{prelude::*, ListItem, ListItemSpacing};
 use util::ResultExt;
 use workspace::Workspace;

-use crate::context::ContextKind;
 use crate::context_picker::directory_context_picker::DirectoryContextPicker;
 use crate::context_picker::fetch_context_picker::FetchContextPicker;
 use crate::context_picker::file_context_picker::FileContextPicker;
@@ -53,24 +52,24 @@ impl ContextPicker {
        let mut entries = Vec::new();
        entries.push(ContextPickerEntry {
            name: "File".into(),
-            kind: ContextKind::File,
+            kind: ContextPickerEntryKind::File,
            icon: IconName::File,
        });
        entries.push(ContextPickerEntry {
            name: "Folder".into(),
-            kind: ContextKind::Directory,
+            kind: ContextPickerEntryKind::Directory,
            icon: IconName::Folder,
        });
        entries.push(ContextPickerEntry {
            name: "Fetch".into(),
-            kind: ContextKind::FetchedUrl,
+            kind: ContextPickerEntryKind::FetchedUrl,
            icon: IconName::Globe,
        });

        if thread_store.is_some() {
            entries.push(ContextPickerEntry {
                name: "Thread".into(),
-                kind: ContextKind::Thread,
+                kind: ContextPickerEntryKind::Thread,
                icon: IconName::MessageCircle,
            });
        }
@@ -134,10 +133,18 @@ impl Render for ContextPicker {
 #[derive(Clone)]
 struct ContextPickerEntry {
    name: SharedString,
-    kind: ContextKind,
+    kind: ContextPickerEntryKind,
    icon: IconName,
 }

+#[derive(Debug, Clone)]
+enum ContextPickerEntryKind {
+    File,
+    Directory,
+    FetchedUrl,
+    Thread,
+}
+
 pub(crate) struct ContextPickerDelegate {
    context_picker: WeakView<ContextPicker>,
    workspace: WeakView<Workspace>,
@@ -177,7 +184,7 @@ impl PickerDelegate for ContextPickerDelegate {
            self.context_picker
                .update(cx, |this, cx| {
                    match entry.kind {
-                        ContextKind::File => {
+                        ContextPickerEntryKind::File => {
                            this.mode = ContextPickerMode::File(cx.new_view(|cx| {
                                FileContextPicker::new(
                                    self.context_picker.clone(),
@@ -188,7 +195,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                )
                            }));
                        }
-                        ContextKind::Directory => {
+                        ContextPickerEntryKind::Directory => {
                            this.mode = ContextPickerMode::Directory(cx.new_view(|cx| {
                                DirectoryContextPicker::new(
                                    self.context_picker.clone(),
@@ -199,7 +206,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                )
                            }));
                        }
-                        ContextKind::FetchedUrl => {
+                        ContextPickerEntryKind::FetchedUrl => {
                            this.mode = ContextPickerMode::Fetch(cx.new_view(|cx| {
                                FetchContextPicker::new(
                                    self.context_picker.clone(),
@@ -210,7 +217,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                )
                            }));
                        }
-                        ContextKind::Thread => {
+                        ContextPickerEntryKind::Thread => {
                            if let Some(thread_store) = self.thread_store.as_ref() {
                                this.mode = ContextPickerMode::Thread(cx.new_view(|cx| {
                                    ThreadContextPicker::new(
--- a/crates/assistant2/src/context_picker/directory_context_picker.rs
+++ b/crates/assistant2/src/context_picker/directory_context_picker.rs
@@ -11,8 +11,10 @@ use ui::{prelude::*, ListItem};
 use util::ResultExt as _;
 use workspace::Workspace;

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

 pub struct DirectoryContextPicker {
    picker: View<Picker<DirectoryContextPickerDelegate>>,
@@ -187,22 +189,6 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
            return;
        };
        let path = mat.path.clone();
-
-        let already_included = self
-            .context_store
-            .update(cx, |context_store, _cx| {
-                if let Some(context_id) = context_store.included_directory(&path) {
-                    context_store.remove_context(&context_id);
-                    true
-                } else {
-                    false
-                }
-            })
-            .unwrap_or(true);
-        if already_included {
-            return;
-        }
-
        let worktree_id = WorktreeId::from_usize(mat.worktree_id);
        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
@@ -231,42 +217,41 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
                    .collect::<Vec<_>>()
            })?;

-            let buffers = futures::future::join_all(open_buffer_tasks).await;
+            let open_all_buffers_tasks = cx.background_executor().spawn(async move {
+                let mut buffers = Vec::with_capacity(open_buffer_tasks.len());
+
+                for open_buffer_task in open_buffer_tasks {
+                    let buffer = open_buffer_task.await?;
+
+                    buffers.push(buffer);
+                }
+
+                anyhow::Ok(buffers)
+            });
+
+            let buffers = open_all_buffers_tasks.await?;

            this.update(&mut cx, |this, cx| {
                let mut text = String::new();

-                let mut ok_count = 0;
+                for buffer in buffers {
+                    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');
+                    }

-                for buffer in buffers.into_iter().flatten() {
-                    let buffer = buffer.read(cx);
-                    let path = buffer.file().map_or(&path, |file| file.path());
-                    push_fenced_codeblock(&path, buffer.text(), &mut text);
-                    ok_count += 1;
-                }
-
-                if ok_count == 0 {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(cx, |workspace, cx| {
-                        workspace.show_error(
-                            &anyhow::anyhow!(
-                                "Could not read any text files from {}",
-                                path.display()
-                            ),
-                            cx,
-                        );
-                    });
-
-                    return anyhow::Ok(());
+                    text.push_str("```\n");
                }

                this.delegate
                    .context_store
                    .update(cx, |context_store, _cx| {
-                        context_store.insert_directory(&path, text);
+                        context_store.insert_context(
+                            ContextKind::Directory,
+                            path.to_string_lossy().to_string(),
+                            text,
+                        );
                    })?;

                match confirm_behavior {
@@ -295,35 +280,16 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
        &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 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)
-                .included_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)),
-                    )
-                }),
+                .child(h_flex().gap_2().child(Label::new(directory_name))),
        )
    }
 }
--- 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;

@@ -200,9 +201,7 @@ impl PickerDelegate for FetchContextPickerDelegate {
                this.delegate
                    .context_store
                    .update(cx, |context_store, _cx| {
-                        if context_store.included_url(&url).is_none() {
-                            context_store.insert_fetched_url(url, text);
-                        }
+                        context_store.insert_context(ContextKind::FetchedUrl, url, text);
                    })?;

                match confirm_behavior {
@@ -231,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).included_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,3 +1,5 @@
+use std::fmt::Write as _;
+use std::ops::RangeInclusive;
 use std::path::Path;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
@@ -6,12 +8,13 @@ use fuzzy::PathMatch;
 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 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, IncludedFile};
+use crate::context_store::ContextStore;

 pub struct FileContextPicker {
    picker: View<Picker<FileContextPickerDelegate>>,
@@ -201,37 +204,20 @@ impl PickerDelegate for FileContextPickerDelegate {
            return;
        };
        let path = mat.path.clone();
-
-        let already_included = self
-            .context_store
-            .update(cx, |context_store, _cx| {
-                match context_store.included_file(&path) {
-                    Some(IncludedFile::Direct(context_id)) => {
-                        context_store.remove_context(&context_id);
-                        true
-                    }
-                    Some(IncludedFile::InDirectory(_)) => true,
-                    None => false,
-                }
-            })
-            .unwrap_or(true);
-        if already_included {
-            return;
-        }
-
        let worktree_id = WorktreeId::from_usize(mat.worktree_id);
        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
-            let Some(open_buffer_task) = project
+            let Some((entry_id, open_buffer_task)) = project
                .update(&mut cx, |project, cx| {
                    let project_path = ProjectPath {
                        worktree_id,
                        path: path.clone(),
                    };

+                    let entry_id = project.entry_for_path(&project_path, cx)?.id;
                    let task = project.open_buffer(project_path, cx);

-                    Some(task)
+                    Some((entry_id, task))
                })
                .ok()
                .flatten()
@@ -239,34 +225,34 @@ impl PickerDelegate for FileContextPickerDelegate {
                return anyhow::Ok(());
            };

-            let result = open_buffer_task.await;
+            let buffer = open_buffer_task.await?;

-            this.update(&mut cx, |this, cx| match result {
-                Ok(buffer) => {
-                    this.delegate
-                        .context_store
-                        .update(cx, |context_store, cx| {
-                            context_store.insert_file(buffer.read(cx));
-                        })?;
+            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');
+                        }

-                    match confirm_behavior {
-                        ConfirmBehavior::KeepOpen => {}
-                        ConfirmBehavior::Close => this.delegate.dismissed(cx),
-                    }
+                        text.push_str("```\n");

-                    anyhow::Ok(())
+                        context_store.insert_context(
+                            ContextKind::File(entry_id),
+                            path.to_string_lossy().to_string(),
+                            text,
+                        );
+                    })?;
+
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };

-                    workspace.update(cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    });
-
-                    anyhow::Ok(())
-                }
+                anyhow::Ok(())
            })??;

            anyhow::Ok(())
@@ -287,7 +273,7 @@ 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];

@@ -315,52 +301,42 @@ impl PickerDelegate for FileContextPickerDelegate {
            (file_name, Some(directory))
        };

-        let added = self
-            .context_store
-            .upgrade()
-            .and_then(|context_store| context_store.read(cx).included_file(&path_match.path));
-
        Some(
-            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)
-                        })),
-                )
-                .when_some(added, |el, added| match added {
-                    IncludedFile::Direct(_) => 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)),
-                    ),
-                    IncludedFile::InDirectory(dir_name) => {
-                        let dir_name = dir_name.to_string_lossy().into_owned();
-
-                        el.end_slot(
-                            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))
-                    }
-                }),
+            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(crate) fn codeblock_fence_for_path(
+    path: Option<&Path>,
+    row_range: Option<RangeInclusive<u32>>,
+) -> String {
+    let mut text = String::new();
+    write!(text, "```").unwrap();
+
+    if let Some(path) = path {
+        if let Some(extension) = path.extension().and_then(|ext| ext.to_str()) {
+            write!(text, "{} ", extension).unwrap();
+        }
+
+        write!(text, "{}", path.display()).unwrap();
+    } else {
+        write!(text, "untitled").unwrap();
+    }
+
+    if let Some(row_range) = row_range {
+        write!(text, ":{}-{}", row_range.start() + 1, row_range.end() + 1).unwrap();
+    }
+
+    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,6 +5,7 @@ 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;
 use crate::thread::ThreadId;
@@ -168,11 +169,11 @@ impl PickerDelegate for ThreadContextPickerDelegate {

        self.context_store
            .update(cx, |context_store, cx| {
-                if let Some(context_id) = context_store.included_thread(&entry.id) {
-                    context_store.remove_context(&context_id);
-                } else {
-                    context_store.insert_thread(thread.read(cx));
-                }
+                context_store.insert_context(
+                    ContextKind::Thread(thread.read(cx).id().clone()),
+                    entry.summary.clone(),
+                    thread.read(cx).text(),
+                );
            })
            .ok();

@@ -195,31 +196,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];

-        let added = self.context_store.upgrade().map_or(false, |ctx_store| {
-            ctx_store.read(cx).included_thread(&thread.id).is_some()
-        });
-
        Some(
            ListItem::new(ix)
                .inset(true)
                .toggle_state(selected)
-                .child(Label::new(thread.summary.clone()))
-                .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)),
-                    )
-                }),
+                .child(Label::new(thread.summary.clone())),
        )
    }
 }
--- a/crates/assistant2/src/context_store.rs
+++ b/crates/assistant2/src/context_store.rs
@@ -1,11 +1,6 @@
-use std::fmt::Write as _;
-use std::path::{Path, PathBuf};
-
-use collections::{HashMap, HashSet};
 use gpui::SharedString;
-use language::Buffer;
+use project::ProjectEntryId;

-use crate::thread::Thread;
 use crate::{
    context::{Context, ContextId, ContextKind},
    thread::ThreadId,
@@ -14,10 +9,6 @@ use crate::{
 pub struct ContextStore {
    context: Vec<Context>,
    next_context_id: ContextId,
-    files: HashMap<PathBuf, ContextId>,
-    directories: HashMap<PathBuf, ContextId>,
-    threads: HashMap<ThreadId, ContextId>,
-    fetched_urls: HashMap<String, ContextId>,
 }

 impl ContextStore {
@@ -25,10 +16,6 @@ impl ContextStore {
        Self {
            context: Vec::new(),
            next_context_id: ContextId(0),
-            files: HashMap::default(),
-            directories: HashMap::default(),
-            threads: HashMap::default(),
-            fetched_urls: HashMap::default(),
        }
    }

@@ -36,192 +23,43 @@ impl ContextStore {
        &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 insert_file(&mut self, buffer: &Buffer) {
-        let Some(file) = buffer.file() else {
-            return;
-        };
-
-        let path = file.path();
-
-        let id = self.next_context_id.post_inc();
-        self.files.insert(path.to_path_buf(), id);
-
-        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 mut text = String::new();
-        push_fenced_codeblock(path, buffer.text(), &mut text);
-
+    pub fn insert_context(
+        &mut self,
+        kind: ContextKind,
+        name: impl Into<SharedString>,
+        text: impl Into<SharedString>,
+    ) {
        self.context.push(Context {
-            id,
-            name,
-            parent,
-            tooltip: Some(full_path),
-            kind: ContextKind::File,
-            text: text.into(),
-        });
-    }
-
-    pub fn insert_directory(&mut self, path: &Path, text: impl Into<SharedString>) {
-        let id = self.next_context_id.post_inc();
-        self.directories.insert(path.to_path_buf(), id);
-
-        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());
-
-        self.context.push(Context {
-            id,
-            name,
-            parent,
-            tooltip: Some(full_path),
-            kind: ContextKind::Directory,
-            text: text.into(),
-        });
-    }
-
-    pub fn insert_thread(&mut self, thread: &Thread) {
-        let context_id = self.next_context_id.post_inc();
-        self.threads.insert(thread.id().clone(), context_id);
-
-        self.context.push(Context {
-            id: context_id,
-            name: thread.summary().unwrap_or("New thread".into()),
-            parent: None,
-            tooltip: None,
-            kind: ContextKind::Thread,
-            text: thread.text().into(),
-        });
-    }
-
-    pub fn insert_fetched_url(&mut self, url: String, text: impl Into<SharedString>) {
-        let context_id = self.next_context_id.post_inc();
-        self.fetched_urls.insert(url.clone(), context_id);
-
-        self.context.push(Context {
-            id: context_id,
-            name: url.into(),
-            parent: None,
-            tooltip: None,
-            kind: ContextKind::FetchedUrl,
+            id: self.next_context_id.post_inc(),
+            name: name.into(),
+            kind,
            text: text.into(),
        });
    }

    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).kind {
-            ContextKind::File => {
-                self.files.retain(|_, context_id| context_id != id);
-            }
-            ContextKind::Directory => {
-                self.directories.retain(|_, context_id| context_id != id);
-            }
-            ContextKind::FetchedUrl => {
-                self.fetched_urls.retain(|_, context_id| context_id != id);
-            }
-            ContextKind::Thread => {
-                self.threads.retain(|_, context_id| context_id != id);
-            }
-        }
+        self.context.retain(|context| context.id != *id);
    }

-    pub fn included_file(&self, path: &Path) -> Option<IncludedFile> {
-        if let Some(id) = self.files.get(path) {
-            return Some(IncludedFile::Direct(*id));
-        }
-
-        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(IncludedFile::InDirectory(buf));
-            }
-        }
-
-        None
+    pub fn contains_project_entry(&self, entry_id: ProjectEntryId) -> bool {
+        self.context.iter().any(|probe| match probe.kind {
+            ContextKind::File(probe_entry_id) => probe_entry_id == entry_id,
+            ContextKind::Directory | ContextKind::FetchedUrl | ContextKind::Thread(_) => false,
+        })
    }

-    pub fn included_directory(&self, path: &Path) -> Option<ContextId> {
-        self.directories.get(path).copied()
-    }
-
-    pub fn included_thread(&self, thread_id: &ThreadId) -> Option<ContextId> {
-        self.threads.get(thread_id).copied()
-    }
-
-    pub fn included_url(&self, url: &str) -> Option<ContextId> {
-        self.fetched_urls.get(url).copied()
-    }
-
-    pub fn duplicated_names(&self) -> HashSet<SharedString> {
-        let mut seen = HashSet::default();
-        let mut dupes = HashSet::default();
-
-        for context in self.context().iter() {
-            if !seen.insert(&context.name) {
-                dupes.insert(context.name.clone());
-            }
-        }
-
-        dupes
+    pub fn contains_thread(&self, thread_id: &ThreadId) -> bool {
+        self.context.iter().any(|probe| match probe.kind {
+            ContextKind::Thread(ref probe_thread_id) => probe_thread_id == thread_id,
+            ContextKind::File(_) | ContextKind::Directory | ContextKind::FetchedUrl => false,
+        })
    }
 }
-
-pub enum IncludedFile {
-    Direct(ContextId),
-    InDirectory(PathBuf),
-}
-
-pub(crate) fn push_fenced_codeblock(path: &Path, content: String, buffer: &mut String) {
-    buffer.reserve(content.len() + 64);
-
-    write!(buffer, "```").unwrap();
-
-    if let Some(extension) = path.extension().and_then(|ext| ext.to_str()) {
-        write!(buffer, "{} ", extension).unwrap();
-    }
-
-    write!(buffer, "{}", path.display()).unwrap();
-
-    buffer.push('\n');
-    buffer.push_str(&content);
-
-    if !buffer.ends_with('\n') {
-        buffer.push('\n');
-    }
-
-    buffer.push_str("```\n");
-}
--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -1,21 +1,19 @@
 use std::rc::Rc;

 use editor::Editor;
-use gpui::{
-    AppContext, DismissEvent, EventEmitter, FocusHandle, Model, Subscription, View, WeakModel,
-    WeakView,
-};
+use gpui::{AppContext, FocusHandle, Model, View, WeakModel, WeakView};
 use language::Buffer;
+use project::ProjectEntryId;
 use ui::{prelude::*, KeyBinding, 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::{Thread, ThreadId};
 use crate::thread_store::ThreadStore;
 use crate::ui::ContextPill;
-use crate::{AssistantPanel, RemoveAllContext, ToggleContextPicker};
+use crate::{AssistantPanel, ToggleContextPicker};

 pub struct ContextStrip {
    context_store: Model<ContextStore>,
@@ -24,7 +22,6 @@ pub struct ContextStrip {
    focus_handle: FocusHandle,
    suggest_context_kind: SuggestContextKind,
    workspace: WeakView<Workspace>,
-    _context_picker_subscription: Subscription,
 }

 impl ContextStrip {
@@ -37,27 +34,21 @@ impl ContextStrip {
        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 context_picker_subscription =
-            cx.subscribe(&context_picker, Self::handle_context_picker_event);
-
        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,
-            _context_picker_subscription: context_picker_subscription,
        }
    }

@@ -71,23 +62,21 @@ impl ContextStrip {
    fn suggested_file(&self, cx: &ViewContext<Self>) -> Option<SuggestedContext> {
        let workspace = self.workspace.upgrade()?;
        let active_item = workspace.read(cx).active_item(cx)?;
+        let entry_id = *active_item.project_entry_ids(cx).first()?;
+
+        if self.context_store.read(cx).contains_project_entry(entry_id) {
+            return None;
+        }

        let editor = active_item.to_any().downcast::<Editor>().ok()?.read(cx);
        let active_buffer = editor.buffer().read(cx).as_singleton()?;

-        let path = active_buffer.read(cx).file()?.path();
-
-        if self.context_store.read(cx).included_file(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 file = active_buffer.read(cx).file()?;
+        let title = file.path().to_string_lossy().into_owned().into();

        Some(SuggestedContext::File {
-            name,
+            entry_id,
+            title,
            buffer: active_buffer.downgrade(),
        })
    }
@@ -106,26 +95,17 @@ impl ContextStrip {
        if self
            .context_store
            .read(cx)
-            .included_thread(active_thread.id())
-            .is_some()
+            .contains_thread(active_thread.id())
        {
            return None;
        }

        Some(SuggestedContext::Thread {
-            name: active_thread.summary().unwrap_or("New Thread".into()),
+            id: active_thread.id().clone(),
+            title: active_thread.summary().unwrap_or("Active Thread".into()),
            thread: weak_active_thread,
        })
    }
-
-    fn handle_context_picker_event(
-        &mut self,
-        _picker: View<ContextPicker>,
-        _event: &DismissEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        cx.emit(ContextStripEvent::PickerDismissed);
-    }
 }

 impl Render for ContextStrip {
@@ -137,8 +117,6 @@ impl Render for ContextStrip {

        let suggested_context = self.suggested_context(cx);

-        let dupe_names = context_store.duplicated_names();
-
        h_flex()
            .flex_wrap()
            .gap_1()
@@ -190,71 +168,60 @@ impl Render for ContextStrip {
                }
            })
            .children(context.iter().map(|context| {
-                ContextPill::new_added(
-                    context.clone(),
-                    dupe_names.contains(&context.name),
-                    Some({
-                        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();
-                        }))
-                    }),
-                )
+                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.kind(),
-                    {
-                        let context_store = self.context_store.clone();
-                        Rc::new(cx.listener(move |_this, _event, cx| {
-                            context_store.update(cx, |context_store, cx| {
-                                suggested.accept(context_store, cx);
-                            });
+                el.child(
+                    Button::new("add-suggested-context", suggested.title().clone())
+                        .on_click({
+                            let context_store = self.context_store.clone();

-                            cx.notify();
-                        }))
-                    },
-                ))
+                            cx.listener(move |_this, _event, cx| {
+                                context_store.update(cx, |context_store, cx| {
+                                    suggested.accept(context_store, cx);
+                                });
+                                cx.notify();
+                            })
+                        })
+                        .icon(IconName::Plus)
+                        .icon_position(IconPosition::Start)
+                        .icon_size(IconSize::XSmall)
+                        .icon_color(Color::Muted)
+                        .label_size(LabelSize::Small)
+                        .style(ButtonStyle::Filled)
+                        .tooltip(|cx| {
+                            Tooltip::with_meta("Suggested Context", None, "Click to add it", cx)
+                        }),
+                )
            })
            .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);
-                                }
-                            })),
+                            .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();
+                                })
+                            }),
                    )
                }
            })
    }
 }

-pub enum ContextStripEvent {
-    PickerDismissed,
-}
-
-impl EventEmitter<ContextStripEvent> for ContextStrip {}
-
 pub enum SuggestContextKind {
    File,
    Thread,
@@ -263,42 +230,54 @@ pub enum SuggestContextKind {
 #[derive(Clone)]
 pub enum SuggestedContext {
    File {
-        name: SharedString,
+        entry_id: ProjectEntryId,
+        title: SharedString,
        buffer: WeakModel<Buffer>,
    },
    Thread {
-        name: SharedString,
+        id: ThreadId,
+        title: SharedString,
        thread: WeakModel<Thread>,
    },
 }

 impl SuggestedContext {
-    pub fn name(&self) -> &SharedString {
+    pub fn title(&self) -> &SharedString {
        match self {
-            Self::File { name, .. } => name,
-            Self::Thread { name, .. } => name,
+            Self::File { title, .. } => title,
+            Self::Thread { title, .. } => title,
        }
    }

    pub fn accept(&self, context_store: &mut ContextStore, cx: &mut AppContext) {
        match self {
-            Self::File { buffer, name: _ } => {
-                if let Some(buffer) = buffer.upgrade() {
-                    context_store.insert_file(buffer.read(cx));
+            Self::File {
+                entry_id,
+                title,
+                buffer,
+            } => {
+                let Some(buffer) = buffer.upgrade() else {
+                    return;
                };
-            }
-            Self::Thread { thread, name: _ } => {
-                if let Some(thread) = thread.upgrade() {
-                    context_store.insert_thread(thread.read(cx));
-                };
-            }
-        }
-    }
+                let text = buffer.read(cx).text();

-    pub fn kind(&self) -> ContextKind {
-        match self {
-            Self::File { .. } => ContextKind::File,
-            Self::Thread { .. } => ContextKind::Thread,
+                context_store.insert_context(
+                    ContextKind::File(*entry_id),
+                    title.clone(),
+                    text.clone(),
+                );
+            }
+            Self::Thread { id, title, thread } => {
+                let Some(thread) = thread.upgrade() else {
+                    return;
+                };
+
+                context_store.insert_context(
+                    ContextKind::Thread(id.clone()),
+                    title.clone(),
+                    thread.read(cx).text(),
+                );
+            }
        }
    }
 }
--- 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,
        }
    }

@@ -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,
+                );
            });
        }
    }
@@ -316,19 +294,20 @@ impl InlineAssistant {
        let newest_selection = newest_selection.unwrap();

        let mut codegen_ranges = Vec::new();
-        for (excerpt_id, buffer, buffer_range) in
-            snapshot.excerpts_in_ranges(selections.iter().map(|selection| {
+        for (excerpt, buffer_range) in
+            snapshot.disjoint_ranges_to_buffer_ranges(selections.iter().map(|selection| {
                snapshot.anchor_before(selection.start)..snapshot.anchor_after(selection.end)
            }))
        {
+            let buffer = excerpt.buffer();
            let start = Anchor {
                buffer_id: Some(buffer.remote_id()),
-                excerpt_id,
+                excerpt_id: excerpt.id(),
                text_anchor: buffer.anchor_before(buffer_range.start),
            };
            let end = Anchor {
                buffer_id: Some(buffer.remote_id()),
-                excerpt_id,
+                excerpt_id: excerpt.id(),
                text_anchor: buffer.anchor_after(buffer_range.end),
            };
            codegen_ranges.push(start..end);
@@ -894,9 +873,9 @@ impl InlineAssistant {
                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 mut ranges = snapshot.range_to_buffer_ranges(assist.range.clone());
                    ranges
-                        .first()
+                        .next()
                        .and_then(|(excerpt, _)| excerpt.buffer().language())
                        .map(|language| language.name())
                });
@@ -1595,13 +1574,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
@@ -2,11 +2,11 @@ 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, SuggestContextKind};
 use crate::terminal_codegen::TerminalCodegen;
 use crate::thread_store::ThreadStore;
 use crate::{CycleNextInlineAssist, CyclePreviousInlineAssist};
-use crate::{RemoveAllContext, ToggleContextPicker, ToggleModelSelector};
+use crate::{ToggleContextPicker, ToggleModelSelector};
 use client::ErrorExt;
 use collections::VecDeque;
 use editor::{
@@ -27,7 +27,6 @@ use settings::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,7 +36,6 @@ 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>,
@@ -48,7 +46,6 @@ pub struct PromptEditor<T> {
    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 left_gutter_spacing = match &self.mode {
            PromptEditorMode::Buffer {
                id: _,
                codegen,
@@ -110,17 +106,12 @@ impl<T: 'static> Render for PromptEditor<T> {
                    .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_flex()
                            .h_full()
-                            .w(left_gutter_width)
+                            .w(left_gutter_spacing)
                            .justify_center()
                            .gap_2()
                            .child(self.render_close_button(cx))
@@ -180,31 +171,19 @@ impl<T: 'static> Render for PromptEditor<T> {
                            .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(h_flex().gap_1().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(div().w(left_gutter_spacing)).child(
+                    h_flex()
+                        .w_full()
+                        .pl_1()
+                        .items_start()
+                        .justify_between()
+                        .child(self.context_strip.clone())
+                        .child(self.model_selector.clone()),
+                ),
            )
    }
 }
@@ -341,11 +320,6 @@ impl<T: 'static> PromptEditor<T> {
        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(_) => {
@@ -706,10 +680,9 @@ impl<T: 'static> PromptEditor<T> {
        let line_height = font_size.to_pixels(cx.rem_size()) * 1.3;

        div()
-            .key_context("InlineAssistEditor")
+            .key_context("MessageEditor")
            .size_full()
            .p_2()
-            .pl_1()
            .bg(cx.theme().colors().editor_background)
            .child({
                let settings = ThemeSettings::get_global(cx);
@@ -734,16 +707,6 @@ impl<T: 'static> PromptEditor<T> {
            })
            .into_any_element()
    }
-
-    fn handle_context_strip_event(
-        &mut self,
-        _context_strip: View<ContextStrip>,
-        ContextStripEvent::PickerDismissed: &ContextStripEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        let editor_focus_handle = self.editor.focus_handle(cx);
-        cx.focus(&editor_focus_handle);
-    }
 }

 pub enum PromptEditorMode {
@@ -821,25 +784,19 @@ impl PromptEditor<BufferCodegen> {
        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(),
-                prompt_editor.focus_handle(cx),
-                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_strip: cx.new_view(|cx| {
+                ContextStrip::new(
+                    context_store,
+                    workspace.clone(),
+                    thread_store.clone(),
+                    prompt_editor.focus_handle(cx),
+                    context_picker_menu_handle.clone(),
+                    SuggestContextKind::Thread,
+                    cx,
+                )
+            }),
            context_picker_menu_handle,
            model_selector: cx.new_view(|cx| {
                AssistantModelSelector::new(fs, model_selector_menu_handle.clone(), cx)
@@ -851,7 +808,6 @@ impl PromptEditor<BufferCodegen> {
            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(),
@@ -968,25 +924,19 @@ impl PromptEditor<TerminalCodegen> {
        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(),
-                prompt_editor.focus_handle(cx),
-                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_strip: cx.new_view(|cx| {
+                ContextStrip::new(
+                    context_store,
+                    workspace.clone(),
+                    thread_store.clone(),
+                    prompt_editor.focus_handle(cx),
+                    context_picker_menu_handle.clone(),
+                    SuggestContextKind::Thread,
+                    cx,
+                )
+            }),
            context_picker_menu_handle,
            model_selector: cx.new_view(|cx| {
                AssistantModelSelector::new(fs, model_selector_menu_handle.clone(), cx)
@@ -998,7 +948,6 @@ impl PromptEditor<TerminalCodegen> {
            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
@@ -10,7 +10,7 @@ use language_model::{LanguageModelRegistry, LanguageModelRequestTool};
 use language_model_selector::LanguageModelSelector;
 use rope::Point;
 use settings::Settings;
-use theme::{get_ui_font_size, ThemeSettings};
+use theme::ThemeSettings;
 use ui::{
    prelude::*, ButtonLike, ElevationIndex, KeyBinding, PopoverMenu, PopoverMenuHandle,
    SwitchWithLabel,
@@ -20,10 +20,10 @@ use workspace::Workspace;
 use crate::assistant_model_selector::AssistantModelSelector;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
-use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
+use crate::context_strip::{ContextStrip, SuggestContextKind};
 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>,
@@ -59,7 +59,6 @@ impl MessageEditor {

            editor
        });
-
        let inline_context_picker = cx.new_view(|cx| {
            ContextPicker::new(
                workspace.clone(),
@@ -69,33 +68,29 @@ impl MessageEditor {
                cx,
            )
        });
-
-        let context_strip = cx.new_view(|cx| {
-            ContextStrip::new(
-                context_store.clone(),
-                workspace.clone(),
-                Some(thread_store.clone()),
-                editor.focus_handle(cx),
-                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_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(),
+                    SuggestContextKind::File,
+                    cx,
+                )
+            }),
            context_picker_menu_handle,
            inline_context_picker,
            inline_context_picker_menu_handle,
@@ -116,11 +111,6 @@ impl MessageEditor {
        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);
    }
@@ -147,9 +137,7 @@ impl MessageEditor {
            editor.clear(cx);
            text
        });
-        let context = self
-            .context_store
-            .update(cx, |this, _cx| this.context().clone());
+        let context = self.context_store.update(cx, |this, _cx| this.drain());

        self.thread.update(cx, |thread, cx| {
            thread.insert_user_message(user_message, context, cx);
@@ -207,16 +195,6 @@ impl MessageEditor {
        let editor_focus_handle = self.editor.focus_handle(cx);
        cx.focus(&editor_focus_handle);
    }
-
-    fn handle_context_strip_event(
-        &mut self,
-        _context_strip: View<ContextStrip>,
-        ContextStripEvent::PickerDismissed: &ContextStripEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        let editor_focus_handle = self.editor.focus_handle(cx);
-        cx.focus(&editor_focus_handle);
-    }
 }

 impl FocusableView for MessageEditor {
@@ -238,7 +216,6 @@ 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))
            .size_full()
            .gap_2()
            .p_2()
@@ -276,7 +253,7 @@ impl Render for MessageEditor {
                            .anchor(gpui::Corner::BottomLeft)
                            .offset(gpui::Point {
                                x: px(0.0),
-                                y: (-get_ui_font_size(cx) * 2) - px(4.0),
+                                y: px(-16.0),
                            })
                            .with_handle(self.inline_context_picker_menu_handle.clone()),
                    )
@@ -285,7 +262,7 @@ impl Render for MessageEditor {
                            .justify_between()
                            .child(SwitchWithLabel::new(
                                "use-tools",
-                                Label::new("Tools").size(LabelSize::Small),
+                                Label::new("Tools"),
                                self.use_tools.into(),
                                cx.listener(|this, selection, _cx| {
                                    this.use_tools = match selection {
@@ -301,7 +278,7 @@ impl Render for MessageEditor {
                                    ButtonLike::new("chat")
                                        .style(ButtonStyle::Filled)
                                        .layer(ElevationIndex::ModalSurface)
-                                        .child(Label::new("Submit").size(LabelSize::Small))
+                                        .child(Label::new("Submit"))
                                        .children(
                                            KeyBinding::for_action_in(&Chat, &focus_handle, cx)
                                                .map(|binding| binding.into_any_element()),
--- 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::{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, Context, ContextId};
+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: HashMap<ContextId, Context>,
-    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: HashMap::default(),
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
@@ -131,15 +129,8 @@ impl Thread {
        &self.tools
    }

-    pub fn context_for_message(&self, id: MessageId) -> Option<Vec<Context>> {
-        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> {
@@ -153,10 +144,7 @@ impl Thread {
        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(
@@ -209,13 +197,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(),
@@ -230,6 +212,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
@@ -247,22 +233,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
    }

--- a/crates/assistant2/src/ui/context_pill.rs
+++ b/crates/assistant2/src/ui/context_pill.rs
@@ -1,153 +1,65 @@
 use std::rc::Rc;

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

 use crate::context::{Context, ContextKind};

 #[derive(IntoElement)]
-pub enum ContextPill {
-    Added {
-        context: Context,
-        dupe_name: bool,
-        on_remove: Option<Rc<dyn Fn(&ClickEvent, &mut WindowContext)>>,
-    },
-    Suggested {
-        name: SharedString,
-        kind: ContextKind,
-        on_add: 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: Context,
-        dupe_name: 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,
+            on_remove: None,
        }
    }

-    pub fn new_suggested(
-        name: SharedString,
-        kind: ContextKind,
-        on_add: Rc<dyn Fn(&ClickEvent, &mut WindowContext)>,
-    ) -> Self {
-        Self::Suggested { name, kind, on_add }
-    }
-
-    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 kind(&self) -> &ContextKind {
-        match self {
-            Self::Added { context, .. } => &context.kind,
-            Self::Suggested { kind, .. } => kind,
-        }
+    pub fn on_remove(mut self, on_remove: Rc<dyn Fn(&ClickEvent, &mut WindowContext)>) -> Self {
+        self.on_remove = Some(on_remove);
+        self
    }
 }

 impl RenderOnce for ContextPill {
    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        let icon = match &self.kind() {
-            ContextKind::File => IconName::File,
+        let padding_right = if self.on_remove.is_some() {
+            px(2.)
+        } else {
+            px(4.)
+        };
+        let icon = match self.context.kind {
+            ContextKind::File(_) => IconName::File,
            ContextKind::Directory => IconName::Folder,
            ContextKind::FetchedUrl => IconName::Globe,
-            ContextKind::Thread => IconName::MessageCircle,
+            ContextKind::Thread(_) => IconName::MessageCircle,
        };

-        let color = cx.theme().colors();
-
-        let base_pill = h_flex()
-            .id(self.id())
+        h_flex()
+            .gap_1()
            .pl_1()
+            .pr(padding_right)
            .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(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted));
-
-        match &self {
-            ContextPill::Added {
-                context,
-                dupe_name,
-                on_remove,
-            } => base_pill
-                .bg(color.element_background)
-                .border_color(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(Icon::new(icon).size(IconSize::XSmall).color(Color::Muted))
+            .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)
-                            }),
-                    )
-                }),
-            ContextPill::Suggested { name, kind, on_add } => base_pill
-                .cursor_pointer()
-                .pr_1()
-                .border_color(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(
-                    Label::new(match kind {
-                        ContextKind::File => "Open File",
-                        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))
-                .on_click({
-                    let on_add = on_add.clone();
-                    move |event, cx| on_add(event, cx)
-                }),
-        }
+            })
    }
 }
--- 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/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/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -4065,7 +4065,7 @@ async fn test_collaborating_with_diagnostics(
                DiagnosticEntry {
                    range: Point::new(0, 4)..Point::new(0, 7),
                    diagnostic: Diagnostic {
-                        group_id: 2,
+                        group_id: 3,
                        message: "message 1".to_string(),
                        severity: lsp::DiagnosticSeverity::ERROR,
                        is_primary: true,
@@ -4075,7 +4075,7 @@ async fn test_collaborating_with_diagnostics(
                DiagnosticEntry {
                    range: Point::new(0, 10)..Point::new(0, 13),
                    diagnostic: Diagnostic {
-                        group_id: 3,
+                        group_id: 4,
                        severity: lsp::DiagnosticSeverity::WARNING,
                        message: "message 2".to_string(),
                        is_primary: true,
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -1134,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),
                                    });
                                }
--- 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
@@ -841,61 +841,72 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {

        h_flex()
            .id(DIAGNOSTIC_HEADER)
-            .block_mouse_down()
-            .h(2. * cx.line_height())
            .w_full()
-            .px_9()
-            .justify_between()
-            .gap_2()
+            .relative()
+            .child(
+                div()
+                    .top(px(0.))
+                    .absolute()
+                    .w_full()
+                    .h_px()
+                    .bg(color.border_variant),
+            )
            .child(
                h_flex()
+                    .block_mouse_down()
+                    .h(2. * cx.line_height())
+                    .pl_10()
+                    .pr_5()
+                    .w_full()
+                    .justify_between()
                    .gap_2()
-                    .px_1()
-                    .rounded_md()
-                    .bg(color.surface_background.opacity(0.5))
-                    .map(|stack| {
-                        stack.child(
-                            svg()
-                                .size(cx.text_style().font_size)
-                                .flex_none()
-                                .map(|icon| {
-                                    if diagnostic.severity == DiagnosticSeverity::ERROR {
-                                        icon.path(IconName::XCircle.path())
-                                            .text_color(Color::Error.color(cx))
-                                    } else {
-                                        icon.path(IconName::Warning.path())
-                                            .text_color(Color::Warning.color(cx))
-                                    }
-                                }),
-                        )
-                    })
                    .child(
                        h_flex()
-                            .gap_1()
+                            .gap_3()
+                            .map(|stack| {
+                                stack.child(svg().size(cx.text_style().font_size).flex_none().map(
+                                    |icon| {
+                                        if diagnostic.severity == DiagnosticSeverity::ERROR {
+                                            icon.path(IconName::XCircle.path())
+                                                .text_color(Color::Error.color(cx))
+                                        } else {
+                                            icon.path(IconName::Warning.path())
+                                                .text_color(Color::Warning.color(cx))
+                                        }
+                                    },
+                                ))
+                            })
                            .child(
-                                StyledText::new(message.clone()).with_highlights(
-                                    &cx.text_style(),
-                                    code_ranges
-                                        .iter()
-                                        .map(|range| (range.clone(), highlight_style)),
-                                ),
+                                h_flex()
+                                    .gap_1()
+                                    .child(
+                                        StyledText::new(message.clone()).with_highlights(
+                                            &cx.text_style(),
+                                            code_ranges
+                                                .iter()
+                                                .map(|range| (range.clone(), highlight_style)),
+                                        ),
+                                    )
+                                    .when_some(diagnostic.code.as_ref(), |stack, code| {
+                                        stack.child(
+                                            div()
+                                                .child(SharedString::from(format!("({code})")))
+                                                .text_color(cx.theme().colors().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),
                            )
-                            .when_some(diagnostic.code.as_ref(), |stack, code| {
-                                stack.child(
-                                    div()
-                                        .child(SharedString::from(format!("({code})")))
-                                        .text_color(color.text_muted),
-                                )
-                            }),
-                    ),
+                        },
+                    )),
            )
-            .when_some(diagnostic.source.as_ref(), |stack, source| {
-                stack.child(
-                    div()
-                        .child(SharedString::from(source.clone()))
-                        .text_color(color.text_muted),
-                )
-            })
            .into_any_element()
    })
 }
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -82,7 +82,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::INFORMATION,
                            is_primary: false,
                            is_disk_based: true,
-                            group_id: 1,
+                            group_id: 2,
                            ..Default::default()
                        },
                    },
@@ -95,7 +95,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::INFORMATION,
                            is_primary: false,
                            is_disk_based: true,
-                            group_id: 0,
+                            group_id: 1,
                            ..Default::default()
                        },
                    },
@@ -106,7 +106,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::INFORMATION,
                            is_primary: false,
                            is_disk_based: true,
-                            group_id: 1,
+                            group_id: 2,
                            ..Default::default()
                        },
                    },
@@ -117,7 +117,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::INFORMATION,
                            is_primary: false,
                            is_disk_based: true,
-                            group_id: 0,
+                            group_id: 1,
                            ..Default::default()
                        },
                    },
@@ -128,7 +128,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::ERROR,
                            is_primary: true,
                            is_disk_based: true,
-                            group_id: 0,
+                            group_id: 1,
                            ..Default::default()
                        },
                    },
@@ -139,7 +139,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::ERROR,
                            is_primary: true,
                            is_disk_based: true,
-                            group_id: 1,
+                            group_id: 2,
                            ..Default::default()
                        },
                    },
@@ -241,7 +241,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                        severity: DiagnosticSeverity::ERROR,
                        is_primary: true,
                        is_disk_based: true,
-                        group_id: 0,
+                        group_id: 1,
                        ..Default::default()
                    },
                }],
@@ -348,7 +348,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::ERROR,
                            is_primary: true,
                            is_disk_based: true,
-                            group_id: 0,
+                            group_id: 1,
                            ..Default::default()
                        },
                    },
@@ -359,7 +359,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
                            severity: DiagnosticSeverity::ERROR,
                            is_primary: true,
                            is_disk_based: true,
-                            group_id: 1,
+                            group_id: 2,
                            ..Default::default()
                        },
                    },
@@ -775,7 +775,7 @@ async fn test_random_diagnostics(cx: &mut TestAppContext, mut rng: StdRng) {
        assert!(view.focus_handle.is_focused(cx));
    });

-    let mut next_group_id = 0;
+    let mut next_group_id = 1;
    let mut next_filename = 0;
    let mut language_server_ids = vec![LanguageServerId(0)];
    let mut updated_language_servers = HashSet::default();
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -1,6 +1,6 @@
 //! This module contains all actions supported by [`Editor`].
 use super::*;
-use gpui::{action_aliases, action_as};
+use gpui::action_as;
 use util::serde::default_true;

 #[derive(PartialEq, Clone, Deserialize, Default)]
@@ -204,7 +204,7 @@ impl_actions!(
        ToggleCodeActions,
        ToggleComments,
        UnfoldAt,
-        FoldAtLevel,
+        FoldAtLevel
    ]
 );

@@ -311,6 +311,7 @@ gpui::actions!(
        OpenExcerpts,
        OpenExcerptsSplit,
        OpenProposedChangesEditor,
+        OpenFile,
        OpenDocs,
        OpenPermalinkToLine,
        OpenUrl,
@@ -388,5 +389,3 @@ gpui::actions!(
 );

 action_as!(go_to_line, ToggleGoToLine as Toggle);
-
-action_aliases!(editor, OpenSelectedFilename, [OpenFile]);
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1,8 +1,8 @@
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
-    div, pulsating_between, px, uniform_list, Animation, AnimationExt, AnyElement,
-    BackgroundExecutor, Div, FontWeight, ListSizingBehavior, Model, ScrollStrategy, SharedString,
-    Size, StrikethroughStyle, StyledText, UniformListScrollHandle, ViewContext, WeakView,
+    div, px, uniform_list, AnyElement, BackgroundExecutor, Div, FontWeight, ListSizingBehavior,
+    Model, ScrollStrategy, SharedString, Size, StrikethroughStyle, StyledText,
+    UniformListScrollHandle, ViewContext, WeakView,
 };
 use language::Buffer;
 use language::{CodeLabel, Documentation};
@@ -10,8 +10,6 @@ use lsp::LanguageServerId;
 use multi_buffer::{Anchor, ExcerptId};
 use ordered_float::OrderedFloat;
 use project::{CodeAction, Completion, TaskSourceKind};
-use settings::Settings;
-use std::time::Duration;
 use std::{
    cell::RefCell,
    cmp::{min, Reverse},
@@ -160,7 +158,7 @@ pub struct CompletionsMenu {
    pub buffer: Model<Buffer>,
    pub completions: Rc<RefCell<Box<[Completion]>>>,
    match_candidates: Rc<[StringMatchCandidate]>,
-    pub entries: Rc<RefCell<Vec<CompletionEntry>>>,
+    pub entries: Rc<[CompletionEntry]>,
    pub selected_item: usize,
    scroll_handle: UniformListScrollHandle,
    resolve_completions: bool,
@@ -197,7 +195,7 @@ impl CompletionsMenu {
            show_completion_documentation,
            completions: RefCell::new(completions).into(),
            match_candidates,
-            entries: RefCell::new(Vec::new()).into(),
+            entries: Vec::new().into(),
            selected_item: 0,
            scroll_handle: UniformListScrollHandle::new(),
            resolve_completions: true,
@@ -246,7 +244,7 @@ impl CompletionsMenu {
                    string: completion.clone(),
                })
            })
-            .collect::<Vec<_>>();
+            .collect();
        Self {
            id,
            sort_completions,
@@ -254,7 +252,7 @@ impl CompletionsMenu {
            buffer,
            completions: RefCell::new(completions).into(),
            match_candidates,
-            entries: RefCell::new(entries).into(),
+            entries,
            selected_item: 0,
            scroll_handle: UniformListScrollHandle::new(),
            resolve_completions: false,
@@ -292,8 +290,7 @@ impl CompletionsMenu {
        provider: Option<&dyn CompletionProvider>,
        cx: &mut ViewContext<Editor>,
    ) {
-        let index = self.entries.borrow().len() - 1;
-        self.update_selection_index(index, provider, cx);
+        self.update_selection_index(self.entries.len() - 1, provider, cx);
    }

    fn update_selection_index(
@@ -315,12 +312,12 @@ impl CompletionsMenu {
        if self.selected_item > 0 {
            self.selected_item - 1
        } else {
-            self.entries.borrow().len() - 1
+            self.entries.len() - 1
        }
    }

    fn next_match_index(&self) -> usize {
-        if self.selected_item + 1 < self.entries.borrow().len() {
+        if self.selected_item + 1 < self.entries.len() {
            self.selected_item + 1
        } else {
            0
@@ -329,15 +326,24 @@ impl CompletionsMenu {

    pub fn show_inline_completion_hint(&mut self, hint: InlineCompletionMenuHint) {
        let hint = CompletionEntry::InlineCompletionHint(hint);
-        let mut entries = self.entries.borrow_mut();
-        match entries.first() {
+
+        self.entries = match self.entries.first() {
            Some(CompletionEntry::InlineCompletionHint { .. }) => {
+                let mut entries = Vec::from(&*self.entries);
                entries[0] = hint;
+                entries
            }
            _ => {
-                entries.insert(0, hint);
+                let mut entries = Vec::with_capacity(self.entries.len() + 1);
+                entries.push(hint);
+                entries.extend_from_slice(&self.entries);
+                entries
            }
        }
+        .into();
+        if self.selected_item != 0 && self.selected_item + 1 < self.entries.len() {
+            self.selected_item += 1;
+        }
    }

    pub fn resolve_visible_completions(
@@ -363,14 +369,13 @@ impl CompletionsMenu {
        let visible_count = last_rendered_range
            .clone()
            .map_or(APPROXIMATE_VISIBLE_COUNT, |range| range.count());
-        let entries = self.entries.borrow();
        let entry_range = if self.selected_item == 0 {
-            0..min(visible_count, entries.len())
-        } else if self.selected_item == entries.len() - 1 {
-            entries.len().saturating_sub(visible_count)..entries.len()
+            0..min(visible_count, self.entries.len())
+        } else if self.selected_item == self.entries.len() - 1 {
+            self.entries.len().saturating_sub(visible_count)..self.entries.len()
        } else {
            last_rendered_range.map_or(0..0, |range| {
-                min(range.start, entries.len())..min(range.end, entries.len())
+                min(range.start, self.entries.len())..min(range.end, self.entries.len())
            })
        };

@@ -381,25 +386,24 @@ impl CompletionsMenu {
            entry_range.clone(),
            EXTRA_TO_RESOLVE,
            EXTRA_TO_RESOLVE,
-            entries.len(),
+            self.entries.len(),
        );

        // Avoid work by sometimes filtering out completions that already have documentation.
        // This filtering doesn't happen if the completions are currently being updated.
        let completions = self.completions.borrow();
        let candidate_ids = entry_indices
-            .flat_map(|i| Self::entry_candidate_id(&entries[i]))
+            .flat_map(|i| Self::entry_candidate_id(&self.entries[i]))
            .filter(|i| completions[*i].documentation.is_none());

        // Current selection is always resolved even if it already has documentation, to handle
        // out-of-spec language servers that return more results later.
-        let candidate_ids = match Self::entry_candidate_id(&entries[self.selected_item]) {
+        let candidate_ids = match Self::entry_candidate_id(&self.entries[self.selected_item]) {
            None => candidate_ids.collect::<Vec<usize>>(),
            Some(selected_candidate_id) => iter::once(selected_candidate_id)
                .chain(candidate_ids.filter(|id| *id != selected_candidate_id))
                .collect::<Vec<usize>>(),
        };
-        drop(entries);

        if candidate_ids.is_empty() {
            return;
@@ -428,7 +432,7 @@ impl CompletionsMenu {
    }

    pub fn visible(&self) -> bool {
-        !self.entries.borrow().is_empty()
+        !self.entries.is_empty()
    }

    fn origin(&self, cursor_position: DisplayPoint) -> ContextMenuOrigin {
@@ -445,7 +449,6 @@ impl CompletionsMenu {
        let show_completion_documentation = self.show_completion_documentation;
        let widest_completion_ix = self
            .entries
-            .borrow()
            .iter()
            .enumerate()
            .max_by_key(|(_, mat)| match mat {
@@ -462,38 +465,33 @@ impl CompletionsMenu {

                    len
                }
-                CompletionEntry::InlineCompletionHint(hint) => {
-                    "Zed AI / ".chars().count() + hint.label().chars().count()
-                }
+                CompletionEntry::InlineCompletionHint(InlineCompletionMenuHint {
+                    provider_name,
+                    ..
+                }) => provider_name.len(),
            })
            .map(|(ix, _)| ix);
        drop(completions);

        let selected_item = self.selected_item;
        let completions = self.completions.clone();
-        let entries = self.entries.clone();
+        let matches = self.entries.clone();
        let last_rendered_range = self.last_rendered_range.clone();
        let style = style.clone();
        let list = uniform_list(
            cx.view().clone(),
            "completions",
-            self.entries.borrow().len(),
+            matches.len(),
            move |_editor, range, cx| {
                last_rendered_range.borrow_mut().replace(range.clone());
                let start_ix = range.start;
                let completions_guard = completions.borrow_mut();

-                entries.borrow()[range]
+                matches[range]
                    .iter()
                    .enumerate()
                    .map(|(ix, mat)| {
                        let item_ix = start_ix + ix;
-                        let buffer_font = theme::ThemeSettings::get_global(cx).buffer_font.clone();
-                        let base_label = h_flex()
-                            .gap_1()
-                            .child(div().font(buffer_font.clone()).child("Zed AI"))
-                            .child(div().px_0p5().child("/").opacity(0.2));
-
                        match mat {
                            CompletionEntry::Match(mat) => {
                                let candidate_id = mat.candidate_id;
@@ -577,57 +575,20 @@ impl CompletionsMenu {
                                        .end_slot::<Label>(documentation_label),
                                )
                            }
-                            CompletionEntry::InlineCompletionHint(
-                                hint @ InlineCompletionMenuHint::None,
-                            ) => div().min_w(px(250.)).max_w(px(500.)).child(
+                            CompletionEntry::InlineCompletionHint(InlineCompletionMenuHint {
+                                provider_name,
+                                ..
+                            }) => div().min_w(px(250.)).max_w(px(500.)).child(
                                ListItem::new("inline-completion")
                                    .inset(true)
                                    .toggle_state(item_ix == selected_item)
                                    .start_slot(Icon::new(IconName::ZedPredict))
                                    .child(
-                                        base_label.child(
-                                            StyledText::new(hint.label())
-                                                .with_highlights(&style.text, None),
-                                        ),
-                                    ),
-                            ),
-                            CompletionEntry::InlineCompletionHint(
-                                hint @ InlineCompletionMenuHint::Loading,
-                            ) => div().min_w(px(250.)).max_w(px(500.)).child(
-                                ListItem::new("inline-completion")
-                                    .inset(true)
-                                    .toggle_state(item_ix == selected_item)
-                                    .start_slot(Icon::new(IconName::ZedPredict))
-                                    .child(base_label.child({
-                                        let text_style = style.text.clone();
-                                        StyledText::new(hint.label())
-                                            .with_highlights(&text_style, None)
-                                            .with_animation(
-                                                "pulsating-label",
-                                                Animation::new(Duration::from_secs(1))
-                                                    .repeat()
-                                                    .with_easing(pulsating_between(0.4, 0.8)),
-                                                move |text, delta| {
-                                                    let mut text_style = text_style.clone();
-                                                    text_style.color =
-                                                        text_style.color.opacity(delta);
-                                                    text.with_highlights(&text_style, None)
-                                                },
-                                            )
-                                    })),
-                            ),
-                            CompletionEntry::InlineCompletionHint(
-                                hint @ InlineCompletionMenuHint::Loaded { .. },
-                            ) => div().min_w(px(250.)).max_w(px(500.)).child(
-                                ListItem::new("inline-completion")
-                                    .inset(true)
-                                    .toggle_state(item_ix == selected_item)
-                                    .start_slot(Icon::new(IconName::ZedPredict))
-                                    .child(
-                                        base_label.child(
-                                            StyledText::new(hint.label())
-                                                .with_highlights(&style.text, None),
-                                        ),
+                                        StyledText::new(format!(
+                                            "{} Completion",
+                                            SharedString::new_static(provider_name)
+                                        ))
+                                        .with_highlights(&style.text, None),
                                    )
                                    .on_click(cx.listener(move |editor, _event, cx| {
                                        cx.stop_propagation();
@@ -662,7 +623,7 @@ impl CompletionsMenu {
            return None;
        }

-        let multiline_docs = match &self.entries.borrow()[self.selected_item] {
+        let multiline_docs = match &self.entries[self.selected_item] {
            CompletionEntry::Match(mat) => {
                match self.completions.borrow_mut()[mat.candidate_id]
                    .documentation
@@ -684,20 +645,19 @@ impl CompletionsMenu {
                    Documentation::Undocumented => return None,
                }
            }
-            CompletionEntry::InlineCompletionHint(InlineCompletionMenuHint::Loaded { text }) => {
-                match text {
-                    InlineCompletionText::Edit { text, highlights } => div()
-                        .mx_1()
-                        .rounded_md()
-                        .bg(cx.theme().colors().editor_background)
-                        .child(
-                            gpui::StyledText::new(text.clone())
-                                .with_highlights(&style.text, highlights.clone()),
-                        ),
-                    InlineCompletionText::Move(text) => div().child(text.clone()),
-                }
-            }
-            CompletionEntry::InlineCompletionHint(_) => return None,
+            CompletionEntry::InlineCompletionHint(hint) => match &hint.text {
+                InlineCompletionText::Edit { text, highlights } => div()
+                    .mx_1()
+                    .rounded(px(6.))
+                    .bg(cx.theme().colors().editor_background)
+                    .border_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .child(
+                        gpui::StyledText::new(text.clone())
+                            .with_highlights(&style.text, highlights.clone()),
+                    ),
+                InlineCompletionText::Move(text) => div().child(text.clone()),
+            },
        };

        Some(
@@ -809,14 +769,12 @@ impl CompletionsMenu {
        }
        drop(completions);

-        let mut entries = self.entries.borrow_mut();
-        if let Some(CompletionEntry::InlineCompletionHint(_)) = entries.first() {
-            entries.truncate(1);
-        } else {
-            entries.truncate(0);
+        let mut new_entries: Vec<_> = matches.into_iter().map(CompletionEntry::Match).collect();
+        if let Some(CompletionEntry::InlineCompletionHint(hint)) = self.entries.first() {
+            new_entries.insert(0, CompletionEntry::InlineCompletionHint(hint.clone()));
        }
-        entries.extend(matches.into_iter().map(CompletionEntry::Match));

+        self.entries = new_entries.into();
        self.selected_item = 0;
    }
 }
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -42,7 +42,7 @@ use fold_map::{FoldMap, FoldSnapshot};
 use gpui::{
    AnyElement, Font, HighlightStyle, LineLayout, Model, ModelContext, Pixels, UnderlineStyle,
 };
-pub use inlay_map::Inlay;
+pub(crate) use inlay_map::Inlay;
 use inlay_map::{InlayMap, InlaySnapshot};
 pub use inlay_map::{InlayOffset, InlayPoint};
 use invisibles::{is_invisible, replacement};
--- a/crates/editor/src/display_map/inlay_map.rs
+++ b/crates/editor/src/display_map/inlay_map.rs
@@ -33,7 +33,7 @@ enum Transform {
 }

 #[derive(Debug, Clone)]
-pub struct Inlay {
+pub(crate) struct Inlay {
    pub(crate) id: InlayId,
    pub position: Anchor,
    pub text: text::Rope,
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -109,7 +109,7 @@ pub use proposed_changes_editor::{
    ProposedChangeLocation, ProposedChangesEditor, ProposedChangesEditorToolbar,
 };
 use similar::{ChangeTag, TextDiff};
-use std::iter::Peekable;
+use std::iter::{self, Peekable};
 use task::{ResolvedTask, TaskTemplate, TaskVariables};

 use hover_links::{find_file, HoverLink, HoveredLinkState, InlayHighlight};
@@ -258,7 +258,7 @@ pub fn render_parsed_markdown(
 }

 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub enum InlayId {
+pub(crate) enum InlayId {
    InlineCompletion(usize),
    Hint(usize),
 }
@@ -459,21 +459,9 @@ pub fn make_suggestion_styles(cx: &WindowContext) -> InlineCompletionStyles {
 type CompletionId = usize;

 #[derive(Debug, Clone)]
-enum InlineCompletionMenuHint {
-    Loading,
-    Loaded { text: InlineCompletionText },
-    None,
-}
-
-impl InlineCompletionMenuHint {
-    pub fn label(&self) -> &'static str {
-        match self {
-            InlineCompletionMenuHint::Loading | InlineCompletionMenuHint::Loaded { .. } => {
-                "Edit Prediction"
-            }
-            InlineCompletionMenuHint::None => "No Prediction",
-        }
-    }
+struct InlineCompletionMenuHint {
+    provider_name: &'static str,
+    text: InlineCompletionText,
 }

 #[derive(Clone, Debug)]
@@ -1739,12 +1727,8 @@ impl Editor {
        self.input_enabled = input_enabled;
    }

-    pub fn set_inline_completions_enabled(&mut self, enabled: bool, cx: &mut ViewContext<Self>) {
+    pub fn set_inline_completions_enabled(&mut self, enabled: bool) {
        self.enable_inline_completions = enabled;
-        if !self.enable_inline_completions {
-            self.take_active_inline_completion(cx);
-            cx.notify();
-        }
    }

    pub fn set_autoindent(&mut self, autoindent: bool) {
@@ -1803,17 +1787,6 @@ impl Editor {
        self.refresh_inline_completion(false, true, cx);
    }

-    pub fn inline_completions_enabled(&self, cx: &AppContext) -> bool {
-        let cursor = self.selections.newest_anchor().head();
-        if let Some((buffer, buffer_position)) =
-            self.buffer.read(cx).text_anchor_for_position(cursor, cx)
-        {
-            self.should_show_inline_completions(&buffer, buffer_position, cx)
-        } else {
-            false
-        }
-    }
-
    fn should_show_inline_completions(
        &self,
        buffer: &Model<Buffer>,
@@ -3577,8 +3550,7 @@ impl Editor {
        );
        let multi_buffer_visible_range = multi_buffer_visible_start..multi_buffer_visible_end;
        multi_buffer_snapshot
-            .range_to_buffer_ranges(multi_buffer_visible_range)
-            .into_iter()
+            .disjoint_ranges_to_buffer_ranges(iter::once(multi_buffer_visible_range))
            .filter(|(_, excerpt_visible_range)| !excerpt_visible_range.is_empty())
            .filter_map(|(excerpt, excerpt_visible_range)| {
                let buffer_file = project::File::from_dyn(excerpt.buffer().file())?;
@@ -3619,7 +3591,7 @@ impl Editor {
        }
    }

-    pub fn splice_inlays(
+    fn splice_inlays(
        &self,
        to_remove: Vec<InlayId>,
        to_insert: Vec<Inlay>,
@@ -3835,26 +3807,6 @@ impl Editor {
    ) -> Option<Task<std::result::Result<(), anyhow::Error>>> {
        use language::ToOffset as _;

-        {
-            let context_menu = self.context_menu.borrow();
-            if let CodeContextMenu::Completions(menu) = context_menu.as_ref()? {
-                let entries = menu.entries.borrow();
-                let entry = entries.get(item_ix.unwrap_or(menu.selected_item));
-                match entry {
-                    Some(CompletionEntry::InlineCompletionHint(
-                        InlineCompletionMenuHint::Loading,
-                    )) => return Some(Task::ready(Ok(()))),
-                    Some(CompletionEntry::InlineCompletionHint(InlineCompletionMenuHint::None)) => {
-                        drop(entries);
-                        drop(context_menu);
-                        self.context_menu_next(&Default::default(), cx);
-                        return Some(Task::ready(Ok(())));
-                    }
-                    _ => {}
-                }
-            }
-        }
-
        let completions_menu =
            if let CodeContextMenu::Completions(menu) = self.hide_context_menu(cx)? {
                menu
@@ -3862,10 +3814,12 @@ impl Editor {
                return None;
            };

-        let entries = completions_menu.entries.borrow();
-        let mat = entries.get(item_ix.unwrap_or(completions_menu.selected_item))?;
+        let mat = completions_menu
+            .entries
+            .get(item_ix.unwrap_or(completions_menu.selected_item))?;
+
        let mat = match mat {
-            CompletionEntry::InlineCompletionHint(_) => {
+            CompletionEntry::InlineCompletionHint { .. } => {
                self.accept_inline_completion(&AcceptInlineCompletion, cx);
                cx.stop_propagation();
                return Some(Task::ready(Ok(())));
@@ -3877,14 +3831,12 @@ impl Editor {
                mat
            }
        };
-        let candidate_id = mat.candidate_id;
-        drop(entries);

        let buffer_handle = completions_menu.buffer;
        let completion = completions_menu
            .completions
            .borrow()
-            .get(candidate_id)?
+            .get(mat.candidate_id)?
            .clone();
        cx.stop_propagation();

@@ -4033,7 +3985,7 @@ impl Editor {
        let apply_edits = provider.apply_additional_edits_for_completion(
            buffer_handle,
            completions_menu.completions.clone(),
-            candidate_id,
+            mat.candidate_id,
            true,
            cx,
        );
@@ -4330,29 +4282,15 @@ impl Editor {
        self.available_code_actions.take();
    }

-    pub fn add_code_action_provider(
+    pub fn push_code_action_provider(
        &mut self,
        provider: Rc<dyn CodeActionProvider>,
        cx: &mut ViewContext<Self>,
    ) {
-        if self
-            .code_action_providers
-            .iter()
-            .any(|existing_provider| existing_provider.id() == provider.id())
-        {
-            return;
-        }
-
        self.code_action_providers.push(provider);
        self.refresh_code_actions(cx);
    }

-    pub fn remove_code_action_provider(&mut self, id: Arc<str>, cx: &mut ViewContext<Self>) {
-        self.code_action_providers
-            .retain(|provider| provider.id() != id);
-        self.refresh_code_actions(cx);
-    }
-
    fn refresh_code_actions(&mut self, cx: &mut ViewContext<Self>) -> Option<()> {
        let buffer = self.buffer.read(cx);
        let newest_selection = self.selections.newest_anchor().clone();
@@ -4542,8 +4480,7 @@ impl Editor {
        if !user_requested
            && (!self.enable_inline_completions
                || !self.should_show_inline_completions(&buffer, cursor_buffer_position, cx)
-                || !self.is_focused(cx)
-                || buffer.read(cx).is_empty())
+                || !self.is_focused(cx))
        {
            self.discard_inline_completion(false, cx);
            return None;
@@ -4633,23 +4570,6 @@ impl Editor {
        _: &AcceptInlineCompletion,
        cx: &mut ViewContext<Self>,
    ) {
-        let buffer = self.buffer.read(cx);
-        let snapshot = buffer.snapshot(cx);
-        let selection = self.selections.newest_adjusted(cx);
-        let cursor = selection.head();
-        let current_indent = snapshot.indent_size_for_line(MultiBufferRow(cursor.row));
-        let suggested_indents = snapshot.suggested_indents([cursor.row], cx);
-        if let Some(suggested_indent) = suggested_indents.get(&MultiBufferRow(cursor.row)).copied()
-        {
-            if cursor.column < suggested_indent.len
-                && cursor.column <= current_indent.len
-                && current_indent.len <= suggested_indent.len
-            {
-                self.tab(&Default::default(), cx);
-                return;
-            }
-        }
-
        if self.show_inline_completions_in_menu(cx) {
            self.hide_context_menu(cx);
        }
@@ -4813,7 +4733,6 @@ impl Editor {
                || (!self.completion_tasks.is_empty() && !self.has_active_inline_completion()));
        if completions_menu_has_precedence
            || !offset_selection.is_empty()
-            || !self.enable_inline_completions
            || self
                .active_inline_completion
                .as_ref()
@@ -4936,8 +4855,8 @@ impl Editor {
        &mut self,
        cx: &mut ViewContext<Self>,
    ) -> Option<InlineCompletionMenuHint> {
-        let provider = self.inline_completion_provider()?;
        if self.has_active_inline_completion() {
+            let provider_name = self.inline_completion_provider()?.display_name();
            let editor_snapshot = self.snapshot(cx);

            let text = match &self.active_inline_completion.as_ref()?.completion {
@@ -4954,15 +4873,16 @@ impl Editor {
                }
            };

-            Some(InlineCompletionMenuHint::Loaded { text })
-        } else if provider.is_refreshing(cx) {
-            Some(InlineCompletionMenuHint::Loading)
+            Some(InlineCompletionMenuHint {
+                provider_name,
+                text,
+            })
        } else {
-            Some(InlineCompletionMenuHint::None)
+            None
        }
    }

-    pub fn inline_completion_provider(&self) -> Option<Arc<dyn InlineCompletionProviderHandle>> {
+    fn inline_completion_provider(&self) -> Option<Arc<dyn InlineCompletionProviderHandle>> {
        Some(self.inline_completion_provider.as_ref()?.provider.clone())
    }

@@ -5189,11 +5109,9 @@ impl Editor {
            .borrow()
            .as_ref()
            .map_or(false, |menu| match menu {
-                CodeContextMenu::Completions(menu) => {
-                    menu.entries.borrow().first().map_or(false, |entry| {
-                        matches!(entry, CompletionEntry::InlineCompletionHint(_))
-                    })
-                }
+                CodeContextMenu::Completions(menu) => menu.entries.first().map_or(false, |entry| {
+                    matches!(entry, CompletionEntry::InlineCompletionHint(_))
+                }),
                CodeContextMenu::CodeActions(_) => false,
            })
    }
@@ -5932,7 +5850,7 @@ impl Editor {
        });
    }

-    pub fn join_lines_impl(&mut self, insert_whitespace: bool, cx: &mut ViewContext<Self>) {
+    pub fn join_lines(&mut self, _: &JoinLines, cx: &mut ViewContext<Self>) {
        if self.read_only(cx) {
            return;
        }
@@ -5974,12 +5892,11 @@ impl Editor {
                    let indent = snapshot.indent_size_for_line(next_line_row);
                    let start_of_next_line = Point::new(next_line_row.0, indent.len);

-                    let replace =
-                        if snapshot.line_len(next_line_row) > indent.len && insert_whitespace {
-                            " "
-                        } else {
-                            ""
-                        };
+                    let replace = if snapshot.line_len(next_line_row) > indent.len {
+                        " "
+                    } else {
+                        ""
+                    };

                    this.buffer.update(cx, |buffer, cx| {
                        buffer.edit([(end_of_line..start_of_next_line, replace)], None, cx)
@@ -5993,10 +5910,6 @@ impl Editor {
        });
    }

-    pub fn join_lines(&mut self, _: &JoinLines, cx: &mut ViewContext<Self>) {
-        self.join_lines_impl(true, cx);
-    }
-
    pub fn sort_lines_case_sensitive(
        &mut self,
        _: &SortLinesCaseSensitive,
@@ -9195,18 +9108,15 @@ impl Editor {
        };

        self.buffer.update(cx, |buffer, cx| {
-            let snapshot = buffer.snapshot(cx);
-            let mut excerpt_ids = selections
-                .iter()
-                .flat_map(|selection| {
-                    snapshot
-                        .excerpts_for_range(selection.range())
-                        .map(|excerpt| excerpt.id())
-                })
-                .collect::<Vec<_>>();
-            excerpt_ids.sort();
-            excerpt_ids.dedup();
-            buffer.expand_excerpts(excerpt_ids, lines, direction, cx)
+            buffer.expand_excerpts(
+                selections
+                    .iter()
+                    .map(|selection| selection.head().excerpt_id)
+                    .dedup(),
+                lines,
+                direction,
+                cx,
+            )
        })
    }

@@ -9592,7 +9502,7 @@ impl Editor {
        url_finder.detach();
    }

-    pub fn open_selected_filename(&mut self, _: &OpenSelectedFilename, cx: &mut ViewContext<Self>) {
+    pub fn open_file(&mut self, _: &OpenFile, cx: &mut ViewContext<Self>) {
        let Some(workspace) = self.workspace() else {
            return;
        };
@@ -10587,13 +10497,13 @@ impl Editor {
        } else {
            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
            let mut toggled_buffers = HashSet::default();
-            for (_, buffer_snapshot, _) in multi_buffer_snapshot.excerpts_in_ranges(
+            for (excerpt, _) in multi_buffer_snapshot.disjoint_ranges_to_buffer_ranges(
                self.selections
                    .disjoint_anchors()
                    .into_iter()
                    .map(|selection| selection.range()),
            ) {
-                let buffer_id = buffer_snapshot.remote_id();
+                let buffer_id = excerpt.buffer().remote_id();
                if toggled_buffers.insert(buffer_id) {
                    if self.buffer_folded(buffer_id, cx) {
                        self.unfold_buffer(buffer_id, cx);
@@ -10673,13 +10583,13 @@ impl Editor {
        } else {
            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
            let mut folded_buffers = HashSet::default();
-            for (_, buffer_snapshot, _) in multi_buffer_snapshot.excerpts_in_ranges(
+            for (excerpt, _) in multi_buffer_snapshot.disjoint_ranges_to_buffer_ranges(
                self.selections
                    .disjoint_anchors()
                    .into_iter()
                    .map(|selection| selection.range()),
            ) {
-                let buffer_id = buffer_snapshot.remote_id();
+                let buffer_id = excerpt.buffer().remote_id();
                if folded_buffers.insert(buffer_id) {
                    self.fold_buffer(buffer_id, cx);
                }
@@ -10839,13 +10749,13 @@ impl Editor {
        } else {
            let multi_buffer_snapshot = self.buffer.read(cx).snapshot(cx);
            let mut unfolded_buffers = HashSet::default();
-            for (_, buffer_snapshot, _) in multi_buffer_snapshot.excerpts_in_ranges(
+            for (excerpt, _) in multi_buffer_snapshot.disjoint_ranges_to_buffer_ranges(
                self.selections
                    .disjoint_anchors()
                    .into_iter()
                    .map(|selection| selection.range()),
            ) {
-                let buffer_id = buffer_snapshot.remote_id();
+                let buffer_id = excerpt.buffer().remote_id();
                if unfolded_buffers.insert(buffer_id) {
                    self.unfold_buffer(buffer_id, cx);
                }
@@ -11589,36 +11499,36 @@ impl Editor {
    }

    fn get_permalink_to_line(&mut self, cx: &mut ViewContext<Self>) -> Task<Result<url::Url>> {
-        let buffer_and_selection = maybe!({
-            let selection = self.selections.newest::<Point>(cx);
+        let buffer_and_selection_rows = maybe!({
+            let multi_buffer = self.buffer().read(cx);
+            let multi_buffer_snapshot = multi_buffer.snapshot(cx);
+            let selection = self.selections.newest_anchor();
            let selection_range = selection.range();

-            let (buffer, selection) = if let Some(buffer) = self.buffer().read(cx).as_singleton() {
-                (buffer, selection_range.start.row..selection_range.end.row)
+            let (buffer, selection_rows) = if let Some(buffer) = multi_buffer.as_singleton() {
+                (
+                    buffer,
+                    selection_range.start.to_point(&multi_buffer_snapshot).row
+                        ..selection_range.end.to_point(&multi_buffer_snapshot).row,
+                )
            } else {
-                let multi_buffer = self.buffer().read(cx);
-                let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-                let buffer_ranges = multi_buffer_snapshot.range_to_buffer_ranges(selection_range);
-
-                let (excerpt, range) = if selection.reversed {
-                    buffer_ranges.first()
-                } else {
-                    buffer_ranges.last()
-                }?;
-
+                let selection_head = selection.head();
+                let excerpt =
+                    multi_buffer_snapshot.excerpt_containing(selection_head..selection_head)?;
+                let range =
+                    excerpt.map_range_to_buffer(selection_range.to_offset(&multi_buffer_snapshot));
                let snapshot = excerpt.buffer();
-                let selection = text::ToPoint::to_point(&range.start, &snapshot).row
-                    ..text::ToPoint::to_point(&range.end, &snapshot).row;
                (
                    multi_buffer.buffer(excerpt.buffer_id()).unwrap().clone(),
-                    selection,
+                    text::ToPoint::to_point(&range.start, &snapshot).row
+                        ..text::ToPoint::to_point(&range.end, &snapshot).row,
                )
            };

-            Some((buffer, selection))
+            Some((buffer, selection_rows))
        });

-        let Some((buffer, selection)) = buffer_and_selection else {
+        let Some((buffer, selection_rows)) = buffer_and_selection_rows else {
            return Task::ready(Err(anyhow!("failed to determine buffer and selection")));
        };

@@ -11627,7 +11537,7 @@ impl Editor {
        };

        project.update(cx, |project, cx| {
-            project.get_permalink_to_line(&buffer, selection, cx)
+            project.get_permalink_to_line(&buffer, selection_rows, cx)
        })
    }

@@ -13610,8 +13520,6 @@ pub trait CompletionProvider {
 }

 pub trait CodeActionProvider {
-    fn id(&self) -> Arc<str>;
-
    fn code_actions(
        &self,
        buffer: &Model<Buffer>,
@@ -13630,10 +13538,6 @@ pub trait CodeActionProvider {
 }

 impl CodeActionProvider for Model<Project> {
-    fn id(&self) -> Arc<str> {
-        "project".into()
-    }
-
    fn code_actions(
        &self,
        buffer: &Model<Buffer>,
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -5962,8 +5962,8 @@ async fn test_autoclose_with_embedded_language(cx: &mut gpui::TestAppContext) {
        .with_injection_query(
            r#"
            (script_element
-                (raw_text) @injection.content
-                (#set! injection.language "javascript"))
+                (raw_text) @content
+                (#set! "language" "javascript"))
            "#,
        )
        .unwrap(),
@@ -8473,7 +8473,7 @@ async fn test_completion_page_up_down_keys(cx: &mut gpui::TestAppContext) {
    cx.update_editor(|editor, _| {
        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
        {
-            assert_eq!(completion_menu_entries(&menu), &["first", "last"]);
+            assert_eq!(completion_menu_entries(&menu.entries), &["first", "last"]);
        } else {
            panic!("expected completion menu to be open");
        }
@@ -8566,7 +8566,7 @@ async fn test_completion_sort(cx: &mut gpui::TestAppContext) {
        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
        {
            assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(&menu.entries),
                &["r", "ret", "Range", "return"]
            );
        } else {
@@ -9068,8 +9068,8 @@ async fn test_toggle_block_comment(cx: &mut gpui::TestAppContext) {
        .with_injection_query(
            r#"
            (script_element
-                (raw_text) @injection.content
-                (#set! injection.language "javascript"))
+                (raw_text) @content
+                (#set! "language" "javascript"))
            "#,
        )
        .unwrap(),
@@ -11080,7 +11080,6 @@ async fn test_completions_default_resolve_data_handling(cx: &mut gpui::TestAppCo
                assert_eq!(
                    completions_menu
                        .entries
-                        .borrow()
                        .iter()
                        .flat_map(|c| match c {
                            CompletionEntry::Match(mat) => Some(mat.string.clone()),
@@ -11191,7 +11190,7 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
        {
            assert_eq!(
-                completion_menu_entries(&menu),
+                completion_menu_entries(&menu.entries),
                &["bg-red", "bg-blue", "bg-yellow"]
            );
        } else {
@@ -11204,7 +11203,10 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
    cx.update_editor(|editor, _| {
        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
        {
-            assert_eq!(completion_menu_entries(&menu), &["bg-blue", "bg-yellow"]);
+            assert_eq!(
+                completion_menu_entries(&menu.entries),
+                &["bg-blue", "bg-yellow"]
+            );
        } else {
            panic!("expected completion menu to be open");
        }
@@ -11218,19 +11220,18 @@ async fn test_completions_in_languages_with_extra_word_characters(cx: &mut gpui:
    cx.update_editor(|editor, _| {
        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
        {
-            assert_eq!(completion_menu_entries(&menu), &["bg-yellow"]);
+            assert_eq!(completion_menu_entries(&menu.entries), &["bg-yellow"]);
        } else {
            panic!("expected completion menu to be open");
        }
    });
 }

-fn completion_menu_entries(menu: &CompletionsMenu) -> Vec<String> {
-    let entries = menu.entries.borrow();
+fn completion_menu_entries(entries: &[CompletionEntry]) -> Vec<&str> {
    entries
        .iter()
        .flat_map(|e| match e {
-            CompletionEntry::Match(mat) => Some(mat.string.clone()),
+            CompletionEntry::Match(mat) => Some(mat.string.as_str()),
            _ => None,
        })
        .collect()
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -342,7 +342,7 @@ impl EditorElement {
                .detach_and_log_err(cx);
        });
        register_action(view, cx, Editor::open_url);
-        register_action(view, cx, Editor::open_selected_filename);
+        register_action(view, cx, Editor::open_file);
        register_action(view, cx, Editor::fold);
        register_action(view, cx, Editor::fold_at_level);
        register_action(view, cx, Editor::fold_all);
@@ -543,29 +543,8 @@ impl EditorElement {
                        // and run the selection logic.
                        modifiers.alt = false;
                    } else {
-                        let scroll_position_row =
-                            position_map.scroll_pixel_position.y / position_map.line_height;
-                        let display_row = (((event.position - gutter_hitbox.bounds.origin).y
-                            + position_map.scroll_pixel_position.y)
-                            / position_map.line_height)
-                            as u32;
-                        let multi_buffer_row = position_map
-                            .snapshot
-                            .display_point_to_point(
-                                DisplayPoint::new(DisplayRow(display_row), 0),
-                                Bias::Right,
-                            )
-                            .row;
-                        let line_offset_from_top = display_row - scroll_position_row as u32;
                        // if double click is made without alt, open the corresponding excerp
-                        editor.open_excerpts_common(
-                            Some(JumpData::MultiBufferRow {
-                                row: MultiBufferRow(multi_buffer_row),
-                                line_offset_from_top,
-                            }),
-                            false,
-                            cx,
-                        );
+                        editor.open_excerpts(&OpenExcerpts, cx);
                        return;
                    }
                }
@@ -5599,21 +5578,21 @@ impl LineWithInvisibles {
                                    });
                                }
                            } else {
-                                invisibles.extend(line_chunk.char_indices().filter_map(
-                                    |(index, c)| {
-                                        let is_whitespace = c.is_whitespace();
-                                        non_whitespace_added |= !is_whitespace;
-                                        if is_whitespace
-                                            && (non_whitespace_added || !is_soft_wrapped)
-                                        {
-                                            Some(Invisible::Whitespace {
-                                                line_offset: line.len() + index,
-                                            })
-                                        } else {
-                                            None
-                                        }
-                                    },
-                                ))
+                                invisibles.extend(
+                                    line_chunk
+                                        .bytes()
+                                        .enumerate()
+                                        .filter(|(_, line_byte)| {
+                                            let is_whitespace =
+                                                (*line_byte as char).is_whitespace();
+                                            non_whitespace_added |= !is_whitespace;
+                                            is_whitespace
+                                                && (non_whitespace_added || !is_soft_wrapped)
+                                        })
+                                        .map(|(whitespace_index, _)| Invisible::Whitespace {
+                                            line_offset: line.len() + whitespace_index,
+                                        }),
+                                )
                            }
                        }

--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -11,11 +11,11 @@ use gpui::{
    StyleRefinement, Styled, Task, TextStyleRefinement, View, ViewContext,
 };
 use itertools::Itertools;
-use language::{DiagnosticEntry, Language, LanguageRegistry};
+use language::{Diagnostic, DiagnosticEntry, Language, LanguageRegistry};
 use lsp::DiagnosticSeverity;
 use markdown::{Markdown, MarkdownStyle};
 use multi_buffer::ToOffset;
-use project::{HoverBlock, HoverBlockKind, InlayHintLabelPart};
+use project::{HoverBlock, InlayHintLabelPart};
 use settings::Settings;
 use std::rc::Rc;
 use std::{borrow::Cow, cell::RefCell};
@@ -263,14 +263,50 @@ fn show_hover(
                delay.await;
            }

-            let local_diagnostic = snapshot
+            let local_diagnostic = if let Some(invisible) = snapshot
                .buffer_snapshot
-                .diagnostics_in_range(anchor..anchor, false)
-                // Find the entry with the most specific range
-                .min_by_key(|entry| {
-                    let range = entry.range.to_offset(&snapshot.buffer_snapshot);
-                    range.end - range.start
-                });
+                .chars_at(anchor)
+                .next()
+                .filter(|&c| is_invisible(c))
+            {
+                let after = snapshot.buffer_snapshot.anchor_after(
+                    anchor.to_offset(&snapshot.buffer_snapshot) + invisible.len_utf8(),
+                );
+                Some(DiagnosticEntry {
+                    diagnostic: Diagnostic {
+                        severity: DiagnosticSeverity::HINT,
+                        message: format!("Unicode character U+{:02X}", invisible as u32),
+                        ..Default::default()
+                    },
+                    range: anchor..after,
+                })
+            } else if let Some(invisible) = snapshot
+                .buffer_snapshot
+                .reversed_chars_at(anchor)
+                .next()
+                .filter(|&c| is_invisible(c))
+            {
+                let before = snapshot.buffer_snapshot.anchor_before(
+                    anchor.to_offset(&snapshot.buffer_snapshot) - invisible.len_utf8(),
+                );
+                Some(DiagnosticEntry {
+                    diagnostic: Diagnostic {
+                        severity: DiagnosticSeverity::HINT,
+                        message: format!("Unicode character U+{:02X}", invisible as u32),
+                        ..Default::default()
+                    },
+                    range: before..anchor,
+                })
+            } else {
+                snapshot
+                    .buffer_snapshot
+                    .diagnostics_in_range(anchor..anchor, false)
+                    // Find the entry with the most specific range
+                    .min_by_key(|entry| {
+                        let range = entry.range.to_offset(&snapshot.buffer_snapshot);
+                        range.end - range.start
+                    })
+            };

            let diagnostic_popover = if let Some(local_diagnostic) = local_diagnostic {
                let text = match local_diagnostic.diagnostic.source {
@@ -353,31 +389,6 @@ fn show_hover(
                this.hover_state.diagnostic_popover = diagnostic_popover;
            })?;

-            let invisible_char = if let Some(invisible) = snapshot
-                .buffer_snapshot
-                .chars_at(anchor)
-                .next()
-                .filter(|&c| is_invisible(c))
-            {
-                let after = snapshot.buffer_snapshot.anchor_after(
-                    anchor.to_offset(&snapshot.buffer_snapshot) + invisible.len_utf8(),
-                );
-                Some((invisible, anchor..after))
-            } else if let Some(invisible) = snapshot
-                .buffer_snapshot
-                .reversed_chars_at(anchor)
-                .next()
-                .filter(|&c| is_invisible(c))
-            {
-                let before = snapshot.buffer_snapshot.anchor_before(
-                    anchor.to_offset(&snapshot.buffer_snapshot) - invisible.len_utf8(),
-                );
-
-                Some((invisible, before..anchor))
-            } else {
-                None
-            };
-
            let hovers_response = if let Some(hover_request) = hover_request {
                hover_request.await
            } else {
@@ -385,26 +396,8 @@ fn show_hover(
            };
            let snapshot = this.update(&mut cx, |this, cx| this.snapshot(cx))?;
            let mut hover_highlights = Vec::with_capacity(hovers_response.len());
-            let mut info_popovers = Vec::with_capacity(
-                hovers_response.len() + if invisible_char.is_some() { 1 } else { 0 },
-            );
-
-            if let Some((invisible, range)) = invisible_char {
-                let blocks = vec![HoverBlock {
-                    text: format!("Unicode character U+{:02X}", invisible as u32),
-                    kind: HoverBlockKind::PlainText,
-                }];
-                let parsed_content = parse_blocks(&blocks, &language_registry, None, &mut cx).await;
-                let scroll_handle = ScrollHandle::new();
-                info_popovers.push(InfoPopover {
-                    symbol_range: RangeInEditor::Text(range),
-                    parsed_content,
-                    scrollbar_state: ScrollbarState::new(scroll_handle.clone()),
-                    scroll_handle,
-                    keyboard_grace: Rc::new(RefCell::new(ignore_timeout)),
-                    anchor: Some(anchor),
-                })
-            }
+            let mut info_popovers = Vec::with_capacity(hovers_response.len());
+            let mut info_popover_tasks = Vec::with_capacity(hovers_response.len());

            for hover_result in hovers_response {
                // Create symbol range of anchors for highlighting and filtering of future requests.
@@ -417,6 +410,7 @@ fn show_hover(
                        let end = snapshot
                            .buffer_snapshot
                            .anchor_in_excerpt(excerpt_id, range.end)?;
+
                        Some(start..end)
                    })
                    .or_else(|| {
@@ -434,15 +428,21 @@ fn show_hover(
                let parsed_content =
                    parse_blocks(&blocks, &language_registry, language, &mut cx).await;
                let scroll_handle = ScrollHandle::new();
-                hover_highlights.push(range.clone());
-                info_popovers.push(InfoPopover {
-                    symbol_range: RangeInEditor::Text(range),
-                    parsed_content,
-                    scrollbar_state: ScrollbarState::new(scroll_handle.clone()),
-                    scroll_handle,
-                    keyboard_grace: Rc::new(RefCell::new(ignore_timeout)),
-                    anchor: Some(anchor),
-                });
+                info_popover_tasks.push((
+                    range.clone(),
+                    InfoPopover {
+                        symbol_range: RangeInEditor::Text(range),
+                        parsed_content,
+                        scrollbar_state: ScrollbarState::new(scroll_handle.clone()),
+                        scroll_handle,
+                        keyboard_grace: Rc::new(RefCell::new(ignore_timeout)),
+                        anchor: Some(anchor),
+                    },
+                ));
+            }
+            for (highlight_range, info_popover) in info_popover_tasks {
+                hover_highlights.push(highlight_range);
+                info_popovers.push(info_popover);
            }

            this.update(&mut cx, |editor, cx| {
@@ -732,7 +732,6 @@ impl InfoPopover {
        cx.notify();
        self.scroll_handle.set_offset(current);
    }
-
    fn render_vertical_scrollbar(&self, cx: &mut ViewContext<Editor>) -> Stateful<Div> {
        div()
            .occlude()
--- a/crates/editor/src/hunk_diff.rs
+++ b/crates/editor/src/hunk_diff.rs
@@ -458,10 +458,7 @@ impl Editor {
    ) -> Option<()> {
        let multi_buffer = self.buffer.read(cx);
        let multi_buffer_snapshot = multi_buffer.snapshot(cx);
-        let (excerpt, range) = multi_buffer_snapshot
-            .range_to_buffer_ranges(range)
-            .into_iter()
-            .next()?;
+        let (excerpt, range) = multi_buffer_snapshot.range_to_buffer_ranges(range).next()?;

        multi_buffer
            .buffer(excerpt.buffer_id())
--- a/crates/editor/src/inline_completion_tests.rs
+++ b/crates/editor/src/inline_completion_tests.rs
@@ -1,9 +1,8 @@
 use gpui::{prelude::*, Model};
 use indoc::indoc;
 use inline_completion::InlineCompletionProvider;
-use language::{Language, LanguageConfig};
 use multi_buffer::{Anchor, MultiBufferSnapshot, ToPoint};
-use std::{num::NonZeroU32, ops::Range, sync::Arc};
+use std::ops::Range;
 use text::{Point, ToOffset};

 use crate::{
@@ -123,54 +122,6 @@ async fn test_inline_completion_jump_button(cx: &mut gpui::TestAppContext) {
    "});
 }

-#[gpui::test]
-async fn test_indentation(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |settings| {
-        settings.defaults.tab_size = NonZeroU32::new(4)
-    });
-
-    let language = Arc::new(
-        Language::new(
-            LanguageConfig::default(),
-            Some(tree_sitter_rust::LANGUAGE.into()),
-        )
-        .with_indents_query(r#"(_ "(" ")" @end) @indent"#)
-        .unwrap(),
-    );
-
-    let mut cx = EditorTestContext::new(cx).await;
-    cx.update_buffer(|buffer, cx| buffer.set_language(Some(language), cx));
-    let provider = cx.new_model(|_| FakeInlineCompletionProvider::default());
-    assign_editor_completion_provider(provider.clone(), &mut cx);
-
-    cx.set_state(indoc! {"
-        const a: A = (
-        ˇ
-        );
-    "});
-
-    propose_edits(
-        &provider,
-        vec![(Point::new(1, 0)..Point::new(1, 0), "    const function()")],
-        &mut cx,
-    );
-    cx.update_editor(|editor, cx| editor.update_visible_inline_completion(cx));
-
-    assert_editor_active_edit_completion(&mut cx, |_, edits| {
-        assert_eq!(edits.len(), 1);
-        assert_eq!(edits[0].1.as_str(), "    const function()");
-    });
-
-    // When the cursor is before the suggested indentation level, accepting a
-    // completion should just indent.
-    accept_completion(&mut cx);
-    cx.assert_editor_state(indoc! {"
-        const a: A = (
-            ˇ
-        );
-    "});
-}
-
 #[gpui::test]
 async fn test_inline_completion_invalidation_range(cx: &mut gpui::TestAppContext) {
    init_test(cx, |_| {});
@@ -374,10 +325,6 @@ impl InlineCompletionProvider for FakeInlineCompletionProvider {
        false
    }

-    fn show_completions_in_normal_mode() -> bool {
-        false
-    }
-
    fn is_enabled(
        &self,
        _buffer: &gpui::Model<language::Buffer>,
@@ -387,10 +334,6 @@ impl InlineCompletionProvider for FakeInlineCompletionProvider {
        true
    }

-    fn is_refreshing(&self) -> bool {
-        false
-    }
-
    fn refresh(
        &mut self,
        _buffer: gpui::Model<language::Buffer>,
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -1468,10 +1468,11 @@ impl SearchableItem for Editor {
                    search_within_ranges
                };

-                for (excerpt_id, search_buffer, search_range) in
-                    buffer.excerpts_in_ranges(search_within_ranges)
+                for (excerpt, search_range) in
+                    buffer.disjoint_ranges_to_buffer_ranges(search_within_ranges)
                {
                    if !search_range.is_empty() {
+                        let search_buffer = excerpt.buffer();
                        ranges.extend(
                            query
                                .search(search_buffer, Some(search_range.clone()))
@@ -1482,8 +1483,8 @@ impl SearchableItem for Editor {
                                        .anchor_after(search_range.start + match_range.start);
                                    let end = search_buffer
                                        .anchor_before(search_range.start + match_range.end);
-                                    buffer.anchor_in_excerpt(excerpt_id, start).unwrap()
-                                        ..buffer.anchor_in_excerpt(excerpt_id, end).unwrap()
+                                    buffer.anchor_in_excerpt(excerpt.id(), start).unwrap()
+                                        ..buffer.anchor_in_excerpt(excerpt.id(), end).unwrap()
                                }),
                        );
                    }
--- a/crates/extensions_ui/src/extension_suggest.rs
+++ b/crates/extensions_ui/src/extension_suggest.rs
@@ -175,7 +175,7 @@ pub(crate) fn suggest(buffer: Model<Buffer>, cx: &mut ViewContext<Workspace>) {
                    "Do you want to install the recommended '{}' extension for '{}' files?",
                    extension_id, file_name_or_extension
                ))
-                .with_click_message("Yes, install extension")
+                .with_click_message("Yes")
                .on_click({
                    let extension_id = extension_id.clone();
                    move |cx| {
@@ -186,7 +186,7 @@ pub(crate) fn suggest(buffer: Model<Buffer>, cx: &mut ViewContext<Workspace>) {
                        });
                    }
                })
-                .with_secondary_click_message("No, don't install it")
+                .with_secondary_click_message("No")
                .on_secondary_click(move |cx| {
                    let key = language_extension_key(&extension_id);
                    db::write_and_log(cx, move || {
--- a/crates/feature_flags/src/feature_flags.rs
+++ b/crates/feature_flags/src/feature_flags.rs
@@ -59,9 +59,9 @@ impl FeatureFlag for ToolUseFeatureFlag {
    }
 }

-pub struct PredictEditsFeatureFlag;
-impl FeatureFlag for PredictEditsFeatureFlag {
-    const NAME: &'static str = "predict-edits";
+pub struct ZetaFeatureFlag;
+impl FeatureFlag for ZetaFeatureFlag {
+    const NAME: &'static str = "zeta";
 }

 pub struct GitUiFeatureFlag;
--- a/crates/fireworks/Cargo.toml
+++ b/crates/fireworks/Cargo.toml
@@ -1,19 +0,0 @@
-[package]
-name = "fireworks"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/fireworks.rs"
-
-[dependencies]
-anyhow.workspace = true
-futures.workspace = true
-http_client.workspace = true
-serde.workspace = true
-serde_json.workspace = true
--- a/crates/fireworks/LICENSE-GPL
+++ b/crates/fireworks/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/fireworks/src/fireworks.rs
+++ b/crates/fireworks/src/fireworks.rs
@@ -1,173 +0,0 @@
-use anyhow::{anyhow, Result};
-use futures::AsyncReadExt;
-use http_client::{http::HeaderMap, AsyncBody, HttpClient, Method, Request as HttpRequest};
-use serde::{Deserialize, Serialize};
-
-pub const FIREWORKS_API_URL: &str = "https://api.openai.com/v1";
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct CompletionRequest {
-    pub model: String,
-    pub prompt: String,
-    pub max_tokens: u32,
-    pub temperature: f32,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub prediction: Option<Prediction>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub rewrite_speculation: Option<bool>,
-}
-
-#[derive(Clone, Deserialize, Serialize, Debug)]
-#[serde(tag = "type", rename_all = "snake_case")]
-pub enum Prediction {
-    Content { content: String },
-}
-
-#[derive(Debug)]
-pub struct Response {
-    pub completion: CompletionResponse,
-    pub headers: Headers,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct CompletionResponse {
-    pub id: String,
-    pub object: String,
-    pub created: u64,
-    pub model: String,
-    pub choices: Vec<CompletionChoice>,
-    pub usage: Usage,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct CompletionChoice {
-    pub text: String,
-}
-
-#[derive(Serialize, Deserialize, Debug)]
-pub struct Usage {
-    pub prompt_tokens: u32,
-    pub completion_tokens: u32,
-    pub total_tokens: u32,
-}
-
-#[derive(Debug, Clone, Default, Serialize)]
-pub struct Headers {
-    pub server_processing_time: Option<f64>,
-    pub request_id: Option<String>,
-    pub prompt_tokens: Option<u32>,
-    pub speculation_generated_tokens: Option<u32>,
-    pub cached_prompt_tokens: Option<u32>,
-    pub backend_host: Option<String>,
-    pub num_concurrent_requests: Option<u32>,
-    pub deployment: Option<String>,
-    pub tokenizer_queue_duration: Option<f64>,
-    pub tokenizer_duration: Option<f64>,
-    pub prefill_queue_duration: Option<f64>,
-    pub prefill_duration: Option<f64>,
-    pub generation_queue_duration: Option<f64>,
-}
-
-impl Headers {
-    pub fn parse(headers: &HeaderMap) -> Self {
-        Headers {
-            request_id: headers
-                .get("x-request-id")
-                .and_then(|v| v.to_str().ok())
-                .map(String::from),
-            server_processing_time: headers
-                .get("fireworks-server-processing-time")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            prompt_tokens: headers
-                .get("fireworks-prompt-tokens")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            speculation_generated_tokens: headers
-                .get("fireworks-speculation-generated-tokens")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            cached_prompt_tokens: headers
-                .get("fireworks-cached-prompt-tokens")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            backend_host: headers
-                .get("fireworks-backend-host")
-                .and_then(|v| v.to_str().ok())
-                .map(String::from),
-            num_concurrent_requests: headers
-                .get("fireworks-num-concurrent-requests")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            deployment: headers
-                .get("fireworks-deployment")
-                .and_then(|v| v.to_str().ok())
-                .map(String::from),
-            tokenizer_queue_duration: headers
-                .get("fireworks-tokenizer-queue-duration")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            tokenizer_duration: headers
-                .get("fireworks-tokenizer-duration")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            prefill_queue_duration: headers
-                .get("fireworks-prefill-queue-duration")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            prefill_duration: headers
-                .get("fireworks-prefill-duration")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-            generation_queue_duration: headers
-                .get("fireworks-generation-queue-duration")
-                .and_then(|v| v.to_str().ok()?.parse().ok()),
-        }
-    }
-}
-
-pub async fn complete(
-    client: &dyn HttpClient,
-    api_url: &str,
-    api_key: &str,
-    request: CompletionRequest,
-) -> Result<Response> {
-    let uri = format!("{api_url}/completions");
-    let request_builder = HttpRequest::builder()
-        .method(Method::POST)
-        .uri(uri)
-        .header("Content-Type", "application/json")
-        .header("Authorization", format!("Bearer {}", api_key));
-
-    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
-    let mut response = client.send(request).await?;
-
-    if response.status().is_success() {
-        let headers = Headers::parse(response.headers());
-
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        Ok(Response {
-            completion: serde_json::from_str(&body)?,
-            headers,
-        })
-    } else {
-        let mut body = String::new();
-        response.body_mut().read_to_string(&mut body).await?;
-
-        #[derive(Deserialize)]
-        struct FireworksResponse {
-            error: FireworksError,
-        }
-
-        #[derive(Deserialize)]
-        struct FireworksError {
-            message: String,
-        }
-
-        match serde_json::from_str::<FireworksResponse>(&body) {
-            Ok(response) if !response.error.message.is_empty() => Err(anyhow!(
-                "Failed to connect to Fireworks API: {}",
-                response.error.message,
-            )),
-
-            _ => Err(anyhow!(
-                "Failed to connect to Fireworks API: {} {}",
-                response.status(),
-                body,
-            )),
-        }
-    }
-}
--- a/crates/fs/Cargo.toml
+++ b/crates/fs/Cargo.toml
@@ -47,9 +47,12 @@ windows.workspace = true

 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 ashpd.workspace = true
+which.workspace = true
+shlex.workspace = true

 [dev-dependencies]
 gpui = { workspace = true, features = ["test-support"] }

 [features]
 test-support = ["gpui/test-support", "git/test-support"]
+
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1,14 +1,18 @@
 #[cfg(target_os = "macos")]
 mod mac_watcher;

-#[cfg(not(target_os = "macos"))]
-pub mod fs_watcher;
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+pub mod linux_watcher;

 use anyhow::{anyhow, Result};
 use git::GitHostingProviderRegistry;

 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 use ashpd::desktop::trash;
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+use smol::process::Command;
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+use std::fs::File;
 #[cfg(unix)]
 use std::os::fd::AsFd;
 #[cfg(unix)]
@@ -441,13 +445,7 @@ impl Fs for RealFs {

    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
    async fn trash_file(&self, path: &Path, _options: RemoveOptions) -> Result<()> {
-        if let Ok(Some(metadata)) = self.metadata(path).await {
-            if metadata.is_symlink {
-                // TODO: trash_file does not support trashing symlinks yet - https://github.com/bilelmoussaoui/ashpd/issues/255
-                return self.remove_file(path, RemoveOptions::default()).await;
-            }
-        }
-        let file = smol::fs::File::open(path).await?;
+        let file = File::open(path)?;
        match trash::trash_file(&file.as_fd()).await {
            Ok(_) => Ok(()),
            Err(err) => Err(anyhow::Error::new(err)),
@@ -518,24 +516,7 @@ impl Fs for RealFs {

    async fn atomic_write(&self, path: PathBuf, data: String) -> Result<()> {
        smol::unblock(move || {
-            let mut tmp_file = if cfg!(any(target_os = "linux", target_os = "freebsd")) {
-                // Use the directory of the destination as temp dir to avoid
-                // invalid cross-device link error, and XDG_CACHE_DIR for fallback.
-                // See https://github.com/zed-industries/zed/pull/8437 for more details.
-                NamedTempFile::new_in(path.parent().unwrap_or(paths::temp_dir()))
-            } else if cfg!(target_os = "windows") {
-                // If temp dir is set to a different drive than the destination,
-                // we receive error:
-                //
-                // failed to persist temporary file:
-                // The system cannot move the file to a different disk drive. (os error 17)
-                //
-                // So we use the directory of the destination as a temp dir to avoid it.
-                // https://github.com/zed-industries/zed/issues/16571
-                NamedTempFile::new_in(path.parent().unwrap_or(paths::temp_dir()))
-            } else {
-                NamedTempFile::new()
-            }?;
+            let mut tmp_file = create_temp_file(&path)?;
            tmp_file.write_all(data.as_bytes())?;
            tmp_file.persist(path)?;
            Ok::<(), anyhow::Error>(())
@@ -550,13 +531,43 @@ impl Fs for RealFs {
        if let Some(path) = path.parent() {
            self.create_dir(path).await?;
        }
-        let file = smol::fs::File::create(path).await?;
-        let mut writer = smol::io::BufWriter::with_capacity(buffer_size, file);
-        for chunk in chunks(text, line_ending) {
-            writer.write_all(chunk.as_bytes()).await?;
+        match smol::fs::File::create(path).await {
+            Ok(file) => {
+                let mut writer = smol::io::BufWriter::with_capacity(buffer_size, file);
+                for chunk in chunks(text, line_ending) {
+                    writer.write_all(chunk.as_bytes()).await?;
+                }
+                writer.flush().await?;
+                Ok(())
+            }
+            Err(e) if e.kind() == std::io::ErrorKind::PermissionDenied => {
+                if cfg!(any(target_os = "linux", target_os = "freebsd")) {
+                    let target_path = path.to_path_buf();
+                    let temp_file = smol::unblock(move || create_temp_file(&target_path)).await?;
+
+                    let temp_path = temp_file.into_temp_path();
+                    let temp_path_for_write = temp_path.to_path_buf();
+
+                    let async_file = smol::fs::OpenOptions::new()
+                        .write(true)
+                        .open(&temp_path)
+                        .await?;
+
+                    let mut writer = smol::io::BufWriter::with_capacity(buffer_size, async_file);
+
+                    for chunk in chunks(text, line_ending) {
+                        writer.write_all(chunk.as_bytes()).await?;
+                    }
+                    writer.flush().await?;
+
+                    write_to_file_as_root(temp_path_for_write, path.to_path_buf()).await
+                } else {
+                    // Todo: Implement for Mac and Windows
+                    Err(e.into())
+                }
+            }
+            Err(e) => Err(e.into()),
        }
-        writer.flush().await?;
-        Ok(())
    }

    async fn canonicalize(&self, path: &Path) -> Result<PathBuf> {
@@ -684,7 +695,7 @@ impl Fs for RealFs {
        )
    }

-    #[cfg(not(target_os = "macos"))]
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
    async fn watch(
        &self,
        path: &Path,
@@ -694,11 +705,10 @@ impl Fs for RealFs {
        Arc<dyn Watcher>,
    ) {
        use parking_lot::Mutex;
-        use util::paths::SanitizedPath;

        let (tx, rx) = smol::channel::unbounded();
        let pending_paths: Arc<Mutex<Vec<PathEvent>>> = Default::default();
-        let watcher = Arc::new(fs_watcher::FsWatcher::new(tx, pending_paths.clone()));
+        let watcher = Arc::new(linux_watcher::LinuxWatcher::new(tx, pending_paths.clone()));

        if watcher.add(path).is_err() {
            // If the path doesn't exist yet (e.g. settings.json), watch the parent dir to learn when it's created.
@@ -716,7 +726,7 @@ impl Fs for RealFs {
                if let Some(parent) = path.parent() {
                    target = parent.join(target);
                    if let Ok(canonical) = self.canonicalize(&target).await {
-                        target = SanitizedPath::from(canonical).as_path().to_path_buf();
+                        target = canonical;
                    }
                }
            }
@@ -743,6 +753,56 @@ impl Fs for RealFs {
        )
    }

+    #[cfg(target_os = "windows")]
+    async fn watch(
+        &self,
+        path: &Path,
+        _latency: Duration,
+    ) -> (
+        Pin<Box<dyn Send + Stream<Item = Vec<PathEvent>>>>,
+        Arc<dyn Watcher>,
+    ) {
+        use notify::{EventKind, Watcher};
+
+        let (tx, rx) = smol::channel::unbounded();
+
+        let mut file_watcher = notify::recommended_watcher({
+            let tx = tx.clone();
+            move |event: Result<notify::Event, _>| {
+                if let Some(event) = event.log_err() {
+                    let kind = match event.kind {
+                        EventKind::Create(_) => Some(PathEventKind::Created),
+                        EventKind::Modify(_) => Some(PathEventKind::Changed),
+                        EventKind::Remove(_) => Some(PathEventKind::Removed),
+                        _ => None,
+                    };
+
+                    tx.try_send(
+                        event
+                            .paths
+                            .into_iter()
+                            .map(|path| PathEvent { path, kind })
+                            .collect::<Vec<_>>(),
+                    )
+                    .ok();
+                }
+            }
+        })
+        .expect("Could not start file watcher");
+
+        file_watcher
+            .watch(path, notify::RecursiveMode::Recursive)
+            .log_err();
+
+        (
+            Box::pin(rx.chain(futures::stream::once(async move {
+                drop(file_watcher);
+                vec![]
+            }))),
+            Arc::new(RealWatcher {}),
+        )
+    }
+
    fn open_repo(&self, dotgit_path: &Path) -> Option<Arc<dyn GitRepository>> {
        // with libgit2, we can open git repo from an existing work dir
        // https://libgit2.org/docs/reference/main/repository/git_repository_open.html
@@ -1963,6 +2023,84 @@ fn chunks(rope: &Rope, line_ending: LineEnding) -> impl Iterator<Item = &str> {
    })
 }

+fn create_temp_file(path: &Path) -> Result<NamedTempFile> {
+    let temp_file = if cfg!(any(target_os = "linux", target_os = "freebsd")) {
+        // Use the directory of the destination as temp dir to avoid
+        // invalid cross-device link error, and XDG_CACHE_DIR for fallback.
+        // See https://github.com/zed-industries/zed/pull/8437 for more details.
+        NamedTempFile::new_in(path.parent().unwrap_or(paths::temp_dir()))?
+    } else if cfg!(target_os = "windows") {
+        // If temp dir is set to a different drive than the destination,
+        // we receive error:
+        //
+        // failed to persist temporary file:
+        // The system cannot move the file to a different disk drive. (os error 17)
+        //
+        // So we use the directory of the destination as a temp dir to avoid it.
+        // https://github.com/zed-industries/zed/issues/16571
+        NamedTempFile::new_in(path.parent().unwrap_or(paths::temp_dir()))?
+    } else {
+        NamedTempFile::new()?
+    };
+
+    Ok(temp_file)
+}
+
+#[cfg(target_os = "macos")]
+async fn write_to_file_as_root(_temp_file_path: PathBuf, _target_file_path: PathBuf) -> Result<()> {
+    unimplemented!("write_to_file_as_root is not implemented")
+}
+
+#[cfg(target_os = "windows")]
+async fn write_to_file_as_root(_temp_file_path: PathBuf, _target_file_path: PathBuf) -> Result<()> {
+    unimplemented!("write_to_file_as_root is not implemented")
+}
+
+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+async fn write_to_file_as_root(temp_file_path: PathBuf, target_file_path: PathBuf) -> Result<()> {
+    use shlex::try_quote;
+    use std::os::unix::fs::PermissionsExt;
+    use which::which;
+
+    let pkexec_path = smol::unblock(|| which("pkexec"))
+        .await
+        .map_err(|_| anyhow::anyhow!("pkexec not found in PATH"))?;
+
+    let script_file = smol::unblock(move || {
+        let script_file = tempfile::Builder::new()
+            .prefix("write-to-file-as-root-")
+            .tempfile_in(paths::temp_dir())?;
+
+        writeln!(
+            script_file.as_file(),
+            "#!/usr/bin/env sh\nset -eu\ncat \"{}\" > \"{}\"",
+            try_quote(&temp_file_path.to_string_lossy())?,
+            try_quote(&target_file_path.to_string_lossy())?
+        )?;
+
+        let mut perms = script_file.as_file().metadata()?.permissions();
+        perms.set_mode(0o700); // rwx------
+        script_file.as_file().set_permissions(perms)?;
+
+        Result::<_>::Ok(script_file)
+    })
+    .await?;
+
+    let script_path = script_file.into_temp_path();
+
+    let output = Command::new(&pkexec_path)
+        .arg("--disable-internal-agent")
+        .arg(&script_path)
+        .output()
+        .await?;
+
+    if !output.status.success() {
+        return Err(anyhow::anyhow!("Failed to write to file as root"));
+    }
+
+    Ok(())
+}
+
 pub fn normalize_path(path: &Path) -> PathBuf {
    let mut components = path.components().peekable();
    let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
--- a/crates/fs/src/linux_watcher.rs
+++ b/crates/fs/src/linux_watcher.rs
@@ -5,12 +5,12 @@ use util::ResultExt;

 use crate::{PathEvent, PathEventKind, Watcher};

-pub struct FsWatcher {
+pub struct LinuxWatcher {
    tx: smol::channel::Sender<()>,
    pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
 }

-impl FsWatcher {
+impl LinuxWatcher {
    pub fn new(
        tx: smol::channel::Sender<()>,
        pending_path_events: Arc<Mutex<Vec<PathEvent>>>,
@@ -22,7 +22,7 @@ impl FsWatcher {
    }
 }

-impl Watcher for FsWatcher {
+impl Watcher for LinuxWatcher {
    fn add(&self, path: &std::path::Path) -> gpui::Result<()> {
        let root_path = path.to_path_buf();

@@ -69,7 +69,7 @@ impl Watcher for FsWatcher {
        })?;

        global(|g| {
-            g.watcher
+            g.inotify
                .lock()
                .watch(path, notify::RecursiveMode::NonRecursive)
        })??;
@@ -79,18 +79,16 @@ impl Watcher for FsWatcher {

    fn remove(&self, path: &std::path::Path) -> gpui::Result<()> {
        use notify::Watcher;
-        Ok(global(|w| w.watcher.lock().unwatch(path))??)
+        Ok(global(|w| w.inotify.lock().unwatch(path))??)
    }
 }

 pub struct GlobalWatcher {
-    // two mutexes because calling watcher.add triggers an watcher.event, which needs watchers.
+    // two mutexes because calling inotify.add triggers an inotify.event, which needs watchers.
    #[cfg(target_os = "linux")]
-    pub(super) watcher: Mutex<notify::INotifyWatcher>,
+    pub(super) inotify: Mutex<notify::INotifyWatcher>,
    #[cfg(target_os = "freebsd")]
-    pub(super) watcher: Mutex<notify::KqueueWatcher>,
-    #[cfg(target_os = "windows")]
-    pub(super) watcher: Mutex<notify::ReadDirectoryChangesWatcher>,
+    pub(super) inotify: Mutex<notify::KqueueWatcher>,
    pub(super) watchers: Mutex<Vec<Box<dyn Fn(&notify::Event) + Send + Sync>>>,
 }

@@ -100,8 +98,7 @@ impl GlobalWatcher {
    }
 }

-static FS_WATCHER_INSTANCE: OnceLock<anyhow::Result<GlobalWatcher, notify::Error>> =
-    OnceLock::new();
+static INOTIFY_INSTANCE: OnceLock<anyhow::Result<GlobalWatcher, notify::Error>> = OnceLock::new();

 fn handle_event(event: Result<notify::Event, notify::Error>) {
    let Some(event) = event.log_err() else { return };
@@ -114,9 +111,9 @@ fn handle_event(event: Result<notify::Event, notify::Error>) {
 }

 pub fn global<T>(f: impl FnOnce(&GlobalWatcher) -> T) -> anyhow::Result<T> {
-    let result = FS_WATCHER_INSTANCE.get_or_init(|| {
+    let result = INOTIFY_INSTANCE.get_or_init(|| {
        notify::recommended_watcher(handle_event).map(|file_watcher| GlobalWatcher {
-            watcher: Mutex::new(file_watcher),
+            inotify: Mutex::new(file_watcher),
            watchers: Default::default(),
        })
    });
--- a/crates/git_ui/Cargo.toml
+++ b/crates/git_ui/Cargo.toml
@@ -17,6 +17,7 @@ anyhow.workspace = true
 collections.workspace = true
 db.workspace = true
 editor.workspace = true
+futures.workspace = true
 git.workspace = true
 gpui.workspace = true
 language.workspace = true
@@ -27,7 +28,6 @@ serde.workspace = true
 serde_derive.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -1,8 +1,8 @@
 use ::settings::Settings;
 use git::repository::GitFileStatus;
-use gpui::{actions, AppContext, Context, Global, Hsla, Model};
+use gpui::{actions, AppContext, Hsla};
 use settings::GitPanelSettings;
-use ui::{Color, Icon, IconName, IntoElement, SharedString};
+use ui::{Color, Icon, IconName, IntoElement};

 pub mod git_panel;
 mod settings;
@@ -12,45 +12,14 @@ actions!(
    [
        StageAll,
        UnstageAll,
-        RevertAll,
+        DiscardAll,
        CommitStagedChanges,
-        CommitAllChanges,
-        ClearMessage
+        CommitAllChanges
    ]
 );

 pub fn init(cx: &mut AppContext) {
    GitPanelSettings::register(cx);
-    let git_state = cx.new_model(|_cx| GitState::new());
-    cx.set_global(GlobalGitState(git_state));
-}
-
-struct GlobalGitState(Model<GitState>);
-
-impl Global for GlobalGitState {}
-
-pub struct GitState {
-    commit_message: Option<SharedString>,
-}
-
-impl GitState {
-    pub fn new() -> Self {
-        GitState {
-            commit_message: None,
-        }
-    }
-
-    pub fn set_message(&mut self, message: Option<SharedString>) {
-        self.commit_message = message;
-    }
-
-    pub fn clear_message(&mut self) {
-        self.commit_message = None;
-    }
-
-    pub fn get_global(cx: &mut AppContext) -> Model<GitState> {
-        cx.global::<GlobalGitState>().0.clone()
-    }
 }

 const ADDED_COLOR: Hsla = Hsla {
@@ -82,8 +51,6 @@ pub fn git_status_icon(status: GitFileStatus) -> impl IntoElement {
            Icon::new(IconName::SquareDot).color(Color::Custom(MODIFIED_COLOR))
        }
        GitFileStatus::Conflict => Icon::new(IconName::Warning).color(Color::Custom(REMOVED_COLOR)),
-        GitFileStatus::Deleted => {
-            Icon::new(IconName::SquareMinus).color(Color::Custom(REMOVED_COLOR))
-        }
+        GitFileStatus::Deleted => Icon::new(IconName::Warning).color(Color::Custom(REMOVED_COLOR)),
    }
 }
--- a/crates/google_ai/src/google_ai.rs
+++ b/crates/google_ai/src/google_ai.rs
@@ -1,6 +1,6 @@
 mod supported_countries;

-use anyhow::{anyhow, bail, Result};
+use anyhow::{anyhow, Result};
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, Stream, StreamExt};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use serde::{Deserialize, Serialize};
@@ -15,20 +15,6 @@ pub async fn stream_generate_content(
    api_key: &str,
    mut request: GenerateContentRequest,
 ) -> Result<BoxStream<'static, Result<GenerateContentResponse>>> {
-    if request.contents.is_empty() {
-        bail!("Request must contain at least one content item");
-    }
-
-    if let Some(user_content) = request
-        .contents
-        .iter()
-        .find(|content| content.role == Role::User)
-    {
-        if user_content.parts.is_empty() {
-            bail!("User content must contain at least one part");
-        }
-    }
-
    let uri = format!(
        "{api_url}/v1beta/models/{model}:streamGenerateContent?alt=sse&key={api_key}",
        model = request.model
@@ -154,7 +140,7 @@ pub struct Content {
    pub role: Role,
 }

-#[derive(Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum Role {
    User,
@@ -305,8 +291,6 @@ pub enum Model {
    Gemini15Pro,
    #[serde(rename = "gemini-1.5-flash")]
    Gemini15Flash,
-    #[serde(rename = "gemini-2.0-flash-exp")]
-    Gemini20Flash,
    #[serde(rename = "custom")]
    Custom {
        name: String,
@@ -321,7 +305,6 @@ impl Model {
        match self {
            Model::Gemini15Pro => "gemini-1.5-pro",
            Model::Gemini15Flash => "gemini-1.5-flash",
-            Model::Gemini20Flash => "gemini-2.0-flash-exp",
            Model::Custom { name, .. } => name,
        }
    }
@@ -330,7 +313,6 @@ impl Model {
        match self {
            Model::Gemini15Pro => "Gemini 1.5 Pro",
            Model::Gemini15Flash => "Gemini 1.5 Flash",
-            Model::Gemini20Flash => "Gemini 2.0 Flash",
            Self::Custom {
                name, display_name, ..
            } => display_name.as_ref().unwrap_or(name),
@@ -341,7 +323,6 @@ impl Model {
        match self {
            Model::Gemini15Pro => 2_000_000,
            Model::Gemini15Flash => 1_000_000,
-            Model::Gemini20Flash => 1_000_000,
            Model::Custom { max_tokens, .. } => *max_tokens,
        }
    }
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -148,7 +148,7 @@ pathfinder_geometry = "0.5"
 [target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
 # Always used
 flume = "0.11"
-oo7 = { git = "https://github.com/zed-industries/oo7", branch = "avoid-crypto-panic" }
+oo7 = "0.3.0"

 # Used in both windowing options
 ashpd = { workspace = true, optional = true }
--- a/crates/gpui/src/action.rs
+++ b/crates/gpui/src/action.rs
@@ -62,14 +62,6 @@ pub trait Action: 'static + Send {
    fn build(value: serde_json::Value) -> Result<Box<dyn Action>>
    where
        Self: Sized;
-
-    /// A list of alternate, deprecated names for this action.
-    fn deprecated_aliases() -> &'static [&'static str]
-    where
-        Self: Sized,
-    {
-        &[]
-    }
 }

 impl std::fmt::Debug for dyn Action {
@@ -93,7 +85,6 @@ pub(crate) struct ActionRegistry {
    builders_by_name: HashMap<SharedString, ActionBuilder>,
    names_by_type_id: HashMap<TypeId, SharedString>,
    all_names: Vec<SharedString>, // So we can return a static slice.
-    deprecations: Vec<(SharedString, SharedString)>,
 }

 impl Default for ActionRegistry {
@@ -102,7 +93,6 @@ impl Default for ActionRegistry {
            builders_by_name: Default::default(),
            names_by_type_id: Default::default(),
            all_names: Default::default(),
-            deprecations: Default::default(),
        };

        this.load_actions();
@@ -121,7 +111,6 @@ pub type MacroActionBuilder = fn() -> ActionData;
 #[doc(hidden)]
 pub struct ActionData {
    pub name: &'static str,
-    pub aliases: &'static [&'static str],
    pub type_id: TypeId,
    pub build: ActionBuilder,
 }
@@ -145,7 +134,6 @@ impl ActionRegistry {
    pub(crate) fn load_action<A: Action>(&mut self) {
        self.insert_action(ActionData {
            name: A::debug_name(),
-            aliases: A::deprecated_aliases(),
            type_id: TypeId::of::<A>(),
            build: A::build,
        });
@@ -154,10 +142,6 @@ impl ActionRegistry {
    fn insert_action(&mut self, action: ActionData) {
        let name: SharedString = action.name.into();
        self.builders_by_name.insert(name.clone(), action.build);
-        for &alias in action.aliases {
-            self.builders_by_name.insert(alias.into(), action.build);
-            self.deprecations.push((alias.into(), name.clone()));
-        }
        self.names_by_type_id.insert(action.type_id, name.clone());
        self.all_names.push(name);
    }
@@ -190,10 +174,6 @@ impl ActionRegistry {
    pub fn all_action_names(&self) -> &[SharedString] {
        self.all_names.as_slice()
    }
-
-    pub fn action_deprecations(&self) -> &[(SharedString, SharedString)] {
-        self.deprecations.as_slice()
-    }
 }

 /// Defines unit structs that can be used as actions.
@@ -226,7 +206,7 @@ macro_rules! actions {
 /// `impl_action_as!`
 #[macro_export]
 macro_rules! action_as {
-    ($namespace:path, $name:ident as $visual_name:ident) => {
+    ($namespace:path, $name:ident as $visual_name:tt) => {
        #[doc = "The `"]
        #[doc = stringify!($name)]
        #[doc = "` action, see [`gpui::actions!`]"]
@@ -248,43 +228,6 @@ macro_rules! action_as {
    };
 }

-/// Defines a unit struct that can be used as an action, with some deprecated aliases.
-#[macro_export]
-macro_rules! action_aliases {
-    ($namespace:path, $name:ident, [$($alias:ident),* $(,)?]) => {
-        #[doc = "The `"]
-        #[doc = stringify!($name)]
-        #[doc = "` action, see [`gpui::actions!`]"]
-        #[derive(
-            ::std::cmp::PartialEq,
-            ::std::clone::Clone,
-            ::std::default::Default,
-            ::std::fmt::Debug,
-            gpui::private::serde_derive::Deserialize,
-        )]
-        #[serde(crate = "gpui::private::serde")]
-        pub struct $name;
-
-        gpui::__impl_action!(
-            $namespace,
-            $name,
-            $name,
-            fn build(
-                _: gpui::private::serde_json::Value,
-            ) -> gpui::Result<::std::boxed::Box<dyn gpui::Action>> {
-                Ok(Box::new(Self))
-            },
-            fn deprecated_aliases() -> &'static [&'static str] {
-                &[
-                    $(concat!(stringify!($namespace), "::", stringify!($alias))),*
-                ]
-            }
-        );
-
-        gpui::register_action!($name);
-    };
-}
-
 /// Implements the Action trait for any struct that implements Clone, Default, PartialEq, and serde_deserialize::Deserialize
 #[macro_export]
 macro_rules! impl_actions {
@@ -326,7 +269,7 @@ macro_rules! impl_action_as {
 #[doc(hidden)]
 #[macro_export]
 macro_rules! __impl_action {
-    ($namespace:path, $name:ident, $visual_name:tt, $($items:item),*) => {
+    ($namespace:path, $name:ident, $visual_name:tt, $build:item) => {
        impl gpui::Action for $name {
            fn name(&self) -> &'static str
            {
@@ -348,6 +291,8 @@ macro_rules! __impl_action {
                )
            }

+            $build
+
            fn partial_eq(&self, action: &dyn gpui::Action) -> bool {
                action
                    .as_any()
@@ -362,8 +307,6 @@ macro_rules! __impl_action {
            fn as_any(&self) -> &dyn ::std::any::Any {
                self
            }
-
-            $($items)*
        }
    };
 }
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -1226,11 +1226,6 @@ impl AppContext {
        self.actions.all_action_names()
    }

-    /// Get a list of all deprecated action aliases and their canonical names.
-    pub fn action_deprecations(&self) -> &[(SharedString, SharedString)] {
-        self.actions.action_deprecations()
-    }
-
    /// Register a callback to be invoked when the application is about to quit.
    /// It is not possible to cancel the quit event at this point.
    pub fn on_app_quit<Fut>(
@@ -1418,11 +1413,6 @@ impl AppContext {
    pub fn get_name(&self) -> &'static str {
        self.name.as_ref().unwrap()
    }
-
-    /// Returns `true` if the platform file picker supports selecting a mix of files and directories.
-    pub fn can_select_mixed_files_and_dirs(&self) -> bool {
-        self.platform.can_select_mixed_files_and_dirs()
-    }
 }

 impl Context for AppContext {
--- a/crates/gpui/src/elements/anchored.rs
+++ b/crates/gpui/src/elements/anchored.rs
@@ -19,7 +19,6 @@ pub struct Anchored {
    fit_mode: AnchoredFitMode,
    anchor_position: Option<Point<Pixels>>,
    position_mode: AnchoredPositionMode,
-    offset: Option<Point<Pixels>>,
 }

 /// anchored gives you an element that will avoid overflowing the window bounds.
@@ -31,7 +30,6 @@ pub fn anchored() -> Anchored {
        fit_mode: AnchoredFitMode::SwitchAnchor,
        anchor_position: None,
        position_mode: AnchoredPositionMode::Window,
-        offset: None,
    }
 }

@@ -49,13 +47,6 @@ impl Anchored {
        self
    }

-    /// Offset the final position by this amount.
-    /// Useful when you want to anchor to an element but offset from it, such as in PopoverMenu.
-    pub fn offset(mut self, offset: Point<Pixels>) -> Self {
-        self.offset = Some(offset);
-        self
-    }
-
    /// Sets the position mode for this anchored element. Local will have this
    /// interpret its [`Anchored::position`] as relative to the parent element.
    /// While Window will have it interpret the position as relative to the window.
@@ -138,7 +129,6 @@ impl Element for Anchored {
            self.anchor_corner,
            size,
            bounds,
-            self.offset,
        );

        let limits = Bounds {
@@ -255,22 +245,18 @@ impl AnchoredPositionMode {
        anchor_corner: Corner,
        size: Size<Pixels>,
        bounds: Bounds<Pixels>,
-        offset: Option<Point<Pixels>>,
    ) -> (Point<Pixels>, Bounds<Pixels>) {
-        let offset = offset.unwrap_or_default();
-
        match self {
            AnchoredPositionMode::Window => {
                let anchor_position = anchor_position.unwrap_or(bounds.origin);
-                let bounds =
-                    Bounds::from_corner_and_size(anchor_corner, anchor_position + offset, size);
+                let bounds = Bounds::from_corner_and_size(anchor_corner, anchor_position, size);
                (anchor_position, bounds)
            }
            AnchoredPositionMode::Local => {
                let anchor_position = anchor_position.unwrap_or_default();
                let bounds = Bounds::from_corner_and_size(
                    anchor_corner,
-                    bounds.origin + anchor_position + offset,
+                    bounds.origin + anchor_position,
                    size,
                );
                (anchor_position, bounds)
--- a/crates/gpui/src/elements/text.rs
+++ b/crates/gpui/src/elements/text.rs
@@ -2,7 +2,7 @@ use crate::{
    ActiveTooltip, AnyTooltip, AnyView, Bounds, DispatchPhase, Element, ElementId, GlobalElementId,
    HighlightStyle, Hitbox, IntoElement, LayoutId, MouseDownEvent, MouseMoveEvent, MouseUpEvent,
    Pixels, Point, SharedString, Size, TextRun, TextStyle, Truncate, WhiteSpace, WindowContext,
-    WrappedLine, WrappedLineLayout, TOOLTIP_DELAY,
+    WrappedLine, TOOLTIP_DELAY,
 };
 use anyhow::anyhow;
 use parking_lot::{Mutex, MutexGuard};
@@ -443,36 +443,6 @@ impl TextLayout {
        None
    }

-    /// Retrieve the layout for the line containing the given byte index.
-    pub fn line_layout_for_index(&self, index: usize) -> Option<Arc<WrappedLineLayout>> {
-        let element_state = self.lock();
-        let element_state = element_state
-            .as_ref()
-            .expect("measurement has not been performed");
-        let bounds = element_state
-            .bounds
-            .expect("prepaint has not been performed");
-        let line_height = element_state.line_height;
-
-        let mut line_origin = bounds.origin;
-        let mut line_start_ix = 0;
-
-        for line in &element_state.lines {
-            let line_end_ix = line_start_ix + line.len();
-            if index < line_start_ix {
-                break;
-            } else if index > line_end_ix {
-                line_origin.y += line.size(line_height).height;
-                line_start_ix = line_end_ix + 1;
-                continue;
-            } else {
-                return Some(line.layout.clone());
-            }
-        }
-
-        None
-    }
-
    /// The bounds of this layout.
    pub fn bounds(&self) -> Bounds<Pixels> {
        self.0.lock().as_ref().unwrap().bounds.unwrap()
--- a/crates/gpui/src/keymap.rs
+++ b/crates/gpui/src/keymap.rs
@@ -134,6 +134,8 @@ impl Keymap {
    /// If a user has disabled a binding with `"x": null` it will not be returned. Disabled
    /// bindings are evaluated with the same precedence rules so you can disable a rule in
    /// a given context only.
+    ///
+    /// In the case of multi-key bindings, the
    pub fn bindings_for_input(
        &self,
        input: &[Keystroke],
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -175,7 +175,6 @@ pub(crate) trait Platform: 'static {
        options: PathPromptOptions,
    ) -> oneshot::Receiver<Result<Option<Vec<PathBuf>>>>;
    fn prompt_for_new_path(&self, directory: &Path) -> oneshot::Receiver<Result<Option<PathBuf>>>;
-    fn can_select_mixed_files_and_dirs(&self) -> bool;
    fn reveal_path(&self, path: &Path);
    fn open_with_system(&self, path: &Path);

--- a/crates/gpui/src/platform/linux/headless/client.rs
+++ b/crates/gpui/src/platform/linux/headless/client.rs
@@ -47,10 +47,6 @@ impl LinuxClient for HeadlessClient {
        f(&mut self.0.borrow_mut().common)
    }

-    fn keyboard_layout(&self) -> String {
-        "unknown".to_string()
-    }
-
    fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
        vec![]
    }
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -1,5 +1,6 @@
 use std::{
    env,
+    panic::AssertUnwindSafe,
    path::{Path, PathBuf},
    process::Command,
    rc::Rc,
@@ -17,7 +18,7 @@ use std::{
 use anyhow::{anyhow, Context as _};
 use async_task::Runnable;
 use calloop::{channel::Channel, LoopSignal};
-use futures::channel::oneshot;
+use futures::{channel::oneshot, future::FutureExt};
 use util::ResultExt as _;
 #[cfg(any(feature = "wayland", feature = "x11"))]
 use xkbcommon::xkb::{self, Keycode, Keysym, State};
@@ -45,7 +46,6 @@ const FILE_PICKER_PORTAL_MISSING: &str =
 pub trait LinuxClient {
    fn compositor_name(&self) -> &'static str;
    fn with_common<R>(&self, f: impl FnOnce(&mut LinuxCommon) -> R) -> R;
-    fn keyboard_layout(&self) -> String;
    fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>>;
    #[allow(unused)]
    fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>>;
@@ -76,7 +76,6 @@ pub(crate) struct PlatformHandlers {
    pub(crate) app_menu_action: Option<Box<dyn FnMut(&dyn Action)>>,
    pub(crate) will_open_app_menu: Option<Box<dyn FnMut()>>,
    pub(crate) validate_app_menu_command: Option<Box<dyn FnMut(&dyn Action) -> bool>>,
-    pub(crate) keyboard_layout_change: Option<Box<dyn FnMut()>>,
 }

 pub(crate) struct LinuxCommon {
@@ -134,11 +133,11 @@ impl<P: LinuxClient + 'static> Platform for P {
    }

    fn keyboard_layout(&self) -> String {
-        self.keyboard_layout()
+        "unknown".into()
    }

-    fn on_keyboard_layout_change(&self, callback: Box<dyn FnMut()>) {
-        self.with_common(|common| common.callbacks.keyboard_layout_change = Some(callback));
+    fn on_keyboard_layout_change(&self, _callback: Box<dyn FnMut()>) {
+        // todo(linux)
    }

    fn run(&self, on_finish_launching: Box<dyn FnOnce()>) {
@@ -372,11 +371,6 @@ impl<P: LinuxClient + 'static> Platform for P {
        done_rx
    }

-    fn can_select_mixed_files_and_dirs(&self) -> bool {
-        // org.freedesktop.portal.FileChooser only supports "pick files" and "pick directories".
-        false
-    }
-
    fn reveal_path(&self, path: &Path) {
        self.reveal_path(path.to_owned());
    }
@@ -489,7 +483,12 @@ impl<P: LinuxClient + 'static> Platform for P {
                    let username = attributes
                        .get("username")
                        .ok_or_else(|| anyhow!("Cannot find username in stored credentials"))?;
-                    let secret = item.secret().await?;
+                    // oo7 panics if the retrieved secret can't be decrypted due to
+                    // unexpected padding.
+                    let secret = AssertUnwindSafe(item.secret())
+                        .catch_unwind()
+                        .await
+                        .map_err(|_| anyhow!("oo7 panicked while trying to read credentials"))??;

                    // we lose the zeroizing capabilities at this boundary,
                    // a current limitation GPUI's credentials api
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -588,19 +588,6 @@ impl WaylandClient {
 }

 impl LinuxClient for WaylandClient {
-    fn keyboard_layout(&self) -> String {
-        let state = self.0.borrow();
-        if let Some(keymap_state) = &state.keymap_state {
-            let layout_idx = keymap_state.serialize_layout(xkbcommon::xkb::STATE_LAYOUT_EFFECTIVE);
-            keymap_state
-                .get_keymap()
-                .layout_get_name(layout_idx)
-                .to_string()
-        } else {
-            "unknown".to_string()
-        }
-    }
-
    fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
        self.0
            .borrow()
@@ -1152,13 +1139,6 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                };
                state.keymap_state = Some(xkb::State::new(&keymap));
                state.compose_state = get_xkb_compose_state(&xkb_context);
-
-                if let Some(mut callback) = state.common.callbacks.keyboard_layout_change.take() {
-                    drop(state);
-                    callback();
-                    state = client.borrow_mut();
-                    state.common.callbacks.keyboard_layout_change = Some(callback);
-                }
            }
            wl_keyboard::Event::Enter { surface, .. } => {
                state.keyboard_focused_window = get_window(&mut state, &surface.id());
@@ -1196,21 +1176,9 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                let focused_window = state.keyboard_focused_window.clone();

                let keymap_state = state.keymap_state.as_mut().unwrap();
-                let old_layout =
-                    keymap_state.serialize_layout(xkbcommon::xkb::STATE_LAYOUT_EFFECTIVE);
                keymap_state.update_mask(mods_depressed, mods_latched, mods_locked, 0, 0, group);
                state.modifiers = Modifiers::from_xkb(keymap_state);

-                if group != old_layout {
-                    if let Some(mut callback) = state.common.callbacks.keyboard_layout_change.take()
-                    {
-                        drop(state);
-                        callback();
-                        state = client.borrow_mut();
-                        state.common.callbacks.keyboard_layout_change = Some(callback);
-                    }
-                }
-
                let Some(focused_window) = focused_window else {
                    return;
                };
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -37,7 +37,7 @@ use x11rb::{
 };
 use xim::{x11rb::X11rbClient, AttributeName, Client, InputStyle};
 use xkbc::x11::ffi::{XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION};
-use xkbcommon::xkb::{self as xkbc, LayoutIndex, ModMask, STATE_LAYOUT_EFFECTIVE};
+use xkbcommon::xkb::{self as xkbc, LayoutIndex, ModMask};

 use super::{
    button_or_scroll_from_event_detail, get_valuator_axis_index, modifiers_from_state,
@@ -840,8 +840,6 @@ impl X11Client {
            }
            Event::XkbStateNotify(event) => {
                let mut state = self.0.borrow_mut();
-                let old_layout = state.xkb.serialize_layout(STATE_LAYOUT_EFFECTIVE);
-                let new_layout = u32::from(event.group);
                state.xkb.update_mask(
                    event.base_mods.into(),
                    event.latched_mods.into(),
@@ -855,17 +853,6 @@ impl X11Client {
                    latched_layout: event.latched_group as u32,
                    locked_layout: event.locked_group.into(),
                };
-
-                if new_layout != old_layout {
-                    if let Some(mut callback) = state.common.callbacks.keyboard_layout_change.take()
-                    {
-                        drop(state);
-                        callback();
-                        state = self.0.borrow_mut();
-                        state.common.callbacks.keyboard_layout_change = Some(callback);
-                    }
-                }
-
                let modifiers = Modifiers::from_xkb(&state.xkb);
                if state.modifiers == modifiers {
                    drop(state);
@@ -1278,16 +1265,6 @@ impl LinuxClient for X11Client {
        f(&mut self.0.borrow_mut().common)
    }

-    fn keyboard_layout(&self) -> String {
-        let state = self.0.borrow();
-        let layout_idx = state.xkb.serialize_layout(STATE_LAYOUT_EFFECTIVE);
-        state
-            .xkb
-            .get_keymap()
-            .layout_get_name(layout_idx)
-            .to_string()
-    }
-
    fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>> {
        let state = self.0.borrow();
        let setup = state.xcb_connection.setup();
--- a/crates/gpui/src/platform/mac/platform.rs
+++ b/crates/gpui/src/platform/mac/platform.rs
@@ -759,10 +759,6 @@ impl Platform for MacPlatform {
        done_rx
    }

-    fn can_select_mixed_files_and_dirs(&self) -> bool {
-        true
-    }
-
    fn reveal_path(&self, path: &Path) {
        unsafe {
            let path = path.to_path_buf();
--- a/crates/gpui/src/platform/mac/shaders.metal
+++ b/crates/gpui/src/platform/mac/shaders.metal
@@ -227,27 +227,21 @@ fragment float4 shadow_fragment(ShadowFragmentInput input [[stage_in]],
    }
  }

-  float alpha;
-  if (shadow.blur_radius == 0.) {
-    float distance = quad_sdf(input.position.xy, shadow.bounds, shadow.corner_radii);
-    alpha = saturate(0.5 - distance);
-  } else {
-    // The signal is only non-zero in a limited range, so don't waste samples
-    float low = point.y - half_size.y;
-    float high = point.y + half_size.y;
-    float start = clamp(-3. * shadow.blur_radius, low, high);
-    float end = clamp(3. * shadow.blur_radius, low, high);
+  // The signal is only non-zero in a limited range, so don't waste samples
+  float low = point.y - half_size.y;
+  float high = point.y + half_size.y;
+  float start = clamp(-3. * shadow.blur_radius, low, high);
+  float end = clamp(3. * shadow.blur_radius, low, high);

-    // Accumulate samples (we can get away with surprisingly few samples)
-    float step = (end - start) / 4.;
-    float y = start + step * 0.5;
-    alpha = 0.;
-    for (int i = 0; i < 4; i++) {
-      alpha += blur_along_x(point.x, point.y - y, shadow.blur_radius,
-                            corner_radius, half_size) *
-               gaussian(y, shadow.blur_radius) * step;
-      y += step;
-    }
+  // Accumulate samples (we can get away with surprisingly few samples)
+  float step = (end - start) / 4.;
+  float y = start + step * 0.5;
+  float alpha = 0.;
+  for (int i = 0; i < 4; i++) {
+    alpha += blur_along_x(point.x, point.y - y, shadow.blur_radius,
+                          corner_radius, half_size) *
+             gaussian(y, shadow.blur_radius) * step;
+    y += step;
  }

  return input.color * float4(1., 1., 1., alpha);
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -299,10 +299,6 @@ impl Platform for TestPlatform {
        rx
    }

-    fn can_select_mixed_files_and_dirs(&self) -> bool {
-        true
-    }
-
    fn reveal_path(&self, _path: &std::path::Path) {
        unimplemented!()
    }
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -407,11 +407,6 @@ impl Platform for WindowsPlatform {
        rx
    }

-    fn can_select_mixed_files_and_dirs(&self) -> bool {
-        // The FOS_PICKFOLDERS flag toggles between "only files" and "only folders".
-        false
-    }
-
    fn reveal_path(&self, path: &Path) {
        let Ok(file_full_path) = path.canonicalize() else {
            log::error!("unable to parse file path");
--- a/crates/gpui_macros/src/register_action.rs
+++ b/crates/gpui_macros/src/register_action.rs
@@ -32,7 +32,6 @@ pub(crate) fn register_action(type_name: &Ident) -> proc_macro2::TokenStream {
                fn #action_builder_fn_name() -> gpui::ActionData {
                    gpui::ActionData {
                        name: <#type_name as gpui::Action>::debug_name(),
-                        aliases: <#type_name as gpui::Action>::deprecated_aliases(),
                        type_id: ::std::any::TypeId::of::<#type_name>(),
                        build: <#type_name as gpui::Action>::build,
                    }
--- a/crates/image_viewer/Cargo.toml
+++ b/crates/image_viewer/Cargo.toml
@@ -24,6 +24,3 @@ theme.workspace = true
 ui.workspace = true
 util.workspace = true
 workspace.workspace = true
-
-[features]
-test-support = ["gpui/test-support"]
--- a/crates/inline_completion/src/inline_completion.rs
+++ b/crates/inline_completion/src/inline_completion.rs
@@ -21,14 +21,12 @@ pub trait InlineCompletionProvider: 'static + Sized {
    fn name() -> &'static str;
    fn display_name() -> &'static str;
    fn show_completions_in_menu() -> bool;
-    fn show_completions_in_normal_mode() -> bool;
    fn is_enabled(
        &self,
        buffer: &Model<Buffer>,
        cursor_position: language::Anchor,
        cx: &AppContext,
    ) -> bool;
-    fn is_refreshing(&self) -> bool;
    fn refresh(
        &mut self,
        buffer: Model<Buffer>,
@@ -63,8 +61,6 @@ pub trait InlineCompletionProviderHandle {
        cx: &AppContext,
    ) -> bool;
    fn show_completions_in_menu(&self) -> bool;
-    fn show_completions_in_normal_mode(&self) -> bool;
-    fn is_refreshing(&self, cx: &AppContext) -> bool;
    fn refresh(
        &self,
        buffer: Model<Buffer>,
@@ -105,10 +101,6 @@ where
        T::show_completions_in_menu()
    }

-    fn show_completions_in_normal_mode(&self) -> bool {
-        T::show_completions_in_normal_mode()
-    }
-
    fn is_enabled(
        &self,
        buffer: &Model<Buffer>,
@@ -118,10 +110,6 @@ where
        self.read(cx).is_enabled(buffer, cursor_position, cx)
    }

-    fn is_refreshing(&self, cx: &AppContext) -> bool {
-        self.read(cx).is_refreshing()
-    }
-
    fn refresh(
        &self,
        buffer: Model<Buffer>,
--- a/crates/inline_completion_button/Cargo.toml
+++ b/crates/inline_completion_button/Cargo.toml
@@ -19,7 +19,6 @@ editor.workspace = true
 feature_flags.workspace = true
 fs.workspace = true
 gpui.workspace = true
-inline_completion.workspace = true
 language.workspace = true
 paths.workspace = true
 settings.workspace = true
--- a/crates/inline_completion_button/src/inline_completion_button.rs
+++ b/crates/inline_completion_button/src/inline_completion_button.rs
@@ -1,12 +1,11 @@
 use anyhow::Result;
 use copilot::{Copilot, Status};
 use editor::{scroll::Autoscroll, Editor};
-use feature_flags::{FeatureFlagAppExt, PredictEditsFeatureFlag};
+use feature_flags::{FeatureFlagAppExt, ZetaFeatureFlag};
 use fs::Fs;
 use gpui::{
-    actions, div, pulsating_between, Action, Animation, AnimationExt, AppContext,
-    AsyncWindowContext, Corner, Entity, IntoElement, ParentElement, Render, Subscription, View,
-    ViewContext, WeakView, WindowContext,
+    actions, div, Action, AppContext, AsyncWindowContext, Corner, Entity, IntoElement,
+    ParentElement, Render, Subscription, View, ViewContext, WeakView, WindowContext,
 };
 use language::{
    language_settings::{
@@ -15,7 +14,7 @@ use language::{
    File, Language,
 };
 use settings::{update_settings_file, Settings, SettingsStore};
-use std::{path::Path, sync::Arc, time::Duration};
+use std::{path::Path, sync::Arc};
 use supermaven::{AccountStatus, Supermaven};
 use workspace::{
    create_and_open_local_file,
@@ -40,7 +39,6 @@ pub struct InlineCompletionButton {
    editor_enabled: Option<bool>,
    language: Option<Arc<Language>>,
    file: Option<Arc<dyn File>>,
-    inline_completion_provider: Option<Arc<dyn inline_completion::InlineCompletionProviderHandle>>,
    fs: Arc<dyn Fs>,
    workspace: WeakView<Workspace>,
 }
@@ -201,40 +199,29 @@ impl Render for InlineCompletionButton {
                );
            }

-            InlineCompletionProvider::Zed => {
-                if !cx.has_flag::<PredictEditsFeatureFlag>() {
+            InlineCompletionProvider::Zeta => {
+                if !cx.has_flag::<ZetaFeatureFlag>() {
                    return div();
                }

-                let this = cx.view().clone();
-                let button = IconButton::new("zeta", IconName::ZedPredict)
-                    .tooltip(|cx| Tooltip::text("Edit Prediction", cx));
-
-                let is_refreshing = self
-                    .inline_completion_provider
-                    .as_ref()
-                    .map_or(false, |provider| provider.is_refreshing(cx));
-
-                let mut popover_menu = PopoverMenu::new("zeta")
-                    .menu(move |cx| {
-                        Some(this.update(cx, |this, cx| this.build_zeta_context_menu(cx)))
-                    })
-                    .anchor(Corner::BottomRight);
-                if is_refreshing {
-                    popover_menu = popover_menu.trigger(
-                        button.with_animation(
-                            "pulsating-label",
-                            Animation::new(Duration::from_secs(2))
-                                .repeat()
-                                .with_easing(pulsating_between(0.2, 1.0)),
-                            |icon_button, delta| icon_button.alpha(delta),
-                        ),
-                    );
-                } else {
-                    popover_menu = popover_menu.trigger(button);
-                }
-
-                div().child(popover_menu.into_any_element())
+                div().child(
+                    IconButton::new("zeta", IconName::ZedPredict)
+                        .tooltip(|cx| {
+                            Tooltip::with_meta(
+                                "Zed Predict",
+                                Some(&RateCompletions),
+                                "Click to rate completions",
+                                cx,
+                            )
+                        })
+                        .on_click(cx.listener(|this, _, cx| {
+                            if let Some(workspace) = this.workspace.upgrade() {
+                                workspace.update(cx, |workspace, cx| {
+                                    RateCompletionModal::toggle(workspace, cx)
+                                });
+                            }
+                        })),
+                )
            }
        }
    }
@@ -258,7 +245,6 @@ impl InlineCompletionButton {
            editor_enabled: None,
            language: None,
            file: None,
-            inline_completion_provider: None,
            workspace,
            fs,
        }
@@ -374,25 +360,6 @@ impl InlineCompletionButton {
        })
    }

-    fn build_zeta_context_menu(&self, cx: &mut ViewContext<Self>) -> View<ContextMenu> {
-        let workspace = self.workspace.clone();
-        ContextMenu::build(cx, |menu, cx| {
-            self.build_language_settings_menu(menu, cx)
-                .separator()
-                .entry(
-                    "Rate Completions",
-                    Some(RateCompletions.boxed_clone()),
-                    move |cx| {
-                        workspace
-                            .update(cx, |workspace, cx| {
-                                RateCompletionModal::toggle(workspace, cx)
-                            })
-                            .ok();
-                    },
-                )
-        })
-    }
-
    pub fn update_enabled(&mut self, editor: View<Editor>, cx: &mut ViewContext<Self>) {
        let editor = editor.read(cx);
        let snapshot = editor.buffer().read(cx).snapshot(cx);
@@ -410,7 +377,6 @@ impl InlineCompletionButton {
                    ),
            )
        };
-        self.inline_completion_provider = editor.inline_completion_provider();
        self.language = language.cloned();
        self.file = file;

--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -208,10 +208,10 @@ pub struct Diagnostic {
    /// The human-readable message associated with this diagnostic.
    pub message: String,
    /// An id that identifies the group to which this diagnostic belongs.
+    /// 0 is used for diagnostics that do not come from a language server.
    ///
-    /// When a language server produces a diagnostic with
-    /// one or more associated diagnostics, those diagnostics are all
-    /// assigned a single group ID.
+    /// When a language server produces a diagnostic with one or more associated diagnostics, those
+    /// diagnostics are all assigned a single group ID.
    pub group_id: usize,
    /// Whether this diagnostic is the primary diagnostic for its group.
    ///
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -3115,8 +3115,8 @@ fn html_lang() -> Language {
    .with_injection_query(
        r#"
        (script_element
-            (raw_text) @injection.content
-            (#set! injection.language "javascript"))
+            (raw_text) @content
+            (#set! "language" "javascript"))
        "#,
    )
    .unwrap()
@@ -3138,15 +3138,15 @@ fn erb_lang() -> Language {
    .with_injection_query(
        r#"
            (
-                (code) @injection.content
-                (#set! injection.language "ruby")
-                (#set! injection.combined)
+                (code) @content
+                (#set! "language" "ruby")
+                (#set! "combined")
            )

            (
-                (content) @injection.content
-                (#set! injection.language "html")
-                (#set! injection.combined)
+                (content) @content
+                (#set! "language" "html")
+                (#set! "combined")
            )
        "#,
    )
@@ -3278,11 +3278,11 @@ pub fn markdown_lang() -> Language {
        r#"
            (fenced_code_block
                (info_string
-                    (language) @injection.language)
-                (code_fence_content) @injection.content)
+                    (language) @language)
+                (code_fence_content) @content)

-                ((inline) @injection.content
-                (#set! injection.language "markdown-inline"))
+            ((inline) @content
+                (#set! "language" "markdown-inline"))
        "#,
    )
    .unwrap()
--- a/crates/language/src/diagnostic_set.rs
+++ b/crates/language/src/diagnostic_set.rs
@@ -1,5 +1,4 @@
 use crate::{range_to_lsp, Diagnostic};
-use anyhow::Result;
 use collections::HashMap;
 use lsp::LanguageServerId;
 use std::{
@@ -55,16 +54,16 @@ pub struct Summary {
 impl DiagnosticEntry<PointUtf16> {
    /// Returns a raw LSP diagnostic used to provide diagnostic context to LSP
    /// codeAction request
-    pub fn to_lsp_diagnostic_stub(&self) -> Result<lsp::Diagnostic> {
+    pub fn to_lsp_diagnostic_stub(&self) -> lsp::Diagnostic {
        let code = self
            .diagnostic
            .code
            .clone()
            .map(lsp::NumberOrString::String);

-        let range = range_to_lsp(self.range.clone())?;
+        let range = range_to_lsp(self.range.clone());

-        Ok(lsp::Diagnostic {
+        lsp::Diagnostic {
            code,
            range,
            severity: Some(self.diagnostic.severity),
@@ -72,7 +71,7 @@ impl DiagnosticEntry<PointUtf16> {
            message: self.diagnostic.message.clone(),
            data: self.diagnostic.data.clone(),
            ..Default::default()
-        })
+        }
    }
 }

--- a/crates/language/src/language.rs
+++ b/crates/language/src/language.rs
@@ -1273,45 +1273,23 @@ impl Language {
            .ok_or_else(|| anyhow!("cannot mutate grammar"))?;
        let query = Query::new(&grammar.ts_language, source)?;
        let mut language_capture_ix = None;
-        let mut injection_language_capture_ix = None;
        let mut content_capture_ix = None;
-        let mut injection_content_capture_ix = None;
        get_capture_indices(
            &query,
            &mut [
                ("language", &mut language_capture_ix),
-                ("injection.language", &mut injection_language_capture_ix),
                ("content", &mut content_capture_ix),
-                ("injection.content", &mut injection_content_capture_ix),
            ],
        );
-        language_capture_ix = match (language_capture_ix, injection_language_capture_ix) {
-            (None, Some(ix)) => Some(ix),
-            (Some(_), Some(_)) => {
-                return Err(anyhow!(
-                    "both language and injection.language captures are present"
-                ));
-            }
-            _ => language_capture_ix,
-        };
-        content_capture_ix = match (content_capture_ix, injection_content_capture_ix) {
-            (None, Some(ix)) => Some(ix),
-            (Some(_), Some(_)) => {
-                return Err(anyhow!(
-                    "both content and injection.content captures are present"
-                ));
-            }
-            _ => content_capture_ix,
-        };
        let patterns = (0..query.pattern_count())
            .map(|ix| {
                let mut config = InjectionPatternConfig::default();
                for setting in query.property_settings(ix) {
                    match setting.key.as_ref() {
-                        "language" | "injection.language" => {
+                        "language" => {
                            config.language.clone_from(&setting.value);
                        }
-                        "combined" | "injection.combined" => {
+                        "combined" => {
                            config.combined = true;
                        }
                        _ => {}
@@ -1871,19 +1849,14 @@ pub fn point_from_lsp(point: lsp::Position) -> Unclipped<PointUtf16> {
    Unclipped(PointUtf16::new(point.line, point.character))
 }

-pub fn range_to_lsp(range: Range<PointUtf16>) -> Result<lsp::Range> {
-    if range.start > range.end {
-        Err(anyhow!(
-            "Inverted range provided to an LSP request: {:?}-{:?}",
-            range.start,
-            range.end
-        ))
-    } else {
-        Ok(lsp::Range {
-            start: point_to_lsp(range.start),
-            end: point_to_lsp(range.end),
-        })
+pub fn range_to_lsp(range: Range<PointUtf16>) -> lsp::Range {
+    let mut start = point_to_lsp(range.start);
+    let mut end = point_to_lsp(range.end);
+    if start > end {
+        log::error!("range_to_lsp called with inverted range {start:?}-{end:?}");
+        mem::swap(&mut start, &mut end);
    }
+    lsp::Range { start, end }
 }

 pub fn range_from_lsp(range: lsp::Range) -> Range<Unclipped<PointUtf16>> {
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -203,7 +203,7 @@ pub enum InlineCompletionProvider {
    #[default]
    Copilot,
    Supermaven,
-    Zed,
+    Zeta,
 }

 /// The settings for inline completions, such as [GitHub Copilot](https://github.com/features/copilot)
--- a/crates/language/src/syntax_map/syntax_map_tests.rs
+++ b/crates/language/src/syntax_map/syntax_map_tests.rs
@@ -1193,15 +1193,15 @@ fn erb_lang() -> Language {
    .with_injection_query(
        r#"
            (
-                (code) @injection.content
-                (#set! injection.language "ruby")
-                (#set! injection.combined)
+                (code) @content
+                (#set! "language" "ruby")
+                (#set! "combined")
            )

            (
-                (content) @injection.content
-                (#set! injection.language "html")
-                (#set! injection.combined)
+                (content) @content
+                (#set! "language" "html")
+                (#set! "combined")
            )
        "#,
    )
@@ -1230,8 +1230,8 @@ fn rust_lang() -> Language {
    .with_injection_query(
        r#"
            (macro_invocation
-                (token_tree) @injection.content
-                (#set! injection.language "rust"))
+                (token_tree) @content
+                (#set! "language" "rust"))
        "#,
    )
    .unwrap()
@@ -1277,13 +1277,13 @@ fn heex_lang() -> Language {
              (partial_expression_value)
              (expression_value)
              (ending_expression_value)
-            ] @injection.content)
-          (#set! injection.language "elixir")
-          (#set! injection.combined)
+            ] @content)
+          (#set! language "elixir")
+          (#set! combined)
        )

-        ((expression (expression_value) @injection.content)
-         (#set! injection.language "elixir"))
+        ((expression (expression_value) @content)
+         (#set! language "elixir"))
        "#,
    )
    .unwrap()
--- a/crates/language_model/src/model/cloud_model.rs
+++ b/crates/language_model/src/model/cloud_model.rs
@@ -88,7 +88,6 @@ impl CloudModel {
            Self::Google(model) => match model {
                google_ai::Model::Gemini15Pro
                | google_ai::Model::Gemini15Flash
-                | google_ai::Model::Gemini20Flash
                | google_ai::Model::Custom { .. } => {
                    LanguageModelAvailability::RequiresPlan(Plan::ZedPro)
                }
--- a/crates/language_tools/src/lsp_log.rs
+++ b/crates/language_tools/src/lsp_log.rs
@@ -10,7 +10,7 @@ use gpui::{
 use language::LanguageServerId;
 use lsp::{
    notification::SetTrace, IoKind, LanguageServer, LanguageServerName, MessageType,
-    SetTraceParams, TraceValue,
+    ServerCapabilities, SetTraceParams, TraceValue,
 };
 use project::{search::SearchQuery, Project, WorktreeId};
 use std::{borrow::Cow, sync::Arc};
@@ -108,6 +108,7 @@ struct LanguageServerState {
    rpc_state: Option<LanguageServerRpcState>,
    trace_level: TraceValue,
    log_level: MessageType,
+    capabilities: ServerCapabilities,
    io_logs_subscription: Option<lsp::Subscription>,
 }

@@ -177,7 +178,7 @@ pub enum LogKind {
    Trace,
    #[default]
    Logs,
-    ServerInfo,
+    Capabilities,
 }

 impl LogKind {
@@ -186,7 +187,7 @@ impl LogKind {
            LogKind::Rpc => RPC_MESSAGES,
            LogKind::Trace => SERVER_TRACE,
            LogKind::Logs => SERVER_LOGS,
-            LogKind::ServerInfo => SERVER_INFO,
+            LogKind::Capabilities => SERVER_CAPABILITIES,
        }
    }
 }
@@ -323,11 +324,7 @@ impl LogStore {
                                    *id,
                                    Some(name.clone()),
                                    *worktree_id,
-                                    project
-                                        .read(cx)
-                                        .lsp_store()
-                                        .read(cx)
-                                        .language_server_for_id(*id),
+                                    project.read(cx).language_server_for_id(*id, cx),
                                    cx,
                                );
                            }
@@ -381,6 +378,7 @@ impl LogStore {
                trace_level: TraceValue::Off,
                log_level: MessageType::LOG,
                io_logs_subscription: None,
+                capabilities: ServerCapabilities::default(),
            }
        });

@@ -404,6 +402,10 @@ impl LogStore {
            }));
        }

+        if let Some(server) = server {
+            server_state.capabilities = server.capabilities();
+        }
+
        Some(server_state)
    }

@@ -488,6 +490,10 @@ impl LogStore {
        Some(&self.language_servers.get(&server_id)?.trace_messages)
    }

+    fn server_capabilities(&self, server_id: LanguageServerId) -> Option<&ServerCapabilities> {
+        Some(&self.language_servers.get(&server_id)?.capabilities)
+    }
+
    fn server_ids_for_project<'a>(
        &'a self,
        lookup_project: &'a WeakModel<Project>,
@@ -613,7 +619,9 @@ impl LspLogView {
                            LogKind::Rpc => this.show_rpc_trace_for_server(server_id, cx),
                            LogKind::Trace => this.show_trace_for_server(server_id, cx),
                            LogKind::Logs => this.show_logs_for_server(server_id, cx),
-                            LogKind::ServerInfo => this.show_server_info(server_id, cx),
+                            LogKind::Capabilities => {
+                                this.show_capabilities_for_server(server_id, cx)
+                            }
                        }
                    } else {
                        this.current_server_id = None;
@@ -630,7 +638,7 @@ impl LspLogView {
                    LogKind::Rpc => this.show_rpc_trace_for_server(server_id, cx),
                    LogKind::Trace => this.show_trace_for_server(server_id, cx),
                    LogKind::Logs => this.show_logs_for_server(server_id, cx),
-                    LogKind::ServerInfo => this.show_server_info(server_id, cx),
+                    LogKind::Capabilities => this.show_capabilities_for_server(server_id, cx),
                }
            }

@@ -704,28 +712,14 @@ impl LspLogView {
        (editor, vec![editor_subscription, search_subscription])
    }

-    fn editor_for_server_info(
-        server: &LanguageServer,
+    fn editor_for_capabilities(
+        capabilities: ServerCapabilities,
        cx: &mut ViewContext<Self>,
    ) -> (View<Editor>, Vec<Subscription>) {
        let editor = cx.new_view(|cx| {
            let mut editor = Editor::multi_line(cx);
-            let server_info = format!(
-                "* Server: {NAME} (id {ID})
-
-* Binary: {BINARY:#?}
-
-* Running in project: {PATH:?}
-
-* Capabilities: {CAPABILITIES}",
-                NAME = server.name(),
-                ID = server.server_id(),
-                BINARY = server.binary(),
-                PATH = server.root_path(),
-                CAPABILITIES = serde_json::to_string_pretty(&server.capabilities())
-                    .unwrap_or_else(|e| format!("Failed to serialize capabilities: {e}")),
-            );
-            editor.set_text(server_info, cx);
+            editor.set_text(serde_json::to_string_pretty(&capabilities).unwrap(), cx);
+            editor.move_to_end(&MoveToEnd, cx);
            editor.set_read_only(true);
            editor.set_show_inline_completions(Some(false), cx);
            editor
@@ -933,13 +927,7 @@ impl LspLogView {
        level: TraceValue,
        cx: &mut ViewContext<Self>,
    ) {
-        if let Some(server) = self
-            .project
-            .read(cx)
-            .lsp_store()
-            .read(cx)
-            .language_server_for_id(server_id)
-        {
+        if let Some(server) = self.project.read(cx).language_server_for_id(server_id, cx) {
            self.log_store.update(cx, |this, _| {
                if let Some(state) = this.get_language_server_state(server_id) {
                    state.trace_level = level;
@@ -952,17 +940,22 @@ impl LspLogView {
        }
    }

-    fn show_server_info(&mut self, server_id: LanguageServerId, cx: &mut ViewContext<Self>) {
-        let lsp_store = self.project.read(cx).lsp_store();
-        let Some(server) = lsp_store.read(cx).language_server_for_id(server_id) else {
-            return;
-        };
-        self.current_server_id = Some(server_id);
-        self.active_entry_kind = LogKind::ServerInfo;
-        let (editor, editor_subscriptions) = Self::editor_for_server_info(&server, cx);
-        self.editor = editor;
-        self.editor_subscriptions = editor_subscriptions;
-        cx.notify();
+    fn show_capabilities_for_server(
+        &mut self,
+        server_id: LanguageServerId,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let capabilities = self.log_store.read(cx).server_capabilities(server_id);
+
+        if let Some(capabilities) = capabilities {
+            self.current_server_id = Some(server_id);
+            self.active_entry_kind = LogKind::Capabilities;
+            let (editor, editor_subscriptions) =
+                Self::editor_for_capabilities(capabilities.clone(), cx);
+            self.editor = editor;
+            self.editor_subscriptions = editor_subscriptions;
+            cx.notify();
+        }
        cx.focus(&self.focus_handle);
    }
 }
@@ -1033,7 +1026,7 @@ impl Item for LspLogView {
                    LogKind::Rpc => new_view.show_rpc_trace_for_server(server_id, cx),
                    LogKind::Trace => new_view.show_trace_for_server(server_id, cx),
                    LogKind::Logs => new_view.show_logs_for_server(server_id, cx),
-                    LogKind::ServerInfo => new_view.show_server_info(server_id, cx),
+                    LogKind::Capabilities => new_view.show_capabilities_for_server(server_id, cx),
                }
            }
            new_view
@@ -1194,7 +1187,9 @@ impl Render for LspLogToolbarItemView {
                                        }
                                        LogKind::Trace => view.show_trace_for_server(server_id, cx),
                                        LogKind::Logs => view.show_logs_for_server(server_id, cx),
-                                        LogKind::ServerInfo => view.show_server_info(server_id, cx),
+                                        LogKind::Capabilities => {
+                                            view.show_capabilities_for_server(server_id, cx)
+                                        }
                                    }
                                    cx.notify();
                                }),
@@ -1277,10 +1272,10 @@ impl Render for LspLogToolbarItemView {
                            )
                        })
                        .entry(
-                            SERVER_INFO,
+                            SERVER_CAPABILITIES,
                            None,
                            cx.handler_for(&log_view, move |view, cx| {
-                                view.show_server_info(server_id, cx);
+                                view.show_capabilities_for_server(server_id, cx);
                            }),
                        )
                    }))
@@ -1439,7 +1434,7 @@ impl Render for LspLogToolbarItemView {
 const RPC_MESSAGES: &str = "RPC Messages";
 const SERVER_LOGS: &str = "Server Logs";
 const SERVER_TRACE: &str = "Server Trace";
-const SERVER_INFO: &str = "Server Info";
+const SERVER_CAPABILITIES: &str = "Server Capabilities";

 impl Default for LspLogToolbarItemView {
    fn default() -> Self {
--- a/crates/language_tools/src/syntax_tree_view.rs
+++ b/crates/language_tools/src/syntax_tree_view.rs
@@ -132,12 +132,14 @@ impl SyntaxTreeView {
            .editor
            .update(cx, |editor, cx| editor.snapshot(cx));
        let (excerpt, buffer, range) = editor_state.editor.update(cx, |editor, cx| {
+            let selection = editor.selections.last::<usize>(cx);
            let selection_range = editor.selections.last::<usize>(cx).range();
+            let selection_head = selection.head();
            let multi_buffer = editor.buffer().read(cx);
-            let (excerpt, range) = snapshot
+            let excerpt = snapshot
                .buffer_snapshot
-                .range_to_buffer_ranges(selection_range)
-                .pop()?;
+                .excerpt_containing(selection_head..selection_head)?;
+            let range = excerpt.map_range_to_buffer(selection_range);
            let buffer = multi_buffer.buffer(excerpt.buffer_id()).unwrap().clone();
            Some((excerpt, buffer, range))
        })?;
--- a/crates/languages/src/c/injections.scm
+++ b/crates/languages/src/c/injections.scm
@@ -1,7 +1,7 @@
 (preproc_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c"))
+    value: (preproc_arg) @content
+    (#set! "language" "c"))

 (preproc_function_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c"))
+    value: (preproc_arg) @content
+    (#set! "language" "c"))
--- a/crates/languages/src/cpp/injections.scm
+++ b/crates/languages/src/cpp/injections.scm
@@ -1,11 +1,11 @@
 (preproc_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c++"))
+    value: (preproc_arg) @content
+    (#set! "language" "c++"))

 (preproc_function_def
-    value: (preproc_arg) @injection.content
-    (#set! injection.language "c++"))
+    value: (preproc_arg) @content
+    (#set! "language" "c++"))

 (raw_string_literal
-  delimiter: (raw_string_delimiter) @injection.language
-  (raw_string_content) @injection.content)
+  delimiter: (raw_string_delimiter) @language
+  (raw_string_content) @content)
--- a/crates/languages/src/go.rs
+++ b/crates/languages/src/go.rs
@@ -43,12 +43,6 @@ static GO_ESCAPE_SUBTEST_NAME_REGEX: LazyLock<Regex> = LazyLock::new(|| {
    Regex::new(r#"[.*+?^${}()|\[\]\\]"#).expect("Failed to create GO_ESCAPE_SUBTEST_NAME_REGEX")
 });

-const BINARY: &str = if cfg!(target_os = "windows") {
-    "gopls.exe"
-} else {
-    "gopls"
-};
-
 #[async_trait(?Send)]
 impl super::LspAdapter for GoLspAdapter {
    fn name(&self) -> LanguageServerName {
@@ -170,7 +164,7 @@ impl super::LspAdapter for GoLspAdapter {
            return Err(anyhow!("failed to install gopls with `go install`. Is `go` installed and in the PATH? Check logs for more information."));
        }

-        let installed_binary_path = gobin_dir.join(BINARY);
+        let installed_binary_path = gobin_dir.join("gopls");
        let version_output = util::command::new_smol_command(&installed_binary_path)
            .arg("version")
            .output()
--- a/crates/languages/src/go/injections.scm
+++ b/crates/languages/src/go/injections.scm
@@ -9,5 +9,5 @@
    [
      (raw_string_literal)
      (interpreted_string_literal)
-    ] @injection.content
-    (#set! injection.language "regex")))
+    ] @content
+    (#set! "language" "regex")))
--- a/crates/languages/src/javascript/injections.scm
+++ b/crates/languages/src/javascript/injections.scm
@@ -1,60 +1,60 @@
 (((comment) @_jsdoc_comment
-  (#match? @_jsdoc_comment "(?s)^/[*][*][^*].*[*]/$")) @injection.content
-  (#set! injection.language "jsdoc"))
+  (#match? @_jsdoc_comment "(?s)^/[*][*][^*].*[*]/$")) @content
+  (#set! "language" "jsdoc"))

-((regex) @injection.content
-  (#set! injection.language "regex"))
+((regex) @content
+  (#set! "language" "regex"))

 (call_expression
  function: (identifier) @_name (#eq? @_name "css")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "css"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "css"))
 )

 (call_expression
  function: (identifier) @_name (#eq? @_name "html")
-  arguments: (template_string) @injection.content
-                              (#set! injection.language "html")
+  arguments: (template_string) @content
+                              (#set! "language" "html")
 )

 (call_expression
  function: (identifier) @_name (#eq? @_name "js")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "javascript"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "javascript"))
 )

 (call_expression
  function: (identifier) @_name (#eq? @_name "json")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "json"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "json"))
 )

 (call_expression
  function: (identifier) @_name (#eq? @_name "sql")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "sql"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "sql"))
 )

 (call_expression
  function: (identifier) @_name (#eq? @_name "ts")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "typescript"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "typescript"))
 )

 (call_expression
  function: (identifier) @_name (#match? @_name "^ya?ml$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "yaml"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "yaml"))
 )

 (call_expression
  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql"))
+  arguments: (template_string (string_fragment) @content
+                              (#set! "language" "graphql"))
 )

 (call_expression
  function: (identifier) @_name (#match? @_name "^g(raph)?ql$")
-  arguments: (arguments (template_string (string_fragment) @injection.content
-                              (#set! injection.language "graphql")))
+  arguments: (arguments (template_string (string_fragment) @content
+                              (#set! "language" "graphql")))
 )
--- a/Show More
+++ b/Show More