Simplify implementation

add g shift-j test
fix editor command
2025-01-07 09:17:25 -07:00 · 2025-01-07 13:27:20 +08:00 · 2025-01-07 13:07:36 +08:00 · 2024-12-30 14:07:08 +08:00 · 2024-12-30 12:32:22 +08:00 · 2024-12-30 10:34:37 +08:00
178 changed files with 9547 additions and 7338 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,14 +7,10 @@ on:
      - "v[0-9]+.[0-9]+.x"
    tags:
      - "v*"
-    paths-ignore:
-      - "docs/**"
  pull_request:
    branches:
      - "**"
-    paths-ignore:
-      - "docs/**/*"
-      - ".github/workflows/community_*"
+  merge_group:

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

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

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

@@ -96,6 +113,7 @@ jobs:
    runs-on:
      - self-hosted
      - test
+    needs: check_docs_only
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -103,29 +121,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"
@@ -139,6 +163,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
@@ -149,21 +174,26 @@ jobs:
          clean: false

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

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

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

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

      - name: Build other binaries and features
+        if: needs.check_docs_only.outputs.docs_only == 'false'
        run: |
          cargo build -p zed
          cargo check -p workspace
@@ -174,6 +204,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
@@ -184,15 +215,18 @@ jobs:
          clean: false

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

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

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

  # todo(windows): Actually run the tests
@@ -201,6 +235,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
@@ -211,16 +246,19 @@ jobs:
          clean: false

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

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

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

  bundle-mac:
@@ -289,14 +327,14 @@ jobs:
          mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg

      - name: Upload app bundle (aarch64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-aarch64.dmg
          path: target/aarch64-apple-darwin/release/Zed-aarch64.dmg

      - name: Upload app bundle (x86_64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.dmg
@@ -326,6 +364,8 @@ jobs:
    env:
      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -345,7 +385,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.tar.gz
@@ -372,6 +412,8 @@ jobs:
    env:
      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
+      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
+      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Checkout repo
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -391,7 +433,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz
--- a/.github/workflows/community_release_actions.yml
+++ b/.github/workflows/community_release_actions.yml
@@ -18,7 +18,7 @@ jobs:
          fi
          echo "::set-output name=URL::$URL"
      - name: Get content
-        uses: 2428392/gh-truncate-string-action@e6b5885fb83c81ca9a700a91b079baec2133be3e # v1.4.0
+        uses: 2428392/gh-truncate-string-action@b3ff790d21cf42af3ca7579146eedb93c8fb0757 # v1.4.1
        id: get-content
        with:
          stringToTruncate: |
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,6 +7,7 @@ on:
  push:
    branches:
      - main
+  merge_group:

 jobs:
  check_formatting:
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "activity_indicator"
@@ -83,8 +83,9 @@ dependencies = [

 [[package]]
 name = "alacritty_terminal"
-version = "0.24.1-dev"
-source = "git+https://github.com/alacritty/alacritty?rev=91d034ff8b53867143c005acfaa14609147c9a2c#91d034ff8b53867143c005acfaa14609147c9a2c"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52b9241459831fee2f22fcda52ddaf9e449b6627334a0f40f13a1b3344018060"
 dependencies = [
 "base64 0.22.1",
 "bitflags 2.6.0",
@@ -493,6 +494,7 @@ dependencies = [
 "project",
 "proto",
 "rand 0.8.5",
+ "release_channel",
 "rope",
 "schemars",
 "serde",
@@ -934,7 +936,7 @@ dependencies = [
 "chrono",
 "futures-util",
 "http-types",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "hyper-rustls 0.24.2",
 "serde",
 "serde_json",
@@ -1008,9 +1010,9 @@ dependencies = [

 [[package]]
 name = "async-tungstenite"
-version = "0.28.1"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6cd055774e8b7f2ff9e5f9646efb298f180c3b886cdf20ef27f5a0bfbe2677b"
+checksum = "1c348fb0b6d132c596eca3dcd941df48fb597aafcb07a738ec41c004b087dc99"
 dependencies = [
 "async-std",
 "async-tls",
@@ -1166,9 +1168,9 @@ dependencies = [

 [[package]]
 name = "aws-config"
-version = "1.5.10"
+version = "1.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b49afaa341e8dd8577e1a2200468f98956d6eda50bcf4a53246cc00174ba924"
+checksum = "a5d1c2c88936a73c699225d0bc00684a534166b0cebc2659c3cdf08de8edc64c"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1177,7 +1179,7 @@ dependencies = [
 "aws-sdk-sts",
 "aws-smithy-async",
 "aws-smithy-http",
- "aws-smithy-json 0.60.7",
+ "aws-smithy-json",
 "aws-smithy-runtime",
 "aws-smithy-runtime-api",
 "aws-smithy-types",
@@ -1208,9 +1210,9 @@ dependencies = [

 [[package]]
 name = "aws-runtime"
-version = "1.4.4"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea"
+checksum = "300a12520b4e6d08b73f77680f12c16e8ae43250d55100e0b2be46d78da16a48"
 dependencies = [
 "aws-credential-types",
 "aws-sigv4",
@@ -1234,15 +1236,15 @@ dependencies = [

 [[package]]
 name = "aws-sdk-kinesis"
-version = "1.52.0"
+version = "1.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5d4932ecd8754ec808b57c13b5ab4965d2b568ae1c1984d1823a4e2aa3e7bc"
+checksum = "cb367ea65d5a59b230d7e670ba59d68d1e51fc53802bf0219effafed21dca23f"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
 "aws-smithy-async",
 "aws-smithy-http",
- "aws-smithy-json 0.61.1",
+ "aws-smithy-json",
 "aws-smithy-runtime",
 "aws-smithy-runtime-api",
 "aws-smithy-types",
@@ -1256,9 +1258,9 @@ dependencies = [

 [[package]]
 name = "aws-sdk-s3"
-version = "1.65.0"
+version = "1.66.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3ba2c5c0f2618937ce3d4a5ad574b86775576fa24006bcb3128c6e2cbf3c34e"
+checksum = "154488d16ab0d627d15ab2832b57e68a16684c8c902f14cb8a75ec933fc94852"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
@@ -1267,7 +1269,7 @@ dependencies = [
 "aws-smithy-checksums",
 "aws-smithy-eventstream",
 "aws-smithy-http",
- "aws-smithy-json 0.61.1",
+ "aws-smithy-json",
 "aws-smithy-runtime",
 "aws-smithy-runtime-api",
 "aws-smithy-types",
@@ -1290,15 +1292,15 @@ dependencies = [

 [[package]]
 name = "aws-sdk-sso"
-version = "1.50.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ca43a4ef210894f93096039ef1d6fa4ad3edfabb3be92b80908b9f2e4b4eab"
+checksum = "74995133da38f109a0eb8e8c886f9e80c713b6e9f2e6e5a6a1ba4450ce2ffc46"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
 "aws-smithy-async",
 "aws-smithy-http",
- "aws-smithy-json 0.61.1",
+ "aws-smithy-json",
 "aws-smithy-runtime",
 "aws-smithy-runtime-api",
 "aws-smithy-types",
@@ -1312,15 +1314,15 @@ dependencies = [

 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.51.0"
+version = "1.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abaf490c2e48eed0bb8e2da2fb08405647bd7f253996e0f93b981958ea0f73b0"
+checksum = "e7062a779685cbf3b2401eb36151e2c6589fd5f3569b8a6bc2d199e5aaa1d059"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
 "aws-smithy-async",
 "aws-smithy-http",
- "aws-smithy-json 0.61.1",
+ "aws-smithy-json",
 "aws-smithy-runtime",
 "aws-smithy-runtime-api",
 "aws-smithy-types",
@@ -1334,15 +1336,15 @@ dependencies = [

 [[package]]
 name = "aws-sdk-sts"
-version = "1.51.0"
+version = "1.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68fde0d69c8bfdc1060ea7da21df3e39f6014da316783336deff0a9ec28f4bf"
+checksum = "299dae7b1dc0ee50434453fa5a229dc4b22bd3ee50409ff16becf1f7346e0193"
 dependencies = [
 "aws-credential-types",
 "aws-runtime",
 "aws-smithy-async",
 "aws-smithy-http",
- "aws-smithy-json 0.61.1",
+ "aws-smithy-json",
 "aws-smithy-query",
 "aws-smithy-runtime",
 "aws-smithy-runtime-api",
@@ -1386,9 +1388,9 @@ dependencies = [

 [[package]]
 name = "aws-smithy-async"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
+checksum = "8aa8ff1492fd9fb99ae28e8467af0dbbb7c31512b16fabf1a0f10d7bb6ef78bb"
 dependencies = [
 "futures-util",
 "pin-project-lite",
@@ -1448,15 +1450,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "aws-smithy-json"
-version = "0.60.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
-dependencies = [
- "aws-smithy-types",
-]
-
 [[package]]
 name = "aws-smithy-json"
 version = "0.61.1"
@@ -1478,9 +1471,9 @@ dependencies = [

 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.4"
+version = "1.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45"
+checksum = "431a10d0e07e09091284ef04453dae4069283aa108d209974d67e77ae1caa658"
 dependencies = [
 "aws-smithy-async",
 "aws-smithy-http",
@@ -1493,7 +1486,7 @@ dependencies = [
 "http-body 0.4.6",
 "http-body 1.0.1",
 "httparse",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "hyper-rustls 0.24.2",
 "once_cell",
 "pin-project-lite",
@@ -1522,9 +1515,9 @@ dependencies = [

 [[package]]
 name = "aws-smithy-types"
-version = "1.2.9"
+version = "1.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbd94a32b3a7d55d3806fe27d98d3ad393050439dd05eb53ece36ec5e3d3510"
+checksum = "8ecbf4d5dfb169812e2b240a4350f15ad3c6b03a54074e5712818801615f2dc5"
 dependencies = [
 "base64-simd",
 "bytes 1.9.0",
@@ -1584,7 +1577,7 @@ dependencies = [
 "headers",
 "http 0.2.12",
 "http-body 0.4.6",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "itoa",
 "matchit",
 "memchr",
@@ -1750,15 +1743,6 @@ dependencies = [
 "bit-vec 0.6.3",
 ]

-[[package]]
-name = "bit-set"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f"
-dependencies = [
- "bit-vec 0.7.0",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -1774,12 +1758,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"

-[[package]]
-name = "bit-vec"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
-
 [[package]]
 name = "bit-vec"
 version = "0.8.0"
@@ -1828,7 +1806,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.5.0"
-source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969"
+source = "git+https://github.com/kvark/blade?rev=099555282605c7c4cca9e66a8f40148298347f80#099555282605c7c4cca9e66a8f40148298347f80"
 dependencies = [
 "ash",
 "ash-window",
@@ -1858,7 +1836,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.3.0"
-source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969"
+source = "git+https://github.com/kvark/blade?rev=099555282605c7c4cca9e66a8f40148298347f80#099555282605c7c4cca9e66a8f40148298347f80"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1868,7 +1846,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.1.0"
-source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969"
+source = "git+https://github.com/kvark/blade?rev=099555282605c7c4cca9e66a8f40148298347f80#099555282605c7c4cca9e66a8f40148298347f80"
 dependencies = [
 "blade-graphics",
 "bytemuck",
@@ -2256,9 +2234,9 @@ dependencies = [

 [[package]]
 name = "cargo_toml"
-version = "0.20.5"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88da5a13c620b4ca0078845707ea9c3faf11edbc3ffd8497d11d686211cd1ac0"
+checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472"
 dependencies = [
 "serde",
 "toml 0.8.19",
@@ -2506,7 +2484,6 @@ dependencies = [
 "exec",
 "fork",
 "ipc-channel",
- "once_cell",
 "parking_lot",
 "paths",
 "plist",
@@ -2523,7 +2500,7 @@ dependencies = [
 "anyhow",
 "async-native-tls",
 "async-recursion 0.3.2",
- "async-tungstenite 0.28.1",
+ "async-tungstenite 0.28.2",
 "chrono",
 "clock",
 "cocoa 0.26.0",
@@ -2533,7 +2510,6 @@ dependencies = [
 "gpui",
 "http_client",
 "log",
- "once_cell",
 "parking_lot",
 "paths",
 "postage",
@@ -2656,7 +2632,7 @@ dependencies = [
 "assistant_tool",
 "async-stripe",
 "async-trait",
- "async-tungstenite 0.28.1",
+ "async-tungstenite 0.28.2",
 "audio",
 "aws-config",
 "aws-sdk-kinesis",
@@ -2688,7 +2664,7 @@ dependencies = [
 "gpui",
 "hex",
 "http_client",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "indoc",
 "jsonwebtoken",
 "language",
@@ -3704,6 +3680,7 @@ dependencies = [
 "ctor",
 "editor",
 "env_logger 0.11.5",
+ "feature_flags",
 "gpui",
 "language",
 "log",
@@ -4412,6 +4389,7 @@ dependencies = [
 "serde",
 "settings",
 "smallvec",
+ "telemetry",
 "theme",
 "ui",
 "util",
@@ -4428,12 +4406,13 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"

 [[package]]
 name = "fancy-regex"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05"
+checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
 dependencies = [
 "bit-set 0.5.3",
- "regex",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
 ]

 [[package]]
@@ -4805,11 +4784,13 @@ dependencies = [
 "rope",
 "serde",
 "serde_json",
+ "shlex",
 "smol",
 "tempfile",
 "text",
 "time",
 "util",
+ "which 6.0.3",
 "windows 0.58.0",
 ]

@@ -5187,8 +5168,12 @@ dependencies = [
 "anyhow",
 "collections",
 "db",
+ "editor",
+ "futures 0.3.31",
 "git",
 "gpui",
+ "language",
+ "menu",
 "project",
 "schemars",
 "serde",
@@ -5610,9 +5595,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

 [[package]]
 name = "heed"
-version = "0.20.5"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb"
+checksum = "bd54745cfacb7b97dee45e8fdb91814b62bccddb481debb7de0f9ee6b7bf5b43"
 dependencies = [
 "bitflags 2.6.0",
 "byteorder",
@@ -5635,9 +5620,9 @@ checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"

 [[package]]
 name = "heed-types"
-version = "0.20.1"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114"
+checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
 dependencies = [
 "bincode",
 "byteorder",
@@ -5864,9 +5849,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

 [[package]]
 name = "hyper"
-version = "0.14.31"
+version = "0.14.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
 dependencies = [
 "bytes 1.9.0",
 "futures-channel",
@@ -5879,7 +5864,7 @@ dependencies = [
 "httpdate",
 "itoa",
 "pin-project-lite",
- "socket2 0.5.8",
+ "socket2 0.4.10",
 "tokio",
 "tower-service",
 "tracing",
@@ -5914,7 +5899,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
 "futures-util",
 "http 0.2.12",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "log",
 "rustls 0.21.12",
 "rustls-native-certs 0.6.3",
@@ -5947,7 +5932,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
 "bytes 1.9.0",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "native-tls",
 "tokio",
 "tokio-native-tls",
@@ -6625,7 +6610,7 @@ checksum = "58d9afa5bc6eeafb78f710a2efc585f69099f8b6a99dc7eb826581e3773a6e31"
 dependencies = [
 "anyhow",
 "async-trait",
- "async-tungstenite 0.28.1",
+ "async-tungstenite 0.28.2",
 "futures 0.3.31",
 "jupyter-protocol",
 "serde",
@@ -7592,9 +7577,8 @@ dependencies = [

 [[package]]
 name = "metal"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21"
+version = "0.30.0"
+source = "git+https://github.com/gfx-rs/metal-rs?rev=ef768ff9d742ae6a0f4e83ddc8031264e7d460c4#ef768ff9d742ae6a0f4e83ddc8031264e7d460c4"
 dependencies = [
 "bitflags 2.6.0",
 "block",
@@ -7716,6 +7700,7 @@ dependencies = [
 "sum_tree",
 "text",
 "theme",
+ "tree-sitter",
 "util",
 ]

@@ -7733,12 +7718,11 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"

 [[package]]
 name = "naga"
-version = "22.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad"
+version = "23.0.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=1a643291c2e8854ba7e4f5445a4388202731bfa1#1a643291c2e8854ba7e4f5445a4388202731bfa1"
 dependencies = [
 "arrayvec",
- "bit-set 0.6.0",
+ "bit-set 0.8.0",
 "bitflags 2.6.0",
 "cfg_aliases 0.1.1",
 "codespan-reporting",
@@ -9607,6 +9591,7 @@ dependencies = [
 "tempfile",
 "terminal",
 "text",
+ "toml 0.8.19",
 "unindent",
 "url",
 "util",
@@ -10279,7 +10264,6 @@ name = "release_channel"
 version = "0.1.0"
 dependencies = [
 "gpui",
- "once_cell",
 ]

 [[package]]
@@ -10374,7 +10358,7 @@ dependencies = [
 "alacritty_terminal",
 "anyhow",
 "async-dispatcher",
- "async-tungstenite 0.28.1",
+ "async-tungstenite 0.28.2",
 "base64 0.22.1",
 "client",
 "collections",
@@ -10432,7 +10416,7 @@ dependencies = [
 "h2 0.3.26",
 "http 0.2.12",
 "http-body 0.4.6",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "hyper-rustls 0.24.2",
 "hyper-tls",
 "ipnet",
@@ -10677,7 +10661,7 @@ name = "rpc"
 version = "0.1.0"
 dependencies = [
 "anyhow",
- "async-tungstenite 0.28.1",
+ "async-tungstenite 0.28.2",
 "base64 0.22.1",
 "chrono",
 "collections",
@@ -11306,9 +11290,9 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 dependencies = [
 "serde",
 ]
@@ -12955,16 +12939,17 @@ dependencies = [

 [[package]]
 name = "tiktoken-rs"
-version = "0.5.9"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234"
+checksum = "44075987ee2486402f0808505dd65692163d243a337fc54363d49afac41087f6"
 dependencies = [
 "anyhow",
 "base64 0.21.7",
 "bstr",
- "fancy-regex 0.12.0",
+ "fancy-regex 0.13.0",
 "lazy_static",
 "parking_lot",
+ "regex",
 "rustc-hash 1.1.0",
 ]

@@ -13488,9 +13473,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter-c"
-version = "0.23.2"
+version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db56fadd8c3c6bc880dffcf1177c9d1c54a71a5207716db8660189082e63b587"
+checksum = "afd2b1bf1585dc2ef6d69e87d01db8adb059006649dd5f96f31aa789ee6e9c71"
 dependencies = [
 "cc",
 "tree-sitter-language",
@@ -13605,9 +13590,9 @@ dependencies = [

 [[package]]
 name = "tree-sitter-json"
-version = "0.23.0"
+version = "0.24.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86a5d6b3ea17e06e7a34aabeadd68f5866c0d0f9359155d432095f8b751865e4"
+checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471"
 dependencies = [
 "cc",
 "tree-sitter-language",
@@ -13995,6 +13980,8 @@ dependencies = [
 "futures-lite 1.13.0",
 "git2",
 "globset",
+ "itertools 0.13.0",
+ "libc",
 "log",
 "rand 0.8.5",
 "regex",
@@ -14248,7 +14235,7 @@ dependencies = [
 "futures-util",
 "headers",
 "http 0.2.12",
- "hyper 0.14.31",
+ "hyper 0.14.32",
 "log",
 "mime",
 "mime_guess",
@@ -16000,7 +15987,7 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.167.1"
+version = "0.168.0"
 dependencies = [
 "activity_indicator",
 "anyhow",
@@ -16134,7 +16121,7 @@ dependencies = [

 [[package]]
 name = "zed_astro"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
 "serde",
 "zed_extension_api 0.1.0",
@@ -16163,7 +16150,7 @@ dependencies = [

 [[package]]
 name = "zed_elixir"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
 "zed_extension_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -337,7 +337,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/alacritty/alacritty", rev = "91d034ff8b53867143c005acfaa14609147c9a2c" }
+alacritty_terminal = "0.24"
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -355,13 +355,13 @@ async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 base64 = "0.22"
 bitflags = "2.6.0"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "099555282605c7c4cca9e66a8f40148298347f80" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "099555282605c7c4cca9e66a8f40148298347f80" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "099555282605c7c4cca9e66a8f40148298347f80" }
 blake3 = "1.5.3"
 bytes = "1.0"
 cargo_metadata = "0.19"
-cargo_toml = "0.20"
+cargo_toml = "0.21"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
 cocoa = "0.26"
@@ -385,7 +385,7 @@ futures-lite = "1.13"
 git2 = { version = "0.19", default-features = false }
 globset = "0.4"
 handlebars = "4.3"
-heed = { version = "0.20.1", features = ["read-txn-no-tls"] }
+heed = { version = "0.21.0", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
 html5ever = "0.27.0"
 hyper = "0.14"
@@ -408,7 +408,6 @@ nanoid = "0.4"
 nbformat = { version = "0.9.0" }
 nix = "0.29"
 num-format = "0.4.4"
-once_cell = "1.19.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
@@ -472,7 +471,7 @@ sys-locale = "0.3.1"
 sysinfo = "0.31.0"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
-tiktoken-rs = "0.5.9"
+tiktoken-rs = "0.6.0"
 time = { version = "0.3", features = [
    "macros",
    "parsing",
@@ -498,7 +497,7 @@ tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex",
 tree-sitter-diff = "0.1.0"
 tree-sitter-html = "0.20"
 tree-sitter-jsdoc = "0.23"
-tree-sitter-json = "0.23"
+tree-sitter-json = "0.24"
 tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
 tree-sitter-python = "0.23"
 tree-sitter-regex = "0.23"
@@ -525,6 +524,12 @@ wasmtime-wasi = "24"
 which = "6.0.0"
 wit-component = "0.201"
 zstd = "0.11"
+# Custom metal-rs is only needed for "macos-blade" feature of GPUI
+#TODO: switch to crates once these are published:
+# - https://github.com/gfx-rs/metal-rs/pull/335
+# - https://github.com/gfx-rs/metal-rs/pull/336
+# - https://github.com/gfx-rs/metal-rs/pull/337
+metal = { git = "https://github.com/gfx-rs/metal-rs", rev = "ef768ff9d742ae6a0f4e83ddc8031264e7d460c4" }

 [workspace.dependencies.async-stripe]
 git = "https://github.com/zed-industries/async-stripe"
--- a/assets/icons/file_icons/css.svg
+++ b/assets/icons/file_icons/css.svg
@@ -1,3 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M11.7633 4.2078H4.23674L4.3551 5.5189H10.1429L9.99592 6.87645H6.20408L6.33877 8.16255H9.86939L9.66122 9.92379L8 10.3275L6.3102 9.92021L6.20408 8.86633H4.7102L4.87755 10.7955L8 11.6457L11.0694 10.8812L11.7633 4.2078ZM2 2H14L12.9061 12.7818L7.98775 14L3.09388 12.7818L2 2Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.58 2H2.5V12.08C2.5 12.5892 2.70229 13.0776 3.06235 13.4376C3.42242 13.7977 3.91078 14 4.42 14H12.58C13.0892 14 13.5776 13.7977 13.9376 13.4376C14.2977 13.0776 14.5 12.5892 14.5 12.08V3.92C14.5 3.41078 14.2977 2.92242 13.9376 2.56235C13.5776 2.20229 13.0892 2 12.58 2ZM3.358 11.6285C3.34615 12.6668 3.96437 13.2311 4.96636 13.232H4.96621C6.06429 13.2456 6.70951 12.4798 6.63088 11.3867H5.48085C5.4899 11.601 5.47243 11.8974 5.36026 12.0313C5.27992 12.1441 5.16183 12.2005 5.00645 12.2005C4.67402 12.1952 4.50788 11.9534 4.50788 11.4753V9.19488C4.50788 8.94247 4.54407 8.75168 4.61645 8.62283C4.73423 8.38524 5.17961 8.3584 5.34825 8.58663C5.47804 8.71252 5.48974 9.04683 5.48101 9.26757H6.63104C6.66099 8.70582 6.53494 8.10381 6.20079 7.80913C5.65853 7.23521 4.37403 7.26765 3.82039 7.80102C3.51213 8.07495 3.358 8.47525 3.358 9.00159V11.6285ZM7.04116 11.3867C7.01043 12.4573 7.50713 13.2473 8.61739 13.232L8.61723 13.2317C10.1571 13.2967 10.5874 11.592 9.96023 10.4759C9.74995 10.1097 9.16994 9.80702 8.71379 9.62981C8.36155 9.46772 8.21038 9.3086 8.20711 8.92079C8.20711 8.55559 8.35983 8.37291 8.66543 8.37291C8.83688 8.37291 8.95357 8.42939 9.01519 8.54217C9.10317 8.6754 9.12454 9.0409 9.11565 9.26742H10.1612C10.1866 8.71627 10.0554 8.11739 9.75509 7.81303C9.26822 7.22257 7.99791 7.24909 7.5115 7.82504C7.0109 8.29179 6.97783 9.4437 7.3346 9.96848C7.49278 10.205 7.75143 10.409 8.1107 10.5809C8.15897 10.6051 8.21552 10.6314 8.27633 10.6598C8.53247 10.7792 8.86416 10.9338 8.97119 11.1046C9.16073 11.3241 9.13593 11.8913 9.00333 12.0877C8.9336 12.1952 8.81285 12.2489 8.64141 12.2489C8.25703 12.2785 8.09666 11.8534 8.12677 11.3867H7.04116ZM10.5474 11.3867C10.5167 12.4573 11.0134 13.2473 12.1236 13.232L12.1235 13.2317C13.6634 13.2967 14.0936 11.592 13.4665 10.4759C13.2562 10.1097 12.6762 9.80702 12.2201 9.62981C11.8678 9.46772 11.7166 9.3086 11.7134 8.92079C11.7134 8.55559 11.8661 8.37291 12.1717 8.37291C12.3431 8.37291 12.4598 8.42939 12.5214 8.54217C12.6094 8.6754 12.6308 9.0409 12.6219 9.26742H13.6674C13.6928 8.71627 13.5617 8.11739 13.2614 7.81303C12.7745 7.22257 11.5042 7.24909 11.0178 7.82504C10.5172 8.29179 10.4841 9.4437 10.8409 9.96848C10.999 10.205 11.2577 10.409 11.617 10.5809C11.6652 10.6051 11.7218 10.6314 11.7826 10.6598C12.0387 10.7792 12.3704 10.9338 12.4775 11.1046C12.667 11.3241 12.6422 11.8913 12.5096 12.0877C12.4399 12.1952 12.3191 12.2489 12.1477 12.2489C11.7633 12.2785 11.6029 11.8534 11.633 11.3867H10.5474Z" fill="black"/>
 </svg>
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -448,7 +448,6 @@
      "cmd-s": "workspace::Save",
      "cmd-k s": "workspace::SaveWithoutFormat",
      "cmd-shift-s": "workspace::SaveAs",
-      "cmd-n": "workspace::NewFile",
      "cmd-shift-n": "workspace::NewWindow",
      "ctrl-`": "terminal_panel::ToggleFocus",
      "cmd-1": ["workspace::ActivatePane", 0],
@@ -495,6 +494,7 @@
    "context": "Workspace && !Terminal",
    "use_key_equivalents": true,
    "bindings": {
+      "cmd-n": "workspace::NewFile",
      "cmd-shift-r": "task::Spawn",
      "cmd-alt-r": "task::Rerun",
      "ctrl-alt-shift-r": ["task::Spawn", { "reveal_target": "center" }]
@@ -761,6 +761,7 @@
      "cmd-v": "terminal::Paste",
      "cmd-a": "editor::SelectAll",
      "cmd-k": "terminal::Clear",
+      "cmd-n": "workspace::NewTerminal",
      "ctrl-enter": "assistant::InlineAssist",
      // Some nice conveniences
      "cmd-backspace": ["terminal::SendText", "\u0015"],
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -197,6 +197,7 @@
      "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",
@@ -278,6 +279,7 @@
      "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"],
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -481,8 +481,10 @@
    "default_width": 240
  },
  "chat_panel": {
-    // Whether to show the chat panel button in the status bar.
-    "button": true,
+    // When to show the chat panel button in the status bar.
+    // Can be 'never', 'always', or 'when_in_call',
+    // or a boolean (interpreted as 'never'/'always').
+    "button": "when_in_call",
    // Where to the chat panel. Can be 'left' or 'right'.
    "dock": "right",
    // Default width of the chat panel.
@@ -1101,9 +1103,6 @@
      "prettier": {
        "allowed": true
      }
-    },
-    "Zig": {
-      "language_servers": ["zls", "..."]
    }
  },
  // Different settings for specific language models.
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -1556,6 +1556,7 @@ impl ContextEditor {
            let mut editor = Editor::for_buffer(context.read(cx).buffer().clone(), None, cx);
            editor.set_soft_wrap_mode(SoftWrap::EditorWidth, cx);
            editor.set_show_line_numbers(false, cx);
+            editor.set_show_scrollbars(false, cx);
            editor.set_show_git_diff_gutter(false, cx);
            editor.set_show_code_actions(false, cx);
            editor.set_show_runnables(false, cx);
--- a/crates/assistant/src/context_store.rs
+++ b/crates/assistant/src/context_store.rs
@@ -22,6 +22,7 @@ use paths::contexts_dir;
 use project::Project;
 use regex::Regex;
 use rpc::AnyProtoClient;
+use std::sync::LazyLock;
 use std::{
    cmp::Reverse,
    ffi::OsStr,
@@ -753,8 +754,8 @@ impl ContextStore {
                    continue;
                }

-                let pattern = r" - \d+.zed.json$";
-                let re = Regex::new(pattern).unwrap();
+                static ASSISTANT_CONTEXT_REGEX: LazyLock<Regex> =
+                    LazyLock::new(|| Regex::new(r" - \d+.zed.json$").unwrap());

                let metadata = fs.metadata(&path).await?;
                if let Some((file_name, metadata)) = path
@@ -763,11 +764,15 @@ impl ContextStore {
                    .zip(metadata)
                {
                    // This is used to filter out contexts saved by the new assistant.
-                    if !re.is_match(file_name) {
+                    if !ASSISTANT_CONTEXT_REGEX.is_match(file_name) {
                        continue;
                    }

-                    if let Some(title) = re.replace(file_name, "").lines().next() {
+                    if let Some(title) = ASSISTANT_CONTEXT_REGEX
+                        .replace(file_name, "")
+                        .lines()
+                        .next()
+                    {
                        contexts.push(SavedContextMetadata {
                            title: title.to_string(),
                            path,
--- a/crates/assistant/src/slash_command.rs
+++ b/crates/assistant/src/slash_command.rs
@@ -149,7 +149,6 @@ impl SlashCommandCompletionProvider {
                            server_id: LanguageServerId(0),
                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
                        })
                    })
                    .collect()
@@ -243,7 +242,6 @@ impl SlashCommandCompletionProvider {
                            server_id: LanguageServerId(0),
                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
                        }
                    })
                    .collect())
@@ -332,6 +330,16 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        Task::ready(Ok(true))
    }

+    fn apply_additional_edits_for_completion(
+        &self,
+        _: Model<Buffer>,
+        _: project::Completion,
+        _: bool,
+        _: &mut ViewContext<Editor>,
+    ) -> Task<Result<Option<language::Transaction>>> {
+        Task::ready(Ok(None))
+    }
+
    fn is_completion_trigger(
        &self,
        buffer: &Model<Buffer>,
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -50,6 +50,7 @@ parking_lot.workspace = true
 picker.workspace = true
 project.workspace = true
 proto.workspace = true
+release_channel.workspace = true
 rope.workspace = true
 schemars.workspace = true
 serde.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -3,8 +3,9 @@ use std::sync::Arc;
 use assistant_tool::ToolWorkingSet;
 use collections::HashMap;
 use gpui::{
-    list, AnyElement, AppContext, Empty, ListAlignment, ListState, Model, StyleRefinement,
-    Subscription, TextStyleRefinement, View, WeakView,
+    list, AbsoluteLength, AnyElement, AppContext, DefiniteLength, EdgesRefinement, Empty, Length,
+    ListAlignment, ListState, Model, StyleRefinement, Subscription, TextStyleRefinement, View,
+    WeakView,
 };
 use language::LanguageRegistry;
 use language_model::Role;
@@ -89,10 +90,11 @@ impl ActiveThread {
        self.list_state.splice(old_len..old_len, 1);

        let theme_settings = ThemeSettings::get_global(cx);
+        let colors = cx.theme().colors();
        let ui_font_size = TextSize::Default.rems(cx);
-        let buffer_font_size = theme_settings.buffer_font_size;
-
+        let buffer_font_size = TextSize::Small.rems(cx);
        let mut text_style = cx.text_style();
+
        text_style.refine(&TextStyleRefinement {
            font_family: Some(theme_settings.ui_font.family.clone()),
            font_size: Some(ui_font_size.into()),
@@ -105,6 +107,26 @@ impl ActiveThread {
            syntax: cx.theme().syntax().clone(),
            selection_background_color: cx.theme().players().local().selection,
            code_block: StyleRefinement {
+                margin: EdgesRefinement {
+                    top: Some(Length::Definite(rems(1.0).into())),
+                    left: Some(Length::Definite(rems(0.).into())),
+                    right: Some(Length::Definite(rems(0.).into())),
+                    bottom: Some(Length::Definite(rems(1.).into())),
+                },
+                padding: EdgesRefinement {
+                    top: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                    left: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                    right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                    bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
+                },
+                background: Some(colors.editor_foreground.opacity(0.01).into()),
+                border_color: Some(colors.border_variant.opacity(0.3)),
+                border_widths: EdgesRefinement {
+                    top: Some(AbsoluteLength::Pixels(Pixels(1.0))),
+                    left: Some(AbsoluteLength::Pixels(Pixels(1.))),
+                    right: Some(AbsoluteLength::Pixels(Pixels(1.))),
+                    bottom: Some(AbsoluteLength::Pixels(Pixels(1.))),
+                },
                text: Some(TextStyleRefinement {
                    font_family: Some(theme_settings.buffer_font.family.clone()),
                    font_size: Some(buffer_font_size.into()),
@@ -114,8 +136,8 @@ impl ActiveThread {
            },
            inline_code: TextStyleRefinement {
                font_family: Some(theme_settings.buffer_font.family.clone()),
-                font_size: Some(ui_font_size.into()),
-                background_color: Some(cx.theme().colors().editor_background),
+                font_size: Some(buffer_font_size.into()),
+                background_color: Some(colors.editor_foreground.opacity(0.01)),
                ..Default::default()
            },
            ..Default::default()
@@ -204,11 +226,12 @@ impl ActiveThread {
        };

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

-        let (role_icon, role_name) = match message.role {
-            Role::User => (IconName::Person, "You"),
-            Role::Assistant => (IconName::ZedAssistant, "Assistant"),
-            Role::System => (IconName::Settings, "System"),
+        let (role_icon, role_name, role_color) = match message.role {
+            Role::User => (IconName::Person, "You", Color::Muted),
+            Role::Assistant => (IconName::ZedAssistant, "Assistant", Color::Accent),
+            Role::System => (IconName::Settings, "System", Color::Default),
        };

        div()
@@ -218,36 +241,45 @@ impl ActiveThread {
            .child(
                v_flex()
                    .border_1()
-                    .border_color(cx.theme().colors().border)
-                    .bg(cx.theme().colors().editor_background)
+                    .border_color(colors.border_variant)
+                    .bg(colors.editor_background)
                    .rounded_md()
                    .child(
                        h_flex()
-                            .justify_between()
-                            .py_1()
-                            .px_2()
+                            .py_1p5()
+                            .px_2p5()
                            .border_b_1()
-                            .border_color(cx.theme().colors().border_variant)
+                            .border_color(colors.border_variant)
+                            .justify_between()
                            .child(
                                h_flex()
                                    .gap_1p5()
                                    .child(
                                        Icon::new(role_icon)
                                            .size(IconSize::XSmall)
-                                            .color(Color::Muted),
+                                            .color(role_color),
                                    )
-                                    .child(Label::new(role_name).size(LabelSize::XSmall)),
+                                    .child(
+                                        Label::new(role_name)
+                                            .size(LabelSize::XSmall)
+                                            .color(role_color),
+                                    ),
                            ),
                    )
-                    .child(v_flex().px_2().py_1().text_ui(cx).child(markdown.clone()))
+                    .child(div().p_2p5().text_ui(cx).child(markdown.clone()))
                    .when_some(context, |parent, context| {
-                        parent.child(
-                            h_flex().flex_wrap().gap_2().p_1p5().children(
-                                context
-                                    .iter()
-                                    .map(|context| ContextPill::new(context.clone())),
-                            ),
-                        )
+                        if !context.is_empty() {
+                            parent.child(
+                                h_flex()
+                                    .flex_wrap()
+                                    .gap_1()
+                                    .px_1p5()
+                                    .pb_1p5()
+                                    .children(context.iter().map(|c| ContextPill::new(c.clone()))),
+                            )
+                        } else {
+                            parent
+                        }
                    }),
            )
            .into_any()
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -1,6 +1,8 @@
 mod active_thread;
+mod assistant_model_selector;
 mod assistant_panel;
 mod assistant_settings;
+mod buffer_codegen;
 mod context;
 mod context_picker;
 mod context_store;
@@ -10,6 +12,7 @@ mod inline_prompt_editor;
 mod message_editor;
 mod prompts;
 mod streaming_diff;
+mod terminal_codegen;
 mod terminal_inline_assistant;
 mod thread;
 mod thread_history;
--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -0,0 +1,85 @@
+use fs::Fs;
+use gpui::View;
+use language_model::LanguageModelRegistry;
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use settings::update_settings_file;
+use std::sync::Arc;
+use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};
+
+use crate::{assistant_settings::AssistantSettings, ToggleModelSelector};
+
+pub struct AssistantModelSelector {
+    selector: View<LanguageModelSelector>,
+    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
+}
+
+impl AssistantModelSelector {
+    pub(crate) fn new(
+        fs: Arc<dyn Fs>,
+        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
+        cx: &mut WindowContext,
+    ) -> Self {
+        Self {
+            selector: cx.new_view(|cx| {
+                let fs = fs.clone();
+                LanguageModelSelector::new(
+                    move |model, cx| {
+                        update_settings_file::<AssistantSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _cx| settings.set_model(model.clone()),
+                        );
+                    },
+                    cx,
+                )
+            }),
+            menu_handle,
+        }
+    }
+}
+
+impl Render for AssistantModelSelector {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+        let focus_handle = self.selector.focus_handle(cx).clone();
+
+        LanguageModelSelectorPopoverMenu::new(
+            self.selector.clone(),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .w_full()
+                        .gap_0p5()
+                        .child(
+                            div()
+                                .overflow_x_hidden()
+                                .flex_grow()
+                                .whitespace_nowrap()
+                                .child(match active_model {
+                                    Some(model) => h_flex()
+                                        .child(
+                                            Label::new(model.name().0)
+                                                .size(LabelSize::Small)
+                                                .color(Color::Muted),
+                                        )
+                                        .into_any_element(),
+                                    _ => Label::new("No model selected")
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted)
+                                        .into_any_element(),
+                                }),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                )
+                .tooltip(move |cx| {
+                    Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
+                }),
+        )
+        .with_handle(self.menu_handle.clone())
+    }
+}
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
--- a/crates/assistant2/src/context.rs
+++ b/crates/assistant2/src/context.rs
@@ -21,7 +21,7 @@ pub struct Context {
    pub text: SharedString,
 }

-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ContextKind {
    File,
    Directory,
--- a/crates/assistant2/src/context_picker.rs
+++ b/crates/assistant2/src/context_picker.rs
@@ -10,6 +10,7 @@ use gpui::{
    WeakModel, WeakView,
 };
 use picker::{Picker, PickerDelegate};
+use release_channel::ReleaseChannel;
 use ui::{prelude::*, ListItem, ListItemSpacing};
 use util::ResultExt;
 use workspace::Workspace;
@@ -22,6 +23,12 @@ use crate::context_picker::thread_context_picker::ThreadContextPicker;
 use crate::context_store::ContextStore;
 use crate::thread_store::ThreadStore;

+#[derive(Debug, Clone, Copy)]
+pub enum ConfirmBehavior {
+    KeepOpen,
+    Close,
+}
+
 #[derive(Debug, Clone)]
 enum ContextPickerMode {
    Default,
@@ -41,25 +48,30 @@ impl ContextPicker {
        workspace: WeakView<Workspace>,
        thread_store: Option<WeakModel<ThreadStore>>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let mut entries = vec![
-            ContextPickerEntry {
-                name: "File".into(),
-                kind: ContextKind::File,
-                icon: IconName::File,
-            },
-            ContextPickerEntry {
+        let mut entries = Vec::new();
+        entries.push(ContextPickerEntry {
+            name: "File".into(),
+            kind: ContextKind::File,
+            icon: IconName::File,
+        });
+        let release_channel = ReleaseChannel::global(cx);
+        // The directory context picker isn't fully implemented yet, so limit it
+        // to development builds.
+        if release_channel == ReleaseChannel::Dev {
+            entries.push(ContextPickerEntry {
                name: "Folder".into(),
                kind: ContextKind::Directory,
                icon: IconName::Folder,
-            },
-            ContextPickerEntry {
-                name: "Fetch".into(),
-                kind: ContextKind::FetchedUrl,
-                icon: IconName::Globe,
-            },
-        ];
+            });
+        }
+        entries.push(ContextPickerEntry {
+            name: "Fetch".into(),
+            kind: ContextKind::FetchedUrl,
+            icon: IconName::Globe,
+        });

        if thread_store.is_some() {
            entries.push(ContextPickerEntry {
@@ -74,6 +86,7 @@ impl ContextPicker {
            workspace,
            thread_store,
            context_store,
+            confirm_behavior,
            entries,
            selected_ix: 0,
        };
@@ -136,6 +149,7 @@ pub(crate) struct ContextPickerDelegate {
    workspace: WeakView<Workspace>,
    thread_store: Option<WeakModel<ThreadStore>>,
    context_store: WeakModel<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    entries: Vec<ContextPickerEntry>,
    selected_ix: usize,
 }
@@ -175,6 +189,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                    self.context_picker.clone(),
                                    self.workspace.clone(),
                                    self.context_store.clone(),
+                                    self.confirm_behavior,
                                    cx,
                                )
                            }));
@@ -185,6 +200,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                    self.context_picker.clone(),
                                    self.workspace.clone(),
                                    self.context_store.clone(),
+                                    self.confirm_behavior,
                                    cx,
                                )
                            }));
@@ -195,6 +211,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                    self.context_picker.clone(),
                                    self.workspace.clone(),
                                    self.context_store.clone(),
+                                    self.confirm_behavior,
                                    cx,
                                )
                            }));
@@ -206,6 +223,7 @@ impl PickerDelegate for ContextPickerDelegate {
                                        thread_store.clone(),
                                        self.context_picker.clone(),
                                        self.context_store.clone(),
+                                        self.confirm_behavior,
                                        cx,
                                    )
                                }));
--- a/crates/assistant2/src/context_picker/directory_context_picker.rs
+++ b/crates/assistant2/src/context_picker/directory_context_picker.rs
@@ -1,6 +1,8 @@
-// TODO: Remove this once we've implemented the functionality.
+// TODO: Remove this when we finish the implementation.
 #![allow(unused)]

+use std::path::Path;
+use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

 use fuzzy::PathMatch;
@@ -11,7 +13,8 @@ use ui::{prelude::*, ListItem};
 use util::ResultExt as _;
 use workspace::Workspace;

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

 pub struct DirectoryContextPicker {
@@ -23,10 +26,15 @@ impl DirectoryContextPicker {
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let delegate =
-            DirectoryContextPickerDelegate::new(context_picker, workspace, context_store);
+        let delegate = DirectoryContextPickerDelegate::new(
+            context_picker,
+            workspace,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));

        Self { picker }
@@ -49,6 +57,7 @@ pub struct DirectoryContextPickerDelegate {
    context_picker: WeakView<ContextPicker>,
    workspace: WeakView<Workspace>,
    context_store: WeakModel<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    matches: Vec<PathMatch>,
    selected_index: usize,
 }
@@ -58,15 +67,76 @@ impl DirectoryContextPickerDelegate {
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        Self {
            context_picker,
            workspace,
            context_store,
+            confirm_behavior,
            matches: Vec::new(),
            selected_index: 0,
        }
    }
+
+    fn search(
+        &mut self,
+        query: String,
+        cancellation_flag: Arc<AtomicBool>,
+        workspace: &View<Workspace>,
+        cx: &mut ViewContext<Picker<Self>>,
+    ) -> Task<Vec<PathMatch>> {
+        if query.is_empty() {
+            let workspace = workspace.read(cx);
+            let project = workspace.project().read(cx);
+            let directory_matches = project.worktrees(cx).flat_map(|worktree| {
+                let worktree = worktree.read(cx);
+                let path_prefix: Arc<str> = worktree.root_name().into();
+                worktree.directories(false, 0).map(move |entry| PathMatch {
+                    score: 0.,
+                    positions: Vec::new(),
+                    worktree_id: worktree.id().to_usize(),
+                    path: entry.path.clone(),
+                    path_prefix: path_prefix.clone(),
+                    distance_to_relative_ancestor: 0,
+                    is_dir: true,
+                })
+            });
+
+            Task::ready(directory_matches.collect())
+        } else {
+            let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
+            let candidate_sets = worktrees
+                .into_iter()
+                .map(|worktree| {
+                    let worktree = worktree.read(cx);
+
+                    PathMatchCandidateSet {
+                        snapshot: worktree.snapshot(),
+                        include_ignored: worktree
+                            .root_entry()
+                            .map_or(false, |entry| entry.is_ignored),
+                        include_root_name: true,
+                        candidates: project::Candidates::Directories,
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            let executor = cx.background_executor().clone();
+            cx.foreground_executor().spawn(async move {
+                fuzzy::match_path_sets(
+                    candidate_sets.as_slice(),
+                    query.as_str(),
+                    None,
+                    false,
+                    100,
+                    &cancellation_flag,
+                    executor,
+                )
+                .await
+            })
+        }
+    }
 }

 impl PickerDelegate for DirectoryContextPickerDelegate {
@@ -80,7 +150,7 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
        self.selected_index
    }

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

@@ -88,13 +158,67 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
        "Search folders…".into()
    }

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

-    fn confirm(&mut self, _secondary: bool, _cx: &mut ViewContext<Picker<Self>>) {
-        // TODO: Implement this once we fix the issues with the file context picker.
+    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
+        let Some(mat) = self.matches.get(self.selected_index) else {
+            return;
+        };
+
+        let workspace = self.workspace.clone();
+        let Some(project) = workspace
+            .upgrade()
+            .map(|workspace| workspace.read(cx).project().clone())
+        else {
+            return;
+        };
+        let path = mat.path.clone();
+        let worktree_id = WorktreeId::from_usize(mat.worktree_id);
+        let confirm_behavior = self.confirm_behavior;
+        cx.spawn(|this, mut cx| async move {
+            this.update(&mut cx, |this, cx| {
+                let mut text = String::new();
+
+                // TODO: Add the files from the selected directory.
+
+                this.delegate
+                    .context_store
+                    .update(cx, |context_store, cx| {
+                        context_store.insert_context(
+                            ContextKind::Directory,
+                            path.to_string_lossy().to_string(),
+                            text,
+                        );
+                    })?;
+
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
+                }
+
+                anyhow::Ok(())
+            })??;
+
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx)
    }

    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
@@ -108,10 +232,18 @@ impl PickerDelegate for DirectoryContextPickerDelegate {

    fn render_match(
        &self,
-        _ix: usize,
-        _selected: bool,
+        ix: usize,
+        selected: bool,
        _cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        None
+        let path_match = &self.matches[ix];
+        let directory_name = path_match.path.to_string_lossy().to_string();
+
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .toggle_state(selected)
+                .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
@@ -12,7 +12,7 @@ use ui::{prelude::*, ListItem, ViewContext};
 use workspace::Workspace;

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

 pub struct FetchContextPicker {
@@ -24,9 +24,15 @@ impl FetchContextPicker {
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let delegate = FetchContextPickerDelegate::new(context_picker, workspace, context_store);
+        let delegate = FetchContextPickerDelegate::new(
+            context_picker,
+            workspace,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));

        Self { picker }
@@ -56,6 +62,7 @@ pub struct FetchContextPickerDelegate {
    context_picker: WeakView<ContextPicker>,
    workspace: WeakView<Workspace>,
    context_store: WeakModel<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    url: String,
 }

@@ -64,11 +71,13 @@ impl FetchContextPickerDelegate {
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        FetchContextPickerDelegate {
            context_picker,
            workspace,
            context_store,
+            confirm_behavior,
            url: String::new(),
        }
    }
@@ -184,6 +193,7 @@ impl PickerDelegate for FetchContextPickerDelegate {

        let http_client = workspace.read(cx).client().http_client().clone();
        let url = self.url.clone();
+        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
            let text = Self::build_message(http_client, &url).await?;

@@ -192,7 +202,14 @@ impl PickerDelegate for FetchContextPickerDelegate {
                    .context_store
                    .update(cx, |context_store, _cx| {
                        context_store.insert_context(ContextKind::FetchedUrl, url, text);
-                    })
+                    })?;
+
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
+                }
+
+                anyhow::Ok(())
            })??;

            anyhow::Ok(())
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -13,7 +13,7 @@ use util::ResultExt as _;
 use workspace::Workspace;

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

 pub struct FileContextPicker {
@@ -25,9 +25,15 @@ impl FileContextPicker {
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let delegate = FileContextPickerDelegate::new(context_picker, workspace, context_store);
+        let delegate = FileContextPickerDelegate::new(
+            context_picker,
+            workspace,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));

        Self { picker }
@@ -50,6 +56,7 @@ pub struct FileContextPickerDelegate {
    context_picker: WeakView<ContextPicker>,
    workspace: WeakView<Workspace>,
    context_store: WeakModel<ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    matches: Vec<PathMatch>,
    selected_index: usize,
 }
@@ -59,11 +66,13 @@ impl FileContextPickerDelegate {
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
        context_store: WeakModel<ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        Self {
            context_picker,
            workspace,
            context_store,
+            confirm_behavior,
            matches: Vec::new(),
            selected_index: 0,
        }
@@ -183,7 +192,9 @@ impl PickerDelegate for FileContextPickerDelegate {
    }

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

        let workspace = self.workspace.clone();
        let Some(project) = workspace
@@ -194,6 +205,7 @@ impl PickerDelegate for FileContextPickerDelegate {
        };
        let path = mat.path.clone();
        let worktree_id = WorktreeId::from_usize(mat.worktree_id);
+        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
            let Some(open_buffer_task) = project
                .update(&mut cx, |project, cx| {
@@ -207,22 +219,31 @@ impl PickerDelegate for FileContextPickerDelegate {
            let buffer = open_buffer_task.await?;

            this.update(&mut cx, |this, cx| {
-                this.delegate.context_store.update(cx, |context_store, cx| {
-                    let mut text = String::new();
-                    text.push_str(&codeblock_fence_for_path(Some(&path), None));
-                    text.push_str(&buffer.read(cx).text());
-                    if !text.ends_with('\n') {
-                        text.push('\n');
-                    }
+                this.delegate
+                    .context_store
+                    .update(cx, |context_store, cx| {
+                        let mut text = String::new();
+                        text.push_str(&codeblock_fence_for_path(Some(&path), None));
+                        text.push_str(&buffer.read(cx).text());
+                        if !text.ends_with('\n') {
+                            text.push('\n');
+                        }

-                    text.push_str("```\n");
+                        text.push_str("```\n");

-                    context_store.insert_context(
-                        ContextKind::File,
-                        path.to_string_lossy().to_string(),
-                        text,
-                    );
-                })
+                        context_store.insert_context(
+                            ContextKind::File,
+                            path.to_string_lossy().to_string(),
+                            text,
+                        );
+                    })?;
+
+                match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
+                }
+
+                anyhow::Ok(())
            })??;

            anyhow::Ok(())
--- a/crates/assistant2/src/context_picker/thread_context_picker.rs
+++ b/crates/assistant2/src/context_picker/thread_context_picker.rs
@@ -6,7 +6,7 @@ use picker::{Picker, PickerDelegate};
 use ui::{prelude::*, ListItem};

 use crate::context::ContextKind;
-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store;
 use crate::thread::ThreadId;
 use crate::thread_store::ThreadStore;
@@ -20,10 +20,15 @@ impl ThreadContextPicker {
        thread_store: WeakModel<ThreadStore>,
        context_picker: WeakView<ContextPicker>,
        context_store: WeakModel<context_store::ContextStore>,
+        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
-        let delegate =
-            ThreadContextPickerDelegate::new(thread_store, context_picker, context_store);
+        let delegate = ThreadContextPickerDelegate::new(
+            thread_store,
+            context_picker,
+            context_store,
+            confirm_behavior,
+        );
        let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));

        ThreadContextPicker { picker }
@@ -52,6 +57,7 @@ pub struct ThreadContextPickerDelegate {
    thread_store: WeakModel<ThreadStore>,
    context_picker: WeakView<ContextPicker>,
    context_store: WeakModel<context_store::ContextStore>,
+    confirm_behavior: ConfirmBehavior,
    matches: Vec<ThreadContextEntry>,
    selected_index: usize,
 }
@@ -61,11 +67,13 @@ impl ThreadContextPickerDelegate {
        thread_store: WeakModel<ThreadStore>,
        context_picker: WeakView<ContextPicker>,
        context_store: WeakModel<context_store::ContextStore>,
+        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        ThreadContextPickerDelegate {
            thread_store,
            context_picker,
            context_store,
+            confirm_behavior,
            matches: Vec::new(),
            selected_index: 0,
        }
@@ -146,7 +154,9 @@ impl PickerDelegate for ThreadContextPickerDelegate {
    }

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

        let Some(thread_store) = self.thread_store.upgrade() else {
            return;
@@ -180,6 +190,11 @@ impl PickerDelegate for ThreadContextPickerDelegate {
                context_store.insert_context(ContextKind::Thread, entry.summary.clone(), text);
            })
            .ok();
+
+        match self.confirm_behavior {
+            ConfirmBehavior::KeepOpen => {}
+            ConfirmBehavior::Close => self.dismissed(cx),
+        }
    }

    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
@@ -203,7 +218,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
            ListItem::new(ix)
                .inset(true)
                .toggle_state(selected)
-                .child(thread.summary.clone()),
+                .child(Label::new(thread.summary.clone())),
        )
    }
 }
--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -4,7 +4,7 @@ use gpui::{FocusHandle, Model, View, WeakModel, WeakView};
 use ui::{prelude::*, PopoverMenu, PopoverMenuHandle, Tooltip};
 use workspace::Workspace;

-use crate::context_picker::ContextPicker;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
 use crate::thread_store::ThreadStore;
 use crate::ui::ContextPill;
@@ -33,6 +33,7 @@ impl ContextStrip {
                    workspace.clone(),
                    thread_store.clone(),
                    context_store.downgrade(),
+                    ConfirmBehavior::KeepOpen,
                    cx,
                )
            }),
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -1,20 +1,24 @@
 use std::sync::Arc;

-use editor::{Editor, EditorElement, EditorStyle};
+use editor::{Editor, EditorElement, EditorEvent, EditorStyle};
 use fs::Fs;
-use gpui::{AppContext, FocusableView, Model, TextStyle, View, WeakModel, WeakView};
+use gpui::{
+    AppContext, DismissEvent, FocusableView, Model, Subscription, TextStyle, View, WeakModel,
+    WeakView,
+};
 use language_model::{LanguageModelRegistry, LanguageModelRequestTool};
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
-use settings::{update_settings_file, Settings};
+use language_model_selector::LanguageModelSelector;
+use rope::Point;
+use settings::Settings;
 use theme::ThemeSettings;
 use ui::{
-    prelude::*, ButtonLike, CheckboxWithLabel, ElevationIndex, KeyBinding, PopoverMenuHandle,
-    Tooltip,
+    prelude::*, ButtonLike, ElevationIndex, KeyBinding, PopoverMenu, PopoverMenuHandle,
+    SwitchWithLabel,
 };
 use workspace::Workspace;

-use crate::assistant_settings::AssistantSettings;
-use crate::context_picker::ContextPicker;
+use crate::assistant_model_selector::AssistantModelSelector;
+use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
 use crate::context_strip::ContextStrip;
 use crate::thread::{RequestKind, Thread};
@@ -27,9 +31,12 @@ pub struct MessageEditor {
    context_store: Model<ContextStore>,
    context_strip: View<ContextStrip>,
    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    language_model_selector: View<LanguageModelSelector>,
-    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
+    inline_context_picker: View<ContextPicker>,
+    inline_context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
+    model_selector: View<AssistantModelSelector>,
+    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    use_tools: bool,
+    _subscriptions: Vec<Subscription>,
 }

 impl MessageEditor {
@@ -42,14 +49,32 @@ impl MessageEditor {
    ) -> Self {
        let context_store = cx.new_model(|_cx| ContextStore::new());
        let context_picker_menu_handle = PopoverMenuHandle::default();
+        let inline_context_picker_menu_handle = PopoverMenuHandle::default();
+        let model_selector_menu_handle = PopoverMenuHandle::default();

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

            editor
        });
+        let inline_context_picker = cx.new_view(|cx| {
+            ContextPicker::new(
+                workspace.clone(),
+                Some(thread_store.clone()),
+                context_store.downgrade(),
+                ConfirmBehavior::Close,
+                cx,
+            )
+        });
+        let subscriptions = vec![
+            cx.subscribe(&editor, Self::handle_editor_event),
+            cx.subscribe(
+                &inline_context_picker,
+                Self::handle_inline_context_picker_event,
+            ),
+        ];

        Self {
            thread,
@@ -66,26 +91,19 @@ impl MessageEditor {
                )
            }),
            context_picker_menu_handle,
-            language_model_selector: cx.new_view(|cx| {
-                let fs = fs.clone();
-                LanguageModelSelector::new(
-                    move |model, cx| {
-                        update_settings_file::<AssistantSettings>(
-                            fs.clone(),
-                            cx,
-                            move |settings, _cx| settings.set_model(model.clone()),
-                        );
-                    },
-                    cx,
-                )
+            inline_context_picker,
+            inline_context_picker_menu_handle,
+            model_selector: cx.new_view(|cx| {
+                AssistantModelSelector::new(fs, model_selector_menu_handle.clone(), cx)
            }),
-            language_model_selector_menu_handle: PopoverMenuHandle::default(),
+            model_selector_menu_handle,
            use_tools: false,
+            _subscriptions: subscriptions,
        }
    }

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

    fn toggle_context_picker(&mut self, _: &ToggleContextPicker, cx: &mut ViewContext<Self>) {
@@ -143,48 +161,38 @@ impl MessageEditor {
        None
    }

-    fn render_language_model_selector(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let active_model = LanguageModelRegistry::read_global(cx).active_model();
-        let focus_handle = self.language_model_selector.focus_handle(cx).clone();
+    fn handle_editor_event(
+        &mut self,
+        editor: View<Editor>,
+        event: &EditorEvent,
+        cx: &mut ViewContext<Self>,
+    ) {
+        match event {
+            EditorEvent::SelectionsChanged { .. } => {
+                editor.update(cx, |editor, cx| {
+                    let snapshot = editor.buffer().read(cx).snapshot(cx);
+                    let newest_cursor = editor.selections.newest::<Point>(cx).head();
+                    if newest_cursor.column > 0 {
+                        let behind_cursor = Point::new(newest_cursor.row, newest_cursor.column - 1);
+                        let char_behind_cursor = snapshot.chars_at(behind_cursor).next();
+                        if char_behind_cursor == Some('@') {
+                            self.inline_context_picker_menu_handle.show(cx);
+                        }
+                    }
+                });
+            }
+            _ => {}
+        }
+    }

-        LanguageModelSelectorPopoverMenu::new(
-            self.language_model_selector.clone(),
-            ButtonLike::new("active-model")
-                .style(ButtonStyle::Subtle)
-                .child(
-                    h_flex()
-                        .w_full()
-                        .gap_0p5()
-                        .child(
-                            div()
-                                .overflow_x_hidden()
-                                .flex_grow()
-                                .whitespace_nowrap()
-                                .child(match active_model {
-                                    Some(model) => h_flex()
-                                        .child(
-                                            Label::new(model.name().0)
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted),
-                                        )
-                                        .into_any_element(),
-                                    _ => Label::new("No model selected")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted)
-                                        .into_any_element(),
-                                }),
-                        )
-                        .child(
-                            Icon::new(IconName::ChevronDown)
-                                .color(Color::Muted)
-                                .size(IconSize::XSmall),
-                        ),
-                )
-                .tooltip(move |cx| {
-                    Tooltip::for_action_in("Change Model", &ToggleModelSelector, &focus_handle, cx)
-                }),
-        )
-        .with_handle(self.language_model_selector_menu_handle.clone())
+    fn handle_inline_context_picker_event(
+        &mut self,
+        _inline_context_picker: View<ContextPicker>,
+        _event: &DismissEvent,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let editor_focus_handle = self.editor.focus_handle(cx);
+        cx.focus(&editor_focus_handle);
    }
 }

@@ -199,6 +207,7 @@ impl Render for MessageEditor {
        let font_size = TextSize::Default.rems(cx);
        let line_height = font_size.to_pixels(cx.rem_size()) * 1.5;
        let focus_handle = self.editor.focus_handle(cx);
+        let inline_context_picker = self.inline_context_picker.clone();
        let bg_color = cx.theme().colors().editor_background;

        v_flex()
@@ -211,58 +220,72 @@ impl Render for MessageEditor {
            .p_2()
            .bg(bg_color)
            .child(self.context_strip.clone())
-            .child(div().id("thread_editor").overflow_y_scroll().h_12().child({
-                let settings = ThemeSettings::get_global(cx);
-                let text_style = TextStyle {
-                    color: cx.theme().colors().editor_foreground,
-                    font_family: settings.ui_font.family.clone(),
-                    font_features: settings.ui_font.features.clone(),
-                    font_size: font_size.into(),
-                    font_weight: settings.ui_font.weight,
-                    line_height: line_height.into(),
-                    ..Default::default()
-                };
-
-                EditorElement::new(
-                    &self.editor,
-                    EditorStyle {
-                        background: bg_color,
-                        local_player: cx.theme().players().local(),
-                        text: text_style,
-                        ..Default::default()
-                    },
-                )
-            }))
            .child(
-                h_flex()
-                    .justify_between()
-                    .child(CheckboxWithLabel::new(
-                        "use-tools",
-                        Label::new("Tools"),
-                        self.use_tools.into(),
-                        cx.listener(|this, selection, _cx| {
-                            this.use_tools = match selection {
-                                ToggleState::Selected => true,
-                                ToggleState::Unselected | ToggleState::Indeterminate => false,
-                            };
-                        }),
-                    ))
+                v_flex()
+                    .gap_4()
+                    .child({
+                        let settings = ThemeSettings::get_global(cx);
+                        let text_style = TextStyle {
+                            color: cx.theme().colors().text,
+                            font_family: settings.ui_font.family.clone(),
+                            font_features: settings.ui_font.features.clone(),
+                            font_size: font_size.into(),
+                            font_weight: settings.ui_font.weight,
+                            line_height: line_height.into(),
+                            ..Default::default()
+                        };
+
+                        EditorElement::new(
+                            &self.editor,
+                            EditorStyle {
+                                background: bg_color,
+                                local_player: cx.theme().players().local(),
+                                text: text_style,
+                                ..Default::default()
+                            },
+                        )
+                    })
+                    .child(
+                        PopoverMenu::new("inline-context-picker")
+                            .menu(move |_cx| Some(inline_context_picker.clone()))
+                            .attach(gpui::Corner::TopLeft)
+                            .anchor(gpui::Corner::BottomLeft)
+                            .offset(gpui::Point {
+                                x: px(0.0),
+                                y: px(-16.0),
+                            })
+                            .with_handle(self.inline_context_picker_menu_handle.clone()),
+                    )
                    .child(
                        h_flex()
-                            .gap_1()
-                            .child(self.render_language_model_selector(cx))
+                            .justify_between()
+                            .child(SwitchWithLabel::new(
+                                "use-tools",
+                                Label::new("Tools"),
+                                self.use_tools.into(),
+                                cx.listener(|this, selection, _cx| {
+                                    this.use_tools = match selection {
+                                        ToggleState::Selected => true,
+                                        ToggleState::Unselected | ToggleState::Indeterminate => {
+                                            false
+                                        }
+                                    };
+                                }),
+                            ))
                            .child(
-                                ButtonLike::new("chat")
-                                    .style(ButtonStyle::Filled)
-                                    .layer(ElevationIndex::ModalSurface)
-                                    .child(Label::new("Submit"))
-                                    .children(
-                                        KeyBinding::for_action_in(&Chat, &focus_handle, cx)
-                                            .map(|binding| binding.into_any_element()),
-                                    )
-                                    .on_click(move |_event, cx| {
-                                        focus_handle.dispatch_action(&Chat, cx);
-                                    }),
+                                h_flex().gap_1().child(self.model_selector.clone()).child(
+                                    ButtonLike::new("chat")
+                                        .style(ButtonStyle::Filled)
+                                        .layer(ElevationIndex::ModalSurface)
+                                        .child(Label::new("Submit"))
+                                        .children(
+                                            KeyBinding::for_action_in(&Chat, &focus_handle, cx)
+                                                .map(|binding| binding.into_any_element()),
+                                        )
+                                        .on_click(move |_event, cx| {
+                                            focus_handle.dispatch_action(&Chat, cx);
+                                        }),
+                                ),
                            ),
                    ),
            )
--- a/crates/assistant2/src/terminal_codegen.rs
+++ b/crates/assistant2/src/terminal_codegen.rs
@@ -0,0 +1,192 @@
+use crate::inline_prompt_editor::CodegenStatus;
+use client::telemetry::Telemetry;
+use futures::{channel::mpsc, SinkExt, StreamExt};
+use gpui::{AppContext, EventEmitter, Model, ModelContext, Task};
+use language_model::{LanguageModelRegistry, LanguageModelRequest};
+use language_models::report_assistant_event;
+use std::{sync::Arc, time::Instant};
+use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
+use terminal::Terminal;
+
+pub struct TerminalCodegen {
+    pub status: CodegenStatus,
+    pub telemetry: Option<Arc<Telemetry>>,
+    terminal: Model<Terminal>,
+    generation: Task<()>,
+    pub message_id: Option<String>,
+    transaction: Option<TerminalTransaction>,
+}
+
+impl EventEmitter<CodegenEvent> for TerminalCodegen {}
+
+impl TerminalCodegen {
+    pub fn new(terminal: Model<Terminal>, telemetry: Option<Arc<Telemetry>>) -> Self {
+        Self {
+            terminal,
+            telemetry,
+            status: CodegenStatus::Idle,
+            generation: Task::ready(()),
+            message_id: None,
+            transaction: None,
+        }
+    }
+
+    pub fn start(&mut self, prompt: LanguageModelRequest, cx: &mut ModelContext<Self>) {
+        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
+            return;
+        };
+
+        let model_api_key = model.api_key(cx);
+        let http_client = cx.http_client();
+        let telemetry = self.telemetry.clone();
+        self.status = CodegenStatus::Pending;
+        self.transaction = Some(TerminalTransaction::start(self.terminal.clone()));
+        self.generation = cx.spawn(|this, mut cx| async move {
+            let model_telemetry_id = model.telemetry_id();
+            let model_provider_id = model.provider_id();
+            let response = model.stream_completion_text(prompt, &cx).await;
+            let generate = async {
+                let message_id = response
+                    .as_ref()
+                    .ok()
+                    .and_then(|response| response.message_id.clone());
+
+                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);
+
+                let task = cx.background_executor().spawn({
+                    let message_id = message_id.clone();
+                    let executor = cx.background_executor().clone();
+                    async move {
+                        let mut response_latency = None;
+                        let request_start = Instant::now();
+                        let task = async {
+                            let mut chunks = response?.stream;
+                            while let Some(chunk) = chunks.next().await {
+                                if response_latency.is_none() {
+                                    response_latency = Some(request_start.elapsed());
+                                }
+                                let chunk = chunk?;
+                                hunks_tx.send(chunk).await?;
+                            }
+
+                            anyhow::Ok(())
+                        };
+
+                        let result = task.await;
+
+                        let error_message = result.as_ref().err().map(|error| error.to_string());
+                        report_assistant_event(
+                            AssistantEvent {
+                                conversation_id: None,
+                                kind: AssistantKind::InlineTerminal,
+                                message_id,
+                                phase: AssistantPhase::Response,
+                                model: model_telemetry_id,
+                                model_provider: model_provider_id.to_string(),
+                                response_latency,
+                                error_message,
+                                language_name: None,
+                            },
+                            telemetry,
+                            http_client,
+                            model_api_key,
+                            &executor,
+                        );
+
+                        result?;
+                        anyhow::Ok(())
+                    }
+                });
+
+                this.update(&mut cx, |this, _| {
+                    this.message_id = message_id;
+                })?;
+
+                while let Some(hunk) = hunks_rx.next().await {
+                    this.update(&mut cx, |this, cx| {
+                        if let Some(transaction) = &mut this.transaction {
+                            transaction.push(hunk, cx);
+                            cx.notify();
+                        }
+                    })?;
+                }
+
+                task.await?;
+                anyhow::Ok(())
+            };
+
+            let result = generate.await;
+
+            this.update(&mut cx, |this, cx| {
+                if let Err(error) = result {
+                    this.status = CodegenStatus::Error(error);
+                } else {
+                    this.status = CodegenStatus::Done;
+                }
+                cx.emit(CodegenEvent::Finished);
+                cx.notify();
+            })
+            .ok();
+        });
+        cx.notify();
+    }
+
+    pub fn stop(&mut self, cx: &mut ModelContext<Self>) {
+        self.status = CodegenStatus::Done;
+        self.generation = Task::ready(());
+        cx.emit(CodegenEvent::Finished);
+        cx.notify();
+    }
+
+    pub fn complete(&mut self, cx: &mut ModelContext<Self>) {
+        if let Some(transaction) = self.transaction.take() {
+            transaction.complete(cx);
+        }
+    }
+
+    pub fn undo(&mut self, cx: &mut ModelContext<Self>) {
+        if let Some(transaction) = self.transaction.take() {
+            transaction.undo(cx);
+        }
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum CodegenEvent {
+    Finished,
+}
+
+pub const CLEAR_INPUT: &str = "\x15";
+const CARRIAGE_RETURN: &str = "\x0d";
+
+struct TerminalTransaction {
+    terminal: Model<Terminal>,
+}
+
+impl TerminalTransaction {
+    pub fn start(terminal: Model<Terminal>) -> Self {
+        Self { terminal }
+    }
+
+    pub fn push(&mut self, hunk: String, cx: &mut AppContext) {
+        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
+        let input = Self::sanitize_input(hunk);
+        self.terminal
+            .update(cx, |terminal, _| terminal.input(input));
+    }
+
+    pub fn undo(&self, cx: &mut AppContext) {
+        self.terminal
+            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
+    }
+
+    pub fn complete(&self, cx: &mut AppContext) {
+        self.terminal.update(cx, |terminal, _| {
+            terminal.input(CARRIAGE_RETURN.to_string())
+        });
+    }
+
+    fn sanitize_input(input: String) -> String {
+        input.replace(['\r', '\n'], "")
+    }
+}
--- a/crates/assistant2/src/terminal_inline_assistant.rs
+++ b/crates/assistant2/src/terminal_inline_assistant.rs
@@ -1,38 +1,29 @@
 use crate::context::attach_context_to_message;
-use crate::context_picker::ContextPicker;
 use crate::context_store::ContextStore;
-use crate::context_strip::ContextStrip;
-use crate::inline_prompt_editor::{CodegenStatus, PromptEditorEvent, PromptMode};
+use crate::inline_prompt_editor::{
+    CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
+};
 use crate::prompts::PromptBuilder;
+use crate::terminal_codegen::{CodegenEvent, TerminalCodegen, CLEAR_INPUT};
 use crate::thread_store::ThreadStore;
-use crate::ToggleContextPicker;
-use crate::{assistant_settings::AssistantSettings, inline_prompt_editor::render_cancel_button};
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
-use editor::{
-    actions::{MoveDown, MoveUp, SelectAll},
-    Editor, EditorElement, EditorEvent, EditorMode, EditorStyle, MultiBuffer,
-};
+use editor::{actions::SelectAll, MultiBuffer};
 use fs::Fs;
-use futures::{channel::mpsc, SinkExt, StreamExt};
 use gpui::{
-    AppContext, Context, EventEmitter, FocusHandle, FocusableView, Global, Model, ModelContext,
-    Subscription, Task, TextStyle, UpdateGlobal, View, WeakModel, WeakView,
+    AppContext, Context, FocusableView, Global, Model, Subscription, UpdateGlobal, View, WeakModel,
+    WeakView,
 };
 use language::Buffer;
 use language_model::{
    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
-use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use language_models::report_assistant_event;
-use settings::{update_settings_file, Settings};
-use std::{cmp, sync::Arc, time::Instant};
+use std::sync::Arc;
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
-use terminal::Terminal;
 use terminal_view::TerminalView;
-use theme::ThemeSettings;
-use ui::{prelude::*, text_for_action, IconButtonShape, PopoverMenuHandle, Tooltip};
+use ui::prelude::*;
 use util::ResultExt;
 use workspace::{notifications::NotificationId, Toast, Workspace};

@@ -48,17 +39,6 @@ pub fn init(
 const DEFAULT_CONTEXT_LINES: usize = 50;
 const PROMPT_HISTORY_MAX_LEN: usize = 20;

-#[derive(Copy, Clone, Default, Debug, PartialEq, Eq, Hash)]
-struct TerminalInlineAssistId(usize);
-
-impl TerminalInlineAssistId {
-    fn post_inc(&mut self) -> TerminalInlineAssistId {
-        let id = *self;
-        self.0 += 1;
-        id
-    }
-}
-
 pub struct TerminalInlineAssistant {
    next_assist_id: TerminalInlineAssistId,
    assists: HashMap<TerminalInlineAssistId, TerminalInlineAssist>,
@@ -99,10 +79,10 @@ impl TerminalInlineAssistant {
            MultiBuffer::singleton(cx.new_model(|cx| Buffer::local(String::new(), cx)), cx)
        });
        let context_store = cx.new_model(|_cx| ContextStore::new());
-        let codegen = cx.new_model(|_| Codegen::new(terminal, self.telemetry.clone()));
+        let codegen = cx.new_model(|_| TerminalCodegen::new(terminal, self.telemetry.clone()));

        let prompt_editor = cx.new_view(|cx| {
-            PromptEditor::new(
+            PromptEditor::new_terminal(
                assist_id,
                self.prompt_history.clone(),
                prompt_buffer.clone(),
@@ -151,11 +131,11 @@ impl TerminalInlineAssistant {

    fn handle_prompt_editor_event(
        &mut self,
-        prompt_editor: View<PromptEditor>,
+        prompt_editor: View<PromptEditor<TerminalCodegen>>,
        event: &PromptEditorEvent,
        cx: &mut WindowContext,
    ) {
-        let assist_id = prompt_editor.read(cx).id;
+        let assist_id = prompt_editor.read(cx).id();
        match event {
            PromptEditorEvent::StartRequested => {
                self.start_assist(assist_id, cx);
@@ -381,8 +361,8 @@ impl TerminalInlineAssistant {

 struct TerminalInlineAssist {
    terminal: WeakView<TerminalView>,
-    prompt_editor: Option<View<PromptEditor>>,
-    codegen: Model<Codegen>,
+    prompt_editor: Option<View<PromptEditor<TerminalCodegen>>>,
+    codegen: Model<TerminalCodegen>,
    workspace: WeakView<Workspace>,
    context_store: Model<ContextStore>,
    _subscriptions: Vec<Subscription>,
@@ -392,12 +372,12 @@ impl TerminalInlineAssist {
    pub fn new(
        assist_id: TerminalInlineAssistId,
        terminal: &View<TerminalView>,
-        prompt_editor: View<PromptEditor>,
+        prompt_editor: View<PromptEditor<TerminalCodegen>>,
        workspace: WeakView<Workspace>,
        context_store: Model<ContextStore>,
        cx: &mut WindowContext,
    ) -> Self {
-        let codegen = prompt_editor.read(cx).codegen.clone();
+        let codegen = prompt_editor.read(cx).codegen().clone();
        Self {
            terminal: terminal.downgrade(),
            prompt_editor: Some(prompt_editor.clone()),
@@ -448,556 +428,3 @@ impl TerminalInlineAssist {
        }
    }
 }
-
-struct PromptEditor {
-    id: TerminalInlineAssistId,
-    height_in_lines: u8,
-    editor: View<Editor>,
-    context_strip: View<ContextStrip>,
-    context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
-    language_model_selector: View<LanguageModelSelector>,
-    edited_since_done: bool,
-    prompt_history: VecDeque<String>,
-    prompt_history_ix: Option<usize>,
-    pending_prompt: String,
-    codegen: Model<Codegen>,
-    _codegen_subscription: Subscription,
-    editor_subscriptions: Vec<Subscription>,
-}
-
-impl EventEmitter<PromptEditorEvent> for PromptEditor {}
-
-impl Render for PromptEditor {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let mut buttons = Vec::new();
-
-        buttons.extend(render_cancel_button(
-            (&self.codegen.read(cx).status).into(),
-            self.edited_since_done,
-            PromptMode::Generate {
-                supports_execute: true,
-            },
-            cx,
-        ));
-
-        v_flex()
-            .border_y_1()
-            .border_color(cx.theme().status().info_border)
-            .py_2()
-            .size_full()
-            .child(
-                h_flex()
-                    .key_context("PromptEditor")
-                    .bg(cx.theme().colors().editor_background)
-                    .on_action(cx.listener(Self::toggle_context_picker))
-                    .on_action(cx.listener(Self::confirm))
-                    .on_action(cx.listener(Self::secondary_confirm))
-                    .on_action(cx.listener(Self::cancel))
-                    .on_action(cx.listener(Self::move_up))
-                    .on_action(cx.listener(Self::move_down))
-                    .child(
-                        h_flex()
-                            .w_12()
-                            .justify_center()
-                            .gap_2()
-                            .child(LanguageModelSelectorPopoverMenu::new(
-                                self.language_model_selector.clone(),
-                                IconButton::new("context", IconName::SettingsAlt)
-                                    .shape(IconButtonShape::Square)
-                                    .icon_size(IconSize::Small)
-                                    .icon_color(Color::Muted)
-                                    .tooltip(move |cx| {
-                                        Tooltip::with_meta(
-                                            format!(
-                                                "Using {}",
-                                                LanguageModelRegistry::read_global(cx)
-                                                    .active_model()
-                                                    .map(|model| model.name().0)
-                                                    .unwrap_or_else(|| "No model selected".into()),
-                                            ),
-                                            None,
-                                            "Change Model",
-                                            cx,
-                                        )
-                                    }),
-                            ))
-                            .children(
-                                if let CodegenStatus::Error(error) = &self.codegen.read(cx).status {
-                                    let error_message = SharedString::from(error.to_string());
-                                    Some(
-                                        div()
-                                            .id("error")
-                                            .tooltip(move |cx| {
-                                                Tooltip::text(error_message.clone(), cx)
-                                            })
-                                            .child(
-                                                Icon::new(IconName::XCircle)
-                                                    .size(IconSize::Small)
-                                                    .color(Color::Error),
-                                            ),
-                                    )
-                                } else {
-                                    None
-                                },
-                            ),
-                    )
-                    .child(div().flex_1().child(self.render_prompt_editor(cx)))
-                    .child(h_flex().gap_1().pr_4().children(buttons)),
-            )
-            .child(h_flex().child(self.context_strip.clone()))
-    }
-}
-
-impl FocusableView for PromptEditor {
-    fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
-        self.editor.focus_handle(cx)
-    }
-}
-
-impl PromptEditor {
-    const MAX_LINES: u8 = 8;
-
-    #[allow(clippy::too_many_arguments)]
-    fn new(
-        id: TerminalInlineAssistId,
-        prompt_history: VecDeque<String>,
-        prompt_buffer: Model<MultiBuffer>,
-        codegen: Model<Codegen>,
-        fs: Arc<dyn Fs>,
-        context_store: Model<ContextStore>,
-        workspace: WeakView<Workspace>,
-        thread_store: Option<WeakModel<ThreadStore>>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        let prompt_editor = cx.new_view(|cx| {
-            let mut editor = Editor::new(
-                EditorMode::AutoHeight {
-                    max_lines: Self::MAX_LINES as usize,
-                },
-                prompt_buffer,
-                None,
-                false,
-                cx,
-            );
-            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text(Self::placeholder_text(cx), cx);
-            editor
-        });
-        let context_picker_menu_handle = PopoverMenuHandle::default();
-
-        let mut this = Self {
-            id,
-            height_in_lines: 1,
-            editor: prompt_editor.clone(),
-            context_strip: cx.new_view(|cx| {
-                ContextStrip::new(
-                    context_store,
-                    workspace.clone(),
-                    thread_store.clone(),
-                    prompt_editor.focus_handle(cx),
-                    context_picker_menu_handle.clone(),
-                    cx,
-                )
-            }),
-            context_picker_menu_handle,
-            language_model_selector: cx.new_view(|cx| {
-                let fs = fs.clone();
-                LanguageModelSelector::new(
-                    move |model, cx| {
-                        update_settings_file::<AssistantSettings>(
-                            fs.clone(),
-                            cx,
-                            move |settings, _| settings.set_model(model.clone()),
-                        );
-                    },
-                    cx,
-                )
-            }),
-            edited_since_done: false,
-            prompt_history,
-            prompt_history_ix: None,
-            pending_prompt: String::new(),
-            _codegen_subscription: cx.observe(&codegen, Self::handle_codegen_changed),
-            editor_subscriptions: Vec::new(),
-            codegen,
-        };
-        this.count_lines(cx);
-        this.subscribe_to_editor(cx);
-        this
-    }
-
-    fn placeholder_text(cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::ToggleFocus, cx)
-            .map(|keybinding| format!(" • {keybinding} for context"))
-            .unwrap_or_default();
-
-        format!("Generate…{context_keybinding} ↓↑ for history")
-    }
-
-    fn subscribe_to_editor(&mut self, cx: &mut ViewContext<Self>) {
-        self.editor_subscriptions.clear();
-        self.editor_subscriptions
-            .push(cx.observe(&self.editor, Self::handle_prompt_editor_changed));
-        self.editor_subscriptions
-            .push(cx.subscribe(&self.editor, Self::handle_prompt_editor_events));
-    }
-
-    fn prompt(&self, cx: &AppContext) -> String {
-        self.editor.read(cx).text(cx)
-    }
-
-    fn count_lines(&mut self, cx: &mut ViewContext<Self>) {
-        let height_in_lines = cmp::max(
-            2, // Make the editor at least two lines tall, to account for padding and buttons.
-            cmp::min(
-                self.editor
-                    .update(cx, |editor, cx| editor.max_point(cx).row().0 + 1),
-                Self::MAX_LINES as u32,
-            ),
-        ) as u8;
-
-        if height_in_lines != self.height_in_lines {
-            self.height_in_lines = height_in_lines;
-            cx.emit(PromptEditorEvent::Resized { height_in_lines });
-        }
-    }
-
-    fn handle_prompt_editor_changed(&mut self, _: View<Editor>, cx: &mut ViewContext<Self>) {
-        self.count_lines(cx);
-    }
-
-    fn handle_prompt_editor_events(
-        &mut self,
-        _: View<Editor>,
-        event: &EditorEvent,
-        cx: &mut ViewContext<Self>,
-    ) {
-        match event {
-            EditorEvent::Edited { .. } => {
-                let prompt = self.editor.read(cx).text(cx);
-                if self
-                    .prompt_history_ix
-                    .map_or(true, |ix| self.prompt_history[ix] != prompt)
-                {
-                    self.prompt_history_ix.take();
-                    self.pending_prompt = prompt;
-                }
-
-                self.edited_since_done = true;
-                cx.notify();
-            }
-            _ => {}
-        }
-    }
-
-    fn handle_codegen_changed(&mut self, _: Model<Codegen>, cx: &mut ViewContext<Self>) {
-        match &self.codegen.read(cx).status {
-            CodegenStatus::Idle => {
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-            CodegenStatus::Pending => {
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(true));
-            }
-            CodegenStatus::Done | CodegenStatus::Error(_) => {
-                self.edited_since_done = false;
-                self.editor
-                    .update(cx, |editor, _| editor.set_read_only(false));
-            }
-        }
-    }
-
-    fn toggle_context_picker(&mut self, _: &ToggleContextPicker, cx: &mut ViewContext<Self>) {
-        self.context_picker_menu_handle.toggle(cx);
-    }
-
-    fn cancel(&mut self, _: &editor::actions::Cancel, cx: &mut ViewContext<Self>) {
-        match &self.codegen.read(cx).status {
-            CodegenStatus::Idle | CodegenStatus::Done | CodegenStatus::Error(_) => {
-                cx.emit(PromptEditorEvent::CancelRequested);
-            }
-            CodegenStatus::Pending => {
-                cx.emit(PromptEditorEvent::StopRequested);
-            }
-        }
-    }
-
-    fn confirm(&mut self, _: &menu::Confirm, cx: &mut ViewContext<Self>) {
-        match &self.codegen.read(cx).status {
-            CodegenStatus::Idle => {
-                if !self.editor.read(cx).text(cx).trim().is_empty() {
-                    cx.emit(PromptEditorEvent::StartRequested);
-                }
-            }
-            CodegenStatus::Pending => {
-                cx.emit(PromptEditorEvent::DismissRequested);
-            }
-            CodegenStatus::Done => {
-                if self.edited_since_done {
-                    cx.emit(PromptEditorEvent::StartRequested);
-                } else {
-                    cx.emit(PromptEditorEvent::ConfirmRequested { execute: false });
-                }
-            }
-            CodegenStatus::Error(_) => {
-                cx.emit(PromptEditorEvent::StartRequested);
-            }
-        }
-    }
-
-    fn secondary_confirm(&mut self, _: &menu::SecondaryConfirm, cx: &mut ViewContext<Self>) {
-        if matches!(self.codegen.read(cx).status, CodegenStatus::Done) {
-            cx.emit(PromptEditorEvent::ConfirmRequested { execute: true });
-        }
-    }
-
-    fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
-        if let Some(ix) = self.prompt_history_ix {
-            if ix > 0 {
-                self.prompt_history_ix = Some(ix - 1);
-                let prompt = self.prompt_history[ix - 1].as_str();
-                self.editor.update(cx, |editor, cx| {
-                    editor.set_text(prompt, cx);
-                    editor.move_to_beginning(&Default::default(), cx);
-                });
-            }
-        } else if !self.prompt_history.is_empty() {
-            self.prompt_history_ix = Some(self.prompt_history.len() - 1);
-            let prompt = self.prompt_history[self.prompt_history.len() - 1].as_str();
-            self.editor.update(cx, |editor, cx| {
-                editor.set_text(prompt, cx);
-                editor.move_to_beginning(&Default::default(), cx);
-            });
-        }
-    }
-
-    fn move_down(&mut self, _: &MoveDown, cx: &mut ViewContext<Self>) {
-        if let Some(ix) = self.prompt_history_ix {
-            if ix < self.prompt_history.len() - 1 {
-                self.prompt_history_ix = Some(ix + 1);
-                let prompt = self.prompt_history[ix + 1].as_str();
-                self.editor.update(cx, |editor, cx| {
-                    editor.set_text(prompt, cx);
-                    editor.move_to_end(&Default::default(), cx)
-                });
-            } else {
-                self.prompt_history_ix = None;
-                let prompt = self.pending_prompt.as_str();
-                self.editor.update(cx, |editor, cx| {
-                    editor.set_text(prompt, cx);
-                    editor.move_to_end(&Default::default(), cx)
-                });
-            }
-        }
-    }
-
-    fn render_prompt_editor(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let settings = ThemeSettings::get_global(cx);
-        let text_style = TextStyle {
-            color: if self.editor.read(cx).read_only(cx) {
-                cx.theme().colors().text_disabled
-            } else {
-                cx.theme().colors().text
-            },
-            font_family: settings.buffer_font.family.clone(),
-            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size.into(),
-            font_weight: settings.buffer_font.weight,
-            line_height: relative(settings.buffer_line_height.value()),
-            ..Default::default()
-        };
-        EditorElement::new(
-            &self.editor,
-            EditorStyle {
-                background: cx.theme().colors().editor_background,
-                local_player: cx.theme().players().local(),
-                text: text_style,
-                ..Default::default()
-            },
-        )
-    }
-}
-
-#[derive(Debug)]
-pub enum CodegenEvent {
-    Finished,
-}
-
-impl EventEmitter<CodegenEvent> for Codegen {}
-
-const CLEAR_INPUT: &str = "\x15";
-const CARRIAGE_RETURN: &str = "\x0d";
-
-struct TerminalTransaction {
-    terminal: Model<Terminal>,
-}
-
-impl TerminalTransaction {
-    pub fn start(terminal: Model<Terminal>) -> Self {
-        Self { terminal }
-    }
-
-    pub fn push(&mut self, hunk: String, cx: &mut AppContext) {
-        // Ensure that the assistant cannot accidentally execute commands that are streamed into the terminal
-        let input = Self::sanitize_input(hunk);
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(input));
-    }
-
-    pub fn undo(&self, cx: &mut AppContext) {
-        self.terminal
-            .update(cx, |terminal, _| terminal.input(CLEAR_INPUT.to_string()));
-    }
-
-    pub fn complete(&self, cx: &mut AppContext) {
-        self.terminal.update(cx, |terminal, _| {
-            terminal.input(CARRIAGE_RETURN.to_string())
-        });
-    }
-
-    fn sanitize_input(input: String) -> String {
-        input.replace(['\r', '\n'], "")
-    }
-}
-
-pub struct Codegen {
-    status: CodegenStatus,
-    telemetry: Option<Arc<Telemetry>>,
-    terminal: Model<Terminal>,
-    generation: Task<()>,
-    message_id: Option<String>,
-    transaction: Option<TerminalTransaction>,
-}
-
-impl Codegen {
-    pub fn new(terminal: Model<Terminal>, telemetry: Option<Arc<Telemetry>>) -> Self {
-        Self {
-            terminal,
-            telemetry,
-            status: CodegenStatus::Idle,
-            generation: Task::ready(()),
-            message_id: None,
-            transaction: None,
-        }
-    }
-
-    pub fn start(&mut self, prompt: LanguageModelRequest, cx: &mut ModelContext<Self>) {
-        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
-            return;
-        };
-
-        let model_api_key = model.api_key(cx);
-        let http_client = cx.http_client();
-        let telemetry = self.telemetry.clone();
-        self.status = CodegenStatus::Pending;
-        self.transaction = Some(TerminalTransaction::start(self.terminal.clone()));
-        self.generation = cx.spawn(|this, mut cx| async move {
-            let model_telemetry_id = model.telemetry_id();
-            let model_provider_id = model.provider_id();
-            let response = model.stream_completion_text(prompt, &cx).await;
-            let generate = async {
-                let message_id = response
-                    .as_ref()
-                    .ok()
-                    .and_then(|response| response.message_id.clone());
-
-                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);
-
-                let task = cx.background_executor().spawn({
-                    let message_id = message_id.clone();
-                    let executor = cx.background_executor().clone();
-                    async move {
-                        let mut response_latency = None;
-                        let request_start = Instant::now();
-                        let task = async {
-                            let mut chunks = response?.stream;
-                            while let Some(chunk) = chunks.next().await {
-                                if response_latency.is_none() {
-                                    response_latency = Some(request_start.elapsed());
-                                }
-                                let chunk = chunk?;
-                                hunks_tx.send(chunk).await?;
-                            }
-
-                            anyhow::Ok(())
-                        };
-
-                        let result = task.await;
-
-                        let error_message = result.as_ref().err().map(|error| error.to_string());
-                        report_assistant_event(
-                            AssistantEvent {
-                                conversation_id: None,
-                                kind: AssistantKind::InlineTerminal,
-                                message_id,
-                                phase: AssistantPhase::Response,
-                                model: model_telemetry_id,
-                                model_provider: model_provider_id.to_string(),
-                                response_latency,
-                                error_message,
-                                language_name: None,
-                            },
-                            telemetry,
-                            http_client,
-                            model_api_key,
-                            &executor,
-                        );
-
-                        result?;
-                        anyhow::Ok(())
-                    }
-                });
-
-                this.update(&mut cx, |this, _| {
-                    this.message_id = message_id;
-                })?;
-
-                while let Some(hunk) = hunks_rx.next().await {
-                    this.update(&mut cx, |this, cx| {
-                        if let Some(transaction) = &mut this.transaction {
-                            transaction.push(hunk, cx);
-                            cx.notify();
-                        }
-                    })?;
-                }
-
-                task.await?;
-                anyhow::Ok(())
-            };
-
-            let result = generate.await;
-
-            this.update(&mut cx, |this, cx| {
-                if let Err(error) = result {
-                    this.status = CodegenStatus::Error(error);
-                } else {
-                    this.status = CodegenStatus::Done;
-                }
-                cx.emit(CodegenEvent::Finished);
-                cx.notify();
-            })
-            .ok();
-        });
-        cx.notify();
-    }
-
-    pub fn stop(&mut self, cx: &mut ModelContext<Self>) {
-        self.status = CodegenStatus::Done;
-        self.generation = Task::ready(());
-        cx.emit(CodegenEvent::Finished);
-        cx.notify();
-    }
-
-    pub fn complete(&mut self, cx: &mut ModelContext<Self>) {
-        if let Some(transaction) = self.transaction.take() {
-            transaction.complete(cx);
-        }
-    }
-
-    pub fn undo(&mut self, cx: &mut ModelContext<Self>) {
-        if let Some(transaction) = self.transaction.take() {
-            transaction.undo(cx);
-        }
-    }
-}
--- a/crates/assistant2/src/ui/context_pill.rs
+++ b/crates/assistant2/src/ui/context_pill.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use gpui::ClickEvent;
 use ui::{prelude::*, IconButtonShape};

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

 #[derive(IntoElement)]
 pub struct ContextPill {
@@ -27,15 +27,28 @@ impl ContextPill {

 impl RenderOnce for ContextPill {
    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
+        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,
+        };
+
        h_flex()
            .gap_1()
-            .pl_1p5()
-            .pr_0p5()
+            .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()
+            .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(
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -39,10 +39,17 @@ impl EventEmitter<ToolbarItemEvent> for Breadcrumbs {}
 impl Render for Breadcrumbs {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        const MAX_SEGMENTS: usize = 12;
-        let element = h_flex().text_ui(cx);
+
+        let element = h_flex()
+            .id("breadcrumb-container")
+            .flex_grow()
+            .overflow_x_scroll()
+            .text_ui(cx);
+
        let Some(active_item) = self.active_item.as_ref() else {
            return element;
        };
+
        let Some(mut segments) = active_item.breadcrumbs(cx.theme(), cx) else {
            return element;
        };
@@ -52,6 +59,7 @@ impl Render for Breadcrumbs {
            prefix_end_ix,
            segments.len().saturating_sub(MAX_SEGMENTS / 2),
        );
+
        if suffix_start_ix > prefix_end_ix {
            segments.splice(
                prefix_end_ix..suffix_start_ix,
@@ -82,6 +90,7 @@ impl Render for Breadcrumbs {
        });

        let breadcrumbs_stack = h_flex().gap_1().children(breadcrumbs);
+
        match active_item
            .downcast::<Editor>()
            .map(|editor| editor.downgrade())
@@ -102,14 +111,14 @@ impl Render for Breadcrumbs {
                        if let Some(editor) = editor.upgrade() {
                            let focus_handle = editor.read(cx).focus_handle(cx);
                            Tooltip::for_action_in(
-                                "Show symbol outline",
+                                "Show Symbol Outline",
                                &editor::actions::ToggleOutline,
                                &focus_handle,
                                cx,
                            )
                        } else {
                            Tooltip::for_action(
-                                "Show symbol outline",
+                                "Show Symbol Outline",
                                &editor::actions::ToggleOutline,
                                cx,
                            )
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -25,7 +25,6 @@ anyhow.workspace = true
 clap.workspace = true
 collections.workspace = true
 ipc-channel = "0.19"
-once_cell.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 release_channel.workspace = true
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -18,6 +18,12 @@ use std::{
 use tempfile::NamedTempFile;
 use util::paths::PathWithPosition;

+#[cfg(any(target_os = "linux", target_os = "freebsd"))]
+use {
+    std::io::IsTerminal,
+    util::{load_login_shell_environment, load_shell_from_passwd, ResultExt},
+};
+
 struct Detect;

 trait InstalledApp {
@@ -161,7 +167,16 @@ fn main() -> Result<()> {
        None
    };

+    // On Linux, desktop entry uses `cli` to spawn `zed`, so we need to load env vars from the shell
+    // since it doesn't inherit env vars from the terminal.
+    #[cfg(any(target_os = "linux", target_os = "freebsd"))]
+    if !std::io::stdout().is_terminal() {
+        load_shell_from_passwd().log_err();
+        load_login_shell_environment().log_err();
+    }
+
    let env = Some(std::env::vars().collect::<HashMap<_, _>>());
+
    let exit_status = Arc::new(Mutex::new(None));
    let mut paths = vec![];
    let mut urls = vec![];
@@ -262,6 +277,7 @@ mod linux {
        os::unix::net::{SocketAddr, UnixDatagram},
        path::{Path, PathBuf},
        process::{self, ExitStatus},
+        sync::LazyLock,
        thread,
        time::Duration,
    };
@@ -269,12 +285,11 @@ mod linux {
    use anyhow::anyhow;
    use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
    use fork::Fork;
-    use once_cell::sync::Lazy;

    use crate::{Detect, InstalledApp};

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

    struct App(PathBuf);

--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -27,7 +27,6 @@ futures.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 log.workspace = true
-once_cell.workspace = true
 paths.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -8,7 +8,6 @@ use futures::channel::mpsc;
 use futures::{Future, StreamExt};
 use gpui::{AppContext, BackgroundExecutor, Task};
 use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
-use once_cell::sync::Lazy;
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
 use settings::{Settings, SettingsStore};
@@ -16,7 +15,12 @@ use sha2::{Digest, Sha256};
 use std::fs::File;
 use std::io::Write;
 use std::time::Instant;
-use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
+use std::{
+    env, mem,
+    path::PathBuf,
+    sync::{Arc, LazyLock},
+    time::Duration,
+};
 use telemetry_events::{
    AppEvent, AssistantEvent, CallEvent, EditEvent, Event, EventRequestBody, EventWrapper,
    InlineCompletionEvent,
@@ -84,7 +88,7 @@ const FLUSH_INTERVAL: Duration = Duration::from_secs(1);

 #[cfg(not(debug_assertions))]
 const FLUSH_INTERVAL: Duration = Duration::from_secs(60 * 5);
-static ZED_CLIENT_CHECKSUM_SEED: Lazy<Option<Vec<u8>>> = Lazy::new(|| {
+static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {
    option_env!("ZED_CLIENT_CHECKSUM_SEED")
        .map(|s| s.as_bytes().into())
        .or_else(|| {
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -252,7 +252,7 @@ spec:
              value: "${AUTO_JOIN_CHANNEL_ID}"
          securityContext:
            capabilities:
-              # FIXME - Switch to the more restrictive `PERFMON` capability.
+              # TODO - Switch to the more restrictive `PERFMON` capability.
              # This capability isn't yet available in a stable version of Debian.
              add: ["SYS_ADMIN"]
      terminationGracePeriodSeconds: 10
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -279,6 +279,7 @@ pub async fn post_panic(

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

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

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

 fn report_to_slack(panic: &Panic) -> bool {
+    // Panics on macOS should make their way to Slack as a crash report,
+    // so we don't need to send them a second time via this channel.
+    if panic.os_name == "macOS" {
+        return false;
+    }
+
    if panic.payload.contains("ERROR_SURFACE_LOST_KHR") {
        return false;
    }
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -1,4 +1,4 @@
-use crate::{collab_panel, ChatPanelSettings};
+use crate::{collab_panel, ChatPanelButton, ChatPanelSettings};
 use anyhow::Result;
 use call::{room, ActiveCall};
 use channel::{ChannelChat, ChannelChatEvent, ChannelMessage, ChannelMessageId, ChannelStore};
@@ -1135,7 +1135,14 @@ impl Panel for ChatPanel {
    }

    fn icon(&self, cx: &WindowContext) -> Option<ui::IconName> {
-        Some(ui::IconName::MessageBubbles).filter(|_| ChatPanelSettings::get_global(cx).button)
+        match ChatPanelSettings::get_global(cx).button {
+            ChatPanelButton::Never => None,
+            ChatPanelButton::Always => Some(ui::IconName::MessageBubbles),
+            ChatPanelButton::WhenInCall => ActiveCall::global(cx)
+                .read(cx)
+                .room()
+                .map(|_| ui::IconName::MessageBubbles),
+        }
    }

    fn icon_tooltip(&self, _cx: &WindowContext) -> Option<&'static str> {
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -79,6 +79,16 @@ impl CompletionProvider for MessageEditorCompletionProvider {
        Task::ready(Ok(false))
    }

+    fn apply_additional_edits_for_completion(
+        &self,
+        _buffer: Model<Buffer>,
+        _completion: Completion,
+        _push_to_history: bool,
+        _cx: &mut ViewContext<Editor>,
+    ) -> Task<Result<Option<language::Transaction>>> {
+        Task::ready(Ok(None))
+    }
+
    fn is_completion_trigger(
        &self,
        _buffer: &Model<Buffer>,
@@ -309,7 +319,6 @@ impl MessageEditor {
                    server_id: LanguageServerId(0), // TODO: Make this optional or something?
                    lsp_completion: Default::default(), // TODO: Make this optional or something?
                    confirm: None,
-                    resolved: true,
                }
            })
            .collect()
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -14,7 +14,7 @@ use gpui::{
 };
 use panel_settings::MessageEditorSettings;
 pub use panel_settings::{
-    ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings,
+    ChatPanelButton, ChatPanelSettings, CollaborationPanelSettings, NotificationPanelSettings,
 };
 use release_channel::ReleaseChannel;
 use settings::Settings;
--- a/crates/collab_ui/src/panel_settings.rs
+++ b/crates/collab_ui/src/panel_settings.rs
@@ -1,6 +1,6 @@
 use gpui::Pixels;
 use schemars::JsonSchema;
-use serde_derive::{Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsSources};
 use workspace::dock::DockPosition;

@@ -11,13 +11,82 @@ pub struct CollaborationPanelSettings {
    pub default_width: Pixels,
 }

+#[derive(Clone, Copy, Default, Serialize, JsonSchema, Debug)]
+#[serde(rename_all = "snake_case")]
+pub enum ChatPanelButton {
+    Never,
+    Always,
+    #[default]
+    WhenInCall,
+}
+
+impl<'de> Deserialize<'de> for ChatPanelButton {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        struct Visitor;
+
+        impl<'de> serde::de::Visitor<'de> for Visitor {
+            type Value = ChatPanelButton;
+
+            fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(
+                    f,
+                    r#"a boolean or one of "never", "always", "when_in_call""#
+                )
+            }
+
+            fn visit_bool<E>(self, b: bool) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                match b {
+                    false => Ok(ChatPanelButton::Never),
+                    true => Ok(ChatPanelButton::Always),
+                }
+            }
+
+            fn visit_str<E>(self, s: &str) -> Result<Self::Value, E>
+            where
+                E: serde::de::Error,
+            {
+                match s {
+                    "never" => Ok(ChatPanelButton::Never),
+                    "always" => Ok(ChatPanelButton::Always),
+                    "when_in_call" => Ok(ChatPanelButton::WhenInCall),
+                    _ => Err(E::unknown_variant(s, &["never", "always", "when_in_call"])),
+                }
+            }
+        }
+
+        deserializer.deserialize_any(Visitor)
+    }
+}
+
 #[derive(Deserialize, Debug)]
 pub struct ChatPanelSettings {
-    pub button: bool,
+    pub button: ChatPanelButton,
    pub dock: DockPosition,
    pub default_width: Pixels,
 }

+#[derive(Clone, Default, Serialize, Deserialize, JsonSchema, Debug)]
+pub struct ChatPanelSettingsContent {
+    /// When to show the panel button in the status bar.
+    ///
+    /// Default: only when in a call
+    pub button: Option<ChatPanelButton>,
+    /// Where to dock the panel.
+    ///
+    /// Default: right
+    pub dock: Option<DockPosition>,
+    /// Default width of the panel in pixels.
+    ///
+    /// Default: 240
+    pub default_width: Option<f32>,
+}
+
 #[derive(Deserialize, Debug)]
 pub struct NotificationPanelSettings {
    pub button: bool,
@@ -66,7 +135,7 @@ impl Settings for CollaborationPanelSettings {
 impl Settings for ChatPanelSettings {
    const KEY: Option<&'static str> = Some("chat_panel");

-    type FileContent = PanelSettingsContent;
+    type FileContent = ChatPanelSettingsContent;

    fn load(
        sources: SettingsSources<Self::FileContent>,
--- a/crates/command_palette/src/command_palette.rs
+++ b/crates/command_palette/src/command_palette.rs
@@ -36,21 +36,26 @@ pub struct CommandPalette {
    picker: View<Picker<CommandPaletteDelegate>>,
 }

-fn trim_consecutive_whitespaces(input: &str) -> String {
+/// Removes subsequent whitespace characters and double colons from the query.
+///
+/// This improves the likelihood of a match by either humanized name or keymap-style name.
+fn normalize_query(input: &str) -> String {
    let mut result = String::with_capacity(input.len());
-    let mut last_char_was_whitespace = false;
+    let mut last_char = None;

    for char in input.trim().chars() {
-        if char.is_whitespace() {
-            if !last_char_was_whitespace {
-                result.push(char);
+        match (last_char, char) {
+            (Some(':'), ':') => continue,
+            (Some(last_char), char) if last_char.is_whitespace() && char.is_whitespace() => {
+                continue
+            }
+            _ => {
+                last_char = Some(char);
            }
-            last_char_was_whitespace = true;
-        } else {
-            result.push(char);
-            last_char_was_whitespace = false;
        }
+        result.push(char);
    }
+
    result
 }

@@ -258,7 +263,7 @@ impl PickerDelegate for CommandPaletteDelegate {
            let mut commands = self.all_commands.clone();
            let hit_counts = cx.global::<HitCounts>().clone();
            let executor = cx.background_executor().clone();
-            let query = trim_consecutive_whitespaces(query.as_str());
+            let query = normalize_query(query.as_str());
            async move {
                commands.sort_by_key(|action| {
                    (
@@ -463,6 +468,25 @@ mod tests {
        );
    }

+    #[test]
+    fn test_normalize_query() {
+        assert_eq!(normalize_query("editor: backspace"), "editor: backspace");
+        assert_eq!(normalize_query("editor:  backspace"), "editor: backspace");
+        assert_eq!(normalize_query("editor:    backspace"), "editor: backspace");
+        assert_eq!(
+            normalize_query("editor::GoToDefinition"),
+            "editor:GoToDefinition"
+        );
+        assert_eq!(
+            normalize_query("editor::::GoToDefinition"),
+            "editor:GoToDefinition"
+        );
+        assert_eq!(
+            normalize_query("editor: :GoToDefinition"),
+            "editor: :GoToDefinition"
+        );
+    }
+
    #[gpui::test]
    async fn test_command_palette(cx: &mut TestAppContext) {
        let app_state = init_test(cx);
@@ -533,6 +557,40 @@ mod tests {
            assert!(palette.delegate.matches.is_empty())
        });
    }
+    #[gpui::test]
+    async fn test_normalized_matches(cx: &mut TestAppContext) {
+        let app_state = init_test(cx);
+        let project = Project::test(app_state.fs.clone(), [], cx).await;
+        let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project.clone(), cx));
+
+        let editor = cx.new_view(|cx| {
+            let mut editor = Editor::single_line(cx);
+            editor.set_text("abc", cx);
+            editor
+        });
+
+        workspace.update(cx, |workspace, cx| {
+            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, cx);
+            editor.update(cx, |editor, cx| editor.focus(cx))
+        });
+
+        // Test normalize (trimming whitespace and double colons)
+        cx.simulate_keystrokes("cmd-shift-p");
+
+        let palette = workspace.update(cx, |workspace, cx| {
+            workspace
+                .active_modal::<CommandPalette>(cx)
+                .unwrap()
+                .read(cx)
+                .picker
+                .clone()
+        });
+
+        cx.simulate_input("Editor::    Backspace");
+        palette.update(cx, |palette, _| {
+            assert_eq!(palette.delegate.matches[0].string, "editor: backspace");
+        });
+    }

    #[gpui::test]
    async fn test_go_to_line(cx: &mut TestAppContext) {
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -34,9 +34,9 @@ pub enum Model {
    Gpt4,
    #[serde(alias = "gpt-3.5-turbo", rename = "gpt-3.5-turbo")]
    Gpt3_5Turbo,
-    #[serde(alias = "o1-preview", rename = "o1")]
+    #[serde(alias = "o1-preview", rename = "o1-preview-2024-09-12")]
    O1Preview,
-    #[serde(alias = "o1-mini", rename = "o1-mini")]
+    #[serde(alias = "o1-mini", rename = "o1-mini-2024-09-12")]
    O1Mini,
    #[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")]
    Claude3_5Sonnet,
--- a/crates/diagnostics/Cargo.toml
+++ b/crates/diagnostics/Cargo.toml
@@ -18,6 +18,7 @@ collections.workspace = true
 ctor.workspace = true
 editor.workspace = true
 env_logger.workspace = true
+feature_flags.workspace = true
 gpui.workspace = true
 language.workspace = true
 log.workspace = true
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -14,6 +14,7 @@ use editor::{
    scroll::Autoscroll,
    Editor, EditorEvent, ExcerptId, ExcerptRange, MultiBuffer, ToOffset,
 };
+use feature_flags::FeatureFlagAppExt;
 use gpui::{
    actions, div, svg, AnyElement, AnyView, AppContext, Context, EventEmitter, FocusHandle,
    FocusableView, Global, HighlightStyle, InteractiveElement, IntoElement, Model, ParentElement,
@@ -21,7 +22,8 @@ use gpui::{
    WeakView, WindowContext,
 };
 use language::{
-    Bias, Buffer, Diagnostic, DiagnosticEntry, DiagnosticSeverity, Point, Selection, SelectionGoal,
+    Bias, Buffer, BufferRow, BufferSnapshot, Diagnostic, DiagnosticEntry, DiagnosticSeverity,
+    Point, Selection, SelectionGoal, ToTreeSitterPoint,
 };
 use lsp::LanguageServerId;
 use project::{DiagnosticSummary, Project, ProjectPath};
@@ -29,9 +31,10 @@ use project_diagnostics_settings::ProjectDiagnosticsSettings;
 use settings::Settings;
 use std::{
    any::{Any, TypeId},
+    cmp,
    cmp::Ordering,
    mem,
-    ops::Range,
+    ops::{Range, RangeInclusive},
    sync::Arc,
    time::Duration,
 };
@@ -41,6 +44,7 @@ use ui::{h_flex, prelude::*, Icon, IconName, Label};
 use util::ResultExt;
 use workspace::{
    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
+    searchable::SearchableItemHandle,
    ItemNavHistory, ToolbarItemLocation, Workspace,
 };

@@ -162,7 +166,7 @@ impl ProjectDiagnosticsEditor {
        let excerpts = cx.new_model(|cx| MultiBuffer::new(project_handle.read(cx).capability()));
        let editor = cx.new_view(|cx| {
            let mut editor =
-                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), false, cx);
+                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), true, cx);
            editor.set_vertical_scroll_margin(5, cx);
            editor
        });
@@ -421,31 +425,28 @@ impl ProjectDiagnosticsEditor {
                        blocks: Default::default(),
                        block_count: 0,
                    };
-                    let mut pending_range: Option<(Range<Point>, usize)> = None;
+                    let mut pending_range: Option<(Range<Point>, Range<Point>, usize)> = None;
                    let mut is_first_excerpt_for_group = true;
                    for (ix, entry) in group.entries.iter().map(Some).chain([None]).enumerate() {
                        let resolved_entry = entry.map(|e| e.resolve::<Point>(&snapshot));
-                        if let Some((range, start_ix)) = &mut pending_range {
-                            if let Some(entry) = resolved_entry.as_ref() {
-                                if entry.range.start.row <= range.end.row + 1 + self.context * 2 {
-                                    range.end = range.end.max(entry.range.end);
+                        let expanded_range = resolved_entry.as_ref().map(|entry| {
+                            context_range_for_entry(entry, self.context, &snapshot, cx)
+                        });
+                        if let Some((range, context_range, start_ix)) = &mut pending_range {
+                            if let Some(expanded_range) = expanded_range.clone() {
+                                // If the entries are overlapping or next to each-other, merge them into one excerpt.
+                                if context_range.end.row + 1 >= expanded_range.start.row {
+                                    context_range.end = context_range.end.max(expanded_range.end);
                                    continue;
                                }
                            }

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

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

@@ -810,6 +812,10 @@ impl Item for ProjectDiagnosticsEditor {
        }
    }

+    fn as_searchable(&self, _: &View<Self>) -> Option<Box<dyn SearchableItemHandle>> {
+        Some(Box::new(self.editor.clone()))
+    }
+
    fn breadcrumb_location(&self, _: &AppContext) -> ToolbarItemLocation {
        ToolbarItemLocation::PrimaryLeft
    }
@@ -918,3 +924,169 @@ fn compare_diagnostics(
        })
        .then_with(|| old.diagnostic.message.cmp(&new.diagnostic.message))
 }
+
+const DIAGNOSTIC_EXPANSION_ROW_LIMIT: u32 = 32;
+
+fn context_range_for_entry(
+    entry: &DiagnosticEntry<Point>,
+    context: u32,
+    snapshot: &BufferSnapshot,
+    cx: &AppContext,
+) -> Range<Point> {
+    if cx.is_staff() {
+        if let Some(rows) = heuristic_syntactic_expand(
+            entry.range.clone(),
+            DIAGNOSTIC_EXPANSION_ROW_LIMIT,
+            snapshot,
+            cx,
+        ) {
+            return Range {
+                start: Point::new(*rows.start(), 0),
+                end: snapshot.clip_point(Point::new(*rows.end(), u32::MAX), Bias::Left),
+            };
+        }
+    }
+    Range {
+        start: Point::new(entry.range.start.row.saturating_sub(context), 0),
+        end: snapshot.clip_point(
+            Point::new(entry.range.end.row + context, u32::MAX),
+            Bias::Left,
+        ),
+    }
+}
+
+/// Expands the input range using syntax information from TreeSitter. This expansion will be limited
+/// to the specified `max_row_count`.
+///
+/// If there is a containing outline item that is less than `max_row_count`, it will be returned.
+/// Otherwise fairly arbitrary heuristics are applied to attempt to return a logical block of code.
+fn heuristic_syntactic_expand<'a>(
+    input_range: Range<Point>,
+    max_row_count: u32,
+    snapshot: &'a BufferSnapshot,
+    cx: &'a AppContext,
+) -> Option<RangeInclusive<BufferRow>> {
+    let input_row_count = input_range.end.row - input_range.start.row;
+    if input_row_count > max_row_count {
+        return None;
+    }
+
+    // If the outline node contains the diagnostic and is small enough, just use that.
+    let outline_range = snapshot.outline_range_containing(input_range.clone());
+    if let Some(outline_range) = outline_range.clone() {
+        // Remove blank lines from start and end
+        if let Some(start_row) = (outline_range.start.row..outline_range.end.row)
+            .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
+        {
+            if let Some(end_row) = (outline_range.start.row..outline_range.end.row + 1)
+                .rev()
+                .find(|row| !snapshot.line_indent_for_row(*row).is_line_blank())
+            {
+                let row_count = end_row.saturating_sub(start_row);
+                if row_count <= max_row_count {
+                    return Some(RangeInclusive::new(
+                        outline_range.start.row,
+                        outline_range.end.row,
+                    ));
+                }
+            }
+        }
+    }
+
+    let mut node = snapshot.syntax_ancestor(input_range.clone())?;
+    loop {
+        let node_start = Point::from_ts_point(node.start_position());
+        let node_end = Point::from_ts_point(node.end_position());
+        let node_range = node_start..node_end;
+        let row_count = node_end.row - node_start.row + 1;
+
+        // Stop if we've exceeded the row count or reached an outline node. Then, find the interval
+        // of node children which contains the query range. For example, this allows just returning
+        // the header of a declaration rather than the entire declaration.
+        if row_count > max_row_count || outline_range == Some(node_range.clone()) {
+            let mut cursor = node.walk();
+            let mut included_child_start = None;
+            let mut included_child_end = None;
+            let mut previous_end = node_start;
+            if cursor.goto_first_child() {
+                loop {
+                    let child_node = cursor.node();
+                    let child_range = previous_end..Point::from_ts_point(child_node.end_position());
+                    if included_child_start.is_none() && child_range.contains(&input_range.start) {
+                        included_child_start = Some(child_range.start);
+                    }
+                    if child_range.contains(&input_range.end) {
+                        included_child_end = Some(child_range.end);
+                    }
+                    previous_end = child_range.end;
+                    if !cursor.goto_next_sibling() {
+                        break;
+                    }
+                }
+            }
+            let end = included_child_end.unwrap_or(node_range.end);
+            if let Some(start) = included_child_start {
+                let row_count = end.row - start.row;
+                if row_count < max_row_count {
+                    return Some(RangeInclusive::new(start.row, end.row));
+                }
+            }
+
+            log::info!(
+                "Expanding to ancestor started on {} node exceeding row limit of {max_row_count}.",
+                node.grammar_name()
+            );
+            return None;
+        }
+
+        let node_name = node.grammar_name();
+        let node_row_range = RangeInclusive::new(node_range.start.row, node_range.end.row);
+        if node_name.ends_with("block") {
+            return Some(node_row_range);
+        } else if node_name.ends_with("statement") || node_name.ends_with("declaration") {
+            // Expand to the nearest dedent or blank line for statements and declarations.
+            let tab_size = snapshot.settings_at(node_range.start, cx).tab_size.get();
+            let indent_level = snapshot
+                .line_indent_for_row(node_range.start.row)
+                .len(tab_size);
+            let rows_remaining = max_row_count.saturating_sub(row_count);
+            let Some(start_row) = (node_range.start.row.saturating_sub(rows_remaining)
+                ..node_range.start.row)
+                .rev()
+                .find(|row| is_line_blank_or_indented_less(indent_level, *row, tab_size, snapshot))
+            else {
+                return Some(node_row_range);
+            };
+            let rows_remaining = max_row_count.saturating_sub(node_range.end.row - start_row);
+            let Some(end_row) = (node_range.end.row + 1
+                ..cmp::min(
+                    node_range.end.row + rows_remaining + 1,
+                    snapshot.row_count(),
+                ))
+                .find(|row| is_line_blank_or_indented_less(indent_level, *row, tab_size, snapshot))
+            else {
+                return Some(node_row_range);
+            };
+            return Some(RangeInclusive::new(start_row, end_row));
+        }
+
+        // TODO: doing this instead of walking a cursor as that doesn't work - why?
+        let Some(parent) = node.parent() else {
+            log::info!(
+                "Expanding to ancestor reached the top node, so using default context line count.",
+            );
+            return None;
+        };
+        node = parent;
+    }
+}
+
+fn is_line_blank_or_indented_less(
+    indent_level: u32,
+    row: u32,
+    tab_size: u32,
+    snapshot: &BufferSnapshot,
+) -> bool {
+    let line_indent = snapshot.line_indent_for_row(row);
+    line_indent.is_line_blank() || line_indent.len(tab_size) < indent_level
+}
--- a/crates/diagnostics/src/diagnostics_tests.rs
+++ b/crates/diagnostics/src/diagnostics_tests.rs
@@ -167,10 +167,10 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
        editor_blocks(&editor, cx),
        [
            (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(15), EXCERPT_HEADER.into()),
-            (DisplayRow(16), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(25), EXCERPT_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(16), EXCERPT_HEADER.into()),
+            (DisplayRow(18), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(27), EXCERPT_HEADER.into()),
        ]
    );
    assert_eq!(
@@ -184,6 +184,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            // diagnostic group 1
            "\n", // primary message
            "\n", // padding
+            "\n", // expand
            "    let x = vec![];\n",
            "    let y = vec![];\n",
            "\n", // supporting diagnostic
@@ -195,6 +196,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            "    c(y);\n",
            "\n", // supporting diagnostic
            "    d(x);\n",
+            "\n", // expand
            "\n", // context ellipsis
            // diagnostic group 2
            "\n", // primary message
@@ -206,11 +208,13 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
            "    a(x);\n",
            "\n", // supporting diagnostic
            "    b(y);\n",
+            "\n", // expand
            "\n", // context ellipsis
            "    c(y);\n",
            "    d(x);\n",
            "\n", // supporting diagnostic
-            "}"
+            "}",
+            "\n", // expand
        )
    );

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

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

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

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

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

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

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

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

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

--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -1,11 +1,8 @@
-use std::cell::RefCell;
-use std::{cmp::Reverse, ops::Range, rc::Rc};
-
 use fuzzy::{StringMatch, StringMatchCandidate};
 use gpui::{
    div, px, uniform_list, AnyElement, BackgroundExecutor, Div, FontWeight, ListSizingBehavior,
-    Model, ScrollStrategy, SharedString, StrikethroughStyle, StyledText, UniformListScrollHandle,
-    ViewContext, WeakView,
+    Model, ScrollStrategy, SharedString, Size, StrikethroughStyle, StyledText,
+    UniformListScrollHandle, ViewContext, WeakView,
 };
 use language::Buffer;
 use language::{CodeLabel, Documentation};
@@ -13,6 +10,13 @@ use lsp::LanguageServerId;
 use multi_buffer::{Anchor, ExcerptId};
 use ordered_float::OrderedFloat;
 use project::{CodeAction, Completion, TaskSourceKind};
+use std::{
+    cell::RefCell,
+    cmp::{min, Reverse},
+    iter,
+    ops::Range,
+    rc::Rc,
+};
 use task::ResolvedTask;
 use ui::{prelude::*, Color, IntoElement, ListItem, Pixels, Popover, Styled};
 use util::ResultExt;
@@ -26,7 +30,10 @@ use crate::{
 };
 use crate::{AcceptInlineCompletion, InlineCompletionMenuHint, InlineCompletionText};

-pub const MAX_COMPLETIONS_ASIDE_WIDTH: Pixels = px(500.);
+pub const MENU_GAP: Pixels = px(4.);
+pub const MENU_ASIDE_X_PADDING: Pixels = px(16.);
+pub const MENU_ASIDE_MIN_WIDTH: Pixels = px(260.);
+pub const MENU_ASIDE_MAX_WIDTH: Pixels = px(500.);

 pub enum CodeContextMenu {
    Completions(CompletionsMenu),
@@ -127,14 +134,12 @@ impl CodeContextMenu {
    pub fn render_aside(
        &self,
        style: &EditorStyle,
-        max_height: Pixels,
+        max_size: Size<Pixels>,
        workspace: Option<WeakView<Workspace>>,
        cx: &mut ViewContext<Editor>,
    ) -> Option<AnyElement> {
        match self {
-            CodeContextMenu::Completions(menu) => {
-                menu.render_aside(style, max_height, workspace, cx)
-            }
+            CodeContextMenu::Completions(menu) => menu.render_aside(style, max_size, workspace, cx),
            CodeContextMenu::CodeActions(_) => None,
        }
    }
@@ -158,6 +163,7 @@ pub struct CompletionsMenu {
    scroll_handle: UniformListScrollHandle,
    resolve_completions: bool,
    show_completion_documentation: bool,
+    last_rendered_range: Rc<RefCell<Option<Range<usize>>>>,
 }

 #[derive(Clone, Debug)]
@@ -193,6 +199,7 @@ impl CompletionsMenu {
            selected_item: 0,
            scroll_handle: UniformListScrollHandle::new(),
            resolve_completions: true,
+            last_rendered_range: RefCell::new(None).into(),
        }
    }

@@ -217,7 +224,6 @@ impl CompletionsMenu {
                documentation: None,
                lsp_completion: Default::default(),
                confirm: None,
-                resolved: true,
            })
            .collect();

@@ -250,6 +256,7 @@ impl CompletionsMenu {
            scroll_handle: UniformListScrollHandle::new(),
            resolve_completions: false,
            show_completion_documentation: false,
+            last_rendered_range: RefCell::new(None).into(),
        }
    }

@@ -258,11 +265,7 @@ impl CompletionsMenu {
        provider: Option<&dyn CompletionProvider>,
        cx: &mut ViewContext<Editor>,
    ) {
-        self.selected_item = 0;
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        self.resolve_selected_completion(provider, cx);
-        cx.notify();
+        self.update_selection_index(0, provider, cx);
    }

    fn select_prev(
@@ -270,15 +273,7 @@ impl CompletionsMenu {
        provider: Option<&dyn CompletionProvider>,
        cx: &mut ViewContext<Editor>,
    ) {
-        if self.selected_item > 0 {
-            self.selected_item -= 1;
-        } else {
-            self.selected_item = self.entries.len() - 1;
-        }
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        self.resolve_selected_completion(provider, cx);
-        cx.notify();
+        self.update_selection_index(self.prev_match_index(), provider, cx);
    }

    fn select_next(
@@ -286,15 +281,7 @@ impl CompletionsMenu {
        provider: Option<&dyn CompletionProvider>,
        cx: &mut ViewContext<Editor>,
    ) {
-        if self.selected_item + 1 < self.entries.len() {
-            self.selected_item += 1;
-        } else {
-            self.selected_item = 0;
-        }
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        self.resolve_selected_completion(provider, cx);
-        cx.notify();
+        self.update_selection_index(self.next_match_index(), provider, cx);
    }

    fn select_last(
@@ -302,11 +289,38 @@ impl CompletionsMenu {
        provider: Option<&dyn CompletionProvider>,
        cx: &mut ViewContext<Editor>,
    ) {
-        self.selected_item = self.entries.len() - 1;
-        self.scroll_handle
-            .scroll_to_item(self.selected_item, ScrollStrategy::Top);
-        self.resolve_selected_completion(provider, cx);
-        cx.notify();
+        self.update_selection_index(self.entries.len() - 1, provider, cx);
+    }
+
+    fn update_selection_index(
+        &mut self,
+        match_index: usize,
+        provider: Option<&dyn CompletionProvider>,
+        cx: &mut ViewContext<Editor>,
+    ) {
+        if self.selected_item != match_index {
+            self.selected_item = match_index;
+            self.scroll_handle
+                .scroll_to_item(self.selected_item, ScrollStrategy::Top);
+            self.resolve_visible_completions(provider, cx);
+            cx.notify();
+        }
+    }
+
+    fn prev_match_index(&self) -> usize {
+        if self.selected_item > 0 {
+            self.selected_item - 1
+        } else {
+            self.entries.len() - 1
+        }
+    }
+
+    fn next_match_index(&self) -> usize {
+        if self.selected_item + 1 < self.entries.len() {
+            self.selected_item + 1
+        } else {
+            0
+        }
    }

    pub fn show_inline_completion_hint(&mut self, hint: InlineCompletionMenuHint) {
@@ -326,10 +340,12 @@ impl CompletionsMenu {
            }
        }
        .into();
-        self.selected_item = 0;
+        if self.selected_item != 0 && self.selected_item + 1 < self.entries.len() {
+            self.selected_item += 1;
+        }
    }

-    pub fn resolve_selected_completion(
+    pub fn resolve_visible_completions(
        &mut self,
        provider: Option<&dyn CompletionProvider>,
        cx: &mut ViewContext<Editor>,
@@ -341,24 +357,76 @@ impl CompletionsMenu {
            return;
        };

-        match &self.entries[self.selected_item] {
-            CompletionEntry::Match(entry) => {
-                let completion_index = entry.candidate_id;
-                let resolve_task = provider.resolve_completions(
-                    self.buffer.clone(),
-                    vec![completion_index],
-                    self.completions.clone(),
-                    cx,
-                );
+        // Attempt to resolve completions for every item that will be displayed. This matters
+        // because single line documentation may be displayed inline with the completion.
+        //
+        // When navigating to the very beginning or end of completions, `last_rendered_range` may
+        // have no overlap with the completions that will be displayed, so instead use a range based
+        // on the last rendered count.
+        const APPROXIMATE_VISIBLE_COUNT: usize = 12;
+        let last_rendered_range = self.last_rendered_range.borrow().clone();
+        let visible_count = last_rendered_range
+            .clone()
+            .map_or(APPROXIMATE_VISIBLE_COUNT, |range| range.count());
+        let entry_range = if self.selected_item == 0 {
+            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, self.entries.len())..min(range.end, self.entries.len())
+            })
+        };

-                cx.spawn(move |editor, mut cx| async move {
-                    if let Some(true) = resolve_task.await.log_err() {
-                        editor.update(&mut cx, |_, cx| cx.notify()).ok();
-                    }
-                })
-                .detach();
+        // Expand the range to resolve more completions than are predicted to be visible, to reduce
+        // jank on navigation.
+        const EXTRA_TO_RESOLVE: usize = 4;
+        let entry_indices = util::iterate_expanded_and_wrapped_usize_range(
+            entry_range.clone(),
+            EXTRA_TO_RESOLVE,
+            EXTRA_TO_RESOLVE,
+            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(&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(&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>>(),
+        };
+
+        if candidate_ids.is_empty() {
+            return;
+        }
+
+        let resolve_task = provider.resolve_completions(
+            self.buffer.clone(),
+            candidate_ids,
+            self.completions.clone(),
+            cx,
+        );
+
+        cx.spawn(move |editor, mut cx| async move {
+            if let Some(true) = resolve_task.await.log_err() {
+                editor.update(&mut cx, |_, cx| cx.notify()).ok();
            }
-            CompletionEntry::InlineCompletionHint { .. } => {}
+        })
+        .detach();
+    }
+
+    fn entry_candidate_id(entry: &CompletionEntry) -> Option<usize> {
+        match entry {
+            CompletionEntry::Match(entry) => Some(entry.candidate_id),
+            CompletionEntry::InlineCompletionHint { .. } => None,
        }
    }

@@ -407,12 +475,14 @@ impl CompletionsMenu {
        let selected_item = self.selected_item;
        let completions = self.completions.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",
            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();

@@ -544,7 +614,7 @@ impl CompletionsMenu {
    fn render_aside(
        &self,
        style: &EditorStyle,
-        max_height: Pixels,
+        max_size: Size<Pixels>,
        workspace: Option<WeakView<Workspace>>,
        cx: &mut ViewContext<Editor>,
    ) -> Option<AnyElement> {
@@ -576,7 +646,7 @@ impl CompletionsMenu {
            }
            CompletionEntry::InlineCompletionHint(hint) => match &hint.text {
                InlineCompletionText::Edit { text, highlights } => div()
-                    .my_1()
+                    .mx_1()
                    .rounded(px(6.))
                    .bg(cx.theme().colors().editor_background)
                    .border_1()
@@ -594,10 +664,9 @@ impl CompletionsMenu {
                .child(
                    multiline_docs
                        .id("multiline_docs")
-                        .max_h(max_height)
-                        .px_0p5()
-                        .min_w(px(260.))
-                        .max_w(MAX_COMPLETIONS_ASIDE_WIDTH)
+                        .px(MENU_ASIDE_X_PADDING / 2.)
+                        .max_w(max_size.width)
+                        .max_h(max_size.height)
                        .overflow_y_scroll()
                        .occlude(),
                )
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -32,6 +32,7 @@ use crate::{
 pub use block_map::{
    Block, BlockBufferRows, BlockChunks as DisplayChunks, BlockContext, BlockId, BlockMap,
    BlockPlacement, BlockPoint, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
+    StickyHeaderExcerpt,
 };
 use block_map::{BlockRow, BlockSnapshot};
 use collections::{HashMap, HashSet};
@@ -1105,6 +1106,10 @@ impl DisplaySnapshot {
            .map(|(row, block)| (DisplayRow(row), block))
    }

+    pub fn sticky_header_excerpt(&self, row: DisplayRow) -> Option<StickyHeaderExcerpt<'_>> {
+        self.block_snapshot.sticky_header_excerpt(row.0)
+    }
+
    pub fn block_for_id(&self, id: BlockId) -> Option<Block> {
        self.block_snapshot.block_for_id(id)
    }
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -1411,6 +1411,66 @@ impl BlockSnapshot {
        })
    }

+    pub fn sticky_header_excerpt(&self, top_row: u32) -> Option<StickyHeaderExcerpt<'_>> {
+        let mut cursor = self.transforms.cursor::<BlockRow>(&());
+        cursor.seek(&BlockRow(top_row), Bias::Left, &());
+
+        while let Some(transform) = cursor.item() {
+            let start = cursor.start().0;
+            let end = cursor.end(&()).0;
+
+            match &transform.block {
+                Some(Block::ExcerptBoundary {
+                    prev_excerpt,
+                    next_excerpt,
+                    starts_new_buffer,
+                    show_excerpt_controls,
+                    ..
+                }) => {
+                    let matches_start = if *show_excerpt_controls && prev_excerpt.is_some() {
+                        start < top_row
+                    } else {
+                        start <= top_row
+                    };
+
+                    if matches_start && top_row <= end {
+                        return next_excerpt.as_ref().map(|excerpt| StickyHeaderExcerpt {
+                            next_buffer_row: None,
+                            next_excerpt_controls_present: *show_excerpt_controls,
+                            excerpt,
+                        });
+                    }
+
+                    let next_buffer_row = if *starts_new_buffer { Some(end) } else { None };
+
+                    return prev_excerpt.as_ref().map(|excerpt| StickyHeaderExcerpt {
+                        excerpt,
+                        next_buffer_row,
+                        next_excerpt_controls_present: *show_excerpt_controls,
+                    });
+                }
+                Some(Block::FoldedBuffer {
+                    prev_excerpt: Some(excerpt),
+                    ..
+                }) if top_row <= start => {
+                    return Some(StickyHeaderExcerpt {
+                        next_buffer_row: Some(end),
+                        next_excerpt_controls_present: false,
+                        excerpt,
+                    });
+                }
+                Some(Block::FoldedBuffer { .. }) | Some(Block::Custom(_)) | None => {}
+            }
+
+            // This is needed to iterate past None / FoldedBuffer / Custom blocks. For FoldedBuffer,
+            // if scrolled slightly past the header of a folded block, the next block is needed for
+            // the sticky header.
+            cursor.next(&());
+        }
+
+        None
+    }
+
    pub fn block_for_id(&self, block_id: BlockId) -> Option<Block> {
        let buffer = self.wrap_snapshot.buffer_snapshot();
        let wrap_point = match block_id {
@@ -1694,6 +1754,12 @@ impl<'a> BlockChunks<'a> {
    }
 }

+pub struct StickyHeaderExcerpt<'a> {
+    pub excerpt: &'a ExcerptInfo,
+    pub next_excerpt_controls_present: bool,
+    pub next_buffer_row: Option<u32>,
+}
+
 impl<'a> Iterator for BlockChunks<'a> {
    type Item = Chunk<'a>;

--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -128,6 +128,7 @@ use multi_buffer::{
    ExpandExcerptDirection, MultiBufferDiffHunk, MultiBufferPoint, MultiBufferRow, ToOffsetUtf16,
 };
 use project::{
+    buffer_store::BufferChangeSet,
    lsp_store::{FormatTarget, FormatTrigger, OpenLspBufferHandle},
    project_settings::{GitGutterSetting, ProjectSettings},
    CodeAction, Completion, CompletionIntent, DocumentHighlight, InlayHint, Location, LocationLink,
@@ -605,6 +606,7 @@ pub struct Editor {
    mode: EditorMode,
    show_breadcrumbs: bool,
    show_gutter: bool,
+    show_scrollbars: bool,
    show_line_numbers: Option<bool>,
    use_relative_line_numbers: Option<bool>,
    show_git_diff_gutter: Option<bool>,
@@ -1234,6 +1236,7 @@ impl Editor {
            project,
            blink_manager: blink_manager.clone(),
            show_local_selections: true,
+            show_scrollbars: true,
            mode,
            show_breadcrumbs: EditorSettings::get_global(cx).toolbar.breadcrumbs,
            show_gutter: mode == EditorMode::Full,
@@ -3742,11 +3745,10 @@ impl Editor {

                    if editor.focus_handle.is_focused(cx) && menu.is_some() {
                        let mut menu = menu.unwrap();
-                        menu.resolve_selected_completion(editor.completion_provider.as_deref(), cx);
+                        menu.resolve_visible_completions(editor.completion_provider.as_deref(), cx);

                        if editor.show_inline_completions_in_menu(cx) {
                            if let Some(hint) = editor.inline_completion_menu_hint(cx) {
-                                editor.hide_active_inline_completion(cx);
                                menu.show_inline_completion_hint(hint);
                            }
                        } else {
@@ -3828,11 +3830,8 @@ impl Editor {
        };

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

        let snippet;
@@ -3976,11 +3975,9 @@ impl Editor {
        }

        let provider = self.completion_provider.as_ref()?;
-        drop(completion);
        let apply_edits = provider.apply_additional_edits_for_completion(
            buffer_handle,
-            completions_menu.completions.clone(),
-            mat.candidate_id,
+            completion.clone(),
            true,
            cx,
        );
@@ -4716,17 +4713,6 @@ impl Editor {
        Some(active_inline_completion.completion)
    }

-    fn hide_active_inline_completion(&mut self, cx: &mut ViewContext<Self>) {
-        if let Some(active_inline_completion) = self.active_inline_completion.as_ref() {
-            self.splice_inlays(
-                active_inline_completion.inlay_ids.clone(),
-                Default::default(),
-                cx,
-            );
-            self.clear_highlights::<InlineCompletionHighlight>(cx);
-        }
-    }
-
    fn update_visible_inline_completion(&mut self, cx: &mut ViewContext<Self>) -> Option<()> {
        let selection = self.selections.newest_anchor();
        let cursor = selection.head();
@@ -4796,34 +4782,32 @@ impl Editor {
            invalidation_row_range = edit_start_row..cursor_row;
            completion = InlineCompletion::Move(first_edit_start);
        } else {
-            if !self.show_inline_completions_in_menu(cx) || !self.has_active_completions_menu() {
-                if edits
-                    .iter()
-                    .all(|(range, _)| range.to_offset(&multibuffer).is_empty())
-                {
-                    let mut inlays = Vec::new();
-                    for (range, new_text) in &edits {
-                        let inlay = Inlay::inline_completion(
-                            post_inc(&mut self.next_inlay_id),
-                            range.start,
-                            new_text.as_str(),
-                        );
-                        inlay_ids.push(inlay.id);
-                        inlays.push(inlay);
-                    }
-
-                    self.splice_inlays(vec![], inlays, cx);
-                } else {
-                    let background_color = cx.theme().status().deleted_background;
-                    self.highlight_text::<InlineCompletionHighlight>(
-                        edits.iter().map(|(range, _)| range.clone()).collect(),
-                        HighlightStyle {
-                            background_color: Some(background_color),
-                            ..Default::default()
-                        },
-                        cx,
+            if edits
+                .iter()
+                .all(|(range, _)| range.to_offset(&multibuffer).is_empty())
+            {
+                let mut inlays = Vec::new();
+                for (range, new_text) in &edits {
+                    let inlay = Inlay::inline_completion(
+                        post_inc(&mut self.next_inlay_id),
+                        range.start,
+                        new_text.as_str(),
                    );
+                    inlay_ids.push(inlay.id);
+                    inlays.push(inlay);
                }
+
+                self.splice_inlays(vec![], inlays, cx);
+            } else {
+                let background_color = cx.theme().status().deleted_background;
+                self.highlight_text::<InlineCompletionHighlight>(
+                    edits.iter().map(|(range, _)| range.clone()).collect(),
+                    HighlightStyle {
+                        background_color: Some(background_color),
+                        ..Default::default()
+                    },
+                    cx,
+                );
            }

            invalidation_row_range = edit_start_row..edit_end_row;
@@ -5103,7 +5087,7 @@ impl Editor {
            }))
    }

-    #[cfg(any(feature = "test-support", test))]
+    #[cfg(feature = "test-support")]
    pub fn context_menu_visible(&self) -> bool {
        self.context_menu
            .borrow()
@@ -5149,14 +5133,14 @@ impl Editor {
    fn render_context_menu_aside(
        &self,
        style: &EditorStyle,
-        max_height: Pixels,
+        max_size: Size<Pixels>,
        cx: &mut ViewContext<Editor>,
    ) -> Option<AnyElement> {
        self.context_menu.borrow().as_ref().and_then(|menu| {
            if menu.visible() {
                menu.render_aside(
                    style,
-                    max_height,
+                    max_size,
                    self.workspace.as_ref().map(|(w, _)| w.clone()),
                    cx,
                )
@@ -5858,7 +5842,7 @@ impl Editor {
        });
    }

-    pub fn join_lines(&mut self, _: &JoinLines, cx: &mut ViewContext<Self>) {
+    pub fn join_lines_impl(&mut self, insert_whitespace: bool, cx: &mut ViewContext<Self>) {
        if self.read_only(cx) {
            return;
        }
@@ -5900,11 +5884,12 @@ 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 {
-                        " "
-                    } else {
-                        ""
-                    };
+                    let replace =
+                        if snapshot.line_len(next_line_row) > indent.len && insert_whitespace {
+                            " "
+                        } else {
+                            ""
+                        };

                    this.buffer.update(cx, |buffer, cx| {
                        buffer.edit([(end_of_line..start_of_next_line, replace)], None, cx)
@@ -5918,6 +5903,10 @@ 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,
@@ -8793,9 +8782,10 @@ impl Editor {
            .map(|selection| {
                let old_range = selection.start..selection.end;
                let mut new_range = old_range.clone();
-                while let Some(containing_range) =
-                    buffer.range_for_syntax_ancestor(new_range.clone())
+                let mut new_node = None;
+                while let Some((node, containing_range)) = buffer.syntax_ancestor(new_range.clone())
                {
+                    new_node = Some(node);
                    new_range = containing_range;
                    if !display_map.intersects_fold(new_range.start)
                        && !display_map.intersects_fold(new_range.end)
@@ -8804,6 +8794,17 @@ impl Editor {
                    }
                }

+                if let Some(node) = new_node {
+                    // Log the ancestor, to support using this action as a way to explore TreeSitter
+                    // nodes. Parent and grandparent are also logged because this operation will not
+                    // visit nodes that have the same range as their parent.
+                    log::info!("Node: {node:?}");
+                    let parent = node.parent();
+                    log::info!("Parent: {parent:?}");
+                    let grandparent = parent.and_then(|x| x.parent());
+                    log::info!("Grandparent: {grandparent:?}");
+                }
+
                selected_larger_node |= new_range != old_range;
                Selection {
                    id: selection.id,
@@ -11266,6 +11267,11 @@ impl Editor {
        cx.notify();
    }

+    pub fn set_show_scrollbars(&mut self, show_scrollbars: bool, cx: &mut ViewContext<Self>) {
+        self.show_scrollbars = show_scrollbars;
+        cx.notify();
+    }
+
    pub fn set_show_line_numbers(&mut self, show_line_numbers: bool, cx: &mut ViewContext<Self>) {
        self.show_line_numbers = Some(show_line_numbers);
        cx.notify();
@@ -12957,6 +12963,14 @@ impl Editor {
            .and_then(|item| item.to_any().downcast_ref::<T>())
    }

+    pub fn add_change_set(
+        &mut self,
+        change_set: Model<BufferChangeSet>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        self.diff_map.add_change_set(change_set, cx);
+    }
+
    fn character_size(&self, cx: &mut ViewContext<Self>) -> gpui::Point<Pixels> {
        let text_layout_details = self.text_layout_details(cx);
        let style = &text_layout_details.editor_style;
@@ -13438,14 +13452,11 @@ pub trait CompletionProvider {

    fn apply_additional_edits_for_completion(
        &self,
-        _buffer: Model<Buffer>,
-        _completions: Rc<RefCell<Box<[Completion]>>>,
-        _completion_index: usize,
-        _push_to_history: bool,
-        _cx: &mut ViewContext<Editor>,
-    ) -> Task<Result<Option<language::Transaction>>> {
-        Task::ready(Ok(None))
-    }
+        buffer: Model<Buffer>,
+        completion: Completion,
+        push_to_history: bool,
+        cx: &mut ViewContext<Editor>,
+    ) -> Task<Result<Option<language::Transaction>>>;

    fn is_completion_trigger(
        &self,
@@ -13604,7 +13615,6 @@ fn snippet_completions(
                Some(Completion {
                    old_range: range,
                    new_text: snippet.body.clone(),
-                    resolved: false,
                    label: CodeLabel {
                        text: matching_prefix.clone(),
                        runs: vec![],
@@ -13670,30 +13680,19 @@ impl CompletionProvider for Model<Project> {
        cx: &mut ViewContext<Editor>,
    ) -> Task<Result<bool>> {
        self.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.resolve_completions(buffer, completion_indices, completions, cx)
-            })
+            project.resolve_completions(buffer, completion_indices, completions, cx)
        })
    }

    fn apply_additional_edits_for_completion(
        &self,
        buffer: Model<Buffer>,
-        completions: Rc<RefCell<Box<[Completion]>>>,
-        completion_index: usize,
+        completion: Completion,
        push_to_history: bool,
        cx: &mut ViewContext<Editor>,
    ) -> Task<Result<Option<language::Transaction>>> {
        self.update(cx, |project, cx| {
-            project.lsp_store().update(cx, |lsp_store, cx| {
-                lsp_store.apply_additional_edits_for_completion(
-                    buffer,
-                    completions,
-                    completion_index,
-                    push_to_history,
-                    cx,
-                )
-            })
+            project.apply_additional_edits_for_completion(buffer, completion, push_to_history, cx)
        })
    }

--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -25,14 +25,18 @@ use language::{
 use language_settings::{Formatter, FormatterList, IndentGuideSettings};
 use multi_buffer::MultiBufferIndentGuide;
 use parking_lot::Mutex;
+use pretty_assertions::{assert_eq, assert_ne};
 use project::{buffer_store::BufferChangeSet, FakeFs};
 use project::{
    lsp_command::SIGNATURE_HELP_HIGHLIGHT_CURRENT,
    project_settings::{LspSettings, ProjectSettings},
 };
 use serde_json::{self, json};
-use std::sync::atomic::{self, AtomicBool, AtomicUsize};
 use std::{cell::RefCell, future::Future, rc::Rc, time::Instant};
+use std::{
+    iter,
+    sync::atomic::{self, AtomicUsize},
+};
 use test::{build_editor_with_project, editor_lsp_test_context::rust_lang};
 use unindent::Unindent;
 use util::{
@@ -8398,6 +8402,7 @@ async fn test_completion(cx: &mut gpui::TestAppContext) {
        additional edit
    "});

+    handle_resolve_completion_request(&mut cx, None).await;
    apply_additional_edits.await.unwrap();

    update_test_language_settings(&mut cx, |settings| {
@@ -10693,14 +10698,10 @@ async fn test_completions_resolve_updates_labels_if_filter_text_matches(
        ..lsp::CompletionItem::default()
    };

-    let item1 = item1.clone();
-    cx.handle_request::<lsp::request::Completion, _, _>({
+    cx.handle_request::<lsp::request::Completion, _, _>(move |_, _, _| {
        let item1 = item1.clone();
-        move |_, _, _| {
-            let item1 = item1.clone();
-            let item2 = item2.clone();
-            async move { Ok(Some(lsp::CompletionResponse::Array(vec![item1, item2]))) }
-        }
+        let item2 = item2.clone();
+        async move { Ok(Some(lsp::CompletionResponse::Array(vec![item1, item2]))) }
    })
    .next()
    .await;
@@ -10727,41 +10728,43 @@ async fn test_completions_resolve_updates_labels_if_filter_text_matches(
        }
    });

-    cx.handle_request::<lsp::request::ResolveCompletionItem, _, _>({
-        let item1 = item1.clone();
-        move |_, item_to_resolve, _| {
-            let item1 = item1.clone();
-            async move {
-                if item1 == item_to_resolve {
-                    Ok(lsp::CompletionItem {
-                        label: "method id()".to_string(),
-                        filter_text: Some("id".to_string()),
-                        detail: Some("Now resolved!".to_string()),
-                        documentation: Some(lsp::Documentation::String("Docs".to_string())),
-                        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                            range: lsp::Range::new(
-                                lsp::Position::new(0, 22),
-                                lsp::Position::new(0, 22),
-                            ),
-                            new_text: ".id".to_string(),
-                        })),
-                        ..lsp::CompletionItem::default()
-                    })
-                } else {
-                    Ok(item_to_resolve)
-                }
-            }
-        }
+    cx.handle_request::<lsp::request::ResolveCompletionItem, _, _>(move |_, _, _| async move {
+        Ok(lsp::CompletionItem {
+            label: "method id()".to_string(),
+            filter_text: Some("id".to_string()),
+            detail: Some("Now resolved!".to_string()),
+            documentation: Some(lsp::Documentation::String("Docs".to_string())),
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
+                new_text: ".id".to_string(),
+            })),
+            ..lsp::CompletionItem::default()
+        })
    })
    .next()
-    .await
-    .unwrap();
+    .await;
    cx.run_until_parked();

    cx.update_editor(|editor, cx| {
        editor.context_menu_next(&Default::default(), cx);
    });

+    cx.handle_request::<lsp::request::ResolveCompletionItem, _, _>(move |_, _, _| async move {
+        Ok(lsp::CompletionItem {
+            label: "invalid changed label".to_string(),
+            detail: Some("Now resolved!".to_string()),
+            documentation: Some(lsp::Documentation::String("Docs".to_string())),
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
+                new_text: ".id".to_string(),
+            })),
+            ..lsp::CompletionItem::default()
+        })
+    })
+    .next()
+    .await;
+    cx.run_until_parked();
+
    cx.update_editor(|editor, _| {
        let context_menu = editor.context_menu.borrow_mut();
        let context_menu = context_menu
@@ -10784,194 +10787,35 @@ async fn test_completions_resolve_updates_labels_if_filter_text_matches(
    });
 }

-#[gpui::test]
-async fn test_completions_resolve_happens_once(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(indoc! {"fn main() { let a = 2ˇ; }"});
-    cx.simulate_keystroke(".");
-
-    let unresolved_item_1 = lsp::CompletionItem {
-        label: "id".to_string(),
-        filter_text: Some("id".to_string()),
-        detail: None,
-        documentation: None,
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            new_text: ".id".to_string(),
-        })),
-        ..lsp::CompletionItem::default()
-    };
-    let resolved_item_1 = lsp::CompletionItem {
-        additional_text_edits: Some(vec![lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 20), lsp::Position::new(0, 22)),
-            new_text: "!!".to_string(),
-        }]),
-        ..unresolved_item_1.clone()
-    };
-    let unresolved_item_2 = lsp::CompletionItem {
-        label: "other".to_string(),
-        filter_text: Some("other".to_string()),
-        detail: None,
-        documentation: None,
-        text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 22), lsp::Position::new(0, 22)),
-            new_text: ".other".to_string(),
-        })),
-        ..lsp::CompletionItem::default()
-    };
-    let resolved_item_2 = lsp::CompletionItem {
-        additional_text_edits: Some(vec![lsp::TextEdit {
-            range: lsp::Range::new(lsp::Position::new(0, 20), lsp::Position::new(0, 22)),
-            new_text: "??".to_string(),
-        }]),
-        ..unresolved_item_2.clone()
-    };
-
-    let resolve_requests_1 = Arc::new(AtomicUsize::new(0));
-    let resolve_requests_2 = Arc::new(AtomicUsize::new(0));
-    cx.lsp
-        .server
-        .on_request::<lsp::request::ResolveCompletionItem, _, _>({
-            let unresolved_item_1 = unresolved_item_1.clone();
-            let resolved_item_1 = resolved_item_1.clone();
-            let unresolved_item_2 = unresolved_item_2.clone();
-            let resolved_item_2 = resolved_item_2.clone();
-            let resolve_requests_1 = resolve_requests_1.clone();
-            let resolve_requests_2 = resolve_requests_2.clone();
-            move |unresolved_request, _| {
-                let unresolved_item_1 = unresolved_item_1.clone();
-                let resolved_item_1 = resolved_item_1.clone();
-                let unresolved_item_2 = unresolved_item_2.clone();
-                let resolved_item_2 = resolved_item_2.clone();
-                let resolve_requests_1 = resolve_requests_1.clone();
-                let resolve_requests_2 = resolve_requests_2.clone();
-                async move {
-                    if unresolved_request == unresolved_item_1 {
-                        resolve_requests_1.fetch_add(1, atomic::Ordering::Release);
-                        Ok(resolved_item_1.clone())
-                    } else if unresolved_request == unresolved_item_2 {
-                        resolve_requests_2.fetch_add(1, atomic::Ordering::Release);
-                        Ok(resolved_item_2.clone())
-                    } else {
-                        panic!("Unexpected completion item {unresolved_request:?}")
-                    }
-                }
-            }
-        })
-        .detach();
-
-    cx.handle_request::<lsp::request::Completion, _, _>(move |_, _, _| {
-        let unresolved_item_1 = unresolved_item_1.clone();
-        let unresolved_item_2 = unresolved_item_2.clone();
-        async move {
-            Ok(Some(lsp::CompletionResponse::Array(vec![
-                unresolved_item_1,
-                unresolved_item_2,
-            ])))
-        }
-    })
-    .next()
-    .await;
-
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _| {
-        let context_menu = editor.context_menu.borrow_mut();
-        let context_menu = context_menu
-            .as_ref()
-            .expect("Should have the context menu deployed");
-        match context_menu {
-            CodeContextMenu::Completions(completions_menu) => {
-                let completions = completions_menu.completions.borrow_mut();
-                assert_eq!(
-                    completions
-                        .iter()
-                        .map(|completion| &completion.label.text)
-                        .collect::<Vec<_>>(),
-                    vec!["id", "other"]
-                )
-            }
-            CodeContextMenu::CodeActions(_) => panic!("Should show the completions menu"),
-        }
-    });
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, cx| {
-        editor.context_menu_next(&ContextMenuNext, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, cx| {
-        editor.context_menu_prev(&ContextMenuPrev, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, cx| {
-        editor.context_menu_next(&ContextMenuNext, cx);
-    });
-    cx.run_until_parked();
-    cx.update_editor(|editor, cx| {
-        editor
-            .compose_completion(&ComposeCompletion::default(), cx)
-            .expect("No task returned")
-    })
-    .await
-    .expect("Completion failed");
-    cx.run_until_parked();
-
-    cx.update_editor(|editor, cx| {
-        assert_eq!(
-            resolve_requests_1.load(atomic::Ordering::Acquire),
-            1,
-            "Should always resolve once despite multiple selections"
-        );
-        assert_eq!(
-            resolve_requests_2.load(atomic::Ordering::Acquire),
-            1,
-            "Should always resolve once after multiple selections and applying the completion"
-        );
-        assert_eq!(
-            editor.text(cx),
-            "fn main() { let a = ??.other; }",
-            "Should use resolved data when applying the completion"
-        );
-    });
-}
-
 #[gpui::test]
 async fn test_completions_default_resolve_data_handling(cx: &mut gpui::TestAppContext) {
    init_test(cx, |_| {});

-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string()]),
-                resolve_provider: Some(true),
-                ..Default::default()
-            }),
-            ..Default::default()
-        },
-        cx,
-    )
-    .await;
-
-    cx.set_state(indoc! {"fn main() { let a = 2ˇ; }"});
-    cx.simulate_keystroke(".");
+    let item_0 = lsp::CompletionItem {
+        label: "abs".into(),
+        insert_text: Some("abs".into()),
+        data: Some(json!({ "very": "special"})),
+        insert_text_mode: Some(lsp::InsertTextMode::ADJUST_INDENTATION),
+        text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
+            lsp::InsertReplaceEdit {
+                new_text: "abs".to_string(),
+                insert: lsp::Range::default(),
+                replace: lsp::Range::default(),
+            },
+        )),
+        ..lsp::CompletionItem::default()
+    };
+    let items = iter::once(item_0.clone())
+        .chain((11..51).map(|i| lsp::CompletionItem {
+            label: format!("item_{}", i),
+            insert_text: Some(format!("item_{}", i)),
+            insert_text_format: Some(lsp::InsertTextFormat::PLAIN_TEXT),
+            ..lsp::CompletionItem::default()
+        }))
+        .collect::<Vec<_>>();

    let default_commit_characters = vec!["?".to_string()];
-    let default_data = json!({ "very": "special"});
+    let default_data = json!({ "default": "data"});
    let default_insert_text_format = lsp::InsertTextFormat::SNIPPET;
    let default_insert_text_mode = lsp::InsertTextMode::AS_IS;
    let default_edit_range = lsp::Range {
@@ -10985,123 +10829,49 @@ async fn test_completions_default_resolve_data_handling(cx: &mut gpui::TestAppCo
        },
    };

-    let resolve_requests_number = Arc::new(AtomicUsize::new(0));
-    let expect_first_item = Arc::new(AtomicBool::new(true));
-    cx.lsp
-        .server
-        .on_request::<lsp::request::ResolveCompletionItem, _, _>({
-            let closure_default_data = default_data.clone();
-            let closure_resolve_requests_number = resolve_requests_number.clone();
-            let closure_expect_first_item = expect_first_item.clone();
-            let closure_default_commit_characters = default_commit_characters.clone();
-            move |item_to_resolve, _| {
-                closure_resolve_requests_number.fetch_add(1, atomic::Ordering::Release);
-                let default_data = closure_default_data.clone();
-                let default_commit_characters = closure_default_commit_characters.clone();
-                let expect_first_item = closure_expect_first_item.clone();
-                async move {
-                    if expect_first_item.load(atomic::Ordering::Acquire) {
-                        assert_eq!(
-                            item_to_resolve.label, "Some(2)",
-                            "Should have selected the first item"
-                        );
-                        assert_eq!(
-                            item_to_resolve.data,
-                            Some(json!({ "very": "special"})),
-                            "First item should bring its own data for resolving"
-                        );
-                        assert_eq!(
-                            item_to_resolve.commit_characters,
-                            Some(default_commit_characters),
-                            "First item had no own commit characters and should inherit the default ones"
-                        );
-                        assert!(
-                            matches!(
-                                item_to_resolve.text_edit,
-                                Some(lsp::CompletionTextEdit::InsertAndReplace { .. })
-                            ),
-                            "First item should bring its own edit range for resolving"
-                        );
-                        assert_eq!(
-                            item_to_resolve.insert_text_format,
-                            Some(default_insert_text_format),
-                            "First item had no own insert text format and should inherit the default one"
-                        );
-                        assert_eq!(
-                            item_to_resolve.insert_text_mode,
-                            Some(lsp::InsertTextMode::ADJUST_INDENTATION),
-                            "First item should bring its own insert text mode for resolving"
-                        );
-                        Ok(item_to_resolve)
-                    } else {
-                        assert_eq!(
-                            item_to_resolve.label, "vec![2]",
-                            "Should have selected the last item"
-                        );
-                        assert_eq!(
-                            item_to_resolve.data,
-                            Some(default_data),
-                            "Last item has no own resolve data and should inherit the default one"
-                        );
-                        assert_eq!(
-                            item_to_resolve.commit_characters,
-                            Some(default_commit_characters),
-                            "Last item had no own commit characters and should inherit the default ones"
-                        );
-                        assert_eq!(
-                            item_to_resolve.text_edit,
-                            Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
-                                range: default_edit_range,
-                                new_text: "vec![2]".to_string()
-                            })),
-                            "Last item had no own edit range and should inherit the default one"
-                        );
-                        assert_eq!(
-                            item_to_resolve.insert_text_format,
-                            Some(lsp::InsertTextFormat::PLAIN_TEXT),
-                            "Last item should bring its own insert text format for resolving"
-                        );
-                        assert_eq!(
-                            item_to_resolve.insert_text_mode,
-                            Some(default_insert_text_mode),
-                            "Last item had no own insert text mode and should inherit the default one"
-                        );
+    let item_0_out = lsp::CompletionItem {
+        commit_characters: Some(default_commit_characters.clone()),
+        insert_text_format: Some(default_insert_text_format),
+        ..item_0
+    };
+    let items_out = iter::once(item_0_out)
+        .chain(items[1..].iter().map(|item| lsp::CompletionItem {
+            commit_characters: Some(default_commit_characters.clone()),
+            data: Some(default_data.clone()),
+            insert_text_mode: Some(default_insert_text_mode),
+            text_edit: Some(lsp::CompletionTextEdit::Edit(lsp::TextEdit {
+                range: default_edit_range,
+                new_text: item.label.clone(),
+            })),
+            ..item.clone()
+        }))
+        .collect::<Vec<lsp::CompletionItem>>();

-                        Ok(item_to_resolve)
-                    }
-                }
-            }
-        }).detach();
+    let mut cx = EditorLspTestContext::new_rust(
+        lsp::ServerCapabilities {
+            completion_provider: Some(lsp::CompletionOptions {
+                trigger_characters: Some(vec![".".to_string()]),
+                resolve_provider: Some(true),
+                ..Default::default()
+            }),
+            ..Default::default()
+        },
+        cx,
+    )
+    .await;
+
+    cx.set_state(indoc! {"fn main() { let a = 2ˇ; }"});
+    cx.simulate_keystroke(".");

    let completion_data = default_data.clone();
    let completion_characters = default_commit_characters.clone();
    cx.handle_request::<lsp::request::Completion, _, _>(move |_, _, _| {
        let default_data = completion_data.clone();
        let default_commit_characters = completion_characters.clone();
+        let items = items.clone();
        async move {
            Ok(Some(lsp::CompletionResponse::List(lsp::CompletionList {
-                items: vec![
-                    lsp::CompletionItem {
-                        label: "Some(2)".into(),
-                        insert_text: Some("Some(2)".into()),
-                        data: Some(json!({ "very": "special"})),
-                        insert_text_mode: Some(lsp::InsertTextMode::ADJUST_INDENTATION),
-                        text_edit: Some(lsp::CompletionTextEdit::InsertAndReplace(
-                            lsp::InsertReplaceEdit {
-                                new_text: "Some(2)".to_string(),
-                                insert: lsp::Range::default(),
-                                replace: lsp::Range::default(),
-                            },
-                        )),
-                        ..lsp::CompletionItem::default()
-                    },
-                    lsp::CompletionItem {
-                        label: "vec![2]".into(),
-                        insert_text: Some("vec![2]".into()),
-                        insert_text_format: Some(lsp::InsertTextFormat::PLAIN_TEXT),
-                        ..lsp::CompletionItem::default()
-                    },
-                ],
+                items,
                item_defaults: Some(lsp::CompletionListItemDefaults {
                    data: Some(default_data.clone()),
                    commit_characters: Some(default_commit_characters.clone()),
@@ -11118,6 +10888,21 @@ async fn test_completions_default_resolve_data_handling(cx: &mut gpui::TestAppCo
    .next()
    .await;

+    let resolved_items = Arc::new(Mutex::new(Vec::new()));
+    cx.lsp
+        .server
+        .on_request::<lsp::request::ResolveCompletionItem, _, _>({
+            let closure_resolved_items = resolved_items.clone();
+            move |item_to_resolve, _| {
+                let closure_resolved_items = closure_resolved_items.clone();
+                async move {
+                    closure_resolved_items.lock().push(item_to_resolve.clone());
+                    Ok(item_to_resolve)
+                }
+            }
+        })
+        .detach();
+
    cx.condition(|editor, _| editor.context_menu_visible())
        .await;
    cx.run_until_parked();
@@ -11126,39 +10911,56 @@ async fn test_completions_default_resolve_data_handling(cx: &mut gpui::TestAppCo
        match menu.as_ref().expect("should have the completions menu") {
            CodeContextMenu::Completions(completions_menu) => {
                assert_eq!(
-                    completion_menu_entries(&completions_menu.entries),
-                    vec!["Some(2)", "vec![2]"]
+                    completions_menu
+                        .entries
+                        .iter()
+                        .flat_map(|c| match c {
+                            CompletionEntry::Match(mat) => Some(mat.string.clone()),
+                            _ => None,
+                        })
+                        .collect::<Vec<String>>(),
+                    items_out
+                        .iter()
+                        .map(|completion| completion.label.clone())
+                        .collect::<Vec<String>>()
                );
            }
            CodeContextMenu::CodeActions(_) => panic!("Expected to have the completions menu"),
        }
    });
+    // Approximate initial displayed interval is 0..12. With extra item padding of 4 this is 0..16
+    // with 4 from the end.
    assert_eq!(
-        resolve_requests_number.load(atomic::Ordering::Acquire),
-        1,
-        "While there are 2 items in the completion list, only 1 resolve request should have been sent, for the selected item"
+        *resolved_items.lock(),
+        [
+            &items_out[0..16],
+            &items_out[items_out.len() - 4..items_out.len()]
+        ]
+        .concat()
+        .iter()
+        .cloned()
+        .collect::<Vec<lsp::CompletionItem>>()
    );
+    resolved_items.lock().clear();

    cx.update_editor(|editor, cx| {
-        editor.context_menu_first(&ContextMenuFirst, cx);
+        editor.context_menu_prev(&ContextMenuPrev, cx);
    });
    cx.run_until_parked();
+    // Completions that have already been resolved are skipped.
    assert_eq!(
-        resolve_requests_number.load(atomic::Ordering::Acquire),
-        1,
-        "After re-selecting the first item, no new resolve requests should be sent"
-    );
-
-    expect_first_item.store(false, atomic::Ordering::Release);
-    cx.update_editor(|editor, cx| {
-        editor.context_menu_last(&ContextMenuLast, cx);
-    });
-    cx.run_until_parked();
-    assert_eq!(
-        resolve_requests_number.load(atomic::Ordering::Acquire),
-        2,
-        "After selecting the other item, another resolve request should have been sent"
+        *resolved_items.lock(),
+        [
+            // Selected item is always resolved even if it was resolved before.
+            &items_out[items_out.len() - 1..items_out.len()],
+            &items_out[items_out.len() - 16..items_out.len() - 4]
+        ]
+        .concat()
+        .iter()
+        .cloned()
+        .collect::<Vec<lsp::CompletionItem>>()
    );
+    resolved_items.lock().clear();
 }

 #[gpui::test]
@@ -11296,7 +11098,7 @@ async fn test_document_format_with_prettier(cx: &mut gpui::TestAppContext) {
            },
            ..Default::default()
        },
-        Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
+        Some(tree_sitter_rust::LANGUAGE.into()),
    )));
    update_test_language_settings(cx, |settings| {
        settings.defaults.prettier = Some(PrettierSettings {
@@ -14768,62 +14570,6 @@ fn test_inline_completion_text_with_deletions(cx: &mut TestAppContext) {
    }
 }

-#[gpui::test]
-async fn test_rename_with_duplicate_edits(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorLspTestContext::new_rust(lsp::ServerCapabilities::default(), cx).await;
-
-    cx.set_state(indoc! {"
-        struct Fˇoo {}
-    "});
-
-    cx.update_editor(|editor, cx| {
-        let highlight_range = Point::new(0, 7)..Point::new(0, 10);
-        let highlight_range = highlight_range.to_anchors(&editor.buffer().read(cx).snapshot(cx));
-        editor.highlight_background::<DocumentHighlightRead>(
-            &[highlight_range],
-            |c| c.editor_document_highlight_read_background,
-            cx,
-        );
-    });
-
-    cx.update_editor(|e, cx| e.rename(&Rename, cx))
-        .expect("Rename was not started")
-        .await
-        .expect("Rename failed");
-    let mut rename_handler =
-        cx.handle_request::<lsp::request::Rename, _, _>(move |url, _, _| async move {
-            let edit = lsp::TextEdit {
-                range: lsp::Range {
-                    start: lsp::Position {
-                        line: 0,
-                        character: 7,
-                    },
-                    end: lsp::Position {
-                        line: 0,
-                        character: 10,
-                    },
-                },
-                new_text: "FooRenamed".to_string(),
-            };
-            Ok(Some(lsp::WorkspaceEdit::new(
-                // Specify the same edit twice
-                std::collections::HashMap::from_iter(Some((url, vec![edit.clone(), edit]))),
-            )))
-        });
-    cx.update_editor(|e, cx| e.confirm_rename(&ConfirmRename, cx))
-        .expect("Confirm rename was not started")
-        .await
-        .expect("Confirm rename failed");
-    rename_handler.next().await.unwrap();
-    cx.run_until_parked();
-
-    // Despite two edits, only one is actually applied as those are identical
-    cx.assert_editor_state(indoc! {"
-        struct FooRenamedˇ {}
-    "});
-}
-
 fn empty_range(row: usize, column: usize) -> Range<DisplayPoint> {
    let point = DisplayPoint::new(DisplayRow(row as u32), column as u32);
    point..point
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -1,6 +1,6 @@
 use crate::{
    blame_entry_tooltip::{blame_entry_relative_timestamp, BlameEntryTooltip},
-    code_context_menus::{CodeActionsMenu, MAX_COMPLETIONS_ASIDE_WIDTH},
+    code_context_menus::{CodeActionsMenu, MENU_ASIDE_MAX_WIDTH, MENU_ASIDE_MIN_WIDTH, MENU_GAP},
    display_map::{
        Block, BlockContext, BlockStyle, DisplaySnapshot, HighlightedChunk, ToDisplayPoint,
    },
@@ -22,7 +22,7 @@ use crate::{
    EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GutterDimensions, HalfPageDown,
    HalfPageUp, HandleInput, HoveredCursor, HoveredHunk, InlineCompletion, JumpData, LineDown,
    LineUp, OpenExcerpts, PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, Selection,
-    SoftWrap, ToPoint, ToggleFold, CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT,
+    SoftWrap, StickyHeaderExcerpt, ToPoint, ToggleFold, CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT,
    GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN, MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
 };
 use client::ParticipantIndex;
@@ -30,14 +30,14 @@ use collections::{BTreeMap, HashMap, HashSet};
 use file_icons::FileIcons;
 use git::{blame::BlameEntry, diff::DiffHunkStatus, Oid};
 use gpui::{
-    anchored, deferred, div, fill, outline, point, px, quad, relative, size, svg,
-    transparent_black, Action, AnyElement, AvailableSpace, Axis, Bounds, ClickEvent, ClipboardItem,
-    ContentMask, Corner, Corners, CursorStyle, DispatchPhase, Edges, Element, ElementInputHandler,
-    Entity, FontId, GlobalElementId, Hitbox, Hsla, InteractiveElement, IntoElement, Length,
-    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad,
-    ParentElement, Pixels, ScrollDelta, ScrollWheelEvent, ShapedLine, SharedString, Size,
-    StatefulInteractiveElement, Style, Styled, Subscription, TextRun, TextStyleRefinement, View,
-    ViewContext, WeakView, WindowContext,
+    anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline, point, px, quad,
+    relative, size, svg, transparent_black, Action, AnyElement, AvailableSpace, Axis, Bounds,
+    ClickEvent, ClipboardItem, ContentMask, Corner, Corners, CursorStyle, DispatchPhase, Edges,
+    Element, ElementInputHandler, Entity, FontId, GlobalElementId, Hitbox, Hsla,
+    InteractiveElement, IntoElement, Length, ModifiersChangedEvent, MouseButton, MouseDownEvent,
+    MouseMoveEvent, MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta, ScrollWheelEvent,
+    ShapedLine, SharedString, Size, StatefulInteractiveElement, Style, Styled, Subscription,
+    TextRun, TextStyleRefinement, View, ViewContext, WeakView, WindowContext,
 };
 use itertools::Itertools;
 use language::{
@@ -1032,6 +1032,7 @@ impl EditorElement {
        scroll_pixel_position: gpui::Point<Pixels>,
        line_height: Pixels,
        em_width: Pixels,
+        em_advance: Pixels,
        autoscroll_containing_element: bool,
        cx: &mut WindowContext,
    ) -> Vec<CursorLayout> {
@@ -1058,7 +1059,7 @@ impl EditorElement {
                    let mut block_width =
                        cursor_row_layout.x_for_index(cursor_column + 1) - cursor_character_x;
                    if block_width == Pixels::ZERO {
-                        block_width = em_width;
+                        block_width = em_advance;
                    }
                    let block_text = if let CursorShape::Block = selection.cursor_shape {
                        snapshot
@@ -1191,12 +1192,13 @@ impl EditorElement {
        );

        let scrollbar_settings = EditorSettings::get_global(cx).scrollbar;
-        let show_scrollbars = match scrollbar_settings.show {
-            ShowScrollbar::Auto => {
-                let editor = self.editor.read(cx);
-                let is_singleton = editor.is_singleton(cx);
-                // Git
-                (is_singleton && scrollbar_settings.git_diff && !snapshot.diff_map.is_empty())
+        let show_scrollbars = self.editor.read(cx).show_scrollbars
+            && match scrollbar_settings.show {
+                ShowScrollbar::Auto => {
+                    let editor = self.editor.read(cx);
+                    let is_singleton = editor.is_singleton(cx);
+                    // Git
+                    (is_singleton && scrollbar_settings.git_diff && !snapshot.diff_map.is_empty())
                    ||
                    // Buffer Search Results
                    (is_singleton && scrollbar_settings.search_results && editor.has_background_highlights::<BufferSearchHighlights>())
@@ -1212,11 +1214,11 @@ impl EditorElement {
                    ||
                    // Scrollmanager
                    editor.scroll_manager.scrollbars_visible()
-            }
-            ShowScrollbar::System => self.editor.read(cx).scroll_manager.scrollbars_visible(),
-            ShowScrollbar::Always => true,
-            ShowScrollbar::Never => false,
-        };
+                }
+                ShowScrollbar::System => self.editor.read(cx).scroll_manager.scrollbars_visible(),
+                ShowScrollbar::Always => true,
+                ShowScrollbar::Never => false,
+            };

        let axes: AxisPair<bool> = scrollbar_settings.axes.into();

@@ -2208,9 +2210,9 @@ impl EditorElement {
        resized_blocks: &mut HashMap<CustomBlockId, u32>,
        selections: &[Selection<Point>],
        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
+        sticky_header_excerpt_id: Option<ExcerptId>,
        cx: &mut WindowContext,
    ) -> (AnyElement, Size<Pixels>) {
-        let header_padding = px(6.0);
        let mut element = match block {
            Block::Custom(block) => {
                let block_start = block.start().to_point(&snapshot.buffer_snapshot);
@@ -2303,14 +2305,7 @@ impl EditorElement {

                let jump_data = jump_data(snapshot, block_row_start, *height, first_excerpt, cx);
                result
-                    .child(self.render_buffer_header(
-                        first_excerpt,
-                        header_padding,
-                        true,
-                        selected,
-                        jump_data,
-                        cx,
-                    ))
+                    .child(self.render_buffer_header(first_excerpt, true, selected, jump_data, cx))
                    .into_any_element()
            }
            Block::ExcerptBoundary {
@@ -2345,14 +2340,19 @@ impl EditorElement {
                if let Some(next_excerpt) = next_excerpt {
                    let jump_data = jump_data(snapshot, block_row_start, *height, next_excerpt, cx);
                    if *starts_new_buffer {
-                        result = result.child(self.render_buffer_header(
-                            next_excerpt,
-                            header_padding,
-                            false,
-                            false,
-                            jump_data,
-                            cx,
-                        ));
+                        if sticky_header_excerpt_id != Some(next_excerpt.id) {
+                            result = result.child(self.render_buffer_header(
+                                next_excerpt,
+                                false,
+                                false,
+                                jump_data,
+                                cx,
+                            ));
+                        } else {
+                            result =
+                                result.child(div().h(FILE_HEADER_HEIGHT as f32 * cx.line_height()));
+                        }
+
                        if *show_excerpt_controls {
                            result = result.child(
                                h_flex()
@@ -2505,7 +2505,6 @@ impl EditorElement {
    fn render_buffer_header(
        &self,
        for_excerpt: &ExcerptInfo,
-        header_padding: Pixels,
        is_folded: bool,
        is_selected: bool,
        jump_data: JumpData,
@@ -2529,8 +2528,8 @@ impl EditorElement {
        let focus_handle = self.editor.focus_handle(cx);

        div()
-            .px(header_padding)
-            .pt(header_padding)
+            .px_2()
+            .pt_2()
            .w_full()
            .h(FILE_HEADER_HEIGHT as f32 * cx.line_height())
            .child(
@@ -2684,6 +2683,7 @@ impl EditorElement {
        line_layouts: &[LineWithInvisibles],
        selections: &[Selection<Point>],
        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
+        sticky_header_excerpt_id: Option<ExcerptId>,
        cx: &mut WindowContext,
    ) -> Result<Vec<BlockLayout>, HashMap<CustomBlockId, u32>> {
        let (fixed_blocks, non_fixed_blocks) = snapshot
@@ -2722,6 +2722,7 @@ impl EditorElement {
                &mut resized_blocks,
                selections,
                is_row_soft_wrapped,
+                sticky_header_excerpt_id,
                cx,
            );
            fixed_block_max_width = fixed_block_max_width.max(element_size.width + em_width);
@@ -2733,6 +2734,7 @@ impl EditorElement {
                style: BlockStyle::Fixed,
            });
        }
+
        for (row, block) in non_fixed_blocks {
            let style = block.style();
            let width = match style {
@@ -2768,6 +2770,7 @@ impl EditorElement {
                &mut resized_blocks,
                selections,
                is_row_soft_wrapped,
+                sticky_header_excerpt_id,
                cx,
            );

@@ -2815,6 +2818,7 @@ impl EditorElement {
                            &mut resized_blocks,
                            selections,
                            is_row_soft_wrapped,
+                            sticky_header_excerpt_id,
                            cx,
                        );

@@ -2881,6 +2885,71 @@ impl EditorElement {
        }
    }

+    fn layout_sticky_buffer_header(
+        &self,
+        StickyHeaderExcerpt {
+            excerpt,
+            next_excerpt_controls_present,
+            next_buffer_row,
+        }: StickyHeaderExcerpt<'_>,
+        scroll_position: f32,
+        line_height: Pixels,
+        snapshot: &EditorSnapshot,
+        hitbox: &Hitbox,
+        cx: &mut WindowContext,
+    ) -> AnyElement {
+        let jump_data = jump_data(snapshot, DisplayRow(0), FILE_HEADER_HEIGHT, excerpt, cx);
+
+        let editor_bg_color = cx.theme().colors().editor_background;
+
+        let mut header = v_flex()
+            .relative()
+            .child(
+                div()
+                    .w(hitbox.bounds.size.width)
+                    .h(FILE_HEADER_HEIGHT as f32 * line_height)
+                    .bg(linear_gradient(
+                        0.,
+                        linear_color_stop(editor_bg_color.opacity(0.), 0.),
+                        linear_color_stop(editor_bg_color, 0.6),
+                    ))
+                    .absolute()
+                    .top_0(),
+            )
+            .child(
+                self.render_buffer_header(excerpt, false, false, jump_data, cx)
+                    .into_any_element(),
+            )
+            .into_any_element();
+
+        let mut origin = hitbox.origin;
+
+        if let Some(next_buffer_row) = next_buffer_row {
+            // Push up the sticky header when the excerpt is getting close to the top of the viewport
+
+            let mut max_row = next_buffer_row - FILE_HEADER_HEIGHT * 2;
+
+            if next_excerpt_controls_present {
+                max_row -= MULTI_BUFFER_EXCERPT_HEADER_HEIGHT;
+            }
+
+            let offset = scroll_position - max_row as f32;
+
+            if offset > 0.0 {
+                origin.y -= Pixels(offset) * line_height;
+            }
+        }
+
+        let size = size(
+            AvailableSpace::Definite(hitbox.size.width),
+            AvailableSpace::MinContent,
+        );
+
+        header.prepaint_as_root(origin, size, cx);
+
+        header
+    }
+
    #[allow(clippy::too_many_arguments)]
    fn layout_context_menu(
        &self,
@@ -2929,6 +2998,11 @@ impl EditorElement {
                }
            };

+        let viewport_bounds = Bounds::new(Default::default(), cx.viewport_size()).extend(Edges {
+            right: -Self::SCROLLBAR_WIDTH - MENU_GAP,
+            ..Default::default()
+        });
+
        // If the context menu's max height won't fit below, then flip it above the line and display
        // it in reverse order. If the available space above is less than below.
        let unconstrained_max_height = line_height * 12. + POPOVER_Y_PADDING;
@@ -2950,7 +3024,7 @@ impl EditorElement {
        // If less than 3 lines fit within the text bounds, instead fit within the window.
        if height < min_height {
            let available_above = bottom_y_when_flipped;
-            let available_below = cx.viewport_size().height - target_position.y;
+            let available_below = viewport_bounds.bottom() - target_position.y;
            if available_below > 3. * line_height {
                y_is_flipped = false;
                height = min_height;
@@ -2968,6 +3042,7 @@ impl EditorElement {

        let max_height_in_lines = ((height - POPOVER_Y_PADDING) / line_height).floor() as u32;

+        // TODO(mgsloan): use viewport_bounds.width as a max width when rendering menu.
        let Some(mut menu_element) = self.editor.update(cx, |editor, cx| {
            editor.render_context_menu(&self.style, max_height_in_lines, cx)
        }) else {
@@ -2976,13 +3051,11 @@ impl EditorElement {

        let menu_size = menu_element.layout_as_root(AvailableSpace::min_size(), cx);
        let menu_position = gpui::Point {
-            x: if target_position.x + menu_size.width > cx.viewport_size().width {
-                // Snap the right edge of the list to the right edge of the window if its horizontal bounds
-                // overflow.
-                (cx.viewport_size().width - menu_size.width).max(Pixels::ZERO)
-            } else {
-                target_position.x
-            },
+            // Snap the right edge of the list to the right edge of the window if its horizontal bounds
+            // overflow. Include space for the scrollbar.
+            x: target_position
+                .x
+                .min((viewport_bounds.right() - menu_size.width).max(Pixels::ZERO)),
            y: if y_is_flipped {
                bottom_y_when_flipped - menu_size.height
            } else {
@@ -2991,43 +3064,31 @@ impl EditorElement {
        };
        cx.defer_draw(menu_element, menu_position, 1);

-        let aside_element = self.editor.update(cx, |editor, cx| {
-            editor.render_context_menu_aside(&self.style, unconstrained_max_height, cx)
-        });
-        if let Some(aside_element) = aside_element {
-            let menu_bounds = Bounds::new(menu_position, menu_size);
-            let max_menu_size = size(menu_size.width, unconstrained_max_height);
-            let max_menu_bounds = if y_is_flipped {
-                Bounds::new(
-                    point(
-                        menu_position.x,
-                        bottom_y_when_flipped - max_menu_size.height,
-                    ),
-                    max_menu_size,
-                )
-            } else {
-                Bounds::new(target_position, max_menu_size)
-            };
-
-            // Pad the target by 4 pixels to create a gap.
-            let mut extend_amount = Edges::all(px(4.));
-            // Extend to include the cursored line to avoid overlapping it.
-            if y_is_flipped {
-                extend_amount.bottom = line_height;
-            } else {
-                extend_amount.top = line_height;
-            }
-            self.layout_context_menu_aside(
-                text_hitbox,
-                y_is_flipped,
-                menu_position,
-                menu_bounds.extend(extend_amount),
-                max_menu_bounds.extend(extend_amount),
-                unconstrained_max_height,
-                aside_element,
-                cx,
-            );
-        }
+        // Layout documentation aside
+        let menu_bounds = Bounds::new(menu_position, menu_size);
+        let max_menu_size = size(menu_size.width, unconstrained_max_height);
+        let max_menu_bounds = if y_is_flipped {
+            Bounds::new(
+                point(
+                    menu_position.x,
+                    bottom_y_when_flipped - max_menu_size.height,
+                ),
+                max_menu_size,
+            )
+        } else {
+            Bounds::new(target_position, max_menu_size)
+        };
+        self.layout_context_menu_aside(
+            text_hitbox,
+            y_is_flipped,
+            menu_position,
+            menu_bounds,
+            max_menu_bounds,
+            unconstrained_max_height,
+            line_height,
+            viewport_bounds,
+            cx,
+        );
    }

    #[allow(clippy::too_many_arguments)]
@@ -3036,66 +3097,106 @@ impl EditorElement {
        text_hitbox: &Hitbox,
        y_is_flipped: bool,
        menu_position: gpui::Point<Pixels>,
-        target_bounds: Bounds<Pixels>,
-        max_target_bounds: Bounds<Pixels>,
+        menu_bounds: Bounds<Pixels>,
+        max_menu_bounds: Bounds<Pixels>,
        max_height: Pixels,
-        aside: AnyElement,
+        line_height: Pixels,
+        viewport_bounds: Bounds<Pixels>,
        cx: &mut WindowContext,
    ) {
-        let mut aside = aside;
-        let actual_size = aside.layout_as_root(AvailableSpace::min_size(), cx);
-
-        // Snap to right side of window if it would overflow.
-        let aside_x = cmp::min(
-            menu_position.x,
-            cx.viewport_size().width - actual_size.width,
-        );
-        if aside_x < px(0.) {
-            // Not enough space, skip drawing.
-            return;
+        let mut extend_amount = Edges::all(MENU_GAP);
+        // Extend to include the cursored line to avoid overlapping it.
+        if y_is_flipped {
+            extend_amount.bottom = line_height;
+        } else {
+            extend_amount.top = line_height;
        }
+        let target_bounds = menu_bounds.extend(extend_amount);
+        let max_target_bounds = max_menu_bounds.extend(extend_amount);

-        let top_position = point(aside_x, target_bounds.top() - actual_size.height);
-        let bottom_position = point(aside_x, target_bounds.bottom());
-        let right_position = point(target_bounds.right(), menu_position.y);
+        let available_within_viewport = target_bounds.space_within(&viewport_bounds);
+        let positioned_aside = if available_within_viewport.right >= MENU_ASIDE_MIN_WIDTH {
+            let max_width = cmp::min(
+                available_within_viewport.right - px(1.),
+                MENU_ASIDE_MAX_WIDTH,
+            );
+            let Some(mut aside) =
+                self.render_context_menu_aside(size(max_width, max_height - POPOVER_Y_PADDING), cx)
+            else {
+                return;
+            };
+            aside.layout_as_root(AvailableSpace::min_size(), cx);
+            let right_position = point(target_bounds.right(), menu_position.y);
+            Some((aside, right_position))
+        } else {
+            let max_size = size(
+                // TODO(mgsloan): Once the menu is bounded by viewport width the bound on viewport
+                // won't be needed here.
+                cmp::min(
+                    cmp::max(menu_bounds.size.width - px(2.), MENU_ASIDE_MIN_WIDTH),
+                    viewport_bounds.right(),
+                ),
+                cmp::min(
+                    max_height,
+                    cmp::max(
+                        available_within_viewport.top,
+                        available_within_viewport.bottom,
+                    ),
+                ) - POPOVER_Y_PADDING,
+            );
+            let Some(mut aside) = self.render_context_menu_aside(max_size, cx) else {
+                return;
+            };
+            let actual_size = aside.layout_as_root(AvailableSpace::min_size(), cx);

-        let fit_horizontally_within = |available: Edges<Pixels>, wanted: Size<Pixels>| {
-            // Prefer to fit to the right, then on the same side of the line as the menu, then on
-            // the other side of the line.
-            if wanted.width < available.right {
-                Some(right_position)
-            } else if !y_is_flipped && wanted.height < available.bottom {
-                Some(bottom_position)
-            } else if !y_is_flipped && wanted.height < available.top {
-                Some(top_position)
-            } else if y_is_flipped && wanted.height < available.top {
-                Some(top_position)
-            } else if y_is_flipped && wanted.height < available.bottom {
-                Some(bottom_position)
-            } else {
-                None
-            }
+            let top_position = point(menu_position.x, target_bounds.top() - actual_size.height);
+            let bottom_position = point(menu_position.x, target_bounds.bottom());
+
+            let fit_within = |available: Edges<Pixels>, wanted: Size<Pixels>| {
+                // Prefer to fit on the same side of the line as the menu, then on the other side of
+                // the line.
+                if !y_is_flipped && wanted.height < available.bottom {
+                    Some(bottom_position)
+                } else if !y_is_flipped && wanted.height < available.top {
+                    Some(top_position)
+                } else if y_is_flipped && wanted.height < available.top {
+                    Some(top_position)
+                } else if y_is_flipped && wanted.height < available.bottom {
+                    Some(bottom_position)
+                } else {
+                    None
+                }
+            };
+
+            // Prefer choosing a direction using max sizes rather than actual size for stability.
+            let available_within_text = max_target_bounds.space_within(&text_hitbox.bounds);
+            let wanted = size(MENU_ASIDE_MAX_WIDTH, max_height);
+            let aside_position = fit_within(available_within_text, wanted)
+                // Fallback: fit max size in window.
+                .or_else(|| fit_within(max_target_bounds.space_within(&viewport_bounds), wanted))
+                // Fallback: fit actual size in window.
+                .or_else(|| fit_within(available_within_viewport, actual_size));
+
+            aside_position.map(|position| (aside, position))
        };

-        // Prefer choosing a direction using max sizes rather than actual size for stability.
-        let mut available = max_target_bounds.space_within(&text_hitbox.bounds);
-        let mut wanted = size(MAX_COMPLETIONS_ASIDE_WIDTH, max_height);
-        let aside_position = fit_horizontally_within(available, wanted)
-            .or_else(|| {
-                // Fallback: fit max size in window.
-                available = max_target_bounds
-                    .space_within(&Bounds::new(Default::default(), cx.viewport_size()));
-                fit_horizontally_within(available, wanted)
-            })
-            .or_else(|| {
-                // Fallback: fit actual size in window.
-                wanted = actual_size;
-                fit_horizontally_within(available, wanted)
-            });
-
        // Skip drawing if it doesn't fit anywhere.
-        if let Some(aside_position) = aside_position {
-            cx.defer_draw(aside, aside_position, 1);
+        if let Some((aside, position)) = positioned_aside {
+            cx.defer_draw(aside, position, 1);
+        }
+    }
+
+    fn render_context_menu_aside(
+        &self,
+        max_size: Size<Pixels>,
+        cx: &mut WindowContext,
+    ) -> Option<AnyElement> {
+        if max_size.width < px(100.) || max_size.height < px(12.) {
+            None
+        } else {
+            self.editor.update(cx, |editor, cx| {
+                editor.render_context_menu_aside(&self.style, max_size, cx)
+            })
        }
    }

@@ -4911,11 +5012,14 @@ fn jump_data(
        let excerpt_start_row = language::ToPoint::to_point(&jump_anchor, buffer).row;
        jump_position.row - excerpt_start_row
    };
-    let line_offset_from_top = block_row_start.0 + height + offset_from_excerpt_start
-        - snapshot
-            .scroll_anchor
-            .scroll_position(&snapshot.display_snapshot)
-            .y as u32;
+    let line_offset_from_top = block_row_start.0
+        + height
+        + offset_from_excerpt_start.saturating_sub(
+            snapshot
+                .scroll_anchor
+                .scroll_position(&snapshot.display_snapshot)
+                .y as u32,
+        );
    JumpData {
        excerpt_id: for_excerpt.id,
        anchor: jump_anchor,
@@ -6062,6 +6166,14 @@ impl Element for EditorElement {
                    let scroll_range_bounds = scrollbar_range_data.scroll_range;
                    let mut scroll_width = scroll_range_bounds.size.width;

+                    let sticky_header_excerpt = if snapshot.buffer_snapshot.show_headers() {
+                        snapshot.sticky_header_excerpt(start_row)
+                    } else {
+                        None
+                    };
+                    let sticky_header_excerpt_id =
+                        sticky_header_excerpt.as_ref().map(|top| top.excerpt.id);
+
                    let blocks = cx.with_element_namespace("blocks", |cx| {
                        self.render_blocks(
                            start_row..end_row,
@@ -6077,6 +6189,7 @@ impl Element for EditorElement {
                            &line_layouts,
                            &local_selections,
                            is_row_soft_wrapped,
+                            sticky_header_excerpt_id,
                            cx,
                        )
                    });
@@ -6090,6 +6203,19 @@ impl Element for EditorElement {
                        }
                    };

+                    let sticky_buffer_header = sticky_header_excerpt.map(|sticky_header_excerpt| {
+                        cx.with_element_namespace("blocks", |cx| {
+                            self.layout_sticky_buffer_header(
+                                sticky_header_excerpt,
+                                scroll_position.y,
+                                line_height,
+                                &snapshot,
+                                &hitbox,
+                                cx,
+                            )
+                        })
+                    });
+
                    let start_buffer_row =
                        MultiBufferRow(start_anchor.to_point(&snapshot.buffer_snapshot).row);
                    let end_buffer_row =
@@ -6217,6 +6343,7 @@ impl Element for EditorElement {
                    );

                    let mut block_start_rows = HashSet::default();
+
                    cx.with_element_namespace("blocks", |cx| {
                        self.layout_blocks(
                            &mut blocks,
@@ -6246,6 +6373,7 @@ impl Element for EditorElement {
                        scroll_pixel_position,
                        line_height,
                        em_width,
+                        em_advance,
                        autoscroll_containing_element,
                        cx,
                    );
@@ -6507,6 +6635,7 @@ impl Element for EditorElement {
                        crease_trailers,
                        tab_invisible,
                        space_invisible,
+                        sticky_buffer_header,
                    }
                })
            })
@@ -6588,6 +6717,12 @@ impl Element for EditorElement {
                        });
                    }

+                    cx.with_element_namespace("blocks", |cx| {
+                        if let Some(mut sticky_header) = layout.sticky_buffer_header.take() {
+                            sticky_header.paint(cx)
+                        }
+                    });
+
                    self.paint_scrollbars(layout, cx);
                    self.paint_inline_completion_popover(layout, cx);
                    self.paint_mouse_context_menu(layout, cx);
@@ -6695,6 +6830,7 @@ pub struct EditorLayout {
    mouse_context_menu: Option<AnyElement>,
    tab_invisible: ShapedLine,
    space_invisible: ShapedLine,
+    sticky_buffer_header: Option<AnyElement>,
 }

 impl EditorLayout {
@@ -7023,7 +7159,16 @@ impl CursorLayout {
            let name_origin = if cursor_name.is_top_row {
                point(bounds.right() - px(1.), bounds.top())
            } else {
-                point(bounds.left(), bounds.top() - text_size / 2. - px(1.))
+                match self.shape {
+                    CursorShape::Bar => point(
+                        bounds.right() - px(2.),
+                        bounds.top() - text_size / 2. - px(1.),
+                    ),
+                    _ => point(
+                        bounds.right() - px(1.),
+                        bounds.top() - text_size / 2. - px(1.),
+                    ),
+                }
            };
            let mut name_element = div()
                .bg(self.color)
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -429,7 +429,7 @@ fn show_hover(
                    })
                    .or_else(|| {
                        let snapshot = &snapshot.buffer_snapshot;
-                        let offset_range = snapshot.range_for_syntax_ancestor(anchor..anchor)?;
+                        let offset_range = snapshot.syntax_ancestor(anchor..anchor)?.1;
                        Some(
                            snapshot.anchor_before(offset_range.start)
                                ..snapshot.anchor_after(offset_range.end),
--- a/crates/editor/src/hunk_diff.rs
+++ b/crates/editor/src/hunk_diff.rs
@@ -1155,6 +1155,11 @@ fn editor_with_deleted_text(
        editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
        editor.set_show_wrap_guides(false, cx);
        editor.set_show_gutter(false, cx);
+        editor.set_show_line_numbers(false, cx);
+        editor.set_show_scrollbars(false, cx);
+        editor.set_show_runnables(false, cx);
+        editor.set_show_git_diff_gutter(false, cx);
+        editor.set_show_code_actions(false, cx);
        editor.scroll_manager.set_forbid_vertical_scroll(true);
        editor.set_read_only(true);
        editor.set_show_inline_completions(Some(false), cx);
@@ -1166,7 +1171,7 @@ fn editor_with_deleted_text(
            false,
            cx,
        );
-        editor.set_current_line_highlight(Some(CurrentLineHighlight::None)); //
+        editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
        editor
            ._subscriptions
            .extend([cx.on_blur(&editor.focus_handle, |editor, cx| {
--- a/crates/editor/src/lsp_ext.rs
+++ b/crates/editor/src/lsp_ext.rs
@@ -1,6 +1,8 @@
+use std::collections::hash_map::Entry;
 use std::sync::Arc;

 use crate::Editor;
+use collections::HashMap;
 use gpui::{Model, WindowContext};
 use language::Buffer;
 use language::Language;
@@ -20,6 +22,7 @@ where
        return None;
    };
    let multibuffer = editor.buffer().read(cx);
+    let mut language_servers_for = HashMap::default();
    editor
        .selections
        .disjoint_anchors()
@@ -28,27 +31,36 @@ where
        .filter_map(|selection| Some((selection.start.buffer_id?, selection.start)))
        .filter_map(|(buffer_id, trigger_anchor)| {
            let buffer = multibuffer.buffer(buffer_id)?;
+            let server_id = *match language_servers_for.entry(buffer_id) {
+                Entry::Occupied(occupied_entry) => occupied_entry.into_mut(),
+                Entry::Vacant(vacant_entry) => {
+                    let language_server_id = project
+                        .read(cx)
+                        .language_servers_for_local_buffer(buffer.read(cx), cx)
+                        .find_map(|(adapter, server)| {
+                            if adapter.name.0.as_ref() == language_server_name {
+                                Some(server.server_id())
+                            } else {
+                                None
+                            }
+                        });
+                    vacant_entry.insert(language_server_id)
+                }
+            }
+            .as_ref()?;
+
+            Some((buffer, trigger_anchor, server_id))
+        })
+        .find_map(|(buffer, trigger_anchor, server_id)| {
            let language = buffer.read(cx).language_at(trigger_anchor.text_anchor)?;
            if !filter_language(&language) {
                return None;
            }
-            Some((trigger_anchor, language, buffer))
-        })
-        .find_map(|(trigger_anchor, language, buffer)| {
-            project
-                .read(cx)
-                .language_servers_for_local_buffer(buffer.read(cx), cx)
-                .find_map(|(adapter, server)| {
-                    if adapter.name.0.as_ref() == language_server_name {
-                        Some((
-                            trigger_anchor,
-                            Arc::clone(&language),
-                            server.server_id(),
-                            buffer.clone(),
-                        ))
-                    } else {
-                        None
-                    }
-                })
+            Some((
+                trigger_anchor,
+                Arc::clone(&language),
+                server_id,
+                buffer.clone(),
+            ))
        })
 }
--- a/crates/extensions_ui/Cargo.toml
+++ b/crates/extensions_ui/Cargo.toml
@@ -30,6 +30,7 @@ semantic_version.workspace = true
 serde.workspace = true
 settings.workspace = true
 smallvec.workspace = true
+telemetry.workspace = true
 theme.workspace = true
 ui.workspace = true
 util.workspace = true
--- a/crates/extensions_ui/src/components/feature_upsell.rs
+++ b/crates/extensions_ui/src/components/feature_upsell.rs
@@ -1,6 +1,3 @@
-use std::sync::Arc;
-
-use client::telemetry::Telemetry;
 use gpui::{AnyElement, Div, StyleRefinement};
 use smallvec::SmallVec;
 use ui::{prelude::*, ButtonLike};
@@ -8,17 +5,15 @@ use ui::{prelude::*, ButtonLike};
 #[derive(IntoElement)]
 pub struct FeatureUpsell {
    base: Div,
-    telemetry: Arc<Telemetry>,
    text: SharedString,
    docs_url: Option<SharedString>,
    children: SmallVec<[AnyElement; 2]>,
 }

 impl FeatureUpsell {
-    pub fn new(telemetry: Arc<Telemetry>, text: impl Into<SharedString>) -> Self {
+    pub fn new(text: impl Into<SharedString>) -> Self {
        Self {
            base: h_flex(),
-            telemetry,
            text: text.into(),
            docs_url: None,
            children: SmallVec::new(),
@@ -67,12 +62,13 @@ impl RenderOnce for FeatureUpsell {
                                    .child(Icon::new(IconName::ArrowUpRight)),
                            )
                            .on_click({
-                                let telemetry = self.telemetry.clone();
                                let docs_url = docs_url.clone();
                                move |_event, cx| {
-                                    telemetry.report_app_event(format!(
-                                        "feature upsell: viewed docs ({docs_url})"
-                                    ));
+                                    telemetry::event!(
+                                        "Documentation Viewed",
+                                        source = "Feature Upsell",
+                                        url = docs_url,
+                                    );
                                    cx.open_url(&docs_url)
                                }
                            }),
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -7,7 +7,6 @@ use std::sync::OnceLock;
 use std::time::Duration;
 use std::{ops::Range, sync::Arc};

-use client::telemetry::Telemetry;
 use client::ExtensionMetadata;
 use collections::{BTreeMap, BTreeSet};
 use editor::{Editor, EditorElement, EditorStyle};
@@ -182,7 +181,6 @@ fn keywords_by_feature() -> &'static BTreeMap<Feature, Vec<&'static str>> {
 pub struct ExtensionsPage {
    workspace: WeakView<Workspace>,
    list: UniformListScrollHandle,
-    telemetry: Arc<Telemetry>,
    is_fetching_extensions: bool,
    filter: ExtensionFilter,
    remote_extension_entries: Vec<ExtensionMetadata>,
@@ -221,7 +219,6 @@ impl ExtensionsPage {
            let mut this = Self {
                workspace: workspace.weak_handle(),
                list: UniformListScrollHandle::new(),
-                telemetry: workspace.client().telemetry().clone(),
                is_fetching_extensions: false,
                filter: ExtensionFilter::All,
                dev_extension_entries: Vec::new(),
@@ -704,18 +701,15 @@ impl ExtensionsPage {

        match status.clone() {
            ExtensionStatus::NotInstalled => (
-                Button::new(SharedString::from(extension.id.clone()), "Install").on_click(
-                    cx.listener({
-                        let extension_id = extension.id.clone();
-                        move |this, _, cx| {
-                            this.telemetry
-                                .report_app_event("extensions: install extension".to_string());
-                            ExtensionStore::global(cx).update(cx, |store, cx| {
-                                store.install_latest_extension(extension_id.clone(), cx)
-                            });
-                        }
-                    }),
-                ),
+                Button::new(SharedString::from(extension.id.clone()), "Install").on_click({
+                    let extension_id = extension.id.clone();
+                    move |_, cx| {
+                        telemetry::event!("Extension Installed");
+                        ExtensionStore::global(cx).update(cx, |store, cx| {
+                            store.install_latest_extension(extension_id.clone(), cx)
+                        });
+                    }
+                }),
                None,
            ),
            ExtensionStatus::Installing => (
@@ -729,18 +723,15 @@ impl ExtensionsPage {
                ),
            ),
            ExtensionStatus::Installed(installed_version) => (
-                Button::new(SharedString::from(extension.id.clone()), "Uninstall").on_click(
-                    cx.listener({
-                        let extension_id = extension.id.clone();
-                        move |this, _, cx| {
-                            this.telemetry
-                                .report_app_event("extensions: uninstall extension".to_string());
-                            ExtensionStore::global(cx).update(cx, |store, cx| {
-                                store.uninstall_extension(extension_id.clone(), cx)
-                            });
-                        }
-                    }),
-                ),
+                Button::new(SharedString::from(extension.id.clone()), "Uninstall").on_click({
+                    let extension_id = extension.id.clone();
+                    move |_, cx| {
+                        telemetry::event!("Extension Uninstalled", extension_id);
+                        ExtensionStore::global(cx).update(cx, |store, cx| {
+                            store.uninstall_extension(extension_id.clone(), cx)
+                        });
+                    }
+                }),
                if installed_version == extension.manifest.version {
                    None
                } else {
@@ -760,13 +751,11 @@ impl ExtensionsPage {
                                })
                            })
                            .disabled(!is_compatible)
-                            .on_click(cx.listener({
+                            .on_click({
                                let extension_id = extension.id.clone();
                                let version = extension.manifest.version.clone();
-                                move |this, _, cx| {
-                                    this.telemetry.report_app_event(
-                                        "extensions: install extension".to_string(),
-                                    );
+                                move |_, cx| {
+                                    telemetry::event!("Extension Installed", extension_id, version);
                                    ExtensionStore::global(cx).update(cx, |store, cx| {
                                        store
                                            .upgrade_extension(
@@ -777,7 +766,7 @@ impl ExtensionsPage {
                                            .detach_and_log_err(cx)
                                    });
                                }
-                            })),
+                            }),
                    )
                },
            ),
@@ -972,19 +961,16 @@ impl ExtensionsPage {
        let upsells_count = self.upsells.len();

        v_flex().children(self.upsells.iter().enumerate().map(|(ix, feature)| {
-            let telemetry = self.telemetry.clone();
            let upsell = match feature {
                Feature::Git => FeatureUpsell::new(
-                    telemetry,
                    "Zed comes with basic Git support. More Git features are coming in the future.",
                )
                .docs_url("https://zed.dev/docs/git"),
                Feature::OpenIn => FeatureUpsell::new(
-                    telemetry,
                    "Zed supports linking to a source line on GitHub and others.",
                )
                .docs_url("https://zed.dev/docs/git#git-integrations"),
-                Feature::Vim => FeatureUpsell::new(telemetry, "Vim support is built-in to Zed!")
+                Feature::Vim => FeatureUpsell::new("Vim support is built-in to Zed!")
                    .docs_url("https://zed.dev/docs/vim")
                    .child(CheckboxWithLabel::new(
                        "enable-vim",
@@ -995,8 +981,7 @@ impl ExtensionsPage {
                            ui::ToggleState::Unselected
                        },
                        cx.listener(move |this, selection, cx| {
-                            this.telemetry
-                                .report_app_event("feature upsell: toggle vim".to_string());
+                            telemetry::event!("Vim Mode Toggled", source = "Feature Upsell");
                            this.update_settings::<VimModeSetting>(
                                selection,
                                cx,
@@ -1004,36 +989,22 @@ impl ExtensionsPage {
                            );
                        }),
                    )),
-                Feature::LanguageBash => {
-                    FeatureUpsell::new(telemetry, "Shell support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/bash")
-                }
-                Feature::LanguageC => {
-                    FeatureUpsell::new(telemetry, "C support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/c")
-                }
-                Feature::LanguageCpp => {
-                    FeatureUpsell::new(telemetry, "C++ support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/cpp")
-                }
-                Feature::LanguageGo => {
-                    FeatureUpsell::new(telemetry, "Go support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/go")
-                }
-                Feature::LanguagePython => {
-                    FeatureUpsell::new(telemetry, "Python support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/python")
-                }
-                Feature::LanguageReact => {
-                    FeatureUpsell::new(telemetry, "React support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/typescript")
-                }
-                Feature::LanguageRust => {
-                    FeatureUpsell::new(telemetry, "Rust support is built-in to Zed!")
-                        .docs_url("https://zed.dev/docs/languages/rust")
-                }
+                Feature::LanguageBash => FeatureUpsell::new("Shell support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/bash"),
+                Feature::LanguageC => FeatureUpsell::new("C support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/c"),
+                Feature::LanguageCpp => FeatureUpsell::new("C++ support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/cpp"),
+                Feature::LanguageGo => FeatureUpsell::new("Go support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/go"),
+                Feature::LanguagePython => FeatureUpsell::new("Python support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/python"),
+                Feature::LanguageReact => FeatureUpsell::new("React support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/typescript"),
+                Feature::LanguageRust => FeatureUpsell::new("Rust support is built-in to Zed!")
+                    .docs_url("https://zed.dev/docs/languages/rust"),
                Feature::LanguageTypescript => {
-                    FeatureUpsell::new(telemetry, "Typescript support is built-in to Zed!")
+                    FeatureUpsell::new("Typescript support is built-in to Zed!")
                        .docs_url("https://zed.dev/docs/languages/typescript")
                }
            };
--- a/crates/feedback/src/feedback_modal.rs
+++ b/crates/feedback/src/feedback_modal.rs
@@ -1,4 +1,8 @@
-use std::{ops::RangeInclusive, sync::Arc, time::Duration};
+use std::{
+    ops::RangeInclusive,
+    sync::{Arc, LazyLock},
+    time::Duration,
+};

 use anyhow::{anyhow, bail};
 use bitflags::bitflags;
@@ -34,7 +38,8 @@ const DEV_MODE: bool = true;
 const DEV_MODE: bool = false;

 const DATABASE_KEY_NAME: &str = "email_address";
-const EMAIL_REGEX: &str = r"\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b";
+static EMAIL_REGEX: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,}\b").unwrap());
 const FEEDBACK_CHAR_LIMIT: RangeInclusive<i32> = 10..=5000;
 const FEEDBACK_SUBMISSION_ERROR_TEXT: &str =
    "Feedback failed to submit, see error log for details.";
@@ -320,7 +325,7 @@ impl FeedbackModal {
        let mut invalid_state_flags = InvalidStateFlags::empty();

        let valid_email_address = match self.email_address_editor.read(cx).text_option(cx) {
-            Some(email_address) => Regex::new(EMAIL_REGEX).unwrap().is_match(&email_address),
+            Some(email_address) => EMAIL_REGEX.is_match(&email_address),
            None => true,
        };

--- a/crates/file_icons/src/file_icons.rs
+++ b/crates/file_icons/src/file_icons.rs
@@ -51,8 +51,8 @@ impl FileIcons {
    pub fn get_icon(path: &Path, cx: &AppContext) -> Option<SharedString> {
        let this = cx.try_global::<Self>()?;

-        // FIXME: Associate a type with the languages and have the file's language
-        //        override these associations
+        // TODO: Associate a type with the languages and have the file's language
+        //       override these associations
        maybe!({
            let suffix = path.icon_stem_or_suffix()?;

--- 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
@@ -10,6 +10,8 @@ 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;
@@ -514,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>(())
@@ -546,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> {
@@ -1999,6 +2014,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/git_hosting_providers/src/providers/github.rs
+++ b/crates/git_hosting_providers/src/providers/github.rs
@@ -1,5 +1,5 @@
 use std::str::FromStr;
-use std::sync::{Arc, OnceLock};
+use std::sync::{Arc, LazyLock};

 use anyhow::{bail, Context, Result};
 use async_trait::async_trait;
@@ -15,9 +15,9 @@ use git::{
 };

 fn pull_request_number_regex() -> &'static Regex {
-    static PULL_REQUEST_NUMBER_REGEX: OnceLock<Regex> = OnceLock::new();
-
-    PULL_REQUEST_NUMBER_REGEX.get_or_init(|| Regex::new(r"\(#(\d+)\)$").unwrap())
+    static PULL_REQUEST_NUMBER_REGEX: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"\(#(\d+)\)$").unwrap());
+    &PULL_REQUEST_NUMBER_REGEX
 }

 #[derive(Debug, Deserialize)]
--- a/crates/git_ui/Cargo.toml
+++ b/crates/git_ui/Cargo.toml
@@ -15,7 +15,11 @@ path = "src/git_ui.rs"
 [dependencies]
 anyhow.workspace = true
 db.workspace = true
+editor.workspace = true
+futures.workspace = true
 gpui.workspace = true
+language.workspace = true
+menu.workspace = true
 project.workspace = true
 schemars.workspace = true
 serde.workspace = true
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
@@ -1,28 +1,42 @@
+use anyhow::{Context as _, Result};
 use collections::HashMap;
+use db::kvp::KEY_VALUE_STORE;
+use editor::{
+    scroll::{Autoscroll, AutoscrollStrategy},
+    Editor, MultiBuffer, DEFAULT_MULTIBUFFER_CONTEXT,
+};
+use git::{diff::DiffHunk, repository::GitFileStatus};
+use gpui::{
+    actions, prelude::*, uniform_list, Action, AppContext, AsyncWindowContext, ClickEvent,
+    CursorStyle, EventEmitter, FocusHandle, FocusableView, KeyContext,
+    ListHorizontalSizingBehavior, ListSizingBehavior, Model, Modifiers, ModifiersChangedEvent,
+    MouseButton, ScrollStrategy, Stateful, Task, UniformListScrollHandle, View, WeakView,
+};
+use language::{Buffer, BufferRow, OffsetRangeExt};
+use menu::{SelectNext, SelectPrev};
+use project::{Entry, EntryKind, Fs, Project, ProjectEntryId, WorktreeId};
+use serde::{Deserialize, Serialize};
+use settings::Settings as _;
 use std::{
    cell::OnceCell,
    collections::HashSet,
    ffi::OsStr,
-    ops::Range,
+    ops::{Deref, Range},
    path::{Path, PathBuf},
+    rc::Rc,
    sync::Arc,
    time::Duration,
+    usize,
 };
-
-use git::repository::GitFileStatus;
-
-use util::{ResultExt, TryFutureExt};
-
-use db::kvp::KEY_VALUE_STORE;
-use gpui::*;
-use project::{Entry, EntryKind, Fs, Project, ProjectEntryId, WorktreeId};
-use serde::{Deserialize, Serialize};
-use settings::Settings as _;
 use ui::{
-    prelude::*, Checkbox, Divider, DividerColor, ElevationIndex, Scrollbar, ScrollbarState, Tooltip,
+    prelude::*, Checkbox, Divider, DividerColor, ElevationIndex, ListItem, Scrollbar,
+    ScrollbarState, Tooltip,
+};
+use util::{ResultExt, TryFutureExt};
+use workspace::{
+    dock::{DockPosition, Panel, PanelEvent},
+    ItemHandle, Workspace,
 };
-use workspace::dock::{DockPosition, Panel, PanelEvent};
-use workspace::Workspace;

 use crate::{git_status_icon, settings::GitPanelSettings};
 use crate::{CommitAllChanges, CommitStagedChanges, DiscardAll, StageAll, UnstageAll};
@@ -31,6 +45,8 @@ actions!(git_panel, [ToggleFocus]);

 const GIT_PANEL_KEY: &str = "GitPanel";

+const UPDATE_DEBOUNCE: Duration = Duration::from_millis(50);
+
 pub fn init(cx: &mut AppContext) {
    cx.observe_new_views(
        |workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>| {
@@ -58,6 +74,8 @@ struct EntryDetails {
    depth: usize,
    is_expanded: bool,
    status: Option<GitFileStatus>,
+    hunks: Rc<OnceCell<Vec<DiffHunk>>>,
+    index: usize,
 }

 impl EntryDetails {
@@ -72,7 +90,7 @@ struct SerializedGitPanel {
 }

 pub struct GitPanel {
-    _workspace: WeakView<Workspace>,
+    workspace: WeakView<Workspace>,
    current_modifiers: Modifiers,
    focus_handle: FocusHandle,
    fs: Arc<dyn Fs>,
@@ -87,8 +105,43 @@ pub struct GitPanel {

    // The entries that are currently shown in the panel, aka
    // not hidden by folding or such
-    visible_entries: Vec<(WorktreeId, Vec<Entry>, OnceCell<HashSet<Arc<Path>>>)>,
+    visible_entries: Vec<WorktreeEntries>,
    width: Option<Pixels>,
+    git_diff_editor: View<Editor>,
+    git_diff_editor_updates: Task<()>,
+    reveal_in_editor: Task<()>,
+}
+
+#[derive(Debug, Clone)]
+struct WorktreeEntries {
+    worktree_id: WorktreeId,
+    visible_entries: Vec<GitPanelEntry>,
+    paths: Rc<OnceCell<HashSet<Arc<Path>>>>,
+}
+
+#[derive(Debug, Clone)]
+struct GitPanelEntry {
+    entry: Entry,
+    hunks: Rc<OnceCell<Vec<DiffHunk>>>,
+}
+
+impl Deref for GitPanelEntry {
+    type Target = Entry;
+
+    fn deref(&self) -> &Self::Target {
+        &self.entry
+    }
+}
+
+impl WorktreeEntries {
+    fn paths(&self) -> &HashSet<Arc<Path>> {
+        self.paths.get_or_init(|| {
+            self.visible_entries
+                .iter()
+                .map(|e| (e.entry.path.clone()))
+                .collect()
+        })
+    }
 }

 impl GitPanel {
@@ -115,18 +168,28 @@ impl GitPanel {
                this.hide_scrollbar(cx);
            })
            .detach();
-            cx.subscribe(&project, |this, _project, event, cx| match event {
+            cx.subscribe(&project, |this, project, event, cx| match event {
                project::Event::WorktreeRemoved(id) => {
                    this.expanded_dir_ids.remove(id);
-                    this.update_visible_entries(None, cx);
+                    this.update_visible_entries(None, None, cx);
                    cx.notify();
                }
-                project::Event::WorktreeUpdatedEntries(_, _)
-                | project::Event::WorktreeAdded(_)
-                | project::Event::WorktreeOrderChanged => {
-                    this.update_visible_entries(None, cx);
+                project::Event::WorktreeOrderChanged => {
+                    this.update_visible_entries(None, None, cx);
                    cx.notify();
                }
+                project::Event::WorktreeUpdatedEntries(id, _)
+                | project::Event::WorktreeAdded(id)
+                | project::Event::WorktreeUpdatedGitRepositories(id) => {
+                    this.update_visible_entries(Some(*id), None, cx);
+                    cx.notify();
+                }
+                project::Event::Closed => {
+                    this.git_diff_editor_updates = Task::ready(());
+                    this.expanded_dir_ids.clear();
+                    this.visible_entries.clear();
+                    this.git_diff_editor = diff_display_editor(project.clone(), cx);
+                }
                _ => {}
            })
            .detach();
@@ -134,11 +197,10 @@ impl GitPanel {
            let scroll_handle = UniformListScrollHandle::new();

            let mut this = Self {
-                _workspace: weak_workspace,
+                workspace: weak_workspace,
                focus_handle: cx.focus_handle(),
                fs,
                pending_serialization: Task::ready(None),
-                project,
                visible_entries: Vec::new(),
                current_modifiers: cx.modifiers(),
                expanded_dir_ids: Default::default(),
@@ -149,8 +211,12 @@ impl GitPanel {
                selected_item: None,
                show_scrollbar: !Self::should_autohide_scrollbar(cx),
                hide_scrollbar_task: None,
+                git_diff_editor: diff_display_editor(project.clone(), cx),
+                git_diff_editor_updates: Task::ready(()),
+                reveal_in_editor: Task::ready(()),
+                project,
            };
-            this.update_visible_entries(None, cx);
+            this.update_visible_entries(None, None, cx);
            this
        });

@@ -251,6 +317,82 @@ impl GitPanel {

        (depth, difference)
    }
+
+    fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) {
+        let item_count = self
+            .visible_entries
+            .iter()
+            .map(|worktree_entries| worktree_entries.visible_entries.len())
+            .sum::<usize>();
+        if item_count == 0 {
+            return;
+        }
+        let selection = match self.selected_item {
+            Some(i) => {
+                if i < item_count - 1 {
+                    self.selected_item = Some(i + 1);
+                    i + 1
+                } else {
+                    self.selected_item = Some(0);
+                    0
+                }
+            }
+            None => {
+                self.selected_item = Some(0);
+                0
+            }
+        };
+        self.scroll_handle
+            .scroll_to_item(selection, ScrollStrategy::Center);
+
+        let mut hunks = None;
+        self.for_each_visible_entry(selection..selection + 1, cx, |_, entry, _| {
+            hunks = Some(entry.hunks.clone());
+        });
+        if let Some(hunks) = hunks {
+            self.reveal_entry_in_git_editor(hunks, false, Some(UPDATE_DEBOUNCE), cx);
+        }
+
+        cx.notify();
+    }
+
+    fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) {
+        let item_count = self
+            .visible_entries
+            .iter()
+            .map(|worktree_entries| worktree_entries.visible_entries.len())
+            .sum::<usize>();
+        if item_count == 0 {
+            return;
+        }
+        let selection = match self.selected_item {
+            Some(i) => {
+                if i > 0 {
+                    self.selected_item = Some(i - 1);
+                    i - 1
+                } else {
+                    self.selected_item = Some(item_count - 1);
+                    item_count - 1
+                }
+            }
+            None => {
+                self.selected_item = Some(0);
+                0
+            }
+        };
+        self.scroll_handle
+            .scroll_to_item(selection, ScrollStrategy::Center);
+
+        let mut hunks = None;
+        self.for_each_visible_entry(selection..selection + 1, cx, |_, entry, _| {
+            hunks = Some(entry.hunks.clone());
+        });
+        if let Some(hunks) = hunks {
+            self.reveal_entry_in_git_editor(hunks, false, Some(UPDATE_DEBOUNCE), cx);
+        }
+
+        cx.notify();
+    }
 }

 impl GitPanel {
@@ -293,8 +435,9 @@ impl GitPanel {
    fn entry_count(&self) -> usize {
        self.visible_entries
            .iter()
-            .map(|(_, entries, _)| {
-                entries
+            .map(|worktree_entries| {
+                worktree_entries
+                    .visible_entries
                    .iter()
                    .filter(|entry| entry.git_status.is_some())
                    .count()
@@ -309,19 +452,23 @@ impl GitPanel {
        mut callback: impl FnMut(ProjectEntryId, EntryDetails, &mut ViewContext<Self>),
    ) {
        let mut ix = 0;
-        for (worktree_id, visible_worktree_entries, entries_paths) in &self.visible_entries {
+        for worktree_entries in &self.visible_entries {
            if ix >= range.end {
                return;
            }

-            if ix + visible_worktree_entries.len() <= range.start {
-                ix += visible_worktree_entries.len();
+            if ix + worktree_entries.visible_entries.len() <= range.start {
+                ix += worktree_entries.visible_entries.len();
                continue;
            }

-            let end_ix = range.end.min(ix + visible_worktree_entries.len());
+            let end_ix = range.end.min(ix + worktree_entries.visible_entries.len());
            // let entry_range = range.start.saturating_sub(ix)..end_ix - ix;
-            if let Some(worktree) = self.project.read(cx).worktree_for_id(*worktree_id, cx) {
+            if let Some(worktree) = self
+                .project
+                .read(cx)
+                .worktree_for_id(worktree_entries.worktree_id, cx)
+            {
                let snapshot = worktree.read(cx).snapshot();
                let root_name = OsStr::new(snapshot.root_name());
                let expanded_entry_ids = self
@@ -331,14 +478,14 @@ impl GitPanel {
                    .unwrap_or(&[]);

                let entry_range = range.start.saturating_sub(ix)..end_ix - ix;
-                let entries = entries_paths.get_or_init(|| {
-                    visible_worktree_entries
-                        .iter()
-                        .map(|e| (e.path.clone()))
-                        .collect()
-                });
+                let entries = worktree_entries.paths();

-                for entry in visible_worktree_entries[entry_range].iter() {
+                let index_start = entry_range.start;
+                for (i, entry) in worktree_entries.visible_entries[entry_range]
+                    .iter()
+                    .enumerate()
+                {
+                    let index = index_start + i;
                    let status = entry.git_status;
                    let is_expanded = expanded_entry_ids.binary_search(&entry.id).is_ok();

@@ -360,16 +507,16 @@ impl GitPanel {
                            .unwrap_or_else(|| root_name.to_string_lossy().to_string()),
                    };

-                    let display_name = entry.path.to_string_lossy().into_owned();
-
                    let details = EntryDetails {
                        filename,
-                        display_name,
+                        display_name: entry.path.to_string_lossy().into_owned(),
                        kind: entry.kind,
                        is_expanded,
                        path: entry.path.clone(),
                        status,
+                        hunks: entry.hunks.clone(),
                        depth,
+                        index,
                    };
                    callback(entry.id, details, cx);
                }
@@ -379,44 +526,75 @@ impl GitPanel {
    }

    // TODO: Update expanded directory state
+    // TODO: Updates happen in the main loop, could be long for large workspaces
    fn update_visible_entries(
        &mut self,
+        for_worktree: Option<WorktreeId>,
        new_selected_entry: Option<(WorktreeId, ProjectEntryId)>,
        cx: &mut ViewContext<Self>,
    ) {
        let project = self.project.read(cx);
-        self.visible_entries.clear();
-        for worktree in project.visible_worktrees(cx) {
-            let snapshot = worktree.read(cx).snapshot();
-            let worktree_id = snapshot.id();
-
-            let mut visible_worktree_entries = Vec::new();
-            let mut entry_iter = snapshot.entries(true, 0);
-            while let Some(entry) = entry_iter.entry() {
-                // Only include entries with a git status
-                if entry.git_status.is_some() {
-                    visible_worktree_entries.push(entry.clone());
+        let mut old_entries_removed = false;
+        let mut after_update = Vec::new();
+        self.visible_entries
+            .retain(|worktree_entries| match for_worktree {
+                Some(for_worktree) => {
+                    if worktree_entries.worktree_id == for_worktree {
+                        old_entries_removed = true;
+                        false
+                    } else if old_entries_removed {
+                        after_update.push(worktree_entries.clone());
+                        false
+                    } else {
+                        true
+                    }
                }
-                entry_iter.advance();
+                None => false,
+            });
+        for worktree in project.visible_worktrees(cx) {
+            let worktree_id = worktree.read(cx).id();
+            if for_worktree.is_some() && for_worktree != Some(worktree_id) {
+                continue;
            }
+            let snapshot = worktree.read(cx).snapshot();

+            let mut visible_worktree_entries = snapshot
+                .entries(false, 0)
+                .filter(|entry| !entry.is_external)
+                .filter(|entry| entry.git_status.is_some())
+                .cloned()
+                .collect::<Vec<_>>();
            snapshot.propagate_git_statuses(&mut visible_worktree_entries);
            project::sort_worktree_entries(&mut visible_worktree_entries);

            if !visible_worktree_entries.is_empty() {
-                self.visible_entries
-                    .push((worktree_id, visible_worktree_entries, OnceCell::new()));
+                self.visible_entries.push(WorktreeEntries {
+                    worktree_id,
+                    visible_entries: visible_worktree_entries
+                        .into_iter()
+                        .map(|entry| GitPanelEntry {
+                            entry,
+                            hunks: Rc::default(),
+                        })
+                        .collect(),
+                    paths: Rc::default(),
+                });
            }
        }
+        self.visible_entries.extend(after_update);

        if let Some((worktree_id, entry_id)) = new_selected_entry {
            self.selected_item = self.visible_entries.iter().enumerate().find_map(
-                |(worktree_index, (id, entries, _))| {
-                    if *id == worktree_id {
-                        entries
+                |(worktree_index, worktree_entries)| {
+                    if worktree_entries.worktree_id == worktree_id {
+                        worktree_entries
+                            .visible_entries
                            .iter()
                            .position(|entry| entry.id == entry_id)
-                            .map(|entry_index| worktree_index * entries.len() + entry_index)
+                            .map(|entry_index| {
+                                worktree_index * worktree_entries.visible_entries.len()
+                                    + entry_index
+                            })
                    } else {
                        None
                    }
@@ -424,6 +602,163 @@ impl GitPanel {
            );
        }

+        let project = self.project.clone();
+        self.git_diff_editor_updates = cx.spawn(|git_panel, mut cx| async move {
+            cx.background_executor()
+                .timer(UPDATE_DEBOUNCE)
+                .await;
+            let Some(project_buffers) = git_panel
+                .update(&mut cx, |git_panel, cx| {
+                    futures::future::join_all(git_panel.visible_entries.iter_mut().flat_map(
+                        move |worktree_entries| {
+                            worktree_entries
+                                .visible_entries
+                                .iter()
+                                .filter_map(|entry| {
+                                    let git_status = entry.git_status()?;
+                                    let entry_hunks = entry.hunks.clone();
+                                    let (entry_path, unstaged_changes_task) =
+                                        project.update(cx, |project, cx| {
+                                            let entry_path =
+                                                project.path_for_entry(entry.id, cx)?;
+                                            let open_task =
+                                                project.open_path(entry_path.clone(), cx);
+                                            let unstaged_changes_task =
+                                                cx.spawn(|project, mut cx| async move {
+                                                    let (_, opened_model) = open_task
+                                                        .await
+                                                        .context("opening buffer")?;
+                                                    let buffer = opened_model
+                                                        .downcast::<Buffer>()
+                                                        .map_err(|_| {
+                                                            anyhow::anyhow!(
+                                                                "accessing buffer for entry"
+                                                            )
+                                                        })?;
+                                                    // TODO added files have noop changes and those are not expanded properly in the multi buffer
+                                                    let unstaged_changes = project
+                                                        .update(&mut cx, |project, cx| {
+                                                            project.open_unstaged_changes(
+                                                                buffer.clone(),
+                                                                cx,
+                                                            )
+                                                        })?
+                                                        .await
+                                                        .context("opening unstaged changes")?;
+
+                                                    let hunks = cx.update(|cx| {
+                                                        entry_hunks
+                                                            .get_or_init(|| {
+                                                                match git_status {
+                                                                    GitFileStatus::Added => {
+                                                                        let buffer_snapshot = buffer.read(cx).snapshot();
+                                                                        let entire_buffer_range =
+                                                                            buffer_snapshot.anchor_after(0)
+                                                                                ..buffer_snapshot
+                                                                                    .anchor_before(
+                                                                                        buffer_snapshot.len(),
+                                                                                    );
+                                                                        let entire_buffer_point_range =
+                                                                            entire_buffer_range
+                                                                                .clone()
+                                                                                .to_point(&buffer_snapshot);
+
+                                                                        vec![DiffHunk {
+                                                                            row_range: entire_buffer_point_range
+                                                                                .start
+                                                                                .row
+                                                                                ..entire_buffer_point_range
+                                                                                    .end
+                                                                                    .row,
+                                                                            buffer_range: entire_buffer_range,
+                                                                            diff_base_byte_range: 0..0,
+                                                                        }]
+                                                                    }
+                                                                    GitFileStatus::Modified => {
+                                                                            let buffer_snapshot =
+                                                                                buffer.read(cx).snapshot();
+                                                                            unstaged_changes.read(cx)
+                                                                                .diff_to_buffer
+                                                                                .hunks_in_row_range(
+                                                                                    0..BufferRow::MAX,
+                                                                                    &buffer_snapshot,
+                                                                                )
+                                                                                .collect()
+                                                                    }
+                                                                    // TODO support conflicts display
+                                                                    GitFileStatus::Conflict => Vec::new(),
+                                                                }
+                                                            }).clone()
+                                                    })?;
+
+                                                    anyhow::Ok((buffer, unstaged_changes, hunks))
+                                                });
+                                            Some((entry_path, unstaged_changes_task))
+                                        })?;
+                                    Some((entry_path, unstaged_changes_task))
+                                })
+                                .map(|(entry_path, open_task)| async move {
+                                    (entry_path, open_task.await)
+                                })
+                                .collect::<Vec<_>>()
+                        },
+                    ))
+                })
+                .ok()
+            else {
+                return;
+            };
+
+            let project_buffers = project_buffers.await;
+            if project_buffers.is_empty() {
+                return;
+            }
+            let mut change_sets = Vec::with_capacity(project_buffers.len());
+            if let Some(buffer_update_task) = git_panel
+                .update(&mut cx, |git_panel, cx| {
+                    let editor = git_panel.git_diff_editor.clone();
+                    let multi_buffer = editor.read(cx).buffer().clone();
+                    let mut buffers_with_ranges = Vec::with_capacity(project_buffers.len());
+                    for (buffer_path, open_result) in project_buffers {
+                        if let Some((buffer, unstaged_changes, diff_hunks)) = open_result
+                            .with_context(|| format!("opening buffer {buffer_path:?}"))
+                            .log_err()
+                        {
+                            change_sets.push(unstaged_changes);
+                            buffers_with_ranges.push((
+                                buffer,
+                                diff_hunks
+                                    .into_iter()
+                                    .map(|hunk| hunk.buffer_range)
+                                    .collect(),
+                            ));
+                        }
+                    }
+
+                    multi_buffer.update(cx, |multi_buffer, cx| {
+                        multi_buffer.clear(cx);
+                        multi_buffer.push_multiple_excerpts_with_context_lines(
+                            buffers_with_ranges,
+                            DEFAULT_MULTIBUFFER_CONTEXT,
+                            cx,
+                        )
+                    })
+                })
+                .ok()
+            {
+                buffer_update_task.await;
+                git_panel
+                    .update(&mut cx, |git_panel, cx| {
+                        git_panel.git_diff_editor.update(cx, |editor, cx| {
+                            for change_set in change_sets {
+                                editor.add_change_set(change_set, cx);
+                            }
+                        })
+                    })
+                    .ok();
+            }
+        });
+
        cx.notify();
    }
 }
@@ -626,17 +961,23 @@ impl GitPanel {
        let item_count = self
            .visible_entries
            .iter()
-            .map(|(_, worktree_entries, _)| worktree_entries.len())
+            .map(|worktree_entries| worktree_entries.visible_entries.len())
            .sum();
+        let selected_entry = self.selected_item;
        h_flex()
            .size_full()
            .overflow_hidden()
            .child(
                uniform_list(cx.view().clone(), "entries", item_count, {
-                    |this, range, cx| {
+                    move |git_panel, range, cx| {
                        let mut items = Vec::with_capacity(range.end - range.start);
-                        this.for_each_visible_entry(range, cx, |id, details, cx| {
-                            items.push(this.render_entry(id, details, cx));
+                        git_panel.for_each_visible_entry(range, cx, |id, details, cx| {
+                            items.push(git_panel.render_entry(
+                                id,
+                                Some(details.index) == selected_entry,
+                                details,
+                                cx,
+                            ));
                        });
                        items
                    }
@@ -653,12 +994,14 @@ impl GitPanel {
    fn render_entry(
        &self,
        id: ProjectEntryId,
+        selected: bool,
        details: EntryDetails,
        cx: &ViewContext<Self>,
    ) -> impl IntoElement {
        let id = id.to_proto() as usize;
        let checkbox_id = ElementId::Name(format!("checkbox_{}", id).into());
        let is_staged = ToggleState::Selected;
+        let handle = cx.view().clone();

        h_flex()
            .id(id)
@@ -676,7 +1019,113 @@ impl GitPanel {
            .when_some(details.status, |this, status| {
                this.child(git_status_icon(status))
            })
-            .child(h_flex().gap_1p5().child(details.display_name.clone()))
+            .child(
+                ListItem::new(("label", id))
+                    .toggle_state(selected)
+                    .child(h_flex().gap_1p5().child(details.display_name.clone()))
+                    .on_click(move |e, cx| {
+                        handle.update(cx, |git_panel, cx| {
+                            git_panel.selected_item = Some(details.index);
+                            let change_focus = e.down.click_count > 1;
+                            git_panel.reveal_entry_in_git_editor(
+                                details.hunks.clone(),
+                                change_focus,
+                                None,
+                                cx,
+                            );
+                        });
+                    }),
+            )
+    }
+
+    fn reveal_entry_in_git_editor(
+        &mut self,
+        hunks: Rc<OnceCell<Vec<DiffHunk>>>,
+        change_focus: bool,
+        debounce: Option<Duration>,
+        cx: &mut ViewContext<'_, Self>,
+    ) {
+        let workspace = self.workspace.clone();
+        let diff_editor = self.git_diff_editor.clone();
+        self.reveal_in_editor = cx.spawn(|_, mut cx| async move {
+            if let Some(debounce) = debounce {
+                cx.background_executor().timer(debounce).await;
+            }
+
+            let Some(editor) = workspace
+                .update(&mut cx, |workspace, cx| {
+                    let git_diff_editor = workspace
+                        .items_of_type::<Editor>(cx)
+                        .find(|editor| &diff_editor == editor);
+                    match git_diff_editor {
+                        Some(existing_editor) => {
+                            workspace.activate_item(&existing_editor, true, change_focus, cx);
+                            existing_editor
+                        }
+                        None => {
+                            workspace.active_pane().update(cx, |pane, cx| {
+                                pane.add_item(
+                                    diff_editor.boxed_clone(),
+                                    true,
+                                    change_focus,
+                                    None,
+                                    cx,
+                                )
+                            });
+                            diff_editor.clone()
+                        }
+                    }
+                })
+                .ok()
+            else {
+                return;
+            };
+
+            if let Some(first_hunk) = hunks.get().and_then(|hunks| hunks.first()) {
+                let hunk_buffer_range = &first_hunk.buffer_range;
+                if let Some(buffer_id) = hunk_buffer_range
+                    .start
+                    .buffer_id
+                    .or_else(|| first_hunk.buffer_range.end.buffer_id)
+                {
+                    editor
+                        .update(&mut cx, |editor, cx| {
+                            let multi_buffer = editor.buffer().read(cx);
+                            let buffer = multi_buffer.buffer(buffer_id)?;
+                            let buffer_snapshot = buffer.read(cx).snapshot();
+                            let (excerpt_id, _) = multi_buffer
+                                .excerpts_for_buffer(&buffer, cx)
+                                .into_iter()
+                                .find(|(_, excerpt)| {
+                                    hunk_buffer_range
+                                        .start
+                                        .cmp(&excerpt.context.start, &buffer_snapshot)
+                                        .is_ge()
+                                        && hunk_buffer_range
+                                            .end
+                                            .cmp(&excerpt.context.end, &buffer_snapshot)
+                                            .is_le()
+                                })?;
+                            let multi_buffer_hunk_start = multi_buffer
+                                .snapshot(cx)
+                                .anchor_in_excerpt(excerpt_id, hunk_buffer_range.start)?;
+                            editor.change_selections(
+                                Some(Autoscroll::Strategy(AutoscrollStrategy::Center)),
+                                cx,
+                                |s| {
+                                    s.select_ranges(Some(
+                                        multi_buffer_hunk_start..multi_buffer_hunk_start,
+                                    ))
+                                },
+                            );
+                            cx.notify();
+                            Some(())
+                        })
+                        .ok()
+                        .flatten();
+                }
+            }
+        });
    }
 }

@@ -704,6 +1153,8 @@ impl Render for GitPanel {
                        this.commit_all_changes(&CommitAllChanges, cx)
                    }))
            })
+            .on_action(cx.listener(Self::select_next))
+            .on_action(cx.listener(Self::select_prev))
            .on_hover(cx.listener(|this, hovered, cx| {
                if *hovered {
                    this.show_scrollbar = true;
@@ -784,3 +1235,14 @@ impl Panel for GitPanel {
        Box::new(ToggleFocus)
    }
 }
+
+fn diff_display_editor(project: Model<Project>, cx: &mut WindowContext) -> View<Editor> {
+    cx.new_view(|cx| {
+        let multi_buffer = cx.new_model(|cx| {
+            MultiBuffer::new(project.read(cx).capability()).with_title("Project diff".to_string())
+        });
+        let mut editor = Editor::for_multibuffer(multi_buffer, Some(project), true, cx);
+        editor.set_expand_all_diff_hunks();
+        editor
+    })
+}
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -136,8 +136,8 @@ font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "40391b7"
 foreign-types = "0.5"
 log.workspace = true
 media.workspace = true
-metal = "0.29"
 objc = "0.2"
+metal.workspace = true

 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "macos"))'.dependencies]
 pathfinder_geometry = "0.5"
--- a/crates/gpui/examples/animation.rs
+++ b/crates/gpui/examples/animation.rs
@@ -1,6 +1,11 @@
 use std::time::Duration;

-use gpui::*;
+use anyhow::Result;
+use gpui::{
+    black, bounce, div, ease_in_out, percentage, prelude::*, px, rgb, size, svg, Animation,
+    AnimationExt as _, App, AppContext, AssetSource, Bounds, SharedString, Transformation,
+    ViewContext, WindowBounds, WindowOptions,
+};

 struct Assets {}

@@ -37,7 +42,7 @@ impl Render for AnimationExample {
                div()
                    .flex()
                    .bg(rgb(0x2e7d32))
-                    .size(Length::Definite(Pixels(300.0).into()))
+                    .size(px(300.0))
                    .justify_center()
                    .items_center()
                    .shadow_lg()
--- a/crates/gpui/examples/hello_world.rs
+++ b/crates/gpui/examples/hello_world.rs
@@ -1,4 +1,7 @@
-use gpui::*;
+use gpui::{
+    div, prelude::*, px, rgb, size, App, AppContext, Bounds, SharedString, ViewContext,
+    WindowBounds, WindowOptions,
+};

 struct HelloWorld {
    text: SharedString,
@@ -11,7 +14,7 @@ impl Render for HelloWorld {
            .flex_col()
            .gap_3()
            .bg(rgb(0x505050))
-            .size(Length::Definite(Pixels(500.0).into()))
+            .size(px(500.0))
            .justify_center()
            .items_center()
            .shadow_lg()
--- a/crates/gpui/examples/image/image.rs
+++ b/crates/gpui/examples/image/image.rs
@@ -1,9 +1,14 @@
+use std::fs;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;

-use gpui::*;
-use std::fs;
+use anyhow::Result;
+use gpui::{
+    actions, div, img, prelude::*, px, rgb, size, App, AppContext, AssetSource, Bounds,
+    ImageSource, KeyBinding, Menu, MenuItem, Point, SharedString, SharedUri, TitlebarOptions,
+    ViewContext, WindowBounds, WindowContext, WindowOptions,
+};

 struct Assets {
    base: PathBuf,
@@ -55,7 +60,7 @@ impl RenderOnce for ImageContainer {
                .size_full()
                .gap_4()
                .child(self.text)
-                .child(img(self.src).w(px(256.0)).h(px(256.0))),
+                .child(img(self.src).size(px(256.0))),
        )
    }
 }
@@ -75,7 +80,7 @@ impl Render for ImageShowcase {
            .justify_center()
            .items_center()
            .gap_8()
-            .bg(rgb(0xFFFFFF))
+            .bg(rgb(0xffffff))
            .child(
                div()
                    .flex()
--- a/crates/gpui/examples/input.rs
+++ b/crates/gpui/examples/input.rs
@@ -1,6 +1,13 @@
 use std::ops::Range;

-use gpui::*;
+use gpui::{
+    actions, black, div, fill, hsla, opaque_grey, point, prelude::*, px, relative, rgb, rgba, size,
+    white, yellow, App, AppContext, Bounds, ClipboardItem, CursorStyle, ElementId,
+    ElementInputHandler, FocusHandle, FocusableView, GlobalElementId, KeyBinding, Keystroke,
+    LayoutId, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad, Pixels, Point,
+    ShapedLine, SharedString, Style, TextRun, UTF16Selection, UnderlineStyle, View, ViewContext,
+    ViewInputHandler, WindowBounds, WindowContext, WindowOptions,
+};
 use unicode_segmentation::*;

 actions!(
@@ -463,7 +470,7 @@ impl Element for TextElement {
                            bounds.bottom(),
                        ),
                    ),
-                    rgba(0x3311FF30),
+                    rgba(0x3311ff30),
                )),
                None,
            )
--- a/crates/gpui/examples/opacity.rs
+++ b/crates/gpui/examples/opacity.rs
@@ -1,6 +1,10 @@
 use std::{fs, path::PathBuf, time::Duration};

-use gpui::*;
+use anyhow::Result;
+use gpui::{
+    div, hsla, img, point, prelude::*, px, rgb, size, svg, App, AppContext, AssetSource, Bounds,
+    BoxShadow, ClickEvent, SharedString, Task, Timer, ViewContext, WindowBounds, WindowOptions,
+};

 struct Assets {
    base: PathBuf,
@@ -76,7 +80,7 @@ impl Render for HelloWorld {
            .flex()
            .flex_row()
            .size_full()
-            .bg(rgb(0xE0E0E0))
+            .bg(rgb(0xe0e0e0))
            .text_xl()
            .child(
                div()
--- a/crates/gpui/examples/set_menus.rs
+++ b/crates/gpui/examples/set_menus.rs
@@ -1,4 +1,6 @@
-use gpui::*;
+use gpui::{
+    actions, div, prelude::*, rgb, App, AppContext, Menu, MenuItem, ViewContext, WindowOptions,
+};

 struct SetMenus;

--- a/crates/gpui/examples/shadow.rs
+++ b/crates/gpui/examples/shadow.rs
@@ -1,4 +1,7 @@
-use gpui::*;
+use gpui::{
+    div, prelude::*, px, rgb, size, App, AppContext, Bounds, ViewContext, WindowBounds,
+    WindowOptions,
+};

 struct Shadow {}

--- a/crates/gpui/examples/svg/svg.rs
+++ b/crates/gpui/examples/svg/svg.rs
@@ -1,7 +1,11 @@
+use std::fs;
 use std::path::PathBuf;

-use gpui::*;
-use std::fs;
+use anyhow::Result;
+use gpui::{
+    div, prelude::*, px, rgb, size, svg, App, AppContext, AssetSource, Bounds, SharedString,
+    ViewContext, WindowBounds, WindowOptions,
+};

 struct Assets {
    base: PathBuf,
--- a/crates/gpui/examples/text_wrapper.rs
+++ b/crates/gpui/examples/text_wrapper.rs
@@ -1,4 +1,6 @@
-use gpui::*;
+use gpui::{
+    div, prelude::*, px, size, App, AppContext, Bounds, ViewContext, WindowBounds, WindowOptions,
+};

 struct HelloWorld {}

--- a/crates/gpui/examples/uniform_list.rs
+++ b/crates/gpui/examples/uniform_list.rs
@@ -1,4 +1,7 @@
-use gpui::*;
+use gpui::{
+    div, prelude::*, px, rgb, size, uniform_list, App, AppContext, Bounds, ViewContext,
+    WindowBounds, WindowOptions,
+};

 struct UniformListExample {}

--- a/crates/gpui/examples/window.rs
+++ b/crates/gpui/examples/window.rs
@@ -1,5 +1,7 @@
-use gpui::*;
-use prelude::FluentBuilder as _;
+use gpui::{
+    div, prelude::*, px, rgb, size, App, AppContext, Bounds, SharedString, Timer, ViewContext,
+    WindowBounds, WindowContext, WindowKind, WindowOptions,
+};

 struct SubWindow {
    custom_titlebar: bool,
--- a/crates/gpui/examples/window_positioning.rs
+++ b/crates/gpui/examples/window_positioning.rs
@@ -1,4 +1,8 @@
-use gpui::*;
+use gpui::{
+    div, point, prelude::*, px, rgb, App, AppContext, Bounds, DisplayId, Hsla, Pixels,
+    SharedString, Size, ViewContext, WindowBackgroundAppearance, WindowBounds, WindowKind,
+    WindowOptions,
+};

 struct WindowContent {
    text: SharedString,
--- a/crates/gpui/examples/window_shadow.rs
+++ b/crates/gpui/examples/window_shadow.rs
@@ -1,15 +1,16 @@
-use gpui::*;
-use prelude::FluentBuilder;
+use gpui::{
+    black, canvas, div, green, point, prelude::*, px, rgb, size, transparent_black, white, App,
+    AppContext, Bounds, CursorStyle, Decorations, Hsla, MouseButton, Pixels, Point, ResizeEdge,
+    Size, ViewContext, WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowOptions,
+};

 struct WindowShadow {}

-/*
-Things to do:
-1. We need a way of calculating which edge or corner the mouse is on,
-    and then dispatch on that
-2. We need to improve the shadow rendering significantly
-3. We need to implement the techniques in here in Zed
-*/
+// Things to do:
+// 1. We need a way of calculating which edge or corner the mouse is on,
+//    and then dispatch on that
+// 2. We need to improve the shadow rendering significantly
+// 3. We need to implement the techniques in here in Zed

 impl Render for WindowShadow {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
@@ -128,7 +129,7 @@ impl Render for WindowShadow {
                            div()
                                .flex()
                                .bg(white())
-                                .size(Length::Definite(Pixels(300.0).into()))
+                                .size(px(300.0))
                                .justify_center()
                                .items_center()
                                .shadow_lg()
--- a/crates/gpui/src/geometry.rs
+++ b/crates/gpui/src/geometry.rs
@@ -815,14 +815,8 @@ where
        Bounds { origin, size }
    }

-    /// Constructs a `Bounds` from a corner point and size.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// # use zed::{Bounds, Corner, Point};
-    /// todo!
-    /// ```
+    /// Constructs a `Bounds` from a corner point and size. The specified corner will be placed at
+    /// the specified origin.
    pub fn from_corner_and_size(corner: Corner, origin: Point<T>, size: Size<T>) -> Bounds<T> {
        let origin = match corner {
            Corner::TopLeft => origin,
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -420,6 +420,9 @@ pub(crate) trait PlatformWindow: HasWindowHandle + HasDisplayHandle {
    fn get_raw_handle(&self) -> windows::HWND;

    // Linux specific methods
+    fn inner_window_bounds(&self) -> WindowBounds {
+        self.window_bounds()
+    }
    fn request_decorations(&self, _decorations: WindowDecorations) {}
    fn show_window_menu(&self, _position: Point<Pixels>) {}
    fn start_window_move(&self) {}
--- a/crates/gpui/src/platform/blade.rs
+++ b/crates/gpui/src/platform/blade.rs
@@ -1,5 +1,11 @@
+#[cfg(target_os = "macos")]
+mod apple_compat;
 mod blade_atlas;
+mod blade_context;
 mod blade_renderer;

+#[cfg(target_os = "macos")]
+pub(crate) use apple_compat::*;
 pub(crate) use blade_atlas::*;
+pub(crate) use blade_context::*;
 pub(crate) use blade_renderer::*;
--- a/crates/gpui/src/platform/blade/apple_compat.rs
+++ b/crates/gpui/src/platform/blade/apple_compat.rs
@@ -0,0 +1,60 @@
+use super::{BladeContext, BladeRenderer, BladeSurfaceConfig};
+use blade_graphics as gpu;
+use std::{ffi::c_void, ptr::NonNull};
+
+#[derive(Clone)]
+pub struct Context {
+    inner: BladeContext,
+}
+impl Default for Context {
+    fn default() -> Self {
+        Self {
+            inner: BladeContext::new().unwrap(),
+        }
+    }
+}
+
+pub type Renderer = BladeRenderer;
+
+pub unsafe fn new_renderer(
+    context: Context,
+    _native_window: *mut c_void,
+    native_view: *mut c_void,
+    bounds: crate::Size<f32>,
+    transparent: bool,
+) -> Renderer {
+    use raw_window_handle as rwh;
+    struct RawWindow {
+        view: *mut c_void,
+    }
+
+    impl rwh::HasWindowHandle for RawWindow {
+        fn window_handle(&self) -> Result<rwh::WindowHandle, rwh::HandleError> {
+            let view = NonNull::new(self.view).unwrap();
+            let handle = rwh::AppKitWindowHandle::new(view);
+            Ok(unsafe { rwh::WindowHandle::borrow_raw(handle.into()) })
+        }
+    }
+    impl rwh::HasDisplayHandle for RawWindow {
+        fn display_handle(&self) -> Result<rwh::DisplayHandle, rwh::HandleError> {
+            let handle = rwh::AppKitDisplayHandle::new();
+            Ok(unsafe { rwh::DisplayHandle::borrow_raw(handle.into()) })
+        }
+    }
+
+    BladeRenderer::new(
+        &context.inner,
+        &RawWindow {
+            view: native_view as *mut _,
+        },
+        BladeSurfaceConfig {
+            size: gpu::Extent {
+                width: bounds.width as u32,
+                height: bounds.height as u32,
+                depth: 1,
+            },
+            transparent,
+        },
+    )
+    .unwrap()
+}
--- a/crates/gpui/src/platform/blade/blade_atlas.rs
+++ b/crates/gpui/src/platform/blade/blade_atlas.rs
@@ -268,7 +268,7 @@ impl BladeAtlasState {
    fn flush(&mut self, encoder: &mut gpu::CommandEncoder) {
        self.flush_initializations(encoder);

-        let mut transfers = encoder.transfer();
+        let mut transfers = encoder.transfer("atlas");
        for upload in self.uploads.drain(..) {
            let texture = &self.storage[upload.id];
            transfers.copy_buffer_to_texture(
--- a/crates/gpui/src/platform/blade/blade_context.rs
+++ b/crates/gpui/src/platform/blade/blade_context.rs
@@ -0,0 +1,24 @@
+use blade_graphics as gpu;
+use std::sync::Arc;
+
+#[cfg_attr(target_os = "macos", derive(Clone))]
+pub struct BladeContext {
+    pub(super) gpu: Arc<gpu::Context>,
+}
+
+impl BladeContext {
+    pub fn new() -> anyhow::Result<Self> {
+        let gpu = Arc::new(
+            unsafe {
+                gpu::Context::init(gpu::ContextDesc {
+                    presentation: true,
+                    validation: false,
+                    device_id: 0, //TODO: hook up to user settings
+                    ..Default::default()
+                })
+            }
+            .map_err(|e| anyhow::anyhow!("{:?}", e))?,
+        );
+        Ok(Self { gpu })
+    }
+}
--- a/crates/gpui/src/platform/blade/blade_renderer.rs
+++ b/crates/gpui/src/platform/blade/blade_renderer.rs
@@ -1,7 +1,7 @@
 // Doing `if let` gives you nice scoping with passes/encoders
 #![allow(irrefutable_let_patterns)]

-use super::{BladeAtlas, PATH_TEXTURE_FORMAT};
+use super::{BladeAtlas, BladeContext, PATH_TEXTURE_FORMAT};
 use crate::{
    AtlasTextureKind, AtlasTile, Background, Bounds, ContentMask, DevicePixels, GpuSpecs,
    MonochromeSprite, Path, PathId, PathVertex, PolychromeSprite, PrimitiveBatch, Quad,
@@ -11,8 +11,6 @@ use bytemuck::{Pod, Zeroable};
 use collections::HashMap;
 #[cfg(target_os = "macos")]
 use media::core_video::CVMetalTextureCache;
-#[cfg(target_os = "macos")]
-use std::{ffi::c_void, ptr::NonNull};

 use blade_graphics as gpu;
 use blade_util::{BufferBelt, BufferBeltDescriptor};
@@ -20,66 +18,6 @@ use std::{mem, sync::Arc};

 const MAX_FRAME_TIME_MS: u32 = 10000;

-#[cfg(target_os = "macos")]
-#[derive(Clone, Default)]
-pub struct Context {}
-#[cfg(target_os = "macos")]
-pub type Renderer = BladeRenderer;
-
-#[cfg(target_os = "macos")]
-pub unsafe fn new_renderer(
-    _context: self::Context,
-    _native_window: *mut c_void,
-    native_view: *mut c_void,
-    bounds: crate::Size<f32>,
-    transparent: bool,
-) -> Renderer {
-    use raw_window_handle as rwh;
-    struct RawWindow {
-        view: *mut c_void,
-    }
-
-    impl rwh::HasWindowHandle for RawWindow {
-        fn window_handle(&self) -> Result<rwh::WindowHandle, rwh::HandleError> {
-            let view = NonNull::new(self.view).unwrap();
-            let handle = rwh::AppKitWindowHandle::new(view);
-            Ok(unsafe { rwh::WindowHandle::borrow_raw(handle.into()) })
-        }
-    }
-    impl rwh::HasDisplayHandle for RawWindow {
-        fn display_handle(&self) -> Result<rwh::DisplayHandle, rwh::HandleError> {
-            let handle = rwh::AppKitDisplayHandle::new();
-            Ok(unsafe { rwh::DisplayHandle::borrow_raw(handle.into()) })
-        }
-    }
-
-    let gpu = Arc::new(
-        gpu::Context::init_windowed(
-            &RawWindow {
-                view: native_view as *mut _,
-            },
-            gpu::ContextDesc {
-                validation: cfg!(debug_assertions),
-                capture: false,
-                overlay: false,
-            },
-        )
-        .unwrap(),
-    );
-
-    BladeRenderer::new(
-        gpu,
-        BladeSurfaceConfig {
-            size: gpu::Extent {
-                width: bounds.width as u32,
-                height: bounds.height as u32,
-                depth: 1,
-            },
-            transparent,
-        },
-    )
-}
-
 #[repr(C)]
 #[derive(Clone, Copy, Pod, Zeroable)]
 struct GlobalParams {
@@ -354,10 +292,14 @@ pub struct BladeSurfaceConfig {
    pub transparent: bool,
 }

+//Note: we could see some of these fields moved into `BladeContext`
+// so that they are shared between windows. E.g. `pipelines`.
+// But that is complicated by the fact that pipelines depend on
+// the format and alpha mode.
 pub struct BladeRenderer {
    gpu: Arc<gpu::Context>,
+    surface: gpu::Surface,
    surface_config: gpu::SurfaceConfig,
-    alpha_mode: gpu::AlphaMode,
    command_encoder: gpu::CommandEncoder,
    last_sync_point: Option<gpu::SyncPoint>,
    pipelines: BladePipelines,
@@ -370,7 +312,11 @@ pub struct BladeRenderer {
 }

 impl BladeRenderer {
-    pub fn new(gpu: Arc<gpu::Context>, config: BladeSurfaceConfig) -> Self {
+    pub fn new<I: raw_window_handle::HasWindowHandle + raw_window_handle::HasDisplayHandle>(
+        context: &BladeContext,
+        window: &I,
+        config: BladeSurfaceConfig,
+    ) -> anyhow::Result<Self> {
        let surface_config = gpu::SurfaceConfig {
            size: config.size,
            usage: gpu::TextureUsage::TARGET,
@@ -379,20 +325,23 @@ impl BladeRenderer {
            allow_exclusive_full_screen: false,
            transparent: config.transparent,
        };
-        let surface_info = gpu.resize(surface_config);
+        let surface = context
+            .gpu
+            .create_surface_configured(window, surface_config)
+            .unwrap();

-        let command_encoder = gpu.create_command_encoder(gpu::CommandEncoderDesc {
+        let command_encoder = context.gpu.create_command_encoder(gpu::CommandEncoderDesc {
            name: "main",
            buffer_count: 2,
        });
-        let pipelines = BladePipelines::new(&gpu, surface_info);
+        let pipelines = BladePipelines::new(&context.gpu, surface.info());
        let instance_belt = BufferBelt::new(BufferBeltDescriptor {
            memory: gpu::Memory::Shared,
            min_chunk_size: 0x1000,
            alignment: 0x40, // Vulkan `minStorageBufferOffsetAlignment` on Intel Xe
        });
-        let atlas = Arc::new(BladeAtlas::new(&gpu));
-        let atlas_sampler = gpu.create_sampler(gpu::SamplerDesc {
+        let atlas = Arc::new(BladeAtlas::new(&context.gpu));
+        let atlas_sampler = context.gpu.create_sampler(gpu::SamplerDesc {
            name: "atlas",
            mag_filter: gpu::FilterMode::Linear,
            min_filter: gpu::FilterMode::Linear,
@@ -402,13 +351,13 @@ impl BladeRenderer {
        #[cfg(target_os = "macos")]
        let core_video_texture_cache = unsafe {
            use foreign_types::ForeignType as _;
-            CVMetalTextureCache::new(gpu.metal_device().as_ptr()).unwrap()
+            CVMetalTextureCache::new(context.gpu.metal_device().as_ptr()).unwrap()
        };

-        Self {
-            gpu,
+        Ok(Self {
+            gpu: Arc::clone(&context.gpu),
+            surface,
            surface_config,
-            alpha_mode: surface_info.alpha,
            command_encoder,
            last_sync_point: None,
            pipelines,
@@ -418,7 +367,7 @@ impl BladeRenderer {
            atlas_sampler,
            #[cfg(target_os = "macos")]
            core_video_texture_cache,
-        }
+        })
    }

    fn wait_for_gpu(&mut self) {
@@ -452,7 +401,8 @@ impl BladeRenderer {
        if always_resize || gpu_size != self.surface_config.size {
            self.wait_for_gpu();
            self.surface_config.size = gpu_size;
-            self.gpu.resize(self.surface_config);
+            self.gpu
+                .reconfigure_surface(&mut self.surface, self.surface_config);
        }
    }

@@ -460,10 +410,10 @@ impl BladeRenderer {
        if transparent != self.surface_config.transparent {
            self.wait_for_gpu();
            self.surface_config.transparent = transparent;
-            let surface_info = self.gpu.resize(self.surface_config);
+            self.gpu
+                .reconfigure_surface(&mut self.surface, self.surface_config);
            self.pipelines.destroy(&self.gpu);
-            self.pipelines = BladePipelines::new(&self.gpu, surface_info);
-            self.alpha_mode = surface_info.alpha;
+            self.pipelines = BladePipelines::new(&self.gpu, self.surface.info());
        }
    }

@@ -490,13 +440,13 @@ impl BladeRenderer {

    #[cfg(target_os = "macos")]
    pub fn layer(&self) -> metal::MetalLayer {
-        self.gpu.metal_layer().unwrap()
+        self.surface.metal_layer()
    }

    #[cfg(target_os = "macos")]
    pub fn layer_ptr(&self) -> *mut metal::CAMetalLayer {
        use metal::foreign_types::ForeignType as _;
-        self.gpu.metal_layer().unwrap().as_ptr()
+        self.surface.metal_layer().as_ptr()
    }

    #[profiling::function]
@@ -538,14 +488,17 @@ impl BladeRenderer {
            };

            let vertex_buf = unsafe { self.instance_belt.alloc_typed(&vertices, &self.gpu) };
-            let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
-                colors: &[gpu::RenderTarget {
-                    view: tex_info.raw_view,
-                    init_op: gpu::InitOp::Clear(gpu::TextureColor::OpaqueBlack),
-                    finish_op: gpu::FinishOp::Store,
-                }],
-                depth_stencil: None,
-            });
+            let mut pass = self.command_encoder.render(
+                "paths",
+                gpu::RenderTargetSet {
+                    colors: &[gpu::RenderTarget {
+                        view: tex_info.raw_view,
+                        init_op: gpu::InitOp::Clear(gpu::TextureColor::OpaqueBlack),
+                        finish_op: gpu::FinishOp::Store,
+                    }],
+                    depth_stencil: None,
+                },
+            );

            let mut encoder = pass.with(&self.pipelines.path_rasterization);
            encoder.bind(
@@ -566,6 +519,7 @@ impl BladeRenderer {
        self.instance_belt.destroy(&self.gpu);
        self.gpu.destroy_command_encoder(&mut self.command_encoder);
        self.pipelines.destroy(&self.gpu);
+        self.gpu.destroy_surface(&mut self.surface);
    }

    pub fn draw(&mut self, scene: &Scene) {
@@ -575,7 +529,7 @@ impl BladeRenderer {

        let frame = {
            profiling::scope!("acquire frame");
-            self.gpu.acquire_frame()
+            self.surface.acquire_frame()
        };
        self.command_encoder.init_texture(frame.texture());

@@ -584,21 +538,24 @@ impl BladeRenderer {
                self.surface_config.size.width as f32,
                self.surface_config.size.height as f32,
            ],
-            premultiplied_alpha: match self.alpha_mode {
+            premultiplied_alpha: match self.surface.info().alpha {
                gpu::AlphaMode::Ignored | gpu::AlphaMode::PostMultiplied => 0,
                gpu::AlphaMode::PreMultiplied => 1,
            },
            pad: 0,
        };

-        if let mut pass = self.command_encoder.render(gpu::RenderTargetSet {
-            colors: &[gpu::RenderTarget {
-                view: frame.texture_view(),
-                init_op: gpu::InitOp::Clear(gpu::TextureColor::TransparentBlack),
-                finish_op: gpu::FinishOp::Store,
-            }],
-            depth_stencil: None,
-        }) {
+        if let mut pass = self.command_encoder.render(
+            "main",
+            gpu::RenderTargetSet {
+                colors: &[gpu::RenderTarget {
+                    view: frame.texture_view(),
+                    init_op: gpu::InitOp::Clear(gpu::TextureColor::TransparentBlack),
+                    finish_op: gpu::FinishOp::Store,
+                }],
+                depth_stencil: None,
+            },
+        ) {
            profiling::scope!("render pass");
            for batch in scene.batches() {
                match batch {
--- a/crates/gpui/src/platform/linux/platform.rs
+++ b/crates/gpui/src/platform/linux/platform.rs
@@ -1,52 +1,45 @@
-#![allow(unused)]
-
-use std::any::{type_name, Any};
-use std::cell::{self, RefCell};
-use std::env;
-use std::ffi::OsString;
-use std::fs::File;
-use std::io::Read;
-use std::ops::{Deref, DerefMut};
-use std::os::fd::{AsFd, AsRawFd, FromRawFd};
-use std::panic::{AssertUnwindSafe, Location};
-use std::rc::Weak;
 use std::{
+    env,
+    panic::AssertUnwindSafe,
    path::{Path, PathBuf},
    process::Command,
    rc::Rc,
    sync::Arc,
+};
+#[cfg(any(feature = "wayland", feature = "x11"))]
+use std::{
+    ffi::OsString,
+    fs::File,
+    io::Read as _,
+    os::fd::{AsFd, AsRawFd, FromRawFd},
    time::Duration,
 };

 use anyhow::{anyhow, Context as _};
 use async_task::Runnable;
-use calloop::channel::Channel;
-use calloop::{EventLoop, LoopHandle, LoopSignal};
-use flume::{Receiver, Sender};
+use calloop::{channel::Channel, LoopSignal};
 use futures::{channel::oneshot, future::FutureExt};
-use parking_lot::Mutex;
-use util::ResultExt;
-
+use util::ResultExt as _;
 #[cfg(any(feature = "wayland", feature = "x11"))]
 use xkbcommon::xkb::{self, Keycode, Keysym, State};

-use crate::platform::NoopTextSystem;
 use crate::{
    px, Action, AnyWindowHandle, BackgroundExecutor, ClipboardItem, CursorStyle, DisplayId,
-    ForegroundExecutor, Keymap, Keystroke, LinuxDispatcher, Menu, MenuItem, Modifiers, OwnedMenu,
-    PathPromptOptions, Pixels, Platform, PlatformDisplay, PlatformInputHandler, PlatformTextSystem,
-    PlatformWindow, Point, PromptLevel, Result, ScreenCaptureSource, SemanticVersion, SharedString,
-    Size, Task, WindowAppearance, WindowOptions, WindowParams,
+    ForegroundExecutor, Keymap, LinuxDispatcher, Menu, MenuItem, OwnedMenu, PathPromptOptions,
+    Pixels, Platform, PlatformDisplay, PlatformTextSystem, PlatformWindow, Point, Result,
+    ScreenCaptureSource, Task, WindowAppearance, WindowParams,
 };
-
+#[cfg(any(feature = "wayland", feature = "x11"))]
 pub(crate) const SCROLL_LINES: f32 = 3.0;

 // Values match the defaults on GTK.
 // Taken from https://github.com/GNOME/gtk/blob/main/gtk/gtksettings.c#L320
+#[cfg(any(feature = "wayland", feature = "x11"))]
 pub(crate) const DOUBLE_CLICK_INTERVAL: Duration = Duration::from_millis(400);
 pub(crate) const DOUBLE_CLICK_DISTANCE: Pixels = px(5.0);
 pub(crate) const KEYRING_LABEL: &str = "zed-github-account";

+#[cfg(any(feature = "wayland", feature = "x11"))]
 const FILE_PICKER_PORTAL_MISSING: &str =
    "Couldn't open file picker due to missing xdg-desktop-portal implementation.";

@@ -54,8 +47,9 @@ pub trait LinuxClient {
    fn compositor_name(&self) -> &'static str;
    fn with_common<R>(&self, f: impl FnOnce(&mut LinuxCommon) -> R) -> R;
    fn displays(&self) -> Vec<Rc<dyn PlatformDisplay>>;
-    fn primary_display(&self) -> Option<Rc<dyn PlatformDisplay>>;
+    #[allow(unused)]
    fn display(&self, id: DisplayId) -> Option<Rc<dyn PlatformDisplay>>;
+    fn primary_display(&self) -> Option<Rc<dyn PlatformDisplay>>;

    fn open_window(
        &self,
@@ -98,9 +92,9 @@ pub(crate) struct LinuxCommon {
 impl LinuxCommon {
    pub fn new(signal: LoopSignal) -> (Self, Channel<Runnable>) {
        let (main_sender, main_receiver) = calloop::channel::channel::<Runnable>();
+
        #[cfg(any(feature = "wayland", feature = "x11"))]
        let text_system = Arc::new(crate::CosmicTextSystem::new());
-
        #[cfg(not(any(feature = "wayland", feature = "x11")))]
        let text_system = Arc::new(crate::NoopTextSystem::new());

@@ -218,7 +212,7 @@ impl<P: LinuxClient + 'static> Platform for P {
        }
    }

-    fn activate(&self, ignoring_other_apps: bool) {
+    fn activate(&self, _ignoring_other_apps: bool) {
        log::info!("activate is not implemented on Linux, ignoring the call")
    }

@@ -281,7 +275,7 @@ impl<P: LinuxClient + 'static> Platform for P {
        let (done_tx, done_rx) = oneshot::channel();

        #[cfg(not(any(feature = "wayland", feature = "x11")))]
-        done_tx.send(Ok(None));
+        let _ = (done_tx.send(Ok(None)), options);

        #[cfg(any(feature = "wayland", feature = "x11"))]
        self.foreground_executor()
@@ -306,7 +300,7 @@ impl<P: LinuxClient + 'static> Platform for P {
                            ashpd::Error::PortalNotFound(_) => anyhow!(FILE_PICKER_PORTAL_MISSING),
                            err => err.into(),
                        };
-                        done_tx.send(Err(result));
+                        let _ = done_tx.send(Err(result));
                        return;
                    }
                };
@@ -322,7 +316,7 @@ impl<P: LinuxClient + 'static> Platform for P {
                    Err(ashpd::Error::Response(_)) => Ok(None),
                    Err(e) => Err(e.into()),
                };
-                done_tx.send(result);
+                let _ = done_tx.send(result);
            })
            .detach();
        done_rx
@@ -332,7 +326,7 @@ impl<P: LinuxClient + 'static> Platform for P {
        let (done_tx, done_rx) = oneshot::channel();

        #[cfg(not(any(feature = "wayland", feature = "x11")))]
-        done_tx.send(Ok(None));
+        let _ = (done_tx.send(Ok(None)), directory);

        #[cfg(any(feature = "wayland", feature = "x11"))]
        self.foreground_executor()
@@ -356,7 +350,7 @@ impl<P: LinuxClient + 'static> Platform for P {
                                }
                                err => err.into(),
                            };
-                            done_tx.send(Err(result));
+                            let _ = done_tx.send(Err(result));
                            return;
                        }
                    };
@@ -369,7 +363,7 @@ impl<P: LinuxClient + 'static> Platform for P {
                        Err(ashpd::Error::Response(_)) => Ok(None),
                        Err(e) => Err(e.into()),
                    };
-                    done_tx.send(result);
+                    let _ = done_tx.send(result);
                }
            })
            .detach();
@@ -426,7 +420,7 @@ impl<P: LinuxClient + 'static> Platform for P {

    fn app_path(&self) -> Result<PathBuf> {
        // get the path of the executable of the current process
-        let exe_path = std::env::current_exe()?;
+        let exe_path = env::current_exe()?;
        Ok(exe_path)
    }

@@ -440,9 +434,9 @@ impl<P: LinuxClient + 'static> Platform for P {
        self.with_common(|common| Some(common.menus.clone()))
    }

-    fn set_dock_menu(&self, menu: Vec<MenuItem>, keymap: &Keymap) {}
+    fn set_dock_menu(&self, _menu: Vec<MenuItem>, _keymap: &Keymap) {}

-    fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf> {
+    fn path_for_auxiliary_executable(&self, _name: &str) -> Result<PathBuf> {
        Err(anyhow::Error::msg(
            "Platform<LinuxPlatform>::path_for_auxiliary_executable is not implemented yet",
        ))
@@ -614,6 +608,7 @@ pub(super) fn reveal_path_internal(
        .detach();
 }

+#[allow(unused)]
 pub(super) fn is_within_click_distance(a: Point<Pixels>, b: Point<Pixels>) -> bool {
    let diff = a - b;
    diff.x.abs() <= DOUBLE_CLICK_DISTANCE && diff.y.abs() <= DOUBLE_CLICK_DISTANCE
@@ -622,7 +617,7 @@ pub(super) fn is_within_click_distance(a: Point<Pixels>, b: Point<Pixels>) -> bo
 #[cfg(any(feature = "wayland", feature = "x11"))]
 pub(super) fn get_xkb_compose_state(cx: &xkb::Context) -> Option<xkb::compose::State> {
    let mut locales = Vec::default();
-    if let Some(locale) = std::env::var_os("LC_CTYPE") {
+    if let Some(locale) = env::var_os("LC_CTYPE") {
        locales.push(locale);
    }
    locales.push(OsString::from("C"));
@@ -650,12 +645,13 @@ pub(super) unsafe fn read_fd(mut fd: filedescriptor::FileDescriptor) -> Result<V
 }

 impl CursorStyle {
+    #[allow(unused)]
    pub(super) fn to_icon_name(&self) -> String {
        // Based on cursor names from https://gitlab.gnome.org/GNOME/adwaita-icon-theme (GNOME)
        // and https://github.com/KDE/breeze (KDE). Both of them seem to be also derived from
        // Web CSS cursor names: https://developer.mozilla.org/en-US/docs/Web/CSS/cursor#values
        match self {
-            CursorStyle::Arrow => "arrow",
+            CursorStyle::Arrow => "left_ptr",
            CursorStyle::IBeam => "text",
            CursorStyle::Crosshair => "crosshair",
            CursorStyle::ClosedHand => "grabbing",
@@ -682,10 +678,12 @@ impl CursorStyle {
 }

 #[cfg(any(feature = "wayland", feature = "x11"))]
-impl Keystroke {
-    pub(super) fn from_xkb(state: &State, modifiers: Modifiers, keycode: Keycode) -> Self {
-        let mut modifiers = modifiers;
-
+impl crate::Keystroke {
+    pub(super) fn from_xkb(
+        state: &State,
+        mut modifiers: crate::Modifiers,
+        keycode: Keycode,
+    ) -> Self {
        let key_utf32 = state.key_get_utf32(keycode);
        let key_utf8 = state.key_get_utf8(keycode);
        let key_sym = state.key_get_one_sym(keycode);
@@ -759,7 +757,7 @@ impl Keystroke {
        let key_char =
            (key_utf32 >= 32 && key_utf32 != 127 && !key_utf8.is_empty()).then_some(key_utf8);

-        Keystroke {
+        Self {
            modifiers,
            key,
            key_char,
@@ -776,7 +774,6 @@ impl Keystroke {
            Keysym::dead_acute => Some("´".to_owned()),
            Keysym::dead_circumflex => Some("^".to_owned()),
            Keysym::dead_tilde => Some("~".to_owned()),
-            Keysym::dead_perispomeni => Some("͂".to_owned()),
            Keysym::dead_macron => Some("¯".to_owned()),
            Keysym::dead_breve => Some("˘".to_owned()),
            Keysym::dead_abovedot => Some("˙".to_owned()),
@@ -794,9 +791,7 @@ impl Keystroke {
            Keysym::dead_horn => Some("̛".to_owned()),
            Keysym::dead_stroke => Some("̶̶".to_owned()),
            Keysym::dead_abovecomma => Some("̓̓".to_owned()),
-            Keysym::dead_psili => Some("᾿".to_owned()),
            Keysym::dead_abovereversedcomma => Some("ʽ".to_owned()),
-            Keysym::dead_dasia => Some("῾".to_owned()),
            Keysym::dead_doublegrave => Some("̏".to_owned()),
            Keysym::dead_belowring => Some("˳".to_owned()),
            Keysym::dead_belowmacron => Some("̱".to_owned()),
@@ -830,7 +825,7 @@ impl Keystroke {
 }

 #[cfg(any(feature = "wayland", feature = "x11"))]
-impl Modifiers {
+impl crate::Modifiers {
    pub(super) fn from_xkb(keymap_state: &State) -> Self {
        let shift = keymap_state.mod_name_is_active(xkb::MOD_NAME_SHIFT, xkb::STATE_MODS_EFFECTIVE);
        let alt = keymap_state.mod_name_is_active(xkb::MOD_NAME_ALT, xkb::STATE_MODS_EFFECTIVE);
@@ -838,7 +833,7 @@ impl Modifiers {
            keymap_state.mod_name_is_active(xkb::MOD_NAME_CTRL, xkb::STATE_MODS_EFFECTIVE);
        let platform =
            keymap_state.mod_name_is_active(xkb::MOD_NAME_LOGO, xkb::STATE_MODS_EFFECTIVE);
-        Modifiers {
+        Self {
            shift,
            alt,
            control,
--- a/crates/gpui/src/platform/linux/wayland/client.rs
+++ b/crates/gpui/src/platform/linux/wayland/client.rs
@@ -1,12 +1,16 @@
-use std::cell::{RefCell, RefMut};
-use std::hash::Hash;
-use std::os::fd::{AsRawFd, BorrowedFd};
-use std::path::PathBuf;
-use std::rc::{Rc, Weak};
-use std::time::{Duration, Instant};
+use std::{
+    cell::{RefCell, RefMut},
+    hash::Hash,
+    os::fd::{AsRawFd, BorrowedFd},
+    path::PathBuf,
+    rc::{Rc, Weak},
+    time::{Duration, Instant},
+};

-use calloop::timer::{TimeoutAction, Timer};
-use calloop::{EventLoop, LoopHandle};
+use calloop::{
+    timer::{TimeoutAction, Timer},
+    EventLoop, LoopHandle,
+};
 use calloop_wayland_source::WaylandSource;
 use collections::HashMap;
 use filedescriptor::Pipe;
@@ -64,30 +68,28 @@ use xkbcommon::xkb::{self, Keycode, KEYMAP_COMPILE_NO_FLAGS};

 use super::display::WaylandDisplay;
 use super::window::{ImeInput, WaylandWindowStatePtr};
-use crate::platform::linux::wayland::clipboard::{
-    Clipboard, DataOffer, FILE_LIST_MIME_TYPE, TEXT_MIME_TYPE,
-};
-use crate::platform::linux::wayland::cursor::Cursor;
-use crate::platform::linux::wayland::serial::{SerialKind, SerialTracker};
-use crate::platform::linux::wayland::window::WaylandWindow;
-use crate::platform::linux::xdg_desktop_portal::{Event as XDPEvent, XDPEventSource};
-use crate::platform::linux::LinuxClient;
+
 use crate::platform::linux::{
    get_xkb_compose_state, is_within_click_distance, open_uri_internal, read_fd,
    reveal_path_internal,
+    wayland::{
+        clipboard::{Clipboard, DataOffer, FILE_LIST_MIME_TYPE, TEXT_MIME_TYPE},
+        cursor::Cursor,
+        serial::{SerialKind, SerialTracker},
+        window::WaylandWindow,
+    },
+    xdg_desktop_portal::{Event as XDPEvent, XDPEventSource},
+    LinuxClient,
 };
-use crate::platform::PlatformWindow;
+use crate::platform::{blade::BladeContext, PlatformWindow};
 use crate::{
-    point, px, size, Bounds, DevicePixels, FileDropEvent, ForegroundExecutor, MouseExitEvent, Size,
-    DOUBLE_CLICK_INTERVAL, SCROLL_LINES,
+    point, px, size, AnyWindowHandle, Bounds, CursorStyle, DevicePixels, DisplayId, FileDropEvent,
+    ForegroundExecutor, KeyDownEvent, KeyUpEvent, Keystroke, LinuxCommon, Modifiers,
+    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseExitEvent, MouseMoveEvent,
+    MouseUpEvent, NavigationDirection, Pixels, PlatformDisplay, PlatformInput, Point, ScaledPixels,
+    ScrollDelta, ScrollWheelEvent, Size, TouchPhase, WindowParams, DOUBLE_CLICK_INTERVAL,
+    SCROLL_LINES,
 };
-use crate::{
-    AnyWindowHandle, CursorStyle, DisplayId, KeyDownEvent, KeyUpEvent, Keystroke, Modifiers,
-    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent,
-    NavigationDirection, Pixels, PlatformDisplay, PlatformInput, Point, ScaledPixels, ScrollDelta,
-    ScrollWheelEvent, TouchPhase,
-};
-use crate::{LinuxCommon, WindowParams};

 /// Used to convert evdev scancode to xkb scancode
 const MIN_KEYCODE: u32 = 8;
@@ -186,6 +188,7 @@ pub struct Output {
 pub(crate) struct WaylandClientState {
    serial_tracker: SerialTracker,
    globals: Globals,
+    gpu_context: BladeContext,
    wl_seat: wl_seat::WlSeat, // TODO: Multi seat support
    wl_pointer: Option<wl_pointer::WlPointer>,
    wl_keyboard: Option<wl_keyboard::WlKeyboard>,
@@ -459,6 +462,8 @@ impl WaylandClient {
            })
            .unwrap();

+        let gpu_context = BladeContext::new().expect("Unable to init GPU context");
+
        let seat = seat.unwrap();
        let globals = Globals::new(
            globals,
@@ -512,6 +517,7 @@ impl WaylandClient {
        let mut state = Rc::new(RefCell::new(WaylandClientState {
            serial_tracker: SerialTracker::new(),
            globals,
+            gpu_context,
            wl_seat: seat,
            wl_pointer: None,
            wl_keyboard: None,
@@ -627,6 +633,7 @@ impl LinuxClient for WaylandClient {
        let (window, surface_id) = WaylandWindow::new(
            handle,
            state.globals.clone(),
+            &state.gpu_context,
            WaylandClientStatePtr(Rc::downgrade(&self.0)),
            params,
            state.common.appearance,
--- a/crates/gpui/src/platform/linux/wayland/window.rs
+++ b/crates/gpui/src/platform/linux/wayland/window.rs
@@ -1,8 +1,10 @@
-use std::cell::{Ref, RefCell, RefMut};
-use std::ffi::c_void;
-use std::ptr::NonNull;
-use std::rc::Rc;
-use std::sync::Arc;
+use std::{
+    cell::{Ref, RefCell, RefMut},
+    ffi::c_void,
+    ptr::NonNull,
+    rc::Rc,
+    sync::Arc,
+};

 use blade_graphics as gpu;
 use collections::HashMap;
@@ -19,10 +21,11 @@ use wayland_protocols::xdg::shell::client::xdg_surface;
 use wayland_protocols::xdg::shell::client::xdg_toplevel::{self};
 use wayland_protocols_plasma::blur::client::org_kde_kwin_blur;

-use crate::platform::blade::{BladeRenderer, BladeSurfaceConfig};
-use crate::platform::linux::wayland::display::WaylandDisplay;
-use crate::platform::linux::wayland::serial::SerialKind;
-use crate::platform::{PlatformAtlas, PlatformInputHandler, PlatformWindow};
+use crate::platform::{
+    blade::{BladeContext, BladeRenderer, BladeSurfaceConfig},
+    linux::wayland::{display::WaylandDisplay, serial::SerialKind},
+    PlatformAtlas, PlatformInputHandler, PlatformWindow,
+};
 use crate::scene::Scene;
 use crate::{
    px, size, AnyWindowHandle, Bounds, Decorations, Globals, GpuSpecs, Modifiers, Output, Pixels,
@@ -123,37 +126,28 @@ impl WaylandWindowState {
        viewport: Option<wp_viewport::WpViewport>,
        client: WaylandClientStatePtr,
        globals: Globals,
+        gpu_context: &BladeContext,
        options: WindowParams,
    ) -> anyhow::Result<Self> {
-        let raw = RawWindow {
-            window: surface.id().as_ptr().cast::<c_void>(),
-            display: surface
-                .backend()
-                .upgrade()
-                .unwrap()
-                .display_ptr()
-                .cast::<c_void>(),
-        };
-        let gpu = Arc::new(
-            unsafe {
-                gpu::Context::init_windowed(
-                    &raw,
-                    gpu::ContextDesc {
-                        validation: false,
-                        capture: false,
-                        overlay: false,
-                    },
-                )
-            }
-            .map_err(|e| anyhow::anyhow!("{:?}", e))?,
-        );
-        let config = BladeSurfaceConfig {
-            size: gpu::Extent {
-                width: options.bounds.size.width.0 as u32,
-                height: options.bounds.size.height.0 as u32,
-                depth: 1,
-            },
-            transparent: true,
+        let renderer = {
+            let raw_window = RawWindow {
+                window: surface.id().as_ptr().cast::<c_void>(),
+                display: surface
+                    .backend()
+                    .upgrade()
+                    .unwrap()
+                    .display_ptr()
+                    .cast::<c_void>(),
+            };
+            let config = BladeSurfaceConfig {
+                size: gpu::Extent {
+                    width: options.bounds.size.width.0 as u32,
+                    height: options.bounds.size.height.0 as u32,
+                    depth: 1,
+                },
+                transparent: true,
+            };
+            BladeRenderer::new(gpu_context, &raw_window, config)?
        };

        Ok(Self {
@@ -168,7 +162,7 @@ impl WaylandWindowState {
            globals,
            outputs: HashMap::default(),
            display: None,
-            renderer: BladeRenderer::new(gpu, config),
+            renderer,
            bounds: options.bounds,
            scale: 1.0,
            input_handler: None,
@@ -266,6 +260,7 @@ impl WaylandWindow {
    pub fn new(
        handle: AnyWindowHandle,
        globals: Globals,
+        gpu_context: &BladeContext,
        client: WaylandClientStatePtr,
        params: WindowParams,
        appearance: WindowAppearance,
@@ -308,6 +303,7 @@ impl WaylandWindow {
                viewport,
                client,
                globals,
+                gpu_context,
                params,
            )?)),
            callbacks: Rc::new(RefCell::new(Callbacks::default())),
@@ -785,6 +781,19 @@ impl PlatformWindow for WaylandWindow {
        }
    }

+    fn inner_window_bounds(&self) -> WindowBounds {
+        let state = self.borrow();
+        if state.fullscreen {
+            WindowBounds::Fullscreen(state.window_bounds)
+        } else if state.maximized {
+            WindowBounds::Maximized(state.window_bounds)
+        } else {
+            let inset = state.inset.unwrap_or(px(0.));
+            drop(state);
+            WindowBounds::Windowed(self.bounds().inset(inset))
+        }
+    }
+
    fn content_size(&self) -> Size<Pixels> {
        self.borrow().bounds.size
    }
--- a/crates/gpui/src/platform/linux/x11/client.rs
+++ b/crates/gpui/src/platform/linux/x11/client.rs
@@ -1,13 +1,17 @@
 use core::str;
-use std::cell::RefCell;
-use std::collections::{BTreeMap, HashSet};
-use std::ops::Deref;
-use std::path::PathBuf;
-use std::rc::{Rc, Weak};
-use std::time::{Duration, Instant};
+use std::{
+    cell::RefCell,
+    collections::{BTreeMap, HashSet},
+    ops::Deref,
+    path::PathBuf,
+    rc::{Rc, Weak},
+    time::{Duration, Instant},
+};

-use calloop::generic::{FdWrapper, Generic};
-use calloop::{EventLoop, LoopHandle, RegistrationToken};
+use calloop::{
+    generic::{FdWrapper, Generic},
+    EventLoop, LoopHandle, RegistrationToken,
+};

 use anyhow::Context as _;
 use collections::HashMap;
@@ -15,44 +19,49 @@ use http_client::Url;
 use smallvec::SmallVec;
 use util::ResultExt;

-use x11rb::connection::{Connection, RequestConnection};
-use x11rb::cursor;
-use x11rb::errors::ConnectionError;
-use x11rb::protocol::randr::ConnectionExt as _;
-use x11rb::protocol::xinput::ConnectionExt;
-use x11rb::protocol::xkb::ConnectionExt as _;
-use x11rb::protocol::xproto::{
-    AtomEnum, ChangeWindowAttributesAux, ClientMessageData, ClientMessageEvent, ConnectionExt as _,
-    EventMask, KeyPressEvent,
+use x11rb::{
+    connection::{Connection, RequestConnection},
+    cursor,
+    errors::ConnectionError,
+    protocol::randr::ConnectionExt as _,
+    protocol::xinput::ConnectionExt,
+    protocol::xkb::ConnectionExt as _,
+    protocol::xproto::{
+        AtomEnum, ChangeWindowAttributesAux, ClientMessageData, ClientMessageEvent,
+        ConnectionExt as _, EventMask, KeyPressEvent,
+    },
+    protocol::{randr, render, xinput, xkb, xproto, Event},
+    resource_manager::Database,
+    wrapper::ConnectionExt as _,
+    xcb_ffi::XCBConnection,
 };
-use x11rb::protocol::{randr, render, xinput, xkb, xproto, Event};
-use x11rb::resource_manager::Database;
-use x11rb::wrapper::ConnectionExt as _;
-use x11rb::xcb_ffi::XCBConnection;
-use xim::{x11rb::X11rbClient, Client};
-use xim::{AttributeName, InputStyle};
+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};

-use crate::platform::linux::LinuxClient;
-use crate::platform::{LinuxCommon, PlatformWindow};
-use crate::{
-    modifiers_from_xinput_info, point, px, AnyWindowHandle, Bounds, ClipboardItem, CursorStyle,
-    DisplayId, FileDropEvent, Keystroke, Modifiers, ModifiersChangedEvent, MouseButton, Pixels,
-    Platform, PlatformDisplay, PlatformInput, Point, RequestFrameOptions, ScaledPixels,
-    ScrollDelta, Size, TouchPhase, WindowParams, X11Window,
-};
-
 use super::{
    button_or_scroll_from_event_detail, get_valuator_axis_index, modifiers_from_state,
    pressed_button_from_mask, ButtonOrScroll, ScrollDirection,
 };
 use super::{X11Display, X11WindowStatePtr, XcbAtoms};
 use super::{XimCallbackEvent, XimHandler};
-use crate::platform::linux::platform::{DOUBLE_CLICK_INTERVAL, SCROLL_LINES};
-use crate::platform::linux::xdg_desktop_portal::{Event as XDPEvent, XDPEventSource};
-use crate::platform::linux::{
-    get_xkb_compose_state, is_within_click_distance, open_uri_internal, reveal_path_internal,
+
+use crate::platform::{
+    blade::BladeContext,
+    linux::{
+        get_xkb_compose_state, is_within_click_distance, open_uri_internal,
+        platform::{DOUBLE_CLICK_INTERVAL, SCROLL_LINES},
+        reveal_path_internal,
+        xdg_desktop_portal::{Event as XDPEvent, XDPEventSource},
+        LinuxClient,
+    },
+    LinuxCommon, PlatformWindow,
+};
+use crate::{
+    modifiers_from_xinput_info, point, px, AnyWindowHandle, Bounds, ClipboardItem, CursorStyle,
+    DisplayId, FileDropEvent, Keystroke, Modifiers, ModifiersChangedEvent, MouseButton, Pixels,
+    Platform, PlatformDisplay, PlatformInput, Point, RequestFrameOptions, ScaledPixels,
+    ScrollDelta, Size, TouchPhase, WindowParams, X11Window,
 };

 /// Value for DeviceId parameters which selects all devices.
@@ -158,6 +167,8 @@ pub struct X11ClientState {
    pub(crate) last_location: Point<Pixels>,
    pub(crate) current_count: usize,

+    gpu_context: BladeContext,
+
    pub(crate) scale_factor: f32,

    xkb_context: xkbc::Context,
@@ -360,6 +371,8 @@ impl X11Client {
        let compose_state = get_xkb_compose_state(&xkb_context);
        let resource_database = x11rb::resource_manager::new_from_default(&xcb_connection).unwrap();

+        let gpu_context = BladeContext::new().expect("Unable to init GPU context");
+
        let scale_factor = resource_database
            .get_value("Xft.dpi", "Xft.dpi")
            .ok()
@@ -428,6 +441,7 @@ impl X11Client {
            last_mouse_button: None,
            last_location: Point::new(px(0.0), px(0.0)),
            current_count: 0,
+            gpu_context,
            scale_factor,

            xkb_context,
@@ -1299,6 +1313,7 @@ impl LinuxClient for X11Client {
            handle,
            X11ClientStatePtr(Rc::downgrade(&self.0)),
            state.common.foreground_executor.clone(),
+            &state.gpu_context,
            params,
            &state.xcb_connection,
            state.client_side_decorations_supported,
--- a/crates/gpui/src/platform/linux/x11/window.rs
+++ b/crates/gpui/src/platform/linux/x11/window.rs
@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Context};

+use crate::platform::blade::{BladeContext, BladeRenderer, BladeSurfaceConfig};
 use crate::{
-    platform::blade::{BladeRenderer, BladeSurfaceConfig},
    px, size, AnyWindowHandle, Bounds, Decorations, DevicePixels, ForegroundExecutor, GpuSpecs,
    Modifiers, Pixels, PlatformAtlas, PlatformDisplay, PlatformInput, PlatformInputHandler,
    PlatformWindow, Point, PromptLevel, RequestFrameOptions, ResizeEdge, ScaledPixels, Scene, Size,
@@ -247,7 +247,6 @@ pub struct X11WindowState {
    x_root_window: xproto::Window,
    pub(crate) counter_id: sync::Counter,
    pub(crate) last_sync_counter: Option<sync::Int64>,
-    _raw: RawWindow,
    bounds: Bounds<Pixels>,
    scale_factor: f32,
    renderer: BladeRenderer,
@@ -358,6 +357,7 @@ impl X11WindowState {
        handle: AnyWindowHandle,
        client: X11ClientStatePtr,
        executor: ForegroundExecutor,
+        gpu_context: &BladeContext,
        params: WindowParams,
        xcb: &Rc<XCBConnection>,
        client_side_decorations_supported: bool,
@@ -555,50 +555,39 @@ impl X11WindowState {

            xcb.flush().with_context(|| "X11 Flush failed.")?;

-            let raw = RawWindow {
-                connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(xcb)
-                    as *mut _,
-                screen_id: x_screen_index,
-                window_id: x_window,
-                visual_id: visual.id,
+            let renderer = {
+                let raw_window = RawWindow {
+                    connection: as_raw_xcb_connection::AsRawXcbConnection::as_raw_xcb_connection(
+                        xcb,
+                    ) as *mut _,
+                    screen_id: x_screen_index,
+                    window_id: x_window,
+                    visual_id: visual.id,
+                };
+                let config = BladeSurfaceConfig {
+                    // Note: this has to be done after the GPU init, or otherwise
+                    // the sizes are immediately invalidated.
+                    size: query_render_extent(xcb, x_window)?,
+                    // We set it to transparent by default, even if we have client-side
+                    // decorations, since those seem to work on X11 even without `true` here.
+                    // If the window appearance changes, then the renderer will get updated
+                    // too
+                    transparent: false,
+                };
+                BladeRenderer::new(gpu_context, &raw_window, config)?
            };
-            let gpu = Arc::new(
-                unsafe {
-                    gpu::Context::init_windowed(
-                        &raw,
-                        gpu::ContextDesc {
-                            validation: false,
-                            capture: false,
-                            overlay: false,
-                        },
-                    )
-                }
-                .map_err(|e| anyhow!("{:?}", e))?,
-            );

-            let config = BladeSurfaceConfig {
-                // Note: this has to be done after the GPU init, or otherwise
-                // the sizes are immediately invalidated.
-                size: query_render_extent(xcb, x_window)?,
-                // We set it to transparent by default, even if we have client-side
-                // decorations, since those seem to work on X11 even without `true` here.
-                // If the window appearance changes, then the renderer will get updated
-                // too
-                transparent: false,
-            };
            check_reply(|| "X11 MapWindow failed.", xcb.map_window(x_window))?;
-
            let display = Rc::new(X11Display::new(xcb, scale_factor, x_screen_index)?);

            Ok(Self {
                client,
                executor,
                display,
-                _raw: raw,
                x_root_window: visual_set.root,
                bounds: bounds.to_pixels(scale_factor),
                scale_factor,
-                renderer: BladeRenderer::new(gpu, config),
+                renderer,
                atoms: *atoms,
                input_handler: None,
                active: false,
@@ -716,6 +705,7 @@ impl X11Window {
        handle: AnyWindowHandle,
        client: X11ClientStatePtr,
        executor: ForegroundExecutor,
+        gpu_context: &BladeContext,
        params: WindowParams,
        xcb: &Rc<XCBConnection>,
        client_side_decorations_supported: bool,
@@ -730,6 +720,7 @@ impl X11Window {
                handle,
                client,
                executor,
+                gpu_context,
                params,
                xcb,
                client_side_decorations_supported,
@@ -1109,6 +1100,30 @@ impl PlatformWindow for X11Window {
        }
    }

+    fn inner_window_bounds(&self) -> WindowBounds {
+        let state = self.0.state.borrow();
+        if self.is_maximized() {
+            WindowBounds::Maximized(state.bounds)
+        } else {
+            let mut bounds = state.bounds;
+            let [left, right, top, bottom] = state.last_insets;
+
+            let [left, right, top, bottom] = [
+                Pixels((left as f32) / state.scale_factor),
+                Pixels((right as f32) / state.scale_factor),
+                Pixels((top as f32) / state.scale_factor),
+                Pixels((bottom as f32) / state.scale_factor),
+            ];
+
+            bounds.origin.x += left;
+            bounds.origin.y += top;
+            bounds.size.width -= left + right;
+            bounds.size.height -= top + bottom;
+
+            WindowBounds::Windowed(bounds)
+        }
+    }
+
    fn content_size(&self) -> Size<Pixels> {
        // We divide by the scale factor here because this value is queried to determine how much to draw,
        // but it will be multiplied later by the scale to adjust for scaling.
--- a/crates/gpui/src/platform/windows/clipboard.rs
+++ b/crates/gpui/src/platform/windows/clipboard.rs
@@ -357,7 +357,7 @@ impl From<ImageFormat> for image::ImageFormat {
            ImageFormat::Jpeg => image::ImageFormat::Jpeg,
            ImageFormat::Webp => image::ImageFormat::WebP,
            ImageFormat::Gif => image::ImageFormat::Gif,
-            // ImageFormat::Svg => todo!(),
+            // TODO: ImageFormat::Svg
            ImageFormat::Bmp => image::ImageFormat::Bmp,
            ImageFormat::Tiff => image::ImageFormat::Tiff,
            _ => unreachable!(),
--- a/crates/gpui/src/platform/windows/events.rs
+++ b/crates/gpui/src/platform/windows/events.rs
@@ -146,19 +146,18 @@ fn handle_size_msg(
    // Don't resize the renderer when the window is minimized, but record that it was minimized so
    // that on restore the swap chain can be recreated via `update_drawable_size_even_if_unchanged`.
    if wparam.0 == SIZE_MINIMIZED as usize {
-        lock.is_minimized = Some(true);
+        lock.restore_from_minimized = lock.callbacks.request_frame.take();
        return Some(0);
    }
-    let may_have_been_minimized = lock.is_minimized.unwrap_or(true);
-    lock.is_minimized = Some(false);

    let width = lparam.loword().max(1) as i32;
    let height = lparam.hiword().max(1) as i32;
    let new_size = size(DevicePixels(width), DevicePixels(height));
    let scale_factor = lock.scale_factor;
-    if may_have_been_minimized {
+    if lock.restore_from_minimized.is_some() {
        lock.renderer
            .update_drawable_size_even_if_unchanged(new_size);
+        lock.callbacks.request_frame = lock.restore_from_minimized.take();
    } else {
        lock.renderer.update_drawable_size(new_size);
    }
--- a/crates/gpui/src/platform/windows/platform.rs
+++ b/crates/gpui/src/platform/windows/platform.rs
@@ -28,11 +28,12 @@ use windows::{
    UI::ViewManagement::UISettings,
 };

-use crate::*;
+use crate::{platform::blade::BladeContext, *};

 pub(crate) struct WindowsPlatform {
    state: RefCell<WindowsPlatformState>,
    raw_window_handles: RwLock<SmallVec<[HWND; 4]>>,
+    gpu_context: BladeContext,
    // The below members will never change throughout the entire lifecycle of the app.
    icon: HICON,
    main_receiver: flume::Receiver<Runnable>,
@@ -47,6 +48,7 @@ pub(crate) struct WindowsPlatform {

 pub(crate) struct WindowsPlatformState {
    callbacks: PlatformCallbacks,
+    menus: Vec<OwnedMenu>,
    // NOTE: standard cursor handles don't need to close.
    pub(crate) current_cursor: HCURSOR,
 }
@@ -69,6 +71,7 @@ impl WindowsPlatformState {
        Self {
            callbacks,
            current_cursor,
+            menus: Vec::new(),
        }
    }
 }
@@ -94,12 +97,14 @@ impl WindowsPlatform {
        let icon = load_icon().unwrap_or_default();
        let state = RefCell::new(WindowsPlatformState::new());
        let raw_window_handles = RwLock::new(SmallVec::new());
+        let gpu_context = BladeContext::new().expect("Unable to init GPU context");
        let windows_version = WindowsVersion::new().expect("Error retrieve windows version");
        let validation_number = rand::random::<usize>();

        Self {
            state,
            raw_window_handles,
+            gpu_context,
            icon,
            main_receiver,
            dispatch_event,
@@ -344,7 +349,12 @@ impl Platform for WindowsPlatform {
        handle: AnyWindowHandle,
        options: WindowParams,
    ) -> Result<Box<dyn PlatformWindow>> {
-        let window = WindowsWindow::new(handle, options, self.generate_creation_info())?;
+        let window = WindowsWindow::new(
+            handle,
+            options,
+            self.generate_creation_info(),
+            &self.gpu_context,
+        )?;
        let handle = window.get_raw_handle();
        self.raw_window_handles.write().push(handle);

@@ -441,8 +451,15 @@ impl Platform for WindowsPlatform {
        self.state.borrow_mut().callbacks.reopen = Some(callback);
    }

+    fn set_menus(&self, menus: Vec<Menu>, _keymap: &Keymap) {
+        self.state.borrow_mut().menus = menus.into_iter().map(|menu| menu.owned()).collect();
+    }
+
+    fn get_menus(&self) -> Option<Vec<OwnedMenu>> {
+        Some(self.state.borrow().menus.clone())
+    }
+
    // todo(windows)
-    fn set_menus(&self, _menus: Vec<Menu>, _keymap: &Keymap) {}
    fn set_dock_menu(&self, _menus: Vec<MenuItem>, _keymap: &Keymap) {}

    fn on_app_menu_action(&self, callback: Box<dyn FnMut(&dyn Action)>) {
--- a/crates/gpui/src/platform/windows/window.rs
+++ b/crates/gpui/src/platform/windows/window.rs
@@ -27,7 +27,7 @@ use windows::{
    },
 };

-use crate::platform::blade::BladeRenderer;
+use crate::platform::blade::{BladeContext, BladeRenderer};
 use crate::*;

 pub(crate) struct WindowsWindow(pub Rc<WindowsWindowStatePtr>);
@@ -38,7 +38,7 @@ pub struct WindowsWindowState {
    pub fullscreen_restore_bounds: Bounds<Pixels>,
    pub border_offset: WindowBorderOffset,
    pub scale_factor: f32,
-    pub is_minimized: Option<bool>,
+    pub restore_from_minimized: Option<Box<dyn FnMut(RequestFrameOptions)>>,

    pub callbacks: Callbacks,
    pub input_handler: Option<PlatformInputHandler>,
@@ -78,6 +78,7 @@ impl WindowsWindowState {
        cs: &CREATESTRUCTW,
        current_cursor: HCURSOR,
        display: WindowsDisplay,
+        gpu_context: &BladeContext,
    ) -> Result<Self> {
        let scale_factor = {
            let monitor_dpi = unsafe { GetDpiForWindow(hwnd) } as f32;
@@ -93,8 +94,8 @@ impl WindowsWindowState {
            size: logical_size,
        };
        let border_offset = WindowBorderOffset::default();
-        let is_minimized = None;
-        let renderer = windows_renderer::windows_renderer(hwnd, transparent)?;
+        let restore_from_minimized = None;
+        let renderer = windows_renderer::init(gpu_context, hwnd, transparent)?;
        let callbacks = Callbacks::default();
        let input_handler = None;
        let system_key_handled = false;
@@ -111,7 +112,7 @@ impl WindowsWindowState {
            fullscreen_restore_bounds,
            border_offset,
            scale_factor,
-            is_minimized,
+            restore_from_minimized,
            callbacks,
            input_handler,
            system_key_handled,
@@ -227,6 +228,7 @@ impl WindowsWindowStatePtr {
            cs,
            context.current_cursor,
            context.display,
+            context.gpu_context,
        )?);

        Ok(Rc::new_cyclic(|this| Self {
@@ -340,7 +342,7 @@ pub(crate) struct Callbacks {
    pub(crate) appearance_changed: Option<Box<dyn FnMut()>>,
 }

-struct WindowCreateContext {
+struct WindowCreateContext<'a> {
    inner: Option<Result<Rc<WindowsWindowStatePtr>>>,
    handle: AnyWindowHandle,
    hide_title_bar: bool,
@@ -352,6 +354,7 @@ struct WindowCreateContext {
    windows_version: WindowsVersion,
    validation_number: usize,
    main_receiver: flume::Receiver<Runnable>,
+    gpu_context: &'a BladeContext,
 }

 impl WindowsWindow {
@@ -359,6 +362,7 @@ impl WindowsWindow {
        handle: AnyWindowHandle,
        params: WindowParams,
        creation_info: WindowCreationInfo,
+        gpu_context: &BladeContext,
    ) -> Result<Self> {
        let WindowCreationInfo {
            icon,
@@ -410,6 +414,7 @@ impl WindowsWindow {
            windows_version,
            validation_number,
            main_receiver,
+            gpu_context,
        };
        let lpparam = Some(&context as *const _ as *const _);
        let creation_result = unsafe {
@@ -1236,38 +1241,24 @@ fn set_window_composition_attribute(hwnd: HWND, color: Option<Color>, state: u32
 }

 mod windows_renderer {
-    use std::{num::NonZeroIsize, sync::Arc};
-
-    use blade_graphics as gpu;
+    use crate::platform::blade::{BladeContext, BladeRenderer, BladeSurfaceConfig};
    use raw_window_handle as rwh;
+    use std::num::NonZeroIsize;
    use windows::Win32::{Foundation::HWND, UI::WindowsAndMessaging::GWLP_HINSTANCE};

-    use crate::{
-        get_window_long,
-        platform::blade::{BladeRenderer, BladeSurfaceConfig},
-    };
+    use crate::get_window_long;

-    pub(super) fn windows_renderer(hwnd: HWND, transparent: bool) -> anyhow::Result<BladeRenderer> {
+    pub(super) fn init(
+        context: &BladeContext,
+        hwnd: HWND,
+        transparent: bool,
+    ) -> anyhow::Result<BladeRenderer> {
        let raw = RawWindow { hwnd };
-        let gpu: Arc<gpu::Context> = Arc::new(
-            unsafe {
-                gpu::Context::init_windowed(
-                    &raw,
-                    gpu::ContextDesc {
-                        validation: false,
-                        capture: false,
-                        overlay: false,
-                    },
-                )
-            }
-            .map_err(|e| anyhow::anyhow!("{:?}", e))?,
-        );
        let config = BladeSurfaceConfig {
-            size: gpu::Extent::default(),
+            size: Default::default(),
            transparent,
        };
-
-        Ok(BladeRenderer::new(gpu, config))
+        BladeRenderer::new(context, &raw, config)
    }

    struct RawWindow {
--- a/crates/gpui/src/window.rs
+++ b/crates/gpui/src/window.rs
@@ -999,6 +999,11 @@ impl<'a> WindowContext<'a> {
        self.window.platform_window.window_bounds()
    }

+    /// Return the `WindowBounds` excluding insets (Wayland and X11)
+    pub fn inner_window_bounds(&self) -> WindowBounds {
+        self.window.platform_window.inner_window_bounds()
+    }
+
    /// Dispatch the given action on the currently focused element.
    pub fn dispatch_action(&mut self, action: Box<dyn Action>) {
        let focus_handle = self.focused();
--- a/crates/html_to_markdown/src/markdown_writer.rs
+++ b/crates/html_to_markdown/src/markdown_writer.rs
@@ -1,7 +1,6 @@
-use std::cell::RefCell;
 use std::collections::VecDeque;
 use std::rc::Rc;
-use std::sync::OnceLock;
+use std::{cell::RefCell, sync::LazyLock};

 use anyhow::Result;
 use markup5ever_rcdom::{Handle, NodeData};
@@ -10,13 +9,14 @@ use regex::Regex;
 use crate::html_element::HtmlElement;

 fn empty_line_regex() -> &'static Regex {
-    static REGEX: OnceLock<Regex> = OnceLock::new();
-    REGEX.get_or_init(|| Regex::new(r"^\s*$").unwrap())
+    static REGEX: LazyLock<Regex> =
+        LazyLock::new(|| Regex::new(r"^\s*$").expect("Failed to create empty_line_regex"));
+    &REGEX
 }

 fn more_than_three_newlines_regex() -> &'static Regex {
-    static REGEX: OnceLock<Regex> = OnceLock::new();
-    REGEX.get_or_init(|| Regex::new(r"\n{3,}").unwrap())
+    static REGEX: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\n{3,}").unwrap());
+    &REGEX
 }

 pub enum StartTagOutcome {
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -68,7 +68,7 @@ pub use text::{
 use theme::SyntaxTheme;
 #[cfg(any(test, feature = "test-support"))]
 use util::RandomCharIter;
-use util::{debug_panic, RangeExt};
+use util::{debug_panic, maybe, RangeExt};

 #[cfg(any(test, feature = "test-support"))]
 pub use {tree_sitter_rust, tree_sitter_typescript};
@@ -2923,10 +2923,13 @@ impl BufferSnapshot {
        (start..end, word_kind)
    }

-    /// Returns the range for the closes syntax node enclosing the given range.
-    pub fn range_for_syntax_ancestor<T: ToOffset>(&self, range: Range<T>) -> Option<Range<usize>> {
+    /// Returns the closest syntax node enclosing the given range.
+    pub fn syntax_ancestor<'a, T: ToOffset>(
+        &'a self,
+        range: Range<T>,
+    ) -> Option<tree_sitter::Node<'a>> {
        let range = range.start.to_offset(self)..range.end.to_offset(self);
-        let mut result: Option<Range<usize>> = None;
+        let mut result: Option<tree_sitter::Node<'a>> = None;
        'outer: for layer in self
            .syntax
            .layers_for_range(range.clone(), &self.text, true)
@@ -2956,7 +2959,7 @@ impl BufferSnapshot {
            }

            let left_node = cursor.node();
-            let mut layer_result = left_node.byte_range();
+            let mut layer_result = left_node;

            // For an empty range, try to find another node immediately to the right of the range.
            if left_node.end_byte() == range.start {
@@ -2979,13 +2982,13 @@ impl BufferSnapshot {
                // If both nodes are the same in that regard, favor the right one.
                if let Some(right_node) = right_node {
                    if right_node.is_named() || !left_node.is_named() {
-                        layer_result = right_node.byte_range();
+                        layer_result = right_node;
                    }
                }
            }

            if let Some(previous_result) = &result {
-                if previous_result.len() < layer_result.len() {
+                if previous_result.byte_range().len() < layer_result.byte_range().len() {
                    continue;
                }
            }
@@ -3028,6 +3031,48 @@ impl BufferSnapshot {
        Some(items)
    }

+    pub fn outline_range_containing<T: ToOffset>(&self, range: Range<T>) -> Option<Range<Point>> {
+        let range = range.to_offset(self);
+        let mut matches = self.syntax.matches(range.clone(), &self.text, |grammar| {
+            grammar.outline_config.as_ref().map(|c| &c.query)
+        });
+        let configs = matches
+            .grammars()
+            .iter()
+            .map(|g| g.outline_config.as_ref().unwrap())
+            .collect::<Vec<_>>();
+
+        while let Some(mat) = matches.peek() {
+            let config = &configs[mat.grammar_index];
+            let containing_item_node = maybe!({
+                let item_node = mat.captures.iter().find_map(|cap| {
+                    if cap.index == config.item_capture_ix {
+                        Some(cap.node)
+                    } else {
+                        None
+                    }
+                })?;
+
+                let item_byte_range = item_node.byte_range();
+                if item_byte_range.end < range.start || item_byte_range.start > range.end {
+                    None
+                } else {
+                    Some(item_node)
+                }
+            });
+
+            if let Some(item_node) = containing_item_node {
+                return Some(
+                    Point::from_ts_point(item_node.start_position())
+                        ..Point::from_ts_point(item_node.end_position()),
+                );
+            }
+
+            matches.advance();
+        }
+        None
+    }
+
    pub fn outline_items_containing<T: ToOffset>(
        &self,
        range: Range<T>,
--- a/crates/language/src/buffer_tests.rs
+++ b/crates/language/src/buffer_tests.rs
@@ -1104,20 +1104,32 @@ fn test_range_for_syntax_ancestor(cx: &mut AppContext) {
        let snapshot = buffer.snapshot();

        assert_eq!(
-            snapshot.range_for_syntax_ancestor(empty_range_at(text, "|")),
-            Some(range_of(text, "|"))
+            snapshot
+                .syntax_ancestor(empty_range_at(text, "|"))
+                .unwrap()
+                .byte_range(),
+            range_of(text, "|")
        );
        assert_eq!(
-            snapshot.range_for_syntax_ancestor(range_of(text, "|")),
-            Some(range_of(text, "|c|"))
+            snapshot
+                .syntax_ancestor(range_of(text, "|"))
+                .unwrap()
+                .byte_range(),
+            range_of(text, "|c|")
        );
        assert_eq!(
-            snapshot.range_for_syntax_ancestor(range_of(text, "|c|")),
-            Some(range_of(text, "|c| {}"))
+            snapshot
+                .syntax_ancestor(range_of(text, "|c|"))
+                .unwrap()
+                .byte_range(),
+            range_of(text, "|c| {}")
        );
        assert_eq!(
-            snapshot.range_for_syntax_ancestor(range_of(text, "|c| {}")),
-            Some(range_of(text, "(|c| {})"))
+            snapshot
+                .syntax_ancestor(range_of(text, "|c| {}"))
+                .unwrap()
+                .byte_range(),
+            range_of(text, "(|c| {})")
        );

        buffer
--- a/Show More
+++ b/Show More