Merge branch 'main' into v3-editor-layout-floatie

WIP
2024-09-30 10:28:16 +02:00 · 2024-07-19 11:28:14 +02:00
1279 changed files with 46353 additions and 58655 deletions
--- a/Dockerfile-collab.dockerignore
+++ b/Dockerfile-collab.dockerignore
--- a/.github/ISSUE_TEMPLATE/0_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/0_feature_request.yml
@@ -15,13 +15,6 @@ body:
      description: A clear and concise description of what you want to happen.
    validations:
      required: true
-  - type: textarea
-    id: environment
-    attributes:
-      label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
-    validations:
-      required: true
  - type: textarea
    attributes:
      label: |
--- a/.github/ISSUE_TEMPLATE/1_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1_bug_report.yml
@@ -2,7 +2,7 @@ name: Bug Report
 description: |
  Use this template for **non-crash-related** bug reports.
  Tip: open this issue template from within Zed with the `file bug report` command palette action.
-labels: ["admin read", "triage", "bug"]
+labels: ["admin read", "triage", "defect"]
 body:
  - type: checkboxes
    attributes:
@@ -21,7 +21,7 @@ body:
    id: environment
    attributes:
      label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
+      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
    validations:
      required: true
  - type: textarea
@@ -38,12 +38,9 @@ body:
        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
      value: |
-        <details><summary>Zed.log</summary>
-
+        <details><summary>Zed.log</summary><pre>
        <!-- Click below this line and paste or drag-and-drop your log-->
-        ```

-        ```
-        <!-- Click above this line and paste or drag-and-drop your log--></details>
+        <!-- Click above this line and paste or drag-and-drop your log--></pre></details>
    validations:
      required: false
--- a/.github/ISSUE_TEMPLATE/2_crash_report.yml
+++ b/.github/ISSUE_TEMPLATE/2_crash_report.yml
@@ -1,7 +1,7 @@
 name: Crash Report
 description: |
  Use this template for crash reports.
-labels: ["admin read", "triage", "bug", "panic / crash"]
+labels: ["admin read", "triage", "defect", "panic / crash"]
 body:
  - type: checkboxes
    attributes:
@@ -20,7 +20,7 @@ body:
    id: environment
    attributes:
      label: Environment
-      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below. If you are unable to run the command, please include your Zed version and release channel, operating system and version, RAM amount, and architecture.
+      description: Run the `copy system specs into clipboard` command palette action and paste the output in the field below.
    validations:
      required: true
  - type: textarea
@@ -31,12 +31,9 @@ body:
        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
      value: |
-        <details><summary>Zed.log</summary>
-
+        <details><summary>Zed.log</summary><pre>
        <!-- Click below this line and paste or drag-and-drop your log-->
-        ```

-        ```
-        <!-- Click above this line and paste or drag-and-drop your log--></details>
+        <!-- Click above this line and paste or drag-and-drop your log--></pre></details>
    validations:
      required: false
--- a/.github/actions/check_style/action.yml
+++ b/.github/actions/check_style/action.yml
@@ -7,3 +7,9 @@ runs:
    - name: cargo fmt
      shell: bash -euxo pipefail {0}
      run: cargo fmt --all -- --check
+
+    - name: Find modified migrations
+      shell: bash -euxo pipefail {0}
+      run: |
+        export SQUAWK_GITHUB_TOKEN=${{ github.token }}
+        . ./script/squawk
--- a/.github/actions/run_tests/action.yml
+++ b/.github/actions/run_tests/action.yml
@@ -10,7 +10,7 @@ runs:
        cargo install cargo-nextest

    - name: Install Node
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
      with:
        node-version: "18"

--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,4 +2,14 @@ Closes #ISSUE

 Release Notes:

- N/A *or* Added/Fixed/Improved ...
+- Added/Fixed/Improved ...
+
+Optionally, include screenshots / media showcasing your addition that can be included in the release notes.
+
+### Or...
+
+Closes #ISSUE
+
+Release Notes:
+
+- N/A
--- a/.github/workflows/bump_collab_staging.yml
+++ b/.github/workflows/bump_collab_staging.yml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          fetch-depth: 0

--- a/.github/workflows/bump_patch_version.yml
+++ b/.github/workflows/bump_patch_version.yml
@@ -18,7 +18,7 @@ jobs:
      - buildjet-16vcpu-ubuntu-2204
    steps:
      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          ref: ${{ github.event.inputs.branch }}
          ssh-key: ${{ secrets.ZED_BOT_DEPLOY_KEY }}
@@ -43,8 +43,6 @@ jobs:
          esac
          which cargo-set-version > /dev/null || cargo install cargo-edit
          output=$(cargo set-version -p zed --bump patch 2>&1 | sed 's/.* //')
-          export GIT_COMMITTER_NAME="Zed Bot"
-          export GIT_COMMITTER_EMAIL="hi@zed.dev"
          git commit -am "Bump to $output for @$GITHUB_ACTOR" --author "Zed Bot <hi@zed.dev>"
          git tag v${output}${tag_suffix}
          git push origin HEAD v${output}${tag_suffix}
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,14 +7,9 @@ on:
      - "v[0-9]+.[0-9]+.x"
    tags:
      - "v*"
-    paths-ignore:
-      - "docs/**"
  pull_request:
    branches:
      - "**"
-    paths-ignore:
-      - "docs/**/*"
-      - ".github/workflows/community_*"

 concurrency:
  # Allow only one workflow per any non-`main` branch.
@@ -25,31 +20,38 @@ env:
  CARGO_TERM_COLOR: always
  CARGO_INCREMENTAL: 0
  RUST_BACKTRACE: 1
-  RUSTFLAGS: "-D warnings"

 jobs:
-  migration_checks:
-    name: Check Postgres and Protobuf migrations, mergability
-    if: github.repository_owner == 'zed-industries'
+  style:
    timeout-minutes: 60
+    name: Check formatting and spelling
    runs-on:
      - self-hosted
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
-          fetch-depth: 0 # fetch full history
+          fetch-depth: 0

      - name: Remove untracked files
        run: git clean -df

-      - name: Find modified migrations
-        shell: bash -euxo pipefail {0}
-        run: |
-          export SQUAWK_GITHUB_TOKEN=${{ github.token }}
-          . ./script/squawk
+      - name: Check spelling
+        run: script/check-spelling
+
+      - name: Run style checks
+        uses: ./.github/actions/check_style
+
+      - name: Check unused dependencies
+        uses: bnjbvr/cargo-machete@main
+
+      - name: Check licenses are present
+        run: script/check-licenses
+
+      - name: Check license generation
+        run: script/generate-licenses /tmp/zed_licenses_output

      - name: Ensure fresh merge
        shell: bash -euxo pipefail {0}
@@ -71,48 +73,21 @@ jobs:
          input: "crates/proto/proto/"
          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"

-  style:
-    timeout-minutes: 60
-    name: Check formatting and spelling
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - buildjet-8vcpu-ubuntu-2204
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-
-      - name: Run style checks
-        uses: ./.github/actions/check_style
-
-      - name: Check for typos
-        uses: crate-ci/typos@8e6a4285bcbde632c5d79900a7779746e8b7ea3f # v1.24.6
-        with:
-          config: ./typos.toml
-
  macos_tests:
    timeout-minutes: 60
    name: (macOS) Run Clippy and tests
-    if: github.repository_owner == 'zed-industries'
    runs-on:
      - self-hosted
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

      - name: cargo clippy
        run: ./script/clippy

-      - name: Check unused dependencies
-        uses: bnjbvr/cargo-machete@main
-
-      - name: Check licenses
-        run: |
-          script/check-licenses
-          script/generate-licenses /tmp/zed_licenses_output
-
      - name: Run tests
        uses: ./.github/actions/run_tests

@@ -120,15 +95,11 @@ jobs:
        run: cargo build -p collab

      - name: Build other binaries and features
-        run: |
-          cargo build --workspace --bins --all-features
-          cargo check -p gpui --features "macos-blade"
-          cargo build -p remote_server
+        run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade"

  linux_tests:
    timeout-minutes: 60
    name: (Linux) Run Clippy and tests
-    if: github.repository_owner == 'zed-industries'
    runs-on:
      - buildjet-16vcpu-ubuntu-2204
    steps:
@@ -136,12 +107,12 @@ jobs:
        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH

      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
+        uses: swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "buildjet"
@@ -158,50 +129,19 @@ jobs:
      - name: Build Zed
        run: cargo build -p zed

-  build_remote_server:
-    timeout-minutes: 60
-    name: (Linux) Build Remote Server
-    if: github.repository_owner == 'zed-industries'
-    runs-on:
-      - buildjet-16vcpu-ubuntu-2204
-    steps:
-      - name: Add Rust to the PATH
-        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          clean: false
-
-      - name: Cache dependencies
-        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-          cache-provider: "buildjet"
-
-      - name: Install Clang & Mold
-        run: ./script/remote-server && ./script/install-mold 2.34.0
-
-      - name: Build Remote Server
-        run: cargo build -p remote_server
-
  # todo(windows): Actually run the tests
  windows_tests:
    timeout-minutes: 60
    name: (Windows) Run Clippy and tests
-    if: github.repository_owner == 'zed-industries'
    runs-on: hosted-windows-1
    steps:
-      # more info here:- https://github.com/rust-lang/cargo/issues/13020
-      - name: Enable longer pathnames for git
-        run: git config --system core.longpaths true
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
+        uses: swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "github"
@@ -211,7 +151,7 @@ jobs:
        run: cargo xtask clippy

      - name: Build Zed
-        run: cargo build
+        run: cargo build -p zed

  bundle-mac:
    timeout-minutes: 60
@@ -232,12 +172,12 @@ jobs:
      DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
    steps:
      - name: Install Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
        with:
          node-version: "18"

      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          # We need to fetch more than one commit so that `script/draft-release-notes`
          # is able to diff between the current and previous tag.
@@ -252,15 +192,32 @@ jobs:
      - name: Determine version and release channel
        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
        run: |
-          # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
-          script/determine-release-channel
+          set -eu

-      - name: Draft release notes
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-        run: |
+          version=$(script/get-crate-version zed)
+          channel=$(cat crates/zed/RELEASE_CHANNEL)
+          echo "Publishing version: ${version} on release channel ${channel}"
+          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+
+          expected_tag_name=""
+          case ${channel} in
+            stable)
+              expected_tag_name="v${version}";;
+            preview)
+              expected_tag_name="v${version}-pre";;
+            nightly)
+              expected_tag_name="v${version}-nightly";;
+            *)
+              echo "can't publish a release on channel ${channel}"
+              exit 1;;
+          esac
+          if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
+            echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
+            exit 1
+          fi
          mkdir -p target/
          # Ignore any errors that occur while drafting release notes to not fail the build.
-          script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md || true
+          script/draft-release-notes "$version" "$channel" > target/release-notes.md || true

      - name: Generate license file
        run: script/generate-licenses
@@ -275,20 +232,20 @@ jobs:
          mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg

      - name: Upload app bundle (universal) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 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 }}.dmg
          path: target/release/Zed.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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 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
@@ -314,7 +271,7 @@ jobs:
    timeout-minutes: 60
    name: Create a Linux bundle
    runs-on:
-      - buildjet-16vcpu-ubuntu-2004
+      - buildjet-16vcpu-ubuntu-2204
    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
    needs: [linux_tests]
    env:
@@ -322,24 +279,45 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

      - name: Install Linux dependencies
-        run: ./script/linux && ./script/install-mold 2.34.0
+        run: ./script/linux

      - name: Determine version and release channel
        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
        run: |
-          # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
-          script/determine-release-channel
+          set -eu
+
+          version=$(script/get-crate-version zed)
+          channel=$(cat crates/zed/RELEASE_CHANNEL)
+          echo "Publishing version: ${version} on release channel ${channel}"
+          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+
+          expected_tag_name=""
+          case ${channel} in
+            stable)
+              expected_tag_name="v${version}";;
+            preview)
+              expected_tag_name="v${version}-pre";;
+            nightly)
+              expected_tag_name="v${version}-nightly";;
+            *)
+              echo "can't publish a release on channel ${channel}"
+              exit 1;;
+          esac
+          if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
+            echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
+            exit 1
+          fi

      - name: Create Linux .tar.gz bundle
        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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 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
@@ -369,7 +347,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -379,14 +357,35 @@ jobs:
      - name: Determine version and release channel
        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
        run: |
-          # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
-          script/determine-release-channel
+          set -eu
+
+          version=$(script/get-crate-version zed)
+          channel=$(cat crates/zed/RELEASE_CHANNEL)
+          echo "Publishing version: ${version} on release channel ${channel}"
+          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
+
+          expected_tag_name=""
+          case ${channel} in
+            stable)
+              expected_tag_name="v${version}";;
+            preview)
+              expected_tag_name="v${version}-pre";;
+            nightly)
+              expected_tag_name="v${version}-nightly";;
+            *)
+              echo "can't publish a release on channel ${channel}"
+              exit 1;;
+          esac
+          if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
+            echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
+            exit 1
+          fi

      - name: Create and upload Linux .tar.gz bundle
        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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # 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
@@ -394,6 +393,7 @@ jobs:

      - name: Upload app bundle to release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
+        if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
        with:
          draft: true
          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
--- a/.github/workflows/community_close_stale_issues.yml
+++ b/.github/workflows/community_close_stale_issues.yml
@@ -6,7 +6,6 @@ on:

 jobs:
  stale:
-    if: github.repository_owner == 'zed-industries'
    runs-on: ubuntu-latest
    steps:
      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9
@@ -15,17 +14,17 @@ jobs:
          stale-issue-message: >
            Hi there! 👋

-            We're working to clean up our issue tracker by closing older issues that might not be relevant anymore. If you are able to reproduce this issue in the latest version of Zed, please let us know by commenting on this issue, and we will keep it open. If you can't reproduce it, feel free to close the issue yourself. Otherwise, we'll close it in 7 days.
+            We're working to clean up our issue tracker by closing older issues that might not be relevant anymore. Are you able to reproduce this issue in the latest version of Zed? If so, please let us know by commenting on this issue and we will keep it open; otherwise, we'll close it in 10 days. Feel free to open a new issue if you're seeing this message after the issue has been closed.

            Thanks for your help!
-          close-issue-message: "This issue was closed due to inactivity. If you're still experiencing this problem, please open a new issue with a link to this issue."
+          close-issue-message: "This issue was closed due to inactivity; feel free to open a new issue if you're still experiencing this problem!"
          # We will increase `days-before-stale` to 365 on or after Jan 24th,
          # 2024. This date marks one year since migrating issues from
          # 'community' to 'zed' repository. The migration added activity to all
          # issues, preventing 365 days from working until then.
          days-before-stale: 180
-          days-before-close: 7
-          any-of-issue-labels: "bug,panic / crash"
+          days-before-close: 10
+          any-of-issue-labels: "defect,panic / crash"
          operations-per-run: 1000
          ascending: true
          enable-statistics: true
--- a/.github/workflows/community_update_all_top_ranking_issues.yml
+++ b/.github/workflows/community_update_all_top_ranking_issues.yml
@@ -1,25 +0,0 @@
-name: Update All Top Ranking Issues
-
-on:
-  schedule:
-    - cron: "0 */12 * * *"
-  workflow_dispatch:
-
-jobs:
-  update_top_ranking_issues:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'zed-industries'
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@2e657c127d5b1635d5a8e3fa40e0ac50a5bf6992 # v3
-        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393
--- a/.github/workflows/community_update_weekly_top_ranking_issues.yml
+++ b/.github/workflows/community_update_weekly_top_ranking_issues.yml
@@ -1,25 +0,0 @@
-name: Update Weekly Top Ranking Issues
-
-on:
-  schedule:
-    - cron: "0 15 * * *"
-  workflow_dispatch:
-
-jobs:
-  update_top_ranking_issues:
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'zed-industries'
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@2e657c127d5b1635d5a8e3fa40e0ac50a5bf6992 # v3
-        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -14,14 +14,14 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
        with:
          version: 9

      - name: Setup Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
        with:
          node-version: "20"
          cache: "pnpm"
--- a/.github/workflows/community_delete_comments.yml
+++ b/.github/workflows/community_delete_comments.yml
--- a/.github/workflows/deploy_cloudflare.yml
+++ b/.github/workflows/deploy_cloudflare.yml
@@ -8,12 +8,11 @@ on:
 jobs:
  deploy-docs:
    name: Deploy Docs
-    if: github.repository_owner == 'zed-industries'
    runs-on: ubuntu-latest

    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -37,28 +36,28 @@ jobs:
          mdbook build ./docs --dest-dir=../target/deploy/docs/

      - name: Deploy Docs
-        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: pages deploy target/deploy --project-name=docs

      - name: Deploy Install
-        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh

      - name: Deploy Docs Workers
-        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: deploy .cloudflare/docs-proxy/src/worker.js

      - name: Deploy Install Workers
-        uses: cloudflare/wrangler-action@05f17c4a695b4d94b57b59997562c6a4624c64e4 # v3
+        uses: cloudflare/wrangler-action@f84a562284fc78278ff9052435d9526f9c718361 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -17,7 +17,7 @@ jobs:
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -36,7 +36,7 @@ jobs:
    needs: style
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -71,16 +71,12 @@ jobs:
        run: doctl registry login

      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

      - name: Build docker image
-        run: |
-          docker build -f Dockerfile-collab \
-            --build-arg GITHUB_SHA=$GITHUB_SHA \
-            --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA \
-            .
+        run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA

      - name: Publish docker image
        run: docker push registry.digitalocean.com/zed/collab:${GITHUB_SHA}
@@ -97,7 +93,7 @@ jobs:

    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -11,27 +11,20 @@ on:
 jobs:
  check_formatting:
    name: "Check formatting"
-    if: github.repository_owner == 'zed-industries'
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4

      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
        with:
          version: 9

-      - name: Prettier Check on /docs
-        working-directory: ./docs
-        run: |
+      - run: |
          pnpm dlx prettier . --check || {
            echo "To fix, run from the root of the zed repo:"
            echo "  cd docs && pnpm dlx prettier . --write && cd .."
            false
          }

-      - name: Check for Typos with Typos-CLI
-        uses: crate-ci/typos@8e6a4285bcbde632c5d79900a7779746e8b7ea3f # v1.24.6
-        with:
-          config: ./typos.toml
-          files: ./docs/
+        working-directory: ./docs
--- a/.github/workflows/publish_extension_cli.yml
+++ b/.github/workflows/publish_extension_cli.yml
@@ -16,12 +16,12 @@ jobs:
      - ubuntu-latest
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

      - name: Cache dependencies
-        uses: swatinem/rust-cache@82a92a6e8fbeee089604da2575dc567ae9ddeaab # v2
+        uses: swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
        with:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "github"
--- a/.github/workflows/randomized_tests.yml
+++ b/.github/workflows/randomized_tests.yml
@@ -22,12 +22,12 @@ jobs:
      - buildjet-16vcpu-ubuntu-2204
    steps:
      - name: Install Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
        with:
          node-version: "18"

      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

--- a/.github/workflows/community_release_actions.yml
+++ b/.github/workflows/community_release_actions.yml
@@ -1,5 +1,3 @@
-name: Release Actions
-
 on:
  release:
    types: [published]
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -23,7 +23,7 @@ jobs:
      - test
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false
          fetch-depth: 0
@@ -44,7 +44,7 @@ jobs:
    needs: style
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -70,12 +70,12 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Install Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
        with:
          node-version: "18"

      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -100,7 +100,7 @@ jobs:
    name: Create a Linux *.tar.gz bundle for x86
    if: github.repository_owner == 'zed-industries'
    runs-on:
-      - buildjet-16vcpu-ubuntu-2004
+      - buildjet-16vcpu-ubuntu-2204
    needs: tests
    env:
      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
@@ -109,7 +109,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -117,7 +117,7 @@ jobs:
        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH

      - name: Install Linux dependencies
-        run: ./script/linux && ./script/install-mold 2.34.0
+        run: ./script/linux

      - name: Limit target directory size
        run: script/clear-target-dir-if-larger-than 100
@@ -149,7 +149,7 @@ jobs:
      ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          clean: false

@@ -182,7 +182,7 @@ jobs:
      - bundle-linux-arm
    steps:
      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
        with:
          fetch-depth: 0

--- a/.github/workflows/update_all_top_ranking_issues.yml
+++ b/.github/workflows/update_all_top_ranking_issues.yml
@@ -0,0 +1,18 @@
+on:
+  schedule:
+    - cron: "0 */12 * * *"
+  workflow_dispatch:
+
+jobs:
+  update_top_ranking_issues:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'zed-industries'
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
+        with:
+          python-version: "3.11"
+          architecture: "x64"
+          cache: "pip"
+      - run: pip install -r script/update_top_ranking_issues/requirements.txt
+      - run: python script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393
--- a/.github/workflows/update_weekly_top_ranking_issues.yml
+++ b/.github/workflows/update_weekly_top_ranking_issues.yml
@@ -0,0 +1,18 @@
+on:
+  schedule:
+    - cron: "0 15 * * *"
+  workflow_dispatch:
+
+jobs:
+  update_top_ranking_issues:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'zed-industries'
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
+      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
+        with:
+          python-version: "3.11"
+          architecture: "x64"
+          cache: "pip"
+      - run: pip install -r script/update_top_ranking_issues/requirements.txt
+      - run: python script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7
--- a/.mailmap
+++ b/.mailmap
@@ -60,8 +60,6 @@ Max Brunsfeld <maxbrunsfeld@gmail.com>
 Max Brunsfeld <maxbrunsfeld@gmail.com> <max@zed.dev>
 Max Linke <maxlinke88@gmail.com>
 Max Linke <maxlinke88@gmail.com> <kain88-de@users.noreply.github.com>
-Michael Sloan <michael@zed.dev>
-Michael Sloan <michael@zed.dev> <mgsloan@google.com>
 Mikayla Maki <mikayla@zed.dev>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@gmail.com>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@icloud.com>
--- a/.zed/settings.json
+++ b/.zed/settings.json
@@ -38,10 +38,6 @@
      }
    }
  },
-  "file_types": {
-    "Dockerfile": ["Dockerfile*[!dockerignore]"],
-    "Git Ignore": ["dockerignore"]
-  },
  "hard_tabs": false,
  "formatter": "auto",
  "remove_trailing_whitespace_on_save": true,
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,3 @@
 # Code of Conduct

-The Code of Conduct for this repository can be found online at [zed.dev/code-of-conduct](https://zed.dev/code-of-conduct).
+The Code of Conduct for this repository can be found online at [zed.dev/docs/code-of-conduct](https://zed.dev/docs/code-of-conduct).
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@

 Thanks for your interest in contributing to Zed, the collaborative platform that is also a code editor!

-All activity in Zed forums is subject to our [Code of Conduct](https://zed.dev/code-of-conduct). Additionally, contributors must sign our [Contributor License Agreement](https://zed.dev/cla) before their contributions can be merged.
+All activity in Zed forums is subject to our [Code of Conduct](https://zed.dev/docs/code-of-conduct). Additionally, contributors must sign our [Contributor License Agreement](https://zed.dev/cla) before their contributions can be merged.

 ## Contribution ideas

--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,29 @@
 [workspace]
 resolver = "2"
 members = [
+    "crates/activity_indicator",
    "crates/anthropic",
    "crates/assets",
+    "crates/assistant",
+    "crates/assistant_slash_command",
    "crates/assistant_tool",
    "crates/audio",
+    "crates/auto_update",
+    "crates/breadcrumbs",
    "crates/call",
    "crates/channel",
    "crates/cli",
    "crates/client",
    "crates/clock",
    "crates/collab",
+    "crates/collab_ui",
    "crates/collections",
+    "crates/command_palette",
    "crates/command_palette_hooks",
    "crates/context_servers",
    "crates/copilot",
    "crates/db",
+    "crates/dev_server_projects",
    "crates/diagnostics",
    "crates/docs_preprocessor",
    "crates/editor",
@@ -23,9 +31,10 @@ members = [
    "crates/extension",
    "crates/extension_api",
    "crates/extension_cli",
-    "crates/extension_host",
+    "crates/extensions_ui",
    "crates/feature_flags",
    "crates/feedback",
+    "crates/file_finder",
    "crates/file_icons",
    "crates/fs",
    "crates/fsevent",
@@ -36,13 +45,19 @@ members = [
    "crates/google_ai",
    "crates/gpui",
    "crates/gpui_macros",
+    "crates/headless",
    "crates/html_to_markdown",
    "crates/http_client",
    "crates/image_viewer",
    "crates/indexed_docs",
+    "crates/inline_completion_button",
    "crates/install_cli",
+    "crates/isahc_http_client",
    "crates/journal",
    "crates/language",
+    "crates/language_model",
+    "crates/language_selector",
+    "crates/language_tools",
    "crates/languages",
    "crates/live_kit_client",
    "crates/live_kit_server",
@@ -57,24 +72,31 @@ members = [
    "crates/ollama",
    "crates/open_ai",
    "crates/outline",
+    "crates/outline_panel",
    "crates/paths",
    "crates/picker",
    "crates/prettier",
    "crates/project",
+    "crates/project_panel",
+    "crates/project_symbols",
    "crates/proto",
+    "crates/quick_action_bar",
+    "crates/recent_projects",
    "crates/refineable",
    "crates/refineable/derive_refineable",
    "crates/release_channel",
    "crates/remote",
    "crates/remote_server",
-    "crates/reqwest_client",
+    "crates/repl",
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
    "crates/search",
+    "crates/semantic_index",
    "crates/semantic_version",
    "crates/session",
    "crates/settings",
+    "crates/settings_ui",
    "crates/snippet",
    "crates/snippet_provider",
    "crates/sqlez",
@@ -84,24 +106,29 @@ members = [
    "crates/sum_tree",
    "crates/supermaven",
    "crates/supermaven_api",
+    "crates/tab_switcher",
    "crates/task",
    "crates/tasks_ui",
    "crates/telemetry_events",
    "crates/terminal",
+    "crates/terminal_view",
    "crates/text",
    "crates/theme",
    "crates/theme_importer",
+    "crates/theme_selector",
    "crates/time_format",
+    "crates/title_bar",
    "crates/ui",
    "crates/ui_input",
    "crates/ui_macros",
-    "crates/reqwest_client",
    "crates/util",
+    "crates/vcs_menu",
+    "crates/vim",
+    "crates/welcome",
    "crates/workspace",
    "crates/worktree",
    "crates/zed",
    "crates/zed_actions",
-    "crates/zed_common",

    #
    # Extensions
@@ -110,11 +137,13 @@ members = [
    "extensions/astro",
    "extensions/clojure",
    "extensions/csharp",
+    "extensions/dart",
    "extensions/deno",
    "extensions/elixir",
    "extensions/elm",
    "extensions/emmet",
    "extensions/erlang",
+    "extensions/gleam",
    "extensions/glsl",
    "extensions/haskell",
    "extensions/html",
@@ -123,15 +152,17 @@ members = [
    "extensions/php",
    "extensions/perplexity",
    "extensions/prisma",
-    "extensions/proto",
    "extensions/purescript",
    "extensions/ruff",
+    "extensions/ruby",
    "extensions/slash-commands-example",
    "extensions/snippets",
+    "extensions/svelte",
    "extensions/terraform",
    "extensions/test-extension",
    "extensions/toml",
    "extensions/uiua",
+    "extensions/vue",
    "extensions/zig",

    #
@@ -143,33 +174,41 @@ members = [
 default-members = ["crates/zed"]

 [workspace.dependencies]
-
 #
 # Workspace member crates
 #

+activity_indicator = { path = "crates/activity_indicator" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
+assistant = { path = "crates/assistant" }
+assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_tool = { path = "crates/assistant_tool" }
 audio = { path = "crates/audio" }
+auto_update = { path = "crates/auto_update" }
+breadcrumbs = { path = "crates/breadcrumbs" }
 call = { path = "crates/call" }
 channel = { path = "crates/channel" }
 cli = { path = "crates/cli" }
 client = { path = "crates/client" }
 clock = { path = "crates/clock" }
 collab = { path = "crates/collab" }
+collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections" }
+command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 context_servers = { path = "crates/context_servers" }
 copilot = { path = "crates/copilot" }
 db = { path = "crates/db" }
+dev_server_projects = { path = "crates/dev_server_projects" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
-extension_host = { path = "crates/extension_host" }
+extensions_ui = { path = "crates/extensions_ui" }
 feature_flags = { path = "crates/feature_flags" }
 feedback = { path = "crates/feedback" }
+file_finder = { path = "crates/file_finder" }
 file_icons = { path = "crates/file_icons" }
 fs = { path = "crates/fs" }
 fsevent = { path = "crates/fsevent" }
@@ -178,15 +217,22 @@ git = { path = "crates/git" }
 git_hosting_providers = { path = "crates/git_hosting_providers" }
 go_to_line = { path = "crates/go_to_line" }
 google_ai = { path = "crates/google_ai" }
-gpui = { path = "crates/gpui", default-features = false, features = ["http_client"]}
+gpui = { path = "crates/gpui" }
 gpui_macros = { path = "crates/gpui_macros" }
+handlebars = "4.3"
+headless = { path = "crates/headless" }
 html_to_markdown = { path = "crates/html_to_markdown" }
 http_client = { path = "crates/http_client" }
 image_viewer = { path = "crates/image_viewer" }
 indexed_docs = { path = "crates/indexed_docs" }
+inline_completion_button = { path = "crates/inline_completion_button" }
 install_cli = { path = "crates/install_cli" }
+isahc_http_client = { path = "crates/isahc_http_client" }
 journal = { path = "crates/journal" }
 language = { path = "crates/language" }
+language_model = { path = "crates/language_model" }
+language_selector = { path = "crates/language_selector" }
+language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
 live_kit_client = { path = "crates/live_kit_client" }
 live_kit_server = { path = "crates/live_kit_server" }
@@ -201,25 +247,32 @@ notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
 outline = { path = "crates/outline" }
+outline_panel = { path = "crates/outline_panel" }
 paths = { path = "crates/paths" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 project = { path = "crates/project" }
+project_panel = { path = "crates/project_panel" }
+project_symbols = { path = "crates/project_symbols" }
 proto = { path = "crates/proto" }
+quick_action_bar = { path = "crates/quick_action_bar" }
+recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
-reqwest_client = { path = "crates/reqwest_client" }
+repl = { path = "crates/repl" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 search = { path = "crates/search" }
+semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
+settings_ui = { path = "crates/settings_ui" }
 snippet = { path = "crates/snippet" }
 snippet_provider = { path = "crates/snippet_provider" }
 sqlez = { path = "crates/sqlez" }
@@ -229,23 +282,29 @@ storybook = { path = "crates/storybook" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
+tab_switcher = { path = "crates/tab_switcher" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
 telemetry_events = { path = "crates/telemetry_events" }
 terminal = { path = "crates/terminal" }
+terminal_view = { path = "crates/terminal_view" }
 text = { path = "crates/text" }
 theme = { path = "crates/theme" }
 theme_importer = { path = "crates/theme_importer" }
+theme_selector = { path = "crates/theme_selector" }
 time_format = { path = "crates/time_format" }
+title_bar = { path = "crates/title_bar" }
 ui = { path = "crates/ui" }
 ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
 util = { path = "crates/util" }
+vcs_menu = { path = "crates/vcs_menu" }
+vim = { path = "crates/vim" }
+welcome = { path = "crates/welcome" }
 workspace = { path = "crates/workspace" }
 worktree = { path = "crates/worktree" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
-zed_common = { path = "crates/zed_common" }

 #
 # External crates
@@ -257,7 +316,6 @@ any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
 ashpd = "0.9.1"
-async-compat = "0.2.1"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = "0.1"
 async-fs = "1.6"
@@ -265,7 +323,7 @@ async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "8
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
 async-trait = "0.1"
-async-tungstenite = "0.24"
+async-tungstenite = "0.23"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 base64 = "0.22"
@@ -274,14 +332,12 @@ blade-graphics = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb
 blade-macros = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
 blade-util = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
 blake3 = "1.5.3"
-bytes = "1.0"
 cargo_metadata = "0.18"
 cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
 clickhouse = "0.11.6"
 cocoa = "0.26"
-cocoa-foundation = "0.2.0"
 convert_case = "0.6.0"
 core-foundation = "0.9.3"
 core-foundation-sys = "0.8.6"
@@ -289,26 +345,27 @@ ctor = "0.2.6"
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
-ec4rs = "1.1"
 emojis = "0.6.1"
 env_logger = "0.11"
 exec = "0.3.1"
-fancy-regex = "0.14.0"
 fork = "0.2.0"
 futures = "0.3"
 futures-batch = "0.6.1"
 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"] }
 hex = "0.4.3"
-html5ever = "0.27.0"
 hyper = "0.14"
+html5ever = "0.27.0"
 ignore = "0.4.22"
 image = "0.25.1"
 indexmap = { version = "1.6.2", features = ["serde"] }
 indoc = "2"
+# We explicitly disable http2 support in isahc.
+isahc = { version = "1.7.2", default-features = false, features = [
+    "text-decoding",
+] }
 itertools = "0.13.0"
 jsonwebtoken = "9.3"
 libc = "0.2"
@@ -316,7 +373,6 @@ linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 markup5ever_rcdom = "0.3.0"
 nanoid = "0.4"
-nbformat = "0.3.2"
 nix = "0.29"
 num-format = "0.4.4"
 once_cell = "1.19.0"
@@ -324,33 +380,18 @@ ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
 pathdiff = "0.2"
-pet = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
-pet-fs = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c" }
-pet-conda = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c"  }
-pet-core = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c"  }
-pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c"  }
-pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c"  }
+profiling = "1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
-profiling = "1"
 prost = "0.9"
 prost-build = "0.9"
 prost-types = "0.9"
 pulldown-cmark = { version = "0.12.0", default-features = false }
 rand = "0.8.5"
-rayon = "1.8"
 regex = "1.5"
 repair_json = "0.1.0"
-reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f6998da16bbca97b6dddda9be7827c50e29", default-features = false, features = [
-    "charset",
-    "http2",
-    "macos-system-configuration",
-    "rustls-tls-native-roots",
-    "socks",
-    "stream",
-] }
 rsa = "0.9.6"
-runtimelib = { version = "0.16.1", default-features = false, features = [
+runtimelib = { version = "0.15", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rustc-demangle = "0.1.23"
@@ -375,7 +416,6 @@ similar = "1.3"
 simplelog = "0.12.2"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
-sqlformat = "0.2"
 strsim = "0.11"
 strum = { version = "0.25.0", features = ["derive"] }
 subtle = "2.5.0"
@@ -393,7 +433,7 @@ time = { version = "0.3", features = [
 ] }
 tiny_http = "0.8"
 toml = "0.8"
-tokio = { version = "1" }
+tokio = { version = "1", features = ["full"] }
 tower-http = "0.4.4"
 tree-sitter = { version = "0.23", features = ["wasm"] }
 tree-sitter-bash = "0.23"
@@ -406,21 +446,20 @@ tree-sitter-go = "0.23"
 tree-sitter-go-mod = { git = "https://github.com/zed-industries/tree-sitter-go-mod", rev = "a9aea5e358cde4d0f8ff20b7bc4fa311e359c7ca", package = "tree-sitter-gomod" }
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
 tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
-tree-sitter-diff = "0.1.0"
 tree-sitter-html = "0.20"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.23"
-tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
+tree-sitter-md = { git = "https://github.com/zed-industries/tree-sitter-markdown", rev = "4cfa6aad6b75052a5077c80fd934757d9267d81b" }
+protols-tree-sitter-proto = { git = "https://github.com/zed-industries/tree-sitter-proto", rev = "0848bd30a64be48772e15fbb9d5ba8c0cc5772ad" }
 tree-sitter-python = "0.23"
 tree-sitter-regex = "0.23"
 tree-sitter-ruby = "0.23"
 tree-sitter-rust = "0.23"
 tree-sitter-typescript = "0.23"
-tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
-unicase = "2.6"
+tree-sitter-yaml =  { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "baff0b51c64ef6a1fb1f8390f3ad6015b83ec13a" }
 unindent = "0.1.7"
+unicase = "2.6"
 unicode-segmentation = "1.10"
-unicode-script = "0.5.7"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "serde"] }
 wasmparser = "0.215"
@@ -435,11 +474,9 @@ wasmtime = { version = "24", default-features = false, features = [
 wasmtime-wasi = "24"
 which = "6.0.0"
 wit-component = "0.201"
-zstd = "0.11"

 [workspace.dependencies.async-stripe]
-git = "https://github.com/zed-industries/async-stripe"
-rev = "3672dd4efb7181aa597bf580bf5a2f5d23db6735"
+version = "0.39"
 default-features = false
 features = [
    "runtime-tokio-hyper-rustls",
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,2 +0,0 @@
-[build]
-dockerfile = "Dockerfile-cross"
--- a/23
+++ b/23
@@ -13,9 +13,28 @@ ARG GITHUB_SHA

 ENV GITHUB_SHA=$GITHUB_SHA

-# Also add `cmake`, since we need it to build `wasmtime`.
+# At some point in the past 3 weeks, additional dependencies on `xkbcommon` and
+# `xkbcommon-x11` were introduced into collab.
+#
+# A `git bisect` points to this commit as being the culprit: `b8e6098f60e5dabe98fe8281f993858dacc04a55`.
+#
+# Now when we try to build collab for the Docker image, it fails with the following
+# error:
+#
+# ```
+# 985.3   = note: /usr/bin/ld: cannot find -lxkbcommon: No such file or directory
+# 985.3           /usr/bin/ld: cannot find -lxkbcommon-x11: No such file or directory
+# 985.3           collect2: error: ld returned 1 exit status
+# ```
+#
+# The last successful deploys were at:
+# - Staging: `4f408ec65a3867278322a189b4eb20f1ab51f508`
+# - Production: `fc4c533d0a8c489e5636a4249d2b52a80039fbd7`
+#
+# Installing these as a temporary workaround, but I think ideally we'd want to figure
+# out what caused them to be included in the first place.
 RUN apt-get update; \
-    apt-get install -y --no-install-recommends cmake
+    apt-get install -y --no-install-recommends libxkbcommon-dev libxkbcommon-x11-dev

 RUN --mount=type=cache,target=./script/node_modules \
    --mount=type=cache,target=/usr/local/cargo/registry \
--- a/17
+++ b/17
@@ -1,17 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG CROSS_BASE_IMAGE
-FROM ${CROSS_BASE_IMAGE}
-WORKDIR /app
-ARG TZ=Etc/UTC \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    DEBIAN_FRONTEND=noninteractive
-ENV CARGO_TERM_COLOR=always
-
-COPY script/install-mold script/
-RUN ./script/install-mold "2.34.0"
-COPY script/remote-server script/
-RUN ./script/remote-server
-
-COPY . .
--- a/Dockerfile-cross.dockerignore
+++ b/Dockerfile-cross.dockerignore
@@ -1,16 +0,0 @@
-.git
-.github
-**/.gitignore
-**/.gitkeep
-.gitattributes
-.mailmap
-**/target
-zed.xcworkspace
-.DS_Store
-compose.yml
-plugins/bin
-script/node_modules
-styles/node_modules
-crates/collab/static/styles.css
-vendor/bin
-assets/themes/
--- a/26
+++ b/26
@@ -1,26 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-WORKDIR /app
-ARG TZ=Etc/UTC \
-    LANG=C.UTF-8 \
-    LC_ALL=C.UTF-8 \
-    DEBIAN_FRONTEND=noninteractive
-ENV CARGO_TERM_COLOR=always
-
-COPY script/linux script/
-RUN ./script/linux
-COPY script/install-mold script/install-cmake script/
-RUN ./script/install-mold "2.34.0"
-RUN ./script/install-cmake "3.30.4"
-
-COPY . .
-
-# When debugging, make these into individual RUN statements.
-# Cleanup to avoid saving big layers we aren't going to use.
-RUN . "$HOME/.cargo/env" \
-    && cargo fetch \
-    && cargo build \
-    && cargo run -- --help \
-    && cargo clean --quiet
--- a/Dockerfile-distros.dockerignore
+++ b/Dockerfile-distros.dockerignore
@@ -1,2 +0,0 @@
-**/target
-**/node_modules
--- a/assets/icons/diff.svg
+++ b/assets/icons/diff.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-diff"><path d="M12 3v14"/><path d="M5 10h14"/><path d="M5 21h14"/></svg>
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -20,7 +20,6 @@
    "bashrc": "terminal",
    "bmp": "image",
    "c": "c",
-    "c++": "cpp",
    "cc": "cpp",
    "cjs": "javascript",
    "coffee": "coffeescript",
@@ -28,7 +27,6 @@
    "cpp": "cpp",
    "css": "css",
    "csv": "storage",
-    "cxx": "cpp",
    "cts": "typescript",
    "dart": "dart",
    "dat": "storage",
@@ -58,7 +56,6 @@
    "gitignore": "vcs",
    "gitkeep": "vcs",
    "gitmodules": "vcs",
-    "gleam": "gleam",
    "go": "go",
    "gql": "graphql",
    "graphql": "graphql",
@@ -66,17 +63,14 @@
    "h": "c",
    "handlebars": "code",
    "hbs": "template",
-    "hcl": "hcl",
    "heex": "elixir",
    "heic": "image",
    "heif": "image",
-    "hh": "cpp",
    "hpp": "cpp",
    "hrl": "erlang",
    "hs": "haskell",
    "htm": "template",
    "html": "template",
-    "hxx": "cpp",
    "ib": "storage",
    "ico": "image",
    "ini": "settings",
@@ -84,7 +78,6 @@
    "j2k": "image",
    "java": "java",
    "jfif": "image",
-    "jl": "julia",
    "jp2": "image",
    "jpeg": "image",
    "jpg": "image",
@@ -119,7 +112,6 @@
    "myd": "storage",
    "myi": "storage",
    "nim": "nim",
-    "nix": "nix",
    "nu": "terminal",
    "odp": "document",
    "ods": "document",
@@ -132,7 +124,6 @@
    "php": "php",
    "plist": "template",
    "png": "image",
-    "postcss": "css",
    "ppt": "document",
    "pptx": "document",
    "prettierignore": "prettier",
@@ -147,15 +138,12 @@
    "rb": "ruby",
    "rebar.config": "erlang",
    "rkt": "code",
-    "roc": "roc",
    "rs": "rust",
    "rtf": "document",
-    "sass": "sass",
    "sav": "storage",
    "sc": "scala",
    "scala": "scala",
    "scm": "code",
-    "scss": "sass",
    "sdf": "storage",
    "sh": "terminal",
    "sql": "storage",
@@ -189,7 +177,6 @@
    "yaml": "settings",
    "yml": "settings",
    "yrl": "erlang",
-    "zig": "zig",
    "zlogin": "terminal",
    "zsh": "terminal",
    "zsh_aliases": "terminal",
@@ -265,9 +252,6 @@
    "fsharp": {
      "icon": "icons/file_icons/fsharp.svg"
    },
-    "gleam": {
-      "icon": "icons/file_icons/gleam.svg"
-    },
    "go": {
      "icon": "icons/file_icons/go.svg"
    },
@@ -277,9 +261,6 @@
    "haskell": {
      "icon": "icons/file_icons/haskell.svg"
    },
-    "hcl": {
-      "icon": "icons/file_icons/hcl.svg"
-    },
    "heroku": {
      "icon": "icons/file_icons/heroku.svg"
    },
@@ -292,9 +273,6 @@
    "javascript": {
      "icon": "icons/file_icons/javascript.svg"
    },
-    "julia": {
-      "icon": "icons/file_icons/julia.svg"
-    },
    "kotlin": {
      "icon": "icons/file_icons/kotlin.svg"
    },
@@ -310,9 +288,6 @@
    "nim": {
      "icon": "icons/file_icons/nim.svg"
    },
-    "nix": {
-      "icon": "icons/file_icons/nix.svg"
-    },
    "ocaml": {
      "icon": "icons/file_icons/ocaml.svg"
    },
@@ -337,18 +312,12 @@
    "react": {
      "icon": "icons/file_icons/react.svg"
    },
-    "roc": {
-      "icon": "icons/file_icons/roc.svg"
-    },
    "ruby": {
      "icon": "icons/file_icons/ruby.svg"
    },
    "rust": {
      "icon": "icons/file_icons/rust.svg"
    },
-    "sass": {
-      "icon": "icons/file_icons/sass.svg"
-    },
    "scala": {
      "icon": "icons/file_icons/scala.svg"
    },
@@ -387,9 +356,6 @@
    },
    "vue": {
      "icon": "icons/file_icons/vue.svg"
-    },
-    "zig": {
-      "icon": "icons/file_icons/zig.svg"
    }
  }
 }
--- a/assets/icons/file_icons/gleam.svg
+++ b/assets/icons/file_icons/gleam.svg
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7.3848 9.30444C7.3848 9.30444 7.53254 10.2646 8.53248 10.0882C9.53242 9.91193 9.36378 8.95549 9.36378 8.95549" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="#FF7676" stroke-opacity="0.52" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.54155 5.54157C6.12355 4.90104 6.01688 2.62541 7.22875 2.3985C8.44063 2.17158 9.19097 4.33148 9.91982 4.6814C10.6487 5.03133 12.8517 4.3028 13.4381 5.38734C14.0244 6.47188 12.1395 7.95973 12.026 8.64088C11.9126 9.32203 13.3614 11.2416 12.4675 12.1701C11.5736 13.0986 9.73005 11.7545 8.90486 11.8834C8.07966 12.0123 6.79244 13.9095 5.67367 13.3502C4.55491 12.7909 5.16702 10.5455 4.82437 9.87612C4.48171 9.20673 2.34028 8.54978 2.4525 7.35049C2.56471 6.15121 4.95956 6.1821 5.54155 5.54157Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-<circle cx="6.25098" cy="7.75" r="0.75" fill="black"/>
-<circle cx="10.1035" cy="7.25" r="0.75" fill="black"/>
-</svg>
--- a/assets/icons/file_icons/hcl.svg
+++ b/assets/icons/file_icons/hcl.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.11466 3.11809C7.21859 3.37393 7.09545 3.66558 6.83961 3.76952L4.31181 4.79643C4.1233 4.87302 4 5.05619 4 5.25967V11.5C4 11.7761 3.77614 12 3.5 12H2.5C2.22386 12 2 11.7761 2 11.5V4.41827C2 3.90959 2.30825 3.45164 2.77953 3.26018L6.08686 1.91658C6.34269 1.81265 6.63434 1.93579 6.73828 2.19163L7.11466 3.11809ZM10.5 1.99999C10.7761 1.99999 11 2.22384 11 2.49999V10.5C11 10.7761 10.7761 11 10.5 11H9.5C9.22386 11 9 10.7761 9 10.5V9.49999C9 9.22384 8.77614 8.99999 8.5 8.99999H7.5C7.22386 8.99999 7 9.22384 7 9.49999V13.5C7 13.7761 6.77614 14 6.5 14H5.5C5.22386 14 5 13.7761 5 13.5V5.53124C5 5.25509 5.22386 5.03124 5.5 5.03124H6.5C6.77614 5.03124 7 5.25509 7 5.53124V6.49999C7 6.77613 7.22386 6.99999 7.5 6.99999H8.5C8.77614 6.99999 9 6.77613 9 6.49999V2.49999C9 2.22384 9.22386 1.99999 9.5 1.99999H10.5ZM13.5 4.03124C13.7761 4.03124 14 4.2551 14 4.53124L14 11.5847C14 12.0859 13.7006 12.5386 13.2394 12.7349L9.99399 14.1159C9.7399 14.224 9.44626 14.1057 9.33813 13.8516L8.94658 12.9315C8.83845 12.6774 8.95678 12.3837 9.21087 12.2756L11.6958 11.2182C11.8802 11.1397 12 10.9586 12 10.7581L12 4.53124C12 4.2551 12.2238 4.03124 12.5 4.03124L13.5 4.03124Z" fill="black"/>
-</svg>
--- a/assets/icons/file_icons/julia.svg
+++ b/assets/icons/file_icons/julia.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="8" cy="5" r="2.75" fill="black"/>
-<circle cx="4.75" cy="11" r="2.75" fill="black" fill-opacity="0.5"/>
-<circle cx="11.25" cy="11" r="2.75" fill="black" fill-opacity="0.75"/>
-</svg>
--- a/assets/icons/file_icons/nix.svg
+++ b/assets/icons/file_icons/nix.svg
@@ -1,8 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.00005 4.76556L4.76569 2.74996M6.00005 4.76556L3.75 4.76563M6.00005 4.76556L7.25006 4.7656" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M10.0232 11.2311L11.2675 13.2406M10.0232 11.2311L12.2732 11.2199M10.0232 11.2311L8.7732 11.2373" stroke="black" stroke-opacity="0.5" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M9.99025 4.91551L10.9985 2.77781M9.99025 4.91551L8.75599 3.03419M9.99025 4.91551L10.6759 5.9607" stroke="black" stroke-opacity="0.5" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M6.0323 11.1009L5.03465 13.2436M6.0323 11.1009L7.27585 12.9761M6.0323 11.1009L5.34151 10.0592" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M11.883 8.19023L14.2466 8.19287M11.883 8.19023L13.0602 6.27268M11.883 8.19023L11.229 9.25547" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<path d="M4.12354 7.8356L1.76002 7.84465M4.12354 7.8356L2.95585 9.75894M4.12354 7.8356L4.7723 6.76713" stroke="black" stroke-opacity="0.5" stroke-width="1.5" stroke-linecap="round"/>
-</svg>
--- a/assets/icons/file_icons/roc.svg
+++ b/assets/icons/file_icons/roc.svg
@@ -1,7 +0,0 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5.51497 2.02702L1.92042 1.95067C1.69543 1.94589 1.57917 2.21756 1.73796 2.37702L6.24865 6.9068C6.42388 7.08277 6.72071 6.92326 6.67067 6.68002L5.75454 2.22659C5.73103 2.11231 5.63161 2.02949 5.51497 2.02702Z" fill="black" fill-opacity="0.5"/>
-<path d="M8.05816 7.38492L12.1366 8.02844C12.3704 8.06532 12.5198 7.78697 12.3599 7.61255L7.30439 2.09814C7.13336 1.91159 6.82522 2.06811 6.87499 2.31624L7.852 7.18714C7.87257 7.28971 7.95483 7.36862 8.05816 7.38492Z" fill="black"/>
-<path d="M9.0952 10.9797L11.3824 9.35081C11.564 9.22151 11.4983 8.93722 11.2785 8.90058L8.496 8.43683C8.31974 8.40746 8.17047 8.56712 8.21162 8.74101L8.70689 10.8337C8.74777 11.0064 8.95062 11.0827 9.0952 10.9797Z" fill="black" fill-opacity="0.5"/>
-<path d="M5.10282 13.9632L7.59108 12.4532C7.68331 12.3972 7.72923 12.2884 7.70498 12.1832L6.75736 8.07484C6.699 7.8218 6.34133 7.81448 6.27266 8.06491L4.73201 13.6834C4.67223 13.9014 4.90954 14.0805 5.10282 13.9632Z" fill="black"/>
-<path d="M11.3183 4.89351L13.1588 7.03149L15.535 6.14302C15.7099 6.07761 15.754 5.85043 15.6161 5.72438L13.7222 3.99219L11.4546 4.48614C11.2695 4.52645 11.1947 4.74995 11.3183 4.89351Z" fill="black"/>
-</svg>
--- a/assets/icons/file_icons/sass.svg
+++ b/assets/icons/file_icons/sass.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.92096 7.00668C7.87408 7.83549 10.0987 7.48203 10.9376 7.06254C12.8751 6.09381 13.9407 4.39379 12.6407 2.90629C11.0157 1.04692 6.24221 2.49998 4.89844 3.40625C3.55467 4.31252 2.67972 5.53126 2.89071 7.1719C3.1017 8.81254 4.68758 9.7422 6.03128 10.3203C5.38786 10.5616 3.8517 11.0388 3.3125 11.7188C2.71341 12.4742 3.04343 14 4.51577 14C7.15639 14 7.59539 11.1486 7.14847 10.4375C7.88773 10.1295 8.49597 9.96169 9.40138 9.77081C9.63831 9.72087 9.65457 9.46395 9.41295 9.44827C8.80252 9.40864 7.30567 9.8489 6.92096 9.97657C5.78909 9.35157 4.51016 7.93818 4.59378 6.87501C4.68676 5.6928 5.27676 5.07603 6.84508 4.21876C8.01705 3.57813 10.258 3.10695 11.25 3.62501C12.6563 4.35936 10.7875 5.75599 9.92969 6.32031C9.28179 6.74656 8.21971 6.77513 7.22979 6.61435C6.99371 6.576 6.74048 6.84974 6.92096 7.00668ZM5.6719 12.4643C6.35508 11.9894 6.45471 11.1076 6.29955 10.8844C5.76663 11.0874 4.36593 11.9102 4.75111 12.4643C4.90628 12.6875 5.31358 12.7134 5.6719 12.4643Z" fill="black"/>
-</svg>
--- a/assets/icons/file_icons/zig.svg
+++ b/assets/icons/file_icons/zig.svg
@@ -1,5 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.25 12H11C10.794 12 10.6764 11.7648 10.8 11.6L11.925 10.1C11.9722 10.037 12.0463 10 12.125 10H12.75C12.8881 10 13 9.88807 13 9.75V6.25C13 6.11193 12.8881 6 12.75 6H12.4045C12.2187 6 12.0978 5.80442 12.1809 5.6382L12.9309 4.1382C12.9732 4.0535 13.0598 4 13.1545 4H14.25C14.3881 4 14.5 4.11193 14.5 4.25V11.75C14.5 11.8881 14.3881 12 14.25 12Z" fill="black"/>
-<path d="M1.75 4H5C5.20601 4 5.32361 4.23519 5.2 4.4L4.075 5.9C4.02779 5.96295 3.95369 6 3.875 6H3.25C3.11193 6 3 6.11193 3 6.25V9.75C3 9.88807 3.11193 10 3.25 10H3.59549C3.78134 10 3.90221 10.1956 3.8191 10.3618L3.0691 11.8618C3.02675 11.9465 2.94018 12 2.84549 12H1.75C1.61193 12 1.5 11.8881 1.5 11.75V4.25C1.5 4.11193 1.61193 4 1.75 4Z" fill="black"/>
-<path d="M7.55748 6H5.95006C5.74177 6 5.62482 5.76022 5.75306 5.59609L6.92493 4.09609C6.97231 4.03544 7.04498 4 7.12194 4H9.93075C9.97607 4 10.0205 3.98769 10.0594 3.96437L11.6408 3.0155C11.8641 2.88154 12.1179 3.13555 11.9837 3.3587L8.22612 9.6083C8.12629 9.77433 8.24508 9.98591 8.43881 9.98712L10.0039 9.9969C10.2092 9.99818 10.3255 10.2327 10.2023 10.3969L9.075 11.9C9.02779 11.963 8.95369 12 8.875 12H6.55383C6.51835 12 6.48328 12.0076 6.45094 12.0222L4.32473 12.9824C4.10122 13.0833 3.88113 12.8356 4.00771 12.6255L7.77161 6.37903C7.87201 6.2124 7.75202 6 7.55748 6Z" fill="black"/>
-</svg>
--- a/assets/icons/file_search.svg
+++ b/assets/icons/file_search.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-file-search"><path d="M14 2v4a2 2 0 0 0 2 2h4"/><path d="M4.268 21a2 2 0 0 0 1.727 1H18a2 2 0 0 0 2-2V7l-5-5H6a2 2 0 0 0-2 2v3"/><path d="m9 18-1.5-1.5"/><circle cx="5" cy="14" r="3"/></svg>
--- a/assets/icons/list_x.svg
+++ b/assets/icons/list_x.svg
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.33333 8H3" stroke="#FBF1C7" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6667 4H3" stroke="#FBF1C7" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.6667 12H3" stroke="#FBF1C7" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M13.6667 6.66663L11 9.33329" stroke="#FBF1C7" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11 6.66663L13.6667 9.33329" stroke="#FBF1C7" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/refresh_title.svg
+++ b/assets/icons/refresh_title.svg
@@ -1,5 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 21V12M7 12H3M7 12H11" stroke="black" stroke-width="2" stroke-linecap="round"/>
-<path d="M21 19L16 19L16 14" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M7.99987 5.07027L7.49915 4.20467L7.99987 5.07027ZM6.04652 5.25026C5.63245 5.61573 5.59305 6.24766 5.95851 6.66173C6.32398 7.0758 6.95592 7.1152 7.36999 6.74974L6.04652 5.25026ZM11.9999 5C15.8659 5 18.9999 8.13401 18.9999 12H20.9999C20.9999 7.02944 16.9705 3 11.9999 3V5ZM18.9999 12C18.9999 14.2101 17.9768 16.1806 16.3744 17.4651L17.6254 19.0256C19.6809 17.3779 20.9999 14.8426 20.9999 12H18.9999ZM8.5006 5.93588C9.5292 5.34086 10.7232 5 11.9999 5V3C10.3623 3 8.82395 3.4383 7.49915 4.20467L8.5006 5.93588ZM7.36999 6.74974C7.71803 6.44255 8.09667 6.16954 8.5006 5.93588L7.49915 4.20467C6.9797 4.50515 6.49329 4.85593 6.04652 5.25026L7.36999 6.74974Z" fill="black"/>
-</svg>
--- a/assets/icons/trash_alt.svg
+++ b/assets/icons/trash_alt.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/></svg>
--- a/assets/icons/wand.svg
+++ b/assets/icons/wand.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-wand"><path d="M15 4V2"/><path d="M15 16v-2"/><path d="M8 9h2"/><path d="M20 9h2"/><path d="M17.8 11.8 19 13"/><path d="M15 9h.01"/><path d="M17.8 6.2 19 5"/><path d="m3 21 9-9"/><path d="M12.2 6.2 11 5"/></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -56,8 +56,7 @@
      "shift-tab": "editor::TabPrev",
      "ctrl-k": "editor::CutToEndOfLine",
      // "ctrl-t": "editor::Transpose",
-      "ctrl-k ctrl-q": "editor::Rewrap",
-      "ctrl-k q": "editor::Rewrap",
+      "alt-q": "editor::Rewrap",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
      "ctrl-delete": "editor::DeleteToNextWordEnd",
      "shift-delete": "editor::Cut",
@@ -127,8 +126,7 @@
      "shift-enter": "editor::Newline",
      "ctrl-enter": "editor::NewlineAbove",
      "ctrl-shift-enter": "editor::NewlineBelow",
-      "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
-      "ctrl-k z": "editor::ToggleSoftWrap",
+      "alt-z": "editor::ToggleSoftWrap",
      "ctrl-f": "buffer_search::Deploy",
      "ctrl-h": ["buffer_search::Deploy", { "replace_enabled": true }],
      // "cmd-e": ["buffer_search::Deploy", { "focus": false }],
@@ -142,7 +140,7 @@
    "bindings": {
      "alt-]": "editor::NextInlineCompletion",
      "alt-[": "editor::PreviousInlineCompletion",
-      "alt-right": "editor::AcceptPartialInlineCompletion"
+      "ctrl-right": "editor::AcceptPartialInlineCompletion"
    }
  },
  {
@@ -171,7 +169,7 @@
      "ctrl-k c": "assistant::CopyCode",
      "ctrl-g": "search::SelectNextMatch",
      "ctrl-shift-g": "search::SelectPrevMatch",
-      "ctrl-shift-m": "assistant::ToggleModelSelector",
+      "alt-m": "assistant::ToggleModelSelector",
      "ctrl-k h": "assistant::DeployHistory",
      "ctrl-k l": "assistant::DeployPromptLibrary",
      "ctrl-n": "assistant::NewContext"
@@ -253,10 +251,10 @@
      "ctrl-shift-pagedown": "pane::SwapItemRight",
      "ctrl-w": "pane::CloseActiveItem",
      "ctrl-f4": "pane::CloseActiveItem",
-      "alt-ctrl-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
+      "alt-ctrl-t": "pane::CloseInactiveItems",
      "alt-ctrl-shift-w": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
+      "ctrl-k u": "pane::CloseCleanItems",
+      "ctrl-k w": "pane::CloseAllItems",
      "ctrl-shift-f": "project_search::ToggleFocus",
      "ctrl-alt-g": "search::SelectNextMatch",
      "ctrl-alt-shift-g": "search::SelectPrevMatch",
@@ -315,19 +313,11 @@
      "ctrl-k ctrl-l": "editor::ToggleFold",
      "ctrl-k ctrl-[": "editor::FoldRecursive",
      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
-      "ctrl-k ctrl-1": ["editor::FoldAtLevel", { "level": 1 }],
-      "ctrl-k ctrl-2": ["editor::FoldAtLevel", { "level": 2 }],
-      "ctrl-k ctrl-3": ["editor::FoldAtLevel", { "level": 3 }],
-      "ctrl-k ctrl-4": ["editor::FoldAtLevel", { "level": 4 }],
-      "ctrl-k ctrl-5": ["editor::FoldAtLevel", { "level": 5 }],
-      "ctrl-k ctrl-6": ["editor::FoldAtLevel", { "level": 6 }],
-      "ctrl-k ctrl-7": ["editor::FoldAtLevel", { "level": 7 }],
-      "ctrl-k ctrl-8": ["editor::FoldAtLevel", { "level": 8 }],
-      "ctrl-k ctrl-9": ["editor::FoldAtLevel", { "level": 9 }],
      "ctrl-k ctrl-0": "editor::FoldAll",
      "ctrl-k ctrl-j": "editor::UnfoldAll",
      "ctrl-space": "editor::ShowCompletions",
      "ctrl-.": "editor::ToggleCodeActions",
+      "alt-ctrl-r": "editor::RevealInFileManager",
      "ctrl-k r": "editor::RevealInFileManager",
      "ctrl-k p": "editor::CopyPath",
      "ctrl-\\": "pane::SplitRight",
@@ -418,8 +408,6 @@
      "ctrl-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
      "ctrl-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
      "ctrl-shift-x": "zed::Extensions",
-      "ctrl-shift-r": "task::Rerun",
-      "ctrl-alt-r": "task::Rerun",
      "alt-t": "task::Rerun",
      "alt-shift-t": "task::Spawn"
    }
@@ -517,13 +505,6 @@
      "ctrl-enter": "assistant::InlineAssist"
    }
  },
-  {
-    "context": "ProposedChangesEditor",
-    "bindings": {
-      "ctrl-shift-y": "editor::ApplyDiffHunk",
-      "ctrl-alt-a": "editor::ApplyAllDiffHunks"
-    }
-  },
  {
    "context": "Editor && jupyter && !ContextEditor",
    "bindings": {
@@ -535,7 +516,6 @@
    "context": "ContextEditor > Editor",
    "bindings": {
      "ctrl-enter": "assistant::Assist",
-      "ctrl-shift-enter": "assistant::Edit",
      "ctrl-s": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
@@ -567,11 +547,9 @@
      "ctrl-alt-c": "outline_panel::CopyPath",
      "alt-ctrl-shift-c": "outline_panel::CopyRelativePath",
      "alt-ctrl-r": "outline_panel::RevealInFileManager",
-      "space": "outline_panel::Open",
+      "space": ["outline_panel::Open", { "change_selection": false }],
      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
-      "alt-enter": "editor::OpenExcerpts",
-      "ctrl-k enter": "editor::OpenExcerptsSplit"
+      "shift-up": "menu::SelectPrev"
    }
  },
  {
@@ -592,7 +570,7 @@
      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFileManager",
      "ctrl-shift-enter": "project_panel::OpenWithSystem",
-      "ctrl-shift-f": "project_panel::NewSearchInDirectory",
+      "alt-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
      "shift-up": "menu::SelectPrev",
      "escape": "menu::Cancel"
@@ -686,8 +664,7 @@
      "shift-up": "terminal::ScrollLineUp",
      "shift-down": "terminal::ScrollLineDown",
      "shift-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode"
+      "shift-end": "terminal::ScrollToBottom"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -51,13 +51,14 @@
      "shift-tab": "editor::TabPrev",
      "ctrl-k": "editor::CutToEndOfLine",
      "ctrl-t": "editor::Transpose",
-      "cmd-k q": "editor::Rewrap",
-      "cmd-k cmd-q": "editor::Rewrap",
+      "alt-q": "editor::Rewrap",
      "cmd-backspace": "editor::DeleteToBeginningOfLine",
      "cmd-delete": "editor::DeleteToEndOfLine",
      "alt-backspace": "editor::DeleteToPreviousWordStart",
      "ctrl-w": "editor::DeleteToPreviousWordStart",
      "alt-delete": "editor::DeleteToNextWordEnd",
+      "alt-h": "editor::DeleteToPreviousWordStart",
+      "alt-d": "editor::DeleteToNextWordEnd",
      "cmd-x": "editor::Cut",
      "cmd-c": "editor::Copy",
      "cmd-v": "editor::Paste",
@@ -85,7 +86,9 @@
      "ctrl-f": "editor::MoveRight",
      "ctrl-l": "editor::ScrollCursorCenter",
      "alt-left": "editor::MoveToPreviousWordStart",
+      "alt-b": "editor::MoveToPreviousWordStart",
      "alt-right": "editor::MoveToNextWordEnd",
+      "alt-f": "editor::MoveToNextWordEnd",
      "cmd-left": "editor::MoveToBeginningOfLine",
      "ctrl-a": "editor::MoveToBeginningOfLine",
      "cmd-right": "editor::MoveToEndOfLine",
@@ -101,7 +104,9 @@
      "shift-right": "editor::SelectRight",
      "ctrl-shift-f": "editor::SelectRight",
      "alt-shift-left": "editor::SelectToPreviousWordStart", // cursorWordLeftSelect
+      "alt-shift-b": "editor::SelectToPreviousWordStart",
      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
+      "alt-shift-f": "editor::SelectToNextWordEnd",
      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
      "cmd-shift-up": "editor::SelectToBeginning",
@@ -116,7 +121,7 @@
      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-shift-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-v": ["editor::MovePageDown", { "center_cursor": true }],
-      "ctrl-shift-v": ["editor::MovePageUp", { "center_cursor": true }],
+      "alt-v": ["editor::MovePageUp", { "center_cursor": true }],
      "ctrl-cmd-space": "editor::ShowCharacterPalette",
      "cmd-;": "editor::ToggleLineNumbers",
      "cmd-alt-z": "editor::RevertSelectedHunks",
@@ -135,7 +140,7 @@
      "shift-enter": "editor::Newline",
      "cmd-enter": "editor::NewlineBelow",
      "cmd-shift-enter": "editor::NewlineAbove",
-      "cmd-k z": "editor::ToggleSoftWrap",
+      "alt-z": "editor::ToggleSoftWrap",
      "cmd-f": "buffer_search::Deploy",
      "cmd-alt-f": ["buffer_search::Deploy", { "replace_enabled": true }],
      "cmd-alt-l": ["buffer_search::Deploy", { "selection_search_enabled": true }],
@@ -150,7 +155,7 @@
    "bindings": {
      "alt-]": "editor::NextInlineCompletion",
      "alt-[": "editor::PreviousInlineCompletion",
-      "ctrl-right": "editor::AcceptPartialInlineCompletion"
+      "cmd-right": "editor::AcceptPartialInlineCompletion"
    }
  },
  {
@@ -186,7 +191,7 @@
      "cmd-k c": "assistant::CopyCode",
      "cmd-g": "search::SelectNextMatch",
      "cmd-shift-g": "search::SelectPrevMatch",
-      "cmd-shift-m": "assistant::ToggleModelSelector",
+      "alt-m": "assistant::ToggleModelSelector",
      "cmd-k h": "assistant::DeployHistory",
      "cmd-k l": "assistant::DeployPromptLibrary",
      "cmd-n": "assistant::NewContext"
@@ -196,7 +201,6 @@
    "context": "ContextEditor > Editor",
    "bindings": {
      "cmd-enter": "assistant::Assist",
-      "cmd-shift-enter": "assistant::Edit",
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
@@ -286,10 +290,10 @@
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
      "cmd-w": "pane::CloseActiveItem",
-      "alt-cmd-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
+      "alt-cmd-t": "pane::CloseInactiveItems",
      "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes",
-      "cmd-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
-      "cmd-k cmd-w": ["pane::CloseAllItems", { "close_pinned": false }],
+      "cmd-k u": "pane::CloseCleanItems",
+      "cmd-k cmd-w": "pane::CloseAllItems",
      "cmd-f": "project_search::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
      "cmd-shift-g": "search::SelectPrevMatch",
@@ -346,19 +350,11 @@
      "cmd-k cmd-l": "editor::ToggleFold",
      "cmd-k cmd-[": "editor::FoldRecursive",
      "cmd-k cmd-]": "editor::UnfoldRecursive",
-      "cmd-k cmd-1": ["editor::FoldAtLevel", { "level": 1 }],
-      "cmd-k cmd-2": ["editor::FoldAtLevel", { "level": 2 }],
-      "cmd-k cmd-3": ["editor::FoldAtLevel", { "level": 3 }],
-      "cmd-k cmd-4": ["editor::FoldAtLevel", { "level": 4 }],
-      "cmd-k cmd-5": ["editor::FoldAtLevel", { "level": 5 }],
-      "cmd-k cmd-6": ["editor::FoldAtLevel", { "level": 6 }],
-      "cmd-k cmd-7": ["editor::FoldAtLevel", { "level": 7 }],
-      "cmd-k cmd-8": ["editor::FoldAtLevel", { "level": 8 }],
-      "cmd-k cmd-9": ["editor::FoldAtLevel", { "level": 9 }],
      "cmd-k cmd-0": "editor::FoldAll",
      "cmd-k cmd-j": "editor::UnfoldAll",
      "ctrl-space": "editor::ShowCompletions",
      "cmd-.": "editor::ToggleCodeActions",
+      "alt-cmd-r": "editor::RevealInFileManager",
      "cmd-k r": "editor::RevealInFileManager",
      "cmd-k p": "editor::CopyPath",
      "cmd-\\": "pane::SplitRight",
@@ -399,7 +395,6 @@
      // Change the default action on `menu::Confirm` by setting the parameter
      // "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
      "alt-cmd-o": "projects::OpenRecent",
-      "ctrl-cmd-o": "projects::OpenRemote",
      "alt-cmd-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
      "cmd-s": "workspace::Save",
@@ -445,15 +440,8 @@
      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
-      "cmd-shift-x": "zed::Extensions"
-    }
-  },
-  {
-    "context": "Workspace && !Terminal",
-    "bindings": {
-      "cmd-shift-r": "task::Spawn",
-      "cmd-alt-r": "task::Rerun",
-      "alt-t": "task::Spawn",
+      "cmd-shift-x": "zed::Extensions",
+      "alt-t": "task::Rerun",
      "alt-shift-t": "task::Spawn"
    }
  },
@@ -544,13 +532,6 @@
      "ctrl-enter": "assistant::InlineAssist"
    }
  },
-  {
-    "context": "ProposedChangesEditor",
-    "bindings": {
-      "cmd-shift-y": "editor::ApplyDiffHunk",
-      "cmd-shift-a": "editor::ApplyAllDiffHunks"
-    }
-  },
  {
    "context": "PromptEditor",
    "bindings": {
@@ -573,11 +554,9 @@
      "cmd-alt-c": "outline_panel::CopyPath",
      "alt-cmd-shift-c": "outline_panel::CopyRelativePath",
      "alt-cmd-r": "outline_panel::RevealInFileManager",
-      "space": "outline_panel::Open",
+      "space": ["outline_panel::Open", { "change_selection": false }],
      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
-      "alt-enter": "editor::OpenExcerpts",
-      "cmd-k enter": "editor::OpenExcerptsSplit"
+      "shift-up": "menu::SelectPrev"
    }
  },
  {
@@ -602,7 +581,7 @@
      "alt-cmd-r": "project_panel::RevealInFileManager",
      "ctrl-shift-enter": "project_panel::OpenWithSystem",
      "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
-      "cmd-shift-f": "project_panel::NewSearchInDirectory",
+      "alt-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
      "shift-up": "menu::SelectPrev",
      "escape": "menu::Cancel"
@@ -694,8 +673,7 @@
      "cmd-home": "terminal::ScrollToTop",
      "cmd-end": "terminal::ScrollToBottom",
      "shift-home": "terminal::ScrollToTop",
-      "shift-end": "terminal::ScrollToBottom",
-      "ctrl-shift-space": "terminal::ToggleViMode"
+      "shift-end": "terminal::ScrollToBottom"
    }
  }
 ]
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -1,63 +0,0 @@
-// documentation: https://zed.dev/docs/key-bindings
-//
-// To see the default key bindings run `zed: open default keymap`
-// from the command palette.
-[
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-g": "editor::Cancel",
-      "ctrl-shift-g": "go_to_line::Toggle",
-      //"ctrl-space": "editor::SetMark",
-      "ctrl-x u": "editor::Undo",
-      "ctrl-x ctrl-u": "editor::Redo",
-      "ctrl-f": "editor::MoveRight",
-      "ctrl-b": "editor::MoveLeft",
-      "ctrl-n": "editor::MoveDown",
-      "ctrl-p": "editor::MoveUp",
-      "ctrl-a": "editor::MoveToBeginningOfLine",
-      "ctrl-e": "editor::MoveToEndOfLine",
-      "alt-f": "editor::MoveToNextSubwordEnd",
-      "alt-b": "editor::MoveToPreviousSubwordStart",
-      "ctrl-d": "editor::Delete",
-      "alt-d": "editor::DeleteToNextWordEnd",
-      "ctrl-k": "editor::CutToEndOfLine",
-      "ctrl-w": "editor::Cut",
-      "alt-w": "editor::Copy",
-      "ctrl-y": "editor::Paste",
-      "ctrl-_": "editor::Undo",
-      "ctrl-v": "editor::MovePageDown",
-      "alt-v": "editor::MovePageUp",
-      "ctrl-x ]": "editor::MoveToEnd",
-      "ctrl-x [": "editor::MoveToBeginning",
-      "ctrl-l": "editor::ScrollCursorCenterTopBottom",
-      "ctrl-s": "buffer_search::Deploy",
-      "ctrl-x ctrl-f": "file_finder::Toggle",
-      "ctrl-shift-r": "editor::Rename"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "ctrl-x k": "pane::CloseActiveItem",
-      "ctrl-x ctrl-c": "workspace::CloseWindow",
-      "ctrl-x o": "workspace::ActivateNextPane",
-      "ctrl-x b": "tab_switcher::Toggle",
-      "ctrl-x 0": "pane::CloseActiveItem",
-      "ctrl-x 1": "pane::CloseInactiveItems",
-      "ctrl-x 2": "pane::SplitVertical",
-      "ctrl-x ctrl-f": "file_finder::Toggle",
-      "ctrl-x ctrl-s": "workspace::Save",
-      "ctrl-x ctrl-w": "workspace::SaveAs",
-      "ctrl-x s": "workspace::SaveAll",
-      "shift shift": "file_finder::Toggle"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward"
-    }
-  }
-]
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -1,7 +1,6 @@
 [
  {
    "bindings": {
-      "ctrl-alt-s": "zed::OpenSettings",
      "ctrl-shift-[": "pane::ActivatePrevItem",
      "ctrl-shift-]": "pane::ActivateNextItem"
    }
@@ -26,8 +25,8 @@
      "alt-j": ["editor::SelectNext", { "replace_newest": false }],
      "alt-shift-j": ["editor::SelectPrevious", { "replace_newest": false }],
      "ctrl-/": ["editor::ToggleComments", { "advance_downwards": true }],
-      "ctrl-w": "editor::SelectLargerSyntaxNode",
-      "ctrl-shift-w": "editor::SelectSmallerSyntaxNode",
+      "alt-up": "editor::SelectLargerSyntaxNode",
+      "alt-down": "editor::SelectSmallerSyntaxNode",
      "shift-alt-up": "editor::MoveLineUp",
      "shift-alt-down": "editor::MoveLineDown",
      "ctrl-alt-l": "editor::Format",
@@ -44,7 +43,6 @@
      "shift-f2": "editor::GoToPrevDiagnostic",
      "ctrl-alt-shift-down": "editor::GoToHunk",
      "ctrl-alt-shift-up": "editor::GoToPrevHunk",
-      "ctrl-alt-z": "editor::RevertSelectedHunks",
      "ctrl-home": "editor::MoveToBeginning",
      "ctrl-end": "editor::MoveToEnd",
      "ctrl-shift-home": "editor::SelectToBeginning",
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -1,63 +0,0 @@
-// documentation: https://zed.dev/docs/key-bindings
-//
-// To see the default key bindings run `zed: open default keymap`
-// from the command palette.
-[
-  {
-    "context": "Editor",
-    "bindings": {
-      "ctrl-g": "editor::Cancel",
-      "ctrl-shift-g": "go_to_line::Toggle",
-      //"ctrl-space": "editor::SetMark",
-      "ctrl-x u": "editor::Undo",
-      "ctrl-x ctrl-u": "editor::Redo",
-      "ctrl-f": "editor::MoveRight",
-      "ctrl-b": "editor::MoveLeft",
-      "ctrl-n": "editor::MoveDown",
-      "ctrl-p": "editor::MoveUp",
-      "ctrl-a": "editor::MoveToBeginningOfLine",
-      "ctrl-e": "editor::MoveToEndOfLine",
-      "alt-f": "editor::MoveToNextSubwordEnd",
-      "alt-b": "editor::MoveToPreviousSubwordStart",
-      "ctrl-d": "editor::Delete",
-      "alt-d": "editor::DeleteToNextWordEnd",
-      "ctrl-k": "editor::CutToEndOfLine",
-      "ctrl-w": "editor::Cut",
-      "alt-w": "editor::Copy",
-      "ctrl-y": "editor::Paste",
-      "ctrl-_": "editor::Undo",
-      "ctrl-v": "editor::MovePageDown",
-      "alt-v": "editor::MovePageUp",
-      "ctrl-x ]": "editor::MoveToEnd",
-      "ctrl-x [": "editor::MoveToBeginning",
-      "ctrl-l": "editor::ScrollCursorCenterTopBottom",
-      "ctrl-s": "buffer_search::Deploy",
-      "ctrl-x ctrl-f": "file_finder::Toggle",
-      "ctrl-shift-r": "editor::Rename"
-    }
-  },
-  {
-    "context": "Workspace",
-    "bindings": {
-      "ctrl-x k": "pane::CloseActiveItem",
-      "ctrl-x ctrl-c": "workspace::CloseWindow",
-      "ctrl-x o": "workspace::ActivateNextPane",
-      "ctrl-x b": "tab_switcher::Toggle",
-      "ctrl-x 0": "pane::CloseActiveItem",
-      "ctrl-x 1": "pane::CloseInactiveItems",
-      "ctrl-x 2": "pane::SplitVertical",
-      "ctrl-x ctrl-f": "file_finder::Toggle",
-      "ctrl-x ctrl-s": "workspace::Save",
-      "ctrl-x ctrl-w": "workspace::SaveAs",
-      "ctrl-x s": "workspace::SaveAll",
-      "shift shift": "file_finder::Toggle"
-    }
-  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "ctrl-alt-left": "pane::GoBack",
-      "ctrl-alt-right": "pane::GoForward"
-    }
-  }
-]
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -24,8 +24,8 @@
      "ctrl-g": ["editor::SelectNext", { "replace_newest": false }],
      "ctrl-cmd-g": ["editor::SelectPrevious", { "replace_newest": false }],
      "cmd-/": ["editor::ToggleComments", { "advance_downwards": true }],
-      "cmd-up": "editor::SelectLargerSyntaxNode",
-      "cmd-down": "editor::SelectSmallerSyntaxNode",
+      "alt-up": "editor::SelectLargerSyntaxNode",
+      "alt-down": "editor::SelectSmallerSyntaxNode",
      "shift-alt-up": "editor::MoveLineUp",
      "shift-alt-down": "editor::MoveLineDown",
      "cmd-alt-l": "editor::Format",
@@ -34,7 +34,7 @@
      "cmd-]": "pane::GoForward",
      "alt-f7": "editor::FindAllReferences",
      "cmd-alt-f7": "editor::FindAllReferences",
-      "cmd-b": "editor::GoToDefinition", // Conflicts with workspace::ToggleLeftDock
+      "cmd-b": "editor::GoToDefinition",
      "cmd-alt-b": "editor::GoToDefinitionSplit",
      "cmd-shift-b": "editor::GoToTypeDefinition",
      "cmd-alt-shift-b": "editor::GoToTypeDefinitionSplit",
@@ -58,20 +58,13 @@
      "alt-enter": "editor::ToggleCodeActions"
    }
  },
-  {
-    "context": "BufferSearchBar > Editor",
-    "bindings": {
-      "shift-enter": "search::SelectPrevMatch"
-    }
-  },
  {
    "context": "Workspace",
    "bindings": {
      "cmd-shift-o": "file_finder::Toggle",
      "cmd-shift-a": "command_palette::Toggle",
      "shift shift": "command_palette::Toggle",
-      "cmd-alt-o": "project_symbols::Toggle", // JetBrains: Go to Symbol
-      "cmd-o": "project_symbols::Toggle", // JetBrains: Go to Class
+      "cmd-alt-o": "project_symbols::Toggle",
      "cmd-1": "workspace::ToggleLeftDock",
      "cmd-6": "diagnostics::Deploy"
    }
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -1,7 +1,6 @@
 [
  {
    "context": "VimControl && !menu",
-    "use_layout_keys": true,
    "bindings": {
      "i": ["vim::PushOperator", { "Object": { "around": false } }],
      "a": ["vim::PushOperator", { "Object": { "around": true } }],
@@ -128,27 +127,20 @@
      "shift-h": "vim::WindowTop",
      "shift-m": "vim::WindowMiddle",
      "shift-l": "vim::WindowBottom",
-      "q": "vim::ToggleRecord",
-      "shift-q": "vim::ReplayLastRecording",
-      "@": ["vim::PushOperator", "ReplayRegister"],
      // z commands
-      "z enter": ["workspace::SendKeystrokes", "z t ^"],
-      "z -": ["workspace::SendKeystrokes", "z b ^"],
-      "z ^": ["workspace::SendKeystrokes", "shift-h k z b ^"],
-      "z +": ["workspace::SendKeystrokes", "shift-l j z t ^"],
      "z t": "editor::ScrollCursorTop",
      "z z": "editor::ScrollCursorCenter",
      "z .": ["workspace::SendKeystrokes", "z z ^"],
      "z b": "editor::ScrollCursorBottom",
      "z a": "editor::ToggleFold",
-      "z shift-a": "editor::ToggleFoldRecursive",
+      "z A": "editor::ToggleFoldRecursive",
      "z c": "editor::Fold",
-      "z shift-c": "editor::FoldRecursive",
+      "z C": "editor::FoldRecursive",
      "z o": "editor::UnfoldLines",
-      "z shift-o": "editor::UnfoldRecursive",
+      "z O": "editor::UnfoldRecursive",
      "z f": "editor::FoldSelectedRanges",
-      "z shift-m": "editor::FoldAll",
-      "z shift-r": "editor::UnfoldAll",
+      "z M": "editor::FoldAll",
+      "z R": "editor::UnfoldAll",
      "shift-z shift-q": ["pane::CloseActiveItem", { "saveIntent": "skip" }],
      "shift-z shift-z": ["pane::CloseActiveItem", { "saveIntent": "saveAll" }],
      // Count support
@@ -161,374 +153,6 @@
      "7": ["vim::Number", 7],
      "8": ["vim::Number", 8],
      "9": ["vim::Number", 9],
-      "ctrl-w d": "editor::GoToDefinitionSplit",
-      "ctrl-w g d": "editor::GoToDefinitionSplit",
-      "ctrl-w shift-d": "editor::GoToTypeDefinitionSplit",
-      "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
-      "ctrl-w space": "editor::OpenExcerptsSplit",
-      "ctrl-w g space": "editor::OpenExcerptsSplit",
-      "ctrl-6": "pane::AlternateFile"
-    }
-  },
-  {
-    "context": "vim_mode == normal",
-    "use_layout_keys": true,
-    "bindings": {
-      "escape": "editor::Cancel",
-      "ctrl-[": "editor::Cancel",
-      ":": "command_palette::Toggle",
-      ".": "vim::Repeat",
-      "c": ["vim::PushOperator", "Change"],
-      "shift-c": "vim::ChangeToEndOfLine",
-      "d": ["vim::PushOperator", "Delete"],
-      "shift-d": "vim::DeleteToEndOfLine",
-      "shift-j": "vim::JoinLines",
-      "y": ["vim::PushOperator", "Yank"],
-      "shift-y": "vim::YankLine",
-      "i": "vim::InsertBefore",
-      "shift-i": "vim::InsertFirstNonWhitespace",
-      "a": "vim::InsertAfter",
-      "shift-a": "vim::InsertEndOfLine",
-      "x": "vim::DeleteRight",
-      "shift-x": "vim::DeleteLeft",
-      "o": "vim::InsertLineBelow",
-      "shift-o": "vim::InsertLineAbove",
-      "~": "vim::ChangeCase",
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "before": true }],
-      "u": "vim::Undo",
-      "ctrl-r": "vim::Redo",
-      "r": ["vim::PushOperator", "Replace"],
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      ">": ["vim::PushOperator", "Indent"],
-      "<": ["vim::PushOperator", "Outdent"],
-      "g u": ["vim::PushOperator", "Lowercase"],
-      "g shift-u": ["vim::PushOperator", "Uppercase"],
-      "g ~": ["vim::PushOperator", "OppositeCase"],
-      "\"": ["vim::PushOperator", "Register"],
-      "g q": ["vim::PushOperator", "Rewrap"],
-      "g w": ["vim::PushOperator", "Rewrap"],
-      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
-      "insert": "vim::InsertBefore",
-      // tree-sitter related commands
-      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode",
-      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPrevDiagnostic",
-      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPrevHunk",
-      "g c": ["vim::PushOperator", "ToggleComments"]
-    }
-  },
-  {
-    "context": "VimControl && VimCount",
-    "use_layout_keys": true,
-    "bindings": {
-      "0": ["vim::Number", 0],
-      ":": "vim::CountCommand"
-    }
-  },
-  {
-    "context": "vim_mode == visual",
-    "use_layout_keys": true,
-    "bindings": {
-      ":": "vim::VisualCommand",
-      "u": "vim::ConvertToLowerCase",
-      "shift-u": "vim::ConvertToUpperCase",
-      "o": "vim::OtherEnd",
-      "shift-o": "vim::OtherEnd",
-      "d": "vim::VisualDelete",
-      "x": "vim::VisualDelete",
-      "shift-d": "vim::VisualDeleteLine",
-      "shift-x": "vim::VisualDeleteLine",
-      "y": "vim::VisualYank",
-      "shift-y": "vim::VisualYank",
-      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "preserveClipboard": true }],
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      "shift-r": "vim::SubstituteLine",
-      "c": "vim::Substitute",
-      "~": "vim::ChangeCase",
-      "*": ["vim::MoveToNext", { "partialWord": true }],
-      "#": ["vim::MoveToPrev", { "partialWord": true }],
-      "ctrl-a": "vim::Increment",
-      "ctrl-x": "vim::Decrement",
-      "g ctrl-a": ["vim::Increment", { "step": true }],
-      "g ctrl-x": ["vim::Decrement", { "step": true }],
-      "shift-i": "vim::InsertBefore",
-      "shift-a": "vim::InsertAfter",
-      "g shift-i": "vim::VisualInsertFirstNonWhiteSpace",
-      "g shift-a": "vim::VisualInsertEndOfLine",
-      "shift-j": "vim::JoinLines",
-      "r": ["vim::PushOperator", "Replace"],
-      "ctrl-c": ["vim::SwitchMode", "Normal"],
-      "escape": ["vim::SwitchMode", "Normal"],
-      "ctrl-[": ["vim::SwitchMode", "Normal"],
-      ">": "vim::Indent",
-      "<": "vim::Outdent",
-      "i": ["vim::PushOperator", { "Object": { "around": false } }],
-      "a": ["vim::PushOperator", { "Object": { "around": true } }],
-      "g c": "vim::ToggleComments",
-      "g q": "vim::Rewrap",
-      "\"": ["vim::PushOperator", "Register"],
-      // tree-sitter related commands
-      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode"
-    }
-  },
-  {
-    "context": "vim_mode == insert",
-    "use_layout_keys": true,
-    "bindings": {
-      "escape": "vim::NormalBefore",
-      "ctrl-c": "vim::NormalBefore",
-      "ctrl-[": "vim::NormalBefore",
-      "ctrl-x": null,
-      "ctrl-x ctrl-o": "editor::ShowCompletions",
-      "ctrl-x ctrl-a": "assistant::InlineAssist", // zed specific
-      "ctrl-x ctrl-c": "editor::ShowInlineCompletion", // zed specific
-      "ctrl-x ctrl-l": "editor::ToggleCodeActions", // zed specific
-      "ctrl-x ctrl-z": "editor::Cancel",
-      "ctrl-w": "editor::DeleteToPreviousWordStart",
-      "ctrl-u": "editor::DeleteToBeginningOfLine",
-      "ctrl-t": "vim::Indent",
-      "ctrl-d": "vim::Outdent",
-      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
-      "ctrl-q": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-shift-q": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-r": ["vim::PushOperator", "Register"],
-      "insert": "vim::ToggleReplace"
-    }
-  },
-  {
-    "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
-    "use_layout_keys": true,
-    "bindings": {
-      "ctrl-p": "editor::ShowCompletions",
-      "ctrl-n": "editor::ShowCompletions"
-    }
-  },
-  {
-    "context": "vim_mode == replace",
-    "use_layout_keys": true,
-    "bindings": {
-      "escape": "vim::NormalBefore",
-      "ctrl-c": "vim::NormalBefore",
-      "ctrl-[": "vim::NormalBefore",
-      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
-      "ctrl-q": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-shift-q": ["vim::PushOperator", { "Literal": {} }],
-      "backspace": "vim::UndoReplace",
-      "tab": "vim::Tab",
-      "enter": "vim::Enter",
-      "insert": "vim::InsertBefore"
-    }
-  },
-  {
-    "context": "vim_mode == waiting",
-    "use_layout_keys": true,
-    "bindings": {
-      "tab": "vim::Tab",
-      "enter": "vim::Enter",
-      "escape": "vim::ClearOperators",
-      "ctrl-c": "vim::ClearOperators",
-      "ctrl-[": "vim::ClearOperators",
-      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-q": ["vim::PushOperator", { "Literal": {} }]
-    }
-  },
-  {
-    "context": "vim_mode == operator",
-    "use_layout_keys": true,
-    "bindings": {
-      "escape": "vim::ClearOperators",
-      "ctrl-c": "vim::ClearOperators",
-      "ctrl-[": "vim::ClearOperators"
-    }
-  },
-  {
-    "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
-    "use_layout_keys": true,
-    "bindings": {
-      "w": "vim::Word",
-      "shift-w": ["vim::Word", { "ignorePunctuation": true }],
-      "t": "vim::Tag",
-      "s": "vim::Sentence",
-      "p": "vim::Paragraph",
-      "'": "vim::Quotes",
-      "`": "vim::BackQuotes",
-      "\"": "vim::DoubleQuotes",
-      "|": "vim::VerticalBars",
-      "(": "vim::Parentheses",
-      ")": "vim::Parentheses",
-      "b": "vim::Parentheses",
-      "[": "vim::SquareBrackets",
-      "]": "vim::SquareBrackets",
-      "r": "vim::SquareBrackets",
-      "{": "vim::CurlyBrackets",
-      "}": "vim::CurlyBrackets",
-      "shift-b": "vim::CurlyBrackets",
-      "<": "vim::AngleBrackets",
-      ">": "vim::AngleBrackets",
-      "a": "vim::AngleBrackets",
-      "g": "vim::Argument"
-    }
-  },
-  {
-    "context": "vim_operator == c",
-    "use_layout_keys": true,
-    "bindings": {
-      "c": "vim::CurrentLine",
-      "d": "editor::Rename", // zed specific
-      "s": ["vim::PushOperator", { "ChangeSurrounds": {} }]
-    }
-  },
-  {
-    "context": "vim_operator == d",
-    "use_layout_keys": true,
-    "bindings": {
-      "d": "vim::CurrentLine",
-      "s": ["vim::PushOperator", "DeleteSurrounds"],
-      "o": "editor::ToggleHunkDiff", // "d o"
-      "p": "editor::RevertSelectedHunks" // "d p"
-    }
-  },
-  {
-    "context": "vim_operator == gu",
-    "use_layout_keys": true,
-    "bindings": {
-      "g u": "vim::CurrentLine",
-      "u": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gU",
-    "use_layout_keys": true,
-    "bindings": {
-      "g shift-u": "vim::CurrentLine",
-      "shift-u": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == g~",
-    "use_layout_keys": true,
-    "bindings": {
-      "g ~": "vim::CurrentLine",
-      "~": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gq",
-    "use_layout_keys": true,
-    "bindings": {
-      "g q": "vim::CurrentLine",
-      "q": "vim::CurrentLine",
-      "g w": "vim::CurrentLine",
-      "w": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == y",
-    "use_layout_keys": true,
-    "bindings": {
-      "y": "vim::CurrentLine",
-      "s": ["vim::PushOperator", { "AddSurrounds": {} }]
-    }
-  },
-  {
-    "context": "vim_operator == ys",
-    "use_layout_keys": true,
-    "bindings": {
-      "s": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == >",
-    "use_layout_keys": true,
-    "bindings": {
-      ">": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == <",
-    "use_layout_keys": true,
-    "bindings": {
-      "<": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == gc",
-    "use_layout_keys": true,
-    "bindings": {
-      "c": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_mode == literal",
-    "use_layout_keys": true,
-    "bindings": {
-      "ctrl-@": ["vim::Literal", ["ctrl-@", "\u0000"]],
-      "ctrl-a": ["vim::Literal", ["ctrl-a", "\u0001"]],
-      "ctrl-b": ["vim::Literal", ["ctrl-b", "\u0002"]],
-      "ctrl-c": ["vim::Literal", ["ctrl-c", "\u0003"]],
-      "ctrl-d": ["vim::Literal", ["ctrl-d", "\u0004"]],
-      "ctrl-e": ["vim::Literal", ["ctrl-e", "\u0005"]],
-      "ctrl-f": ["vim::Literal", ["ctrl-f", "\u0006"]],
-      "ctrl-g": ["vim::Literal", ["ctrl-g", "\u0007"]],
-      "ctrl-h": ["vim::Literal", ["ctrl-h", "\u0008"]],
-      "ctrl-i": ["vim::Literal", ["ctrl-i", "\u0009"]],
-      "ctrl-j": ["vim::Literal", ["ctrl-j", "\u000A"]],
-      "ctrl-k": ["vim::Literal", ["ctrl-k", "\u000B"]],
-      "ctrl-l": ["vim::Literal", ["ctrl-l", "\u000C"]],
-      "ctrl-m": ["vim::Literal", ["ctrl-m", "\u000D"]],
-      "ctrl-n": ["vim::Literal", ["ctrl-n", "\u000E"]],
-      "ctrl-o": ["vim::Literal", ["ctrl-o", "\u000F"]],
-      "ctrl-p": ["vim::Literal", ["ctrl-p", "\u0010"]],
-      "ctrl-q": ["vim::Literal", ["ctrl-q", "\u0011"]],
-      "ctrl-r": ["vim::Literal", ["ctrl-r", "\u0012"]],
-      "ctrl-s": ["vim::Literal", ["ctrl-s", "\u0013"]],
-      "ctrl-t": ["vim::Literal", ["ctrl-t", "\u0014"]],
-      "ctrl-u": ["vim::Literal", ["ctrl-u", "\u0015"]],
-      "ctrl-v": ["vim::Literal", ["ctrl-v", "\u0016"]],
-      "ctrl-w": ["vim::Literal", ["ctrl-w", "\u0017"]],
-      "ctrl-x": ["vim::Literal", ["ctrl-x", "\u0018"]],
-      "ctrl-y": ["vim::Literal", ["ctrl-y", "\u0019"]],
-      "ctrl-z": ["vim::Literal", ["ctrl-z", "\u001A"]],
-      "ctrl-[": ["vim::Literal", ["ctrl-[", "\u001B"]],
-      "ctrl-\\": ["vim::Literal", ["ctrl-\\", "\u001C"]],
-      "ctrl-]": ["vim::Literal", ["ctrl-]", "\u001D"]],
-      "ctrl-^": ["vim::Literal", ["ctrl-^", "\u001E"]],
-      "ctrl-_": ["vim::Literal", ["ctrl-_", "\u001F"]],
-      "escape": ["vim::Literal", ["escape", "\u001B"]],
-      "enter": ["vim::Literal", ["enter", "\u000D"]],
-      "tab": ["vim::Literal", ["tab", "\u0009"]],
-      // zed extensions:
-      "backspace": ["vim::Literal", ["backspace", "\u0008"]],
-      "delete": ["vim::Literal", ["delete", "\u007F"]]
-    }
-  },
-  {
-    "context": "BufferSearchBar && !in_replace",
-    "use_layout_keys": true,
-    "bindings": {
-      "enter": "vim::SearchSubmit",
-      "escape": "buffer_search::Dismiss"
-    }
-  },
-  {
-    "context": "ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
-    "use_layout_keys": true,
-    "bindings": {
      // window related commands (ctrl-w X)
      "ctrl-w": null,
      "ctrl-w left": ["workspace::ActivatePaneInDirection", "Left"],
@@ -573,12 +197,296 @@
      "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
      "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
      "ctrl-w n": "workspace::NewFileSplitHorizontal",
-      "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal"
+      "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal",
+      "ctrl-w d": "editor::GoToDefinitionSplit",
+      "ctrl-w g d": "editor::GoToDefinitionSplit",
+      "ctrl-w shift-d": "editor::GoToTypeDefinitionSplit",
+      "ctrl-w g shift-d": "editor::GoToTypeDefinitionSplit",
+      "ctrl-w space": "editor::OpenExcerptsSplit",
+      "ctrl-w g space": "editor::OpenExcerptsSplit",
+      "ctrl-6": "pane::AlternateFile"
    }
  },
  {
-    "context": "EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
-    "use_layout_keys": true,
+    "context": "vim_mode == normal",
+    "bindings": {
+      "escape": "editor::Cancel",
+      "ctrl-[": "editor::Cancel",
+      ":": "command_palette::Toggle",
+      ".": "vim::Repeat",
+      "c": ["vim::PushOperator", "Change"],
+      "shift-c": "vim::ChangeToEndOfLine",
+      "d": ["vim::PushOperator", "Delete"],
+      "shift-d": "vim::DeleteToEndOfLine",
+      "shift-j": "vim::JoinLines",
+      "y": ["vim::PushOperator", "Yank"],
+      "shift-y": "vim::YankLine",
+      "i": "vim::InsertBefore",
+      "shift-i": "vim::InsertFirstNonWhitespace",
+      "a": "vim::InsertAfter",
+      "shift-a": "vim::InsertEndOfLine",
+      "x": "vim::DeleteRight",
+      "shift-x": "vim::DeleteLeft",
+      "o": "vim::InsertLineBelow",
+      "shift-o": "vim::InsertLineAbove",
+      "~": "vim::ChangeCase",
+      "ctrl-a": "vim::Increment",
+      "ctrl-x": "vim::Decrement",
+      "p": "vim::Paste",
+      "shift-p": ["vim::Paste", { "before": true }],
+      "u": "vim::Undo",
+      "ctrl-r": "vim::Redo",
+      "r": ["vim::PushOperator", "Replace"],
+      "s": "vim::Substitute",
+      "shift-s": "vim::SubstituteLine",
+      ">": ["vim::PushOperator", "Indent"],
+      "<": ["vim::PushOperator", "Outdent"],
+      "g u": ["vim::PushOperator", "Lowercase"],
+      "g shift-u": ["vim::PushOperator", "Uppercase"],
+      "g ~": ["vim::PushOperator", "OppositeCase"],
+      "\"": ["vim::PushOperator", "Register"],
+      "g q": ["vim::PushOperator", "Rewrap"],
+      "g w": ["vim::PushOperator", "Rewrap"],
+      "q": "vim::ToggleRecord",
+      "shift-q": "vim::ReplayLastRecording",
+      "@": ["vim::PushOperator", "ReplayRegister"],
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-pageup": "pane::ActivatePrevItem",
+      // tree-sitter related commands
+      "[ x": "editor::SelectLargerSyntaxNode",
+      "] x": "editor::SelectSmallerSyntaxNode",
+      "] d": "editor::GoToDiagnostic",
+      "[ d": "editor::GoToPrevDiagnostic",
+      "] c": "editor::GoToHunk",
+      "[ c": "editor::GoToPrevHunk",
+      "g c": ["vim::PushOperator", "ToggleComments"]
+    }
+  },
+  {
+    "context": "VimControl && VimCount",
+    "bindings": {
+      "0": ["vim::Number", 0],
+      ":": "vim::CountCommand"
+    }
+  },
+  {
+    "context": "vim_mode == visual",
+    "bindings": {
+      ":": "vim::VisualCommand",
+      "u": "vim::ConvertToLowerCase",
+      "U": "vim::ConvertToUpperCase",
+      "o": "vim::OtherEnd",
+      "shift-o": "vim::OtherEnd",
+      "d": "vim::VisualDelete",
+      "x": "vim::VisualDelete",
+      "shift-d": "vim::VisualDeleteLine",
+      "shift-x": "vim::VisualDeleteLine",
+      "y": "vim::VisualYank",
+      "shift-y": "vim::VisualYank",
+      "p": "vim::Paste",
+      "shift-p": ["vim::Paste", { "preserveClipboard": true }],
+      "s": "vim::Substitute",
+      "shift-s": "vim::SubstituteLine",
+      "shift-r": "vim::SubstituteLine",
+      "c": "vim::Substitute",
+      "~": "vim::ChangeCase",
+      "*": ["vim::MoveToNext", { "partialWord": true }],
+      "#": ["vim::MoveToPrev", { "partialWord": true }],
+      "ctrl-a": "vim::Increment",
+      "ctrl-x": "vim::Decrement",
+      "g ctrl-a": ["vim::Increment", { "step": true }],
+      "g ctrl-x": ["vim::Decrement", { "step": true }],
+      "shift-i": "vim::InsertBefore",
+      "shift-a": "vim::InsertAfter",
+      "g I": "vim::VisualInsertFirstNonWhiteSpace",
+      "g A": "vim::VisualInsertEndOfLine",
+      "shift-j": "vim::JoinLines",
+      "r": ["vim::PushOperator", "Replace"],
+      "ctrl-c": ["vim::SwitchMode", "Normal"],
+      "escape": ["vim::SwitchMode", "Normal"],
+      "ctrl-[": ["vim::SwitchMode", "Normal"],
+      ">": "vim::Indent",
+      "<": "vim::Outdent",
+      "i": ["vim::PushOperator", { "Object": { "around": false } }],
+      "a": ["vim::PushOperator", { "Object": { "around": true } }],
+      "g c": "vim::ToggleComments",
+      "g q": "vim::Rewrap",
+      "\"": ["vim::PushOperator", "Register"],
+      // tree-sitter related commands
+      "[ x": "editor::SelectLargerSyntaxNode",
+      "] x": "editor::SelectSmallerSyntaxNode"
+    }
+  },
+  {
+    "context": "vim_mode == insert",
+    "bindings": {
+      "escape": "vim::NormalBefore",
+      "ctrl-c": "vim::NormalBefore",
+      "ctrl-[": "vim::NormalBefore",
+      "ctrl-x": null,
+      "ctrl-x ctrl-o": "editor::ShowCompletions",
+      "ctrl-x ctrl-a": "assistant::InlineAssist", // zed specific
+      "ctrl-x ctrl-c": "editor::ShowInlineCompletion", // zed specific
+      "ctrl-x ctrl-l": "editor::ToggleCodeActions", // zed specific
+      "ctrl-x ctrl-z": "editor::Cancel",
+      "ctrl-w": "editor::DeleteToPreviousWordStart",
+      "ctrl-u": "editor::DeleteToBeginningOfLine",
+      "ctrl-t": "vim::Indent",
+      "ctrl-d": "vim::Outdent",
+      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
+      "ctrl-r": ["vim::PushOperator", "Register"]
+    }
+  },
+  {
+    "context": "vim_mode == insert && !(showing_code_actions || showing_completions)",
+    "bindings": {
+      "ctrl-p": "editor::ShowCompletions",
+      "ctrl-n": "editor::ShowCompletions"
+    }
+  },
+  {
+    "context": "vim_mode == replace",
+    "bindings": {
+      "escape": "vim::NormalBefore",
+      "ctrl-c": "vim::NormalBefore",
+      "ctrl-[": "vim::NormalBefore",
+      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
+      "backspace": "vim::UndoReplace",
+      "tab": "vim::Tab",
+      "enter": "vim::Enter"
+    }
+  },
+  {
+    "context": "vim_mode == waiting",
+    "bindings": {
+      "tab": "vim::Tab",
+      "enter": "vim::Enter",
+      "escape": "vim::ClearOperators",
+      "ctrl-c": "vim::ClearOperators",
+      "ctrl-[": "vim::ClearOperators",
+      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }]
+    }
+  },
+  {
+    "context": "vim_mode == operator",
+    "bindings": {
+      "escape": "vim::ClearOperators",
+      "ctrl-c": "vim::ClearOperators",
+      "ctrl-[": "vim::ClearOperators"
+    }
+  },
+  {
+    "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
+    "bindings": {
+      "w": "vim::Word",
+      "shift-w": ["vim::Word", { "ignorePunctuation": true }],
+      "t": "vim::Tag",
+      "s": "vim::Sentence",
+      "p": "vim::Paragraph",
+      "'": "vim::Quotes",
+      "`": "vim::BackQuotes",
+      "\"": "vim::DoubleQuotes",
+      "|": "vim::VerticalBars",
+      "(": "vim::Parentheses",
+      ")": "vim::Parentheses",
+      "b": "vim::Parentheses",
+      "[": "vim::SquareBrackets",
+      "]": "vim::SquareBrackets",
+      "{": "vim::CurlyBrackets",
+      "}": "vim::CurlyBrackets",
+      "shift-b": "vim::CurlyBrackets",
+      "<": "vim::AngleBrackets",
+      ">": "vim::AngleBrackets",
+      "a": "vim::Argument"
+    }
+  },
+  {
+    "context": "vim_operator == c",
+    "bindings": {
+      "c": "vim::CurrentLine",
+      "d": "editor::Rename", // zed specific
+      "s": ["vim::PushOperator", { "ChangeSurrounds": {} }]
+    }
+  },
+  {
+    "context": "vim_operator == d",
+    "bindings": {
+      "d": "vim::CurrentLine",
+      "s": ["vim::PushOperator", "DeleteSurrounds"],
+      "o": "editor::ToggleHunkDiff", // "d o"
+      "p": "editor::RevertSelectedHunks" // "d p"
+    }
+  },
+  {
+    "context": "vim_operator == gu",
+    "bindings": {
+      "g u": "vim::CurrentLine",
+      "u": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == gU",
+    "bindings": {
+      "g shift-u": "vim::CurrentLine",
+      "shift-u": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == g~",
+    "bindings": {
+      "g ~": "vim::CurrentLine",
+      "~": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == gq",
+    "bindings": {
+      "g q": "vim::CurrentLine",
+      "q": "vim::CurrentLine",
+      "g w": "vim::CurrentLine",
+      "w": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == y",
+    "bindings": {
+      "y": "vim::CurrentLine",
+      "s": ["vim::PushOperator", { "AddSurrounds": {} }]
+    }
+  },
+  {
+    "context": "vim_operator == ys",
+    "bindings": {
+      "s": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == >",
+    "bindings": {
+      ">": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == <",
+    "bindings": {
+      "<": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "vim_operator == gc",
+    "bindings": {
+      "c": "vim::CurrentLine"
+    }
+  },
+  {
+    "context": "BufferSearchBar && !in_replace",
+    "bindings": {
+      "enter": "vim::SearchSubmit",
+      "escape": "buffer_search::Dismiss"
+    }
+  },
+  {
+    "context": "EmptyPane || SharedScreen",
    "bindings": {
      ":": "command_palette::Toggle",
      "g /": "pane::DeploySearch"
@@ -587,7 +495,6 @@
  {
    // netrw compatibility
    "context": "ProjectPanel && not_editing",
-    "use_layout_keys": true,
    "bindings": {
      ":": "command_palette::Toggle",
      "%": "project_panel::NewFile",
@@ -615,7 +522,6 @@
  },
  {
    "context": "OutlinePanel && not_editing",
-    "use_layout_keys": true,
    "bindings": {
      "j": "menu::SelectNext",
      "k": "menu::SelectPrev",
--- a/assets/prompts/content_prompt.hbs
+++ b/assets/prompts/content_prompt.hbs
@@ -50,9 +50,6 @@ And here's the section to rewrite based on that prompt again for reference:

 {{#if diagnostic_errors}}
 {{#each diagnostic_errors}}
-
-Below are the diagnostic errors visible to the user.  If the user requests problems to be fixed, use this information, but do not try to fix these errors if the user hasn't asked you to.
-
 <diagnostic_error>
    <line_number>{{line_number}}</line_number>
    <error_message>{{error_message}}</error_message>
--- a/assets/prompts/edit_workflow.hbs
+++ b/assets/prompts/edit_workflow.hbs
@@ -0,0 +1,312 @@
+<task_description>
+
+# Code Change Workflow
+
+Your task is to guide the user through code changes using a series of steps. Each step should describe a high-level change, which can consist of multiple edits to distinct locations in the codebase.
+
+## Output Example
+
+Provide output as XML, with the following format:
+
+<step>
+Update the Person struct to store an age
+
+```rust
+struct Person {
+    // existing fields...
+    age: u8,
+    height: f32,
+    // existing fields...
+}
+
+impl Person {
+    fn age(&self) -> u8 {
+        self.age
+    }
+}
+```
+
+<edit>
+<path>src/person.rs</path>
+<operation>insert_before</operation>
+<search>height: f32,</search>
+<description>Add the age field</description>
+</edit>
+
+<edit>
+<path>src/person.rs</path>
+<operation>insert_after</operation>
+<search>impl Person {</search>
+<description>Add the age getter</description>
+</edit>
+</step>
+
+## Output Format
+
+First, each `<step>` must contain a written description of the change that should be made. The description should begin with a high-level overview, and can contain markdown code blocks as well. The description should be self-contained and actionable.
+
+After the description, each `<step>` must contain one or more `<edit>` tags, each of which refer to a specific range in a source file. Each `<edit>` tag must contain the following child tags:
+
+### `<path>` (required)
+
+This tag contains the path to the file that will be changed. It can be an existing path, or a path that should be created.
+
+### `<search>` (optional)
+
+This tag contains a search string to locate in the source file, e.g. `pub fn baz() {`. If not provided, the new content will be inserted at the top of the file. Make sure to produce a string that exists in the source file and that isn't ambiguous. When there's ambiguity, add more lines to the search to eliminate it.
+
+### `<description>` (required)
+
+This tag contains a single-line description of the edit that should be made at the given location.
+
+### `<operation>` (required)
+
+This tag indicates what type of change should be made, relative to the given location. It can be one of the following:
+- `update`: Rewrites the specified string entirely based on the given description.
+- `create`: Creates a new file with the given path based on the provided description.
+- `insert_before`: Inserts new text based on the given description before the specified search string.
+- `insert_after`: Inserts new text based on the given description after the specified search string.
+- `delete`: Deletes the specified string from the containing file.
+
+<guidelines>
+- There's no need to describe *what* to do, just *where* to do it.
+- Only reference locations that actually exist (unless you're creating a file).
+- If creating a file, assume any subsequent updates are included at the time of creation.
+- Don't create and then update a file. Always create new files in one hot.
+- Prefer multiple edits to smaller regions, as opposed to one big edit to a larger region.
+- Don't produce edits that intersect each other. In that case, merge them into a bigger edit.
+- Never nest an edit with another edit. Never include CDATA. All edits are leaf nodes.
+- Descriptions are required for all edits except delete.
+- When generating multiple edits, ensure the descriptions are specific to each individual operation.
+- Avoid referring to the search string in the description. Focus on the change to be made, not the location where it's made. That's implicit with the `search` string you provide.
+- Don't generate multiple edits at the same location. Instead, combine them together in a single edit with a succinct combined description.
+- Always ensure imports are added if you're referencing symbols that are not in scope.
+</guidelines>
+
+Here are some concrete examples.
+
+<example>
+<message role="user">
+
+```rs src/shapes.rs
+pub mod rectangle;
+pub mod circle;
+```
+
+```rs src/shapes/rectangle.rs
+pub struct Rectangle {
+    width: f64,
+    height: f64,
+}
+
+impl Rectangle {
+    pub fn new(width: f64, height: f64) -> Self {
+        Rectangle { width, height }
+    }
+}
+```
+
+```rs src/shapes/circle.rs
+pub struct Circle {
+    radius: f64,
+}
+
+impl Circle {
+    pub fn new(radius: f64) -> Self {
+        Circle { radius }
+    }
+}
+```
+
+Update all shapes to store their origin as an (x, y) tuple and implement Display.
+</message>
+
+<message role="assistant">
+We'll need to update both the rectangle and circle modules.
+
+<step>
+Add origin fields to both shape types.
+
+```rust
+struct Rectangle {
+    // existing fields ...
+    origin: (f64, f64),
+}
+```
+
+```rust
+struct Circle {
+    // existing fields ...
+    origin: (f64, f64),
+}
+```
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>insert_before</operation>
+<search>
+    width: f64,
+    height: f64,
+</search>
+<description>Add the origin field to Rectangle</description>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_before</operation>
+<search>
+    radius: f64,
+</search>
+<description>Add the origin field to Circle</description>
+</edit>
+
+<step>
+Update both shape's constructors to take an origin.
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>update</operation>
+<search>
+    fn new(width: f64, height: f64) -> Self {
+        Rectangle { width, height }
+    }
+</search>
+<description>Update the Rectangle new function to take an origin</description>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>update</operation>
+<search>
+    fn new(radius: f64) -> Self {
+        Circle { radius }
+    }
+</search>
+<description>Update the Circle new function to take an origin</description>
+</edit>
+</step>
+
+<step>
+Implement Display for both shapes
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>insert_before</operation>
+<search>
+struct Rectangle {
+</search>
+<description>Add an import for the `std::fmt` module</description>
+</edit>
+
+<edit>
+<path>src/shapes/rectangle.rs</path>
+<operation>insert_after</operation>
+<search>
+        Rectangle { width, height }
+    }
+}
+</search>
+<description>Add a Display implementation for Rectangle</description>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_before</operation>
+<search>
+struct Circle {
+</search>
+<description>Add an import for the `std::fmt` module</description>
+</edit>
+
+<edit>
+<path>src/shapes/circle.rs</path>
+<operation>insert_after</operation>
+<search>
+        Circle { radius }
+    }
+}
+</search>
+<description>Add a Display implementation for Circle</description>
+</edit>
+</step>
+</message>
+</example>
+
+<example number=2>
+<message role="user">
+
+```rs src/user.rs
+struct User {
+    pub name: String,
+    age: u32,
+    email: String,
+}
+
+impl User {
+    fn new(name: String, age: u32, email: String) -> Self {
+        User { name, age, email }
+    }
+
+    pub fn print_info(&self) {
+        todo!()
+    }
+}
+```
+
+Let's print all the user information and delete the email field.
+</message>
+
+<message role="assistant">
+<step>
+Update the 'print_info' method to print user information
+
+```rust
+impl User {
+    // ... other methods ...
+
+    pub fn print_info(&self) {
+        println!("Name: {name}, Age: {age}", name = self.name, age = self.age);
+    }
+}
+```
+
+<edit>
+<path>src/user.rs</path>
+<operation>update</operation>
+<search>
+    pub fn print_info(&self) {
+        todo!()
+    }
+</search>
+<description>Print all the user information</description>
+</edit>
+</step>
+
+<step>
+Remove the 'email' field from the User struct
+
+<edit>
+<path>src/user.rs</path>
+<operation>delete</operation>
+<search>
+email: String,
+</search>
+</edit>
+
+<edit>
+<path>src/user.rs</path>
+<operation>update</operation>
+<symbol>
+fn new(name: String, age: u32, email: String) -> Self {
+    User { name, age, email }
+}
+</symbol>
+<description>Remove email parameter from new method</description>
+</edit>
+</step>
+</message>
+</example>
+
+You should think step by step. When possible, produce smaller, coherent logical steps as opposed to one big step that combines lots of heterogeneous edits.
+
+</task_description>
--- a/assets/prompts/step_resolution.hbs
+++ b/assets/prompts/step_resolution.hbs
@@ -0,0 +1,496 @@
+<overview>
+Your task is to map a step from a workflow to locations in source code where code needs to be changed to fulfill that step.
+Given a workflow containing background context plus a series of <step> tags, you will resolve *one* of these step tags to resolve to one or more locations in the code.
+With each location, you will produce a brief, one-line description of the changes to be made.
+
+<guidelines>
+- There's no need to describe *what* to do, just *where* to do it.
+- Only reference locations that actually exist (unless you're creating a file).
+- If creating a file, assume any subsequent updates are included at the time of creation.
+- Don't create and then update a file. Always create new files in shot.
+- Prefer updating symbols lower in the syntax tree if possible.
+- Never include suggestions on a parent symbol and one of its children in the same suggestions block.
+- Never nest an operation with another operation or include CDATA or other content. All suggestions are leaf nodes.
+- Descriptions are required for all suggestions except delete.
+- When generating multiple suggestions, ensure the descriptions are specific to each individual operation.
+- Avoid referring to the location in the description. Focus on the change to be made, not the location where it's made. That's implicit with the symbol you provide.
+- Don't generate multiple suggestions at the same location. Instead, combine them together in a single operation with a succinct combined description.
+- To add imports respond with a suggestion where the `"symbol"` key is set to `"#imports"`
+</guidelines>
+</overview>
+
+<examples>
+<example>
+<workflow_context>
+<message role="user">
+```rs src/rectangle.rs
+struct Rectangle {
+    width: f64,
+    height: f64,
+}
+
+impl Rectangle {
+    fn new(width: f64, height: f64) -> Self {
+        Rectangle { width, height }
+    }
+}
+```
+
+We need to add methods to calculate the area and perimeter of the rectangle. Can you help with that?
+</message>
+<message role="assistant">
+Sure, I can help with that!
+
+<step>Add new methods 'calculate_area' and 'calculate_perimeter' to the Rectangle struct</step>
+<step>Implement the 'Display' trait for the Rectangle struct</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Add new methods 'calculate_area' and 'calculate_perimeter' to the Rectangle struct
+</step_to_resolve>
+
+<incorrect_output reason="NEVER append multiple children at the same location.">
+{
+  "title": "Add Rectangle methods",
+  "suggestions": [
+    {
+      "kind": "AppendChild",
+      "path": "src/shapes.rs",
+      "symbol": "impl Rectangle",
+      "description": "Add calculate_area method"
+    },
+    {
+      "kind": "AppendChild",
+      "path": "src/shapes.rs",
+      "symbol": "impl Rectangle",
+      "description": "Add calculate_perimeter method"
+    }
+  ]
+}
+</incorrect_output>
+
+<correct_output>
+{
+  "title": "Add Rectangle methods",
+  "suggestions": [
+    {
+      "kind": "AppendChild",
+      "path": "src/shapes.rs",
+      "symbol": "impl Rectangle",
+      "description": "Add calculate area and perimeter methods"
+    }
+  ]
+}
+</correct_output>
+
+<step_to_resolve>
+Implement the 'Display' trait for the Rectangle struct
+</step_to_resolve>
+
+<output>
+{
+  "title": "Implement Display for Rectangle",
+  "suggestions": [
+    {
+      "kind": "InsertSiblingAfter",
+      "path": "src/shapes.rs",
+      "symbol": "impl Rectangle",
+      "description": "Implement Display trait for Rectangle"
+    }
+  ]
+}
+</output>
+
+<example>
+<workflow_context>
+<message role="user">
+```rs src/user.rs
+struct User {
+    pub name: String,
+    age: u32,
+    email: String,
+}
+
+impl User {
+    fn new(name: String, age: u32, email: String) -> Self {
+        User { name, age, email }
+    }
+
+    pub fn print_info(&self) {
+        println!("Name: {}, Age: {}, Email: {}", self.name, self.age, self.email);
+    }
+}
+```
+</message>
+<message role="assistant">
+Certainly!
+<step>Update the 'print_info' method to use formatted output</step>
+<step>Remove the 'email' field from the User struct</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Update the 'print_info' method to use formatted output
+</step_to_resolve>
+
+<output>
+{
+  "title": "Use formatted output",
+  "suggestions": [
+    {
+      "kind": "Update",
+      "path": "src/user.rs",
+      "symbol": "impl User pub fn print_info",
+      "description": "Use formatted output"
+    }
+  ]
+}
+</output>
+
+<step_to_resolve>
+Remove the 'email' field from the User struct
+</step_to_resolve>
+
+<output>
+{
+  "title": "Remove email field",
+  "suggestions": [
+      {
+        "kind": "Delete",
+        "path": "src/user.rs",
+        "symbol": "struct User email"
+      }
+    ]
+}
+</output>
+</example>
+
+<example>
+<workflow_context>
+<message role="user">
+```rs src/vehicle.rs
+struct Vehicle {
+    make: String,
+    model: String,
+    year: u32,
+}
+
+impl Vehicle {
+    fn new(make: String, model: String, year: u32) -> Self {
+        Vehicle { make, model, year }
+    }
+
+    fn print_year(&self) {
+        println!("Year: {}", self.year);
+    }
+}
+```
+</message>
+<message role="assistant">
+<step>Add a 'use std::fmt;' statement at the beginning of the file</step>
+<step>Add a new method 'start_engine' in the Vehicle impl block</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Add a 'use std::fmt;' statement at the beginning of the file
+</step_to_resolve>
+
+<output>
+{
+  "title": "Add use std::fmt statement",
+  "suggestions": [
+    {
+      "kind": "PrependChild",
+      "path": "src/vehicle.rs",
+      "symbol": "#imports",
+      "description": "Add 'use std::fmt' statement"
+    }
+  ]
+}
+</output>
+
+<step_to_resolve>
+Add a new method 'start_engine' in the Vehicle impl block
+</step_to_resolve>
+
+<output>
+{
+  "title": "Add start_engine method",
+  "suggestions": [
+    {
+      "kind": "InsertSiblingAfter",
+      "path": "src/vehicle.rs",
+      "symbol": "impl Vehicle fn new",
+      "description": "Add start_engine method"
+    }
+  ]
+}
+</output>
+</example>
+
+<example>
+<workflow_context>
+<message role="user">
+```rs src/employee.rs
+struct Employee {
+    name: String,
+    position: String,
+    salary: u32,
+    department: String,
+}
+
+impl Employee {
+    fn new(name: String, position: String, salary: u32, department: String) -> Self {
+        Employee { name, position, salary, department }
+    }
+
+    fn print_details(&self) {
+        println!("Name: {}, Position: {}, Salary: {}, Department: {}",
+                  self.name, self.position, self.salary, self.department);
+    }
+
+    fn give_raise(&mut self, amount: u32) {
+        self.salary += amount;
+    }
+}
+```
+</message>
+<message role="assistant">
+<step>Make salary an f32</step>
+<step>Remove the 'department' field and update the 'print_details' method</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Make salary an f32
+</step_to_resolve>
+
+<incorrect_output reason="NEVER include suggestions on a parent symbol and one of its children in the same suggestions block.">
+{
+  "title": "Change salary to f32",
+  "suggestions": [
+    {
+      "kind": "Update",
+      "path": "src/employee.rs",
+      "symbol": "struct Employee",
+      "description": "Change the type of salary to an f32"
+    },
+    {
+      "kind": "Update",
+      "path": "src/employee.rs",
+      "symbol": "struct Employee salary",
+      "description": "Change the type to an f32"
+    }
+  ]
+}
+</incorrect_output>
+
+<correct_output>
+{
+  "title": "Change salary to f32",
+  "suggestions": [
+    {
+      "kind": "Update",
+      "path": "src/employee.rs",
+      "symbol": "struct Employee salary",
+      "description": "Change the type to an f32"
+    }
+  ]
+}
+</correct_output>
+
+<step_to_resolve>
+Remove the 'department' field and update the 'print_details' method
+</step_to_resolve>
+
+<output>
+{
+  "title": "Remove department",
+  "suggestions": [
+    {
+      "kind": "Delete",
+      "path": "src/employee.rs",
+      "symbol": "struct Employee department"
+    },
+    {
+      "kind": "Update",
+      "path": "src/employee.rs",
+      "symbol": "impl Employee fn print_details",
+      "description": "Don't print the 'department' field"
+    }
+  ]
+}
+</output>
+</example>
+
+<example>
+<workflow_context>
+<message role="user">
+```rs src/game.rs
+struct Player {
+    name: String,
+    health: i32,
+    pub score: u32,
+}
+
+impl Player {
+    pub fn new(name: String) -> Self {
+        Player { name, health: 100, score: 0 }
+    }
+}
+
+struct Game {
+    players: Vec<Player>,
+}
+
+impl Game {
+    fn new() -> Self {
+        Game { players: Vec::new() }
+    }
+}
+```
+</message>
+<message role="assistant">
+<step>Add a 'level' field to Player and update the 'new' method</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Add a 'level' field to Player and update the 'new' method
+</step_to_resolve>
+
+<output>
+{
+  "title": "Add level field to Player",
+  "suggestions": [
+    {
+      "kind": "InsertSiblingAfter",
+      "path": "src/game.rs",
+      "symbol": "struct Player pub score",
+      "description": "Add level field to Player"
+    },
+    {
+      "kind": "Update",
+      "path": "src/game.rs",
+      "symbol": "impl Player pub fn new",
+      "description": "Initialize level in new method"
+    }
+  ]
+}
+</output>
+</example>
+
+<example>
+<workflow_context>
+<message role="user">
+```rs src/config.rs
+use std::collections::HashMap;
+
+struct Config {
+    settings: HashMap<String, String>,
+}
+
+impl Config {
+    fn new() -> Self {
+        Config { settings: HashMap::new() }
+    }
+}
+```
+</message>
+<message role="assistant">
+<step>Add a 'load_from_file' method to Config and import necessary modules</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Add a 'load_from_file' method to Config and import necessary modules
+</step_to_resolve>
+
+<output>
+{
+  "title": "Add load_from_file method",
+  "suggestions": [
+    {
+      "kind": "PrependChild",
+      "path": "src/config.rs",
+      "symbol": "#imports",
+      "description": "Import std::fs and std::io modules"
+    },
+    {
+      "kind": "AppendChild",
+      "path": "src/config.rs",
+      "symbol": "impl Config",
+      "description": "Add load_from_file method"
+    }
+  ]
+}
+</output>
+</example>
+
+<example>
+<workflow_context>
+<message role="user">
+```rs src/database.rs
+pub(crate) struct Database {
+    connection: Connection,
+}
+
+impl Database {
+    fn new(url: &str) -> Result<Self, Error> {
+        let connection = Connection::connect(url)?;
+        Ok(Database { connection })
+    }
+
+    async fn query(&self, sql: &str) -> Result<Vec<Row>, Error> {
+        self.connection.query(sql, &[])
+    }
+}
+```
+</message>
+<message role="assistant">
+<step>Add error handling to the 'query' method and create a custom error type</step>
+</message>
+</workflow_context>
+
+<step_to_resolve>
+Add error handling to the 'query' method and create a custom error type
+</step_to_resolve>
+
+<output>
+{
+  "title": "Add error handling to query",
+  "suggestions": [
+    {
+      "kind": "PrependChild",
+      "path": "src/database.rs",
+      "description": "Import necessary error handling modules"
+    },
+    {
+      "kind": "InsertSiblingBefore",
+      "path": "src/database.rs",
+      "symbol": "pub(crate) struct Database",
+      "description": "Define custom DatabaseError enum"
+    },
+    {
+      "kind": "Update",
+      "path": "src/database.rs",
+      "symbol": "impl Database async fn query",
+      "description": "Implement error handling in query method"
+    }
+  ]
+}
+</output>
+</example>
+</examples>
+
+Now generate the suggestions for the following step:
+
+<workflow_context>
+{{{workflow_context}}}
+</workflow_context>
+
+<step_to_resolve>
+{{{step_to_resolve}}}
+</step_to_resolve>
--- a/assets/prompts/suggest_edits.hbs
+++ b/assets/prompts/suggest_edits.hbs
@@ -1,206 +0,0 @@
-<task_description>
-
-The user of a code editor wants to make a change to their codebase.
-You must describe the change using the following XML structure:
-
- <patch> - A group of related code changes.
-  Child tags:
-    - <title> (required) - A high-level description of the changes. This should be as short
-      as possible, possibly using common abbreviations.
-    - <edit> (1 or more) - An edit to make at a particular range within a file.
-      Includes the following child tags:
-        - <path> (required) - The path to the file that will be changed.
-        - <description> (optional) - An arbitrarily-long comment that describes the purpose
-          of this edit.
-        - <old_text> (optional) - An excerpt from the file's current contents that uniquely
-          identifies a range within the file where the edit should occur. If this tag is not
-          specified, then the entire file will be used as the range.
-        - <new_text> (required) - The new text to insert into the file.
-        - <operation> (required) - The type of change that should occur at the given range
-          of the file. Must be one of the following values:
-            - `update`: Replaces the entire range with the new text.
-            - `insert_before`: Inserts the new text before the range.
-            - `insert_after`: Inserts new text after the range.
-            - `create`: Creates a new file with the given path and the new text.
-            - `delete`: Deletes the specified range from the file.
-
-<guidelines>
- Never provide multiple edits whose ranges intersect each other. Instead, merge them into one edit.
- Prefer multiple edits to smaller, disjoint ranges, rather than one edit to a larger range.
- There's no need to escape angle brackets within XML tags.
- Always ensure imports are added if you're referencing symbols that are not in scope.
-</guidelines>
-
-Here are some concrete examples.
-
-<example>
-<message role="user">
-
-```rs src/shapes.rs
-pub mod rectangle;
-pub mod circle;
-```
-
-```rs src/shapes/rectangle.rs
-pub struct Rectangle {
-    width: f64,
-    height: f64,
-}
-
-impl Rectangle {
-    pub fn new(width: f64, height: f64) -> Self {
-        Rectangle { width, height }
-    }
-}
-```
-
-```rs src/shapes/circle.rs
-pub struct Circle {
-    radius: f64,
-}
-
-impl Circle {
-    pub fn new(radius: f64) -> Self {
-        Circle { radius }
-    }
-}
-```
-
-Update all shapes to store their origin as an (x, y) tuple and implement Display.
-</message>
-
-<message role="assistant">
-We'll need to update both the rectangle and circle modules.
-
-<patch>
-<title>Add origins and display impls to shapes</title>
-<edit>
-<path>src/shapes/rectangle.rs</path>
-<description>Add the origin field to Rectangle struct</description>
-<operation>insert_after</operation>
-<old_text>
-pub struct Rectangle {
-</old_text>
-<new_text>
-origin: (f64, f64),
-</new_text>
-</edit>
-
-<edit>
-<path>src/shapes/rectangle.rs</path>
-<operation>update</operation>
-<old_text>
-fn new(width: f64, height: f64) -> Self {
-    Rectangle { width, height }
-}
-</old_text>
-<new_text>
-fn new(origin: (f64, f64), width: f64, height: f64) -> Self {
-    Rectangle { origin, width, height }
-}
-</new_text>
-</edit>
-
-<edit>
-<path>src/shapes/circle.rs</path>
-<description>Add the origin field to Circle struct</description>
-<operation>insert_after</operation>
-<old_text>
-pub struct Circle {
-    radius: f64,
-</old_text>
-<new_text>
-    origin: (f64, f64),
-</new_text>
-</edit>
-
-<edit>
-<path>src/shapes/circle.rs</path>
-<operation>update</operation>
-<old_text>
-fn new(radius: f64) -> Self {
-    Circle { radius }
-}
-</old_text>
-<new_text>
-fn new(origin: (f64, f64), radius: f64) -> Self {
-    Circle { origin, radius }
-}
-</new_text>
-</edit>
-</step>
-
-<edit>
-<path>src/shapes/rectangle.rs</path>
-<operation>insert_before</operation>
-<old_text>
-struct Rectangle {
-</old_text>
-<new_text>
-use std::fmt;
-
-</new_text>
-</edit>
-
-<edit>
-<path>src/shapes/rectangle.rs</path>
-<description>
-Add a manual Display implementation for Rectangle.
-Currently, this is the same as a derived Display implementation.
-</description>
-<operation>insert_after</operation>
-<old_text>
-        Rectangle { width, height }
-    }
-}
-</old_text>
-<new_text>
-impl fmt::Display for Rectangle {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.format_struct(f, "Rectangle")
-            .field("origin", &self.origin)
-            .field("width", &self.width)
-            .field("height", &self.height)
-            .finish()
-    }
-}
-</new_text>
-</edit>
-
-<edit>
-<path>src/shapes/circle.rs</path>
-<operation>insert_before</operation>
-<old_text>
-struct Circle {
-</old_text>
-<new_text>
-use std::fmt;
-</new_text>
-</edit>
-
-<edit>
-<path>src/shapes/circle.rs</path>
-<operation>insert_after</operation>
-<old_text>
-        Circle { radius }
-    }
-}
-</old_text>
-<new_text>
-impl fmt::Display for Rectangle {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.format_struct(f, "Rectangle")
-            .field("origin", &self.origin)
-            .field("width", &self.width)
-            .field("height", &self.height)
-            .finish()
-    }
-}
-</new_text>
-</edit>
-</patch>
-
-</message>
-</example>
-
-</task_description>
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -68,17 +68,9 @@
  "ui_font_size": 16,
  // How much to fade out unused code.
  "unnecessary_code_fade": 0.3,
-  // Active pane styling settings.
-  "active_pane_modifiers": {
-    // The factor to grow the active pane by. Defaults to 1.0
-    // which gives the same size as all other panes.
-    "magnification": 1.0,
-    // Inset border size of the active pane, in pixels.
-    "border_size": 0.0,
-    // Opacity of the inactive panes. 0 means transparent, 1 means opaque.
-    // Values are clamped to the [0.0, 1.0] range.
-    "inactive_opacity": 1.0
-  },
+  // The factor to grow the active pane by. Defaults to 1.0
+  // which gives the same size as all other panes.
+  "active_pane_magnification": 1.0,
  // The direction that you want to split panes horizontally. Defaults to "up"
  "pane_split_direction_horizontal": "up",
  // The direction that you want to split panes horizontally. Defaults to "left"
@@ -126,8 +118,8 @@
  //     "bar"
  //  2. A block that surrounds the following character
  //     "block"
-  //  3. An underline / underscore that runs along the following character
-  //     "underline"
+  //  3. An underline that runs along the following character
+  //     "underscore"
  //  4. A box drawn around the following character
  //     "hollow"
  //
@@ -160,7 +152,7 @@
  "show_signature_help_after_edits": true,
  // Whether to show wrap guides (vertical rulers) in the editor.
  // Setting this to true will show a guide at the 'preferred_line_length' value
-  // if 'soft_wrap' is set to 'preferred_line_length', and will show any
+  // if softwrap is set to 'preferred_line_length', and will show any
  // additional guides as specified by the 'wrap_guides' setting.
  "show_wrap_guides": true,
  // Character counts at which to show wrap guides in the editor.
@@ -182,8 +174,6 @@
  // bracket, brace, single or double quote characters.
  // For example, when you select text and type (, Zed will surround the text with ().
  "use_auto_surround": true,
-  // Whether indentation of pasted content should be adjusted based on the context.
-  "auto_indent_on_paste": true,
  // Controls how the editor handles the autoclosed characters.
  // When set to `false`(default), skipping over and auto-removing of the closing characters
  // happen only for auto-inserted characters.
@@ -193,9 +183,6 @@
  // Controls whether inline completions are shown immediately (true)
  // or manually by triggering `editor::ShowInlineCompletion` (false).
  "show_inline_completions": true,
-  // Controls whether inline completions are shown in a given language scope.
-  // Example: ["string", "comment"]
-  "inline_completions_disabled_in": [],
  // Whether to show tabs and spaces in the editor.
  // This setting can take three values:
  //
@@ -369,29 +356,8 @@
    /// Scrollbar-related settings
    "scrollbar": {
      /// When to show the scrollbar in the project panel.
-      /// This setting can take four values:
      ///
-      /// 1. null (default): Inherit editor settings
-      /// 2. Show the scrollbar if there's important information or
-      ///    follow the system's configured behavior (default):
-      ///   "auto"
-      /// 3. Match the system's configured behavior:
-      ///    "system"
-      /// 4. Always show the scrollbar:
-      ///    "always"
-      /// 5. Never show the scrollbar:
-      ///    "never"
-      "show": null
-    },
-    // Settings related to indent guides in the project panel.
-    "indent_guides": {
-      // When to show indent guides in the project panel.
-      // This setting can take two values:
-      //
-      // 1. Always show indent guides:
-      //    "always"
-      // 2. Never show indent guides:
-      //    "never"
+      /// Default: always
      "show": "always"
    }
  },
@@ -416,35 +382,7 @@
    "auto_reveal_entries": true,
    /// Whether to fold directories automatically
    /// when a directory has only one directory inside.
-    "auto_fold_dirs": true,
-    // Settings related to indent guides in the outline panel.
-    "indent_guides": {
-      // When to show indent guides in the outline panel.
-      // This setting can take two values:
-      //
-      // 1. Always show indent guides:
-      //    "always"
-      // 2. Never show indent guides:
-      //    "never"
-      "show": "always"
-    },
-    /// Scrollbar-related settings
-    "scrollbar": {
-      /// When to show the scrollbar in the project panel.
-      /// This setting can take four values:
-      ///
-      /// 1. null (default): Inherit editor settings
-      /// 2. Show the scrollbar if there's important information or
-      ///    follow the system's configured behavior (default):
-      ///   "auto"
-      /// 3. Match the system's configured behavior:
-      ///    "system"
-      /// 4. Always show the scrollbar:
-      ///    "always"
-      /// 5. Never show the scrollbar:
-      ///    "never"
-      "show": null
-    }
+    "auto_fold_dirs": true
  },
  "collaboration_panel": {
    // Whether to show the collaboration panel button in the status bar.
@@ -488,7 +426,7 @@
    "default_width": 640,
    // Default height when the assistant is docked to the bottom.
    "default_height": 320,
-    // The default model to use when creating new chats.
+    // The default model to use when creating new contexts.
    "default_model": {
      // The provider to use.
      "provider": "zed.dev",
@@ -546,14 +484,7 @@
    // Position of the close button on the editor tabs.
    "close_position": "right",
    // Whether to show the file icon for a tab.
-    "file_icons": false,
-    // What to do after closing the current tab.
-    //
-    // 1. Activate the tab that was open previously (default)
-    //     "History"
-    // 2. Activate the neighbour tab (prefers the right one, if present)
-    //     "Neighbour"
-    "activate_on_close": "history"
+    "file_icons": false
  },
  // Settings related to preview tabs.
  "preview_tabs": {
@@ -665,20 +596,16 @@
      // Sets a delay after which the inline blame information is shown.
      // Delay is restarted with every cursor movement.
      // "delay_ms": 600
-      //
-      // Whether or not do display the git commit summary on the same line.
-      // "show_commit_summary": false
-      //
-      // The minimum column number to show the inline blame information at
-      // "min_column": 0
    }
  },
  // Configuration for how direnv configuration should be loaded. May take 2 values:
-  // 1. Load direnv configuration using `direnv export json` directly.
-  //      "load_direnv": "direct"
-  // 2. Load direnv configuration through the shell hook, works for POSIX shells and fish.
+  // 1. Load direnv configuration through the shell hook, works for POSIX shells and fish.
  //      "load_direnv": "shell_hook"
-  "load_direnv": "direct",
+  // 2. Load direnv configuration using `direnv export json` directly.
+  //    This can help with some shells that otherwise would not detect
+  //    the direnv environment, such as nushell or elvish.
+  //      "load_direnv": "direct"
+  "load_direnv": "shell_hook",
  "inline_completions": {
    // A list of globs representing files that inline completions should be disabled for.
    "disabled_globs": [".env"]
@@ -744,18 +671,6 @@
    //  3. Always blink the cursor, ignoring the terminal mode
    //         "blinking": "on",
    "blinking": "terminal_controlled",
-    // Default cursor shape for the terminal.
-    //  1. A block that surrounds the following character
-    //     "block"
-    //  2. A vertical bar
-    //     "bar"
-    //  3. An underline / underscore that runs along the following character
-    //     "underline"
-    //  4. A box drawn around the following character
-    //     "hollow"
-    //
-    // Default: not set, defaults to "block"
-    "cursor_shape": null,
    // Set whether Alternate Scroll mode (code: ?1007) is active by default.
    // Alternate Scroll mode converts mouse scroll events into up / down key
    // presses when in the alternate screen (e.g. when running applications
@@ -770,10 +685,10 @@
    // May take 2 values:
    //  1. Rely on default platform handling of option key, on macOS
    //     this means generating certain unicode characters
-    //         "option_as_meta": false,
+    //         "option_to_meta": false,
    //  2. Make the option keys behave as a 'meta' key, e.g. for emacs
-    //         "option_as_meta": true,
-    "option_as_meta": false,
+    //         "option_to_meta": true,
+    "option_as_meta": true,
    // Whether or not selecting text in the terminal will automatically
    // copy to the system clipboard.
    "copy_on_select": false,
@@ -861,7 +776,7 @@
  /// You can override this to use a version of node that is not in $PATH with:
  /// {
  ///   "node": {
-  ///     "path": "/path/to/node"
+  ///     "node_path": "/path/to/node"
  ///     "npm_path": "/path/to/npm" (defaults to node_path/../npm)
  ///   }
  /// }
@@ -882,7 +797,6 @@
  // Different settings for specific languages.
  "languages": {
    "Astro": {
-      "language_servers": ["astro-language-server", "..."],
      "prettier": {
        "allowed": true,
        "plugins": ["prettier-plugin-astro"]
@@ -906,13 +820,6 @@
        "allowed": true
      }
    },
-    "Dart": {
-      "tab_size": 2
-    },
-    "Diff": {
-      "remove_trailing_whitespace_on_save": false,
-      "ensure_final_newline_on_save": false
-    },
    "Elixir": {
      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
    },
@@ -1157,13 +1064,13 @@
  // }
  "command_aliases": {},
  // ssh_connections is an array of ssh connections.
+  // By default this setting is null, which disables the direct ssh connection support.
  // You can configure these from `project: Open Remote` in the command palette.
  // Zed's ssh support will pull configuration from your ~/.ssh too.
  // Examples:
  // [
  //   {
  //     "host": "example-box",
-  //     // "port": 22, "username": "test", "args": ["-i", "/home/user/.ssh/id_rsa"]
  //     "projects": [
  //       {
  //         "paths": ["/home/user/code/zed"]
@@ -1171,7 +1078,7 @@
  //     ]
  //   }
  // ]
-  "ssh_connections": [],
+  "ssh_connections": null,
  // Configures the Context Server Protocol binaries
  //
  // Examples:
--- a/assets/settings/initial_server_settings.json
+++ b/assets/settings/initial_server_settings.json
@@ -1,7 +0,0 @@
-// Server-specific settings
-//
-// For a full list of overridable settings, and general information on settings,
-// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
-{
-  "lsp": {}
-}
--- a/assets/settings/initial_tasks.json
+++ b/assets/settings/initial_tasks.json
@@ -16,7 +16,6 @@
    "allow_concurrent_runs": false,
    // What to do with the terminal pane and tab, after the command was started:
    // * `always` — always show the terminal pane, add and focus the corresponding task's tab in it (default)
-    // * `no_focus` — always show the terminal pane, add/reuse the task's tab there, but don't focus it
    // * `never` — avoid changing current terminal pane focus, but still add/reuse the task's tab there
    "reveal": "always",
    // What to do with the terminal pane and tab, after the command had finished:
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -27,15 +27,15 @@
        "ghost_element.active": "#454a56ff",
        "ghost_element.selected": "#454a56ff",
        "ghost_element.disabled": "#2e343eff",
-        "text": "#dce0e5ff",
-        "text.muted": "#a9afbcff",
-        "text.placeholder": "#878a98ff",
-        "text.disabled": "#878a98ff",
+        "text": "#c8ccd4ff",
+        "text.muted": "#838994ff",
+        "text.placeholder": "#696B77ff",
+        "text.disabled": "#696B77ff",
        "text.accent": "#74ade8ff",
-        "icon": "#dce0e5ff",
-        "icon.muted": "#a9afbcff",
-        "icon.disabled": "#878a98ff",
-        "icon.placeholder": "#a9afbcff",
+        "icon": "#c8ccd4ff",
+        "icon.muted": "#838994ff",
+        "icon.disabled": "#696B77ff",
+        "icon.placeholder": "#838994ff",
        "icon.accent": "#74ade8ff",
        "status_bar.background": "#3b414dff",
        "title_bar.background": "#3b414dff",
@@ -60,19 +60,19 @@
        "editor.active_line.background": "#2f343ebf",
        "editor.highlighted_line.background": "#2f343eff",
        "editor.line_number": "#c8ccd459",
-        "editor.active_line_number": "#dce0e5ff",
-        "editor.invisible": "#878a98ff",
+        "editor.active_line_number": "#c8ccd4ff",
+        "editor.invisible": "#696B77ff",
        "editor.wrap_guide": "#c8ccd40d",
        "editor.active_wrap_guide": "#c8ccd41a",
        "editor.document_highlight.read_background": "#74ade81a",
        "editor.document_highlight.write_background": "#555a6366",
        "terminal.background": "#282c33ff",
-        "terminal.foreground": "#dce0e5ff",
-        "terminal.bright_foreground": "#dce0e5ff",
+        "terminal.foreground": "#c8ccd4ff",
+        "terminal.bright_foreground": "#c8ccd4ff",
        "terminal.dim_foreground": "#282c33ff",
        "terminal.ansi.black": "#282c33ff",
        "terminal.ansi.bright_black": "#525561ff",
-        "terminal.ansi.dim_black": "#dce0e5ff",
+        "terminal.ansi.dim_black": "#c8ccd4ff",
        "terminal.ansi.red": "#d07277ff",
        "terminal.ansi.bright_red": "#673a3cff",
        "terminal.ansi.dim_red": "#eab7b9ff",
@@ -91,8 +91,8 @@
        "terminal.ansi.cyan": "#6eb4bfff",
        "terminal.ansi.bright_cyan": "#3a565bff",
        "terminal.ansi.dim_cyan": "#b9d9dfff",
-        "terminal.ansi.white": "#dce0e5ff",
-        "terminal.ansi.bright_white": "#dce0e5ff",
+        "terminal.ansi.white": "#c8ccd4ff",
+        "terminal.ansi.bright_white": "#c8ccd4ff",
        "terminal.ansi.dim_white": "#575d65ff",
        "link_text.hover": "#74ade8ff",
        "conflict": "#dec184ff",
@@ -107,14 +107,14 @@
        "error": "#d07277ff",
        "error.background": "#d072771a",
        "error.border": "#4c2b2cff",
-        "hidden": "#878a98ff",
-        "hidden.background": "#696b771a",
+        "hidden": "#696B77ff",
+        "hidden.background": "#696B771a",
        "hidden.border": "#414754ff",
-        "hint": "#788ca6ff",
+        "hint": "#5a6f89ff",
        "hint.background": "#5a6f891a",
        "hint.border": "#293b5bff",
-        "ignored": "#878a98ff",
-        "ignored.background": "#696b771a",
+        "ignored": "#696B77ff",
+        "ignored.background": "#696B771a",
        "ignored.border": "#464b57ff",
        "info": "#74ade8ff",
        "info.background": "#74ade81a",
@@ -131,7 +131,7 @@
        "success": "#a1c181ff",
        "success.background": "#a1c1811a",
        "success.border": "#38482fff",
-        "unreachable": "#a9afbcff",
+        "unreachable": "#838994ff",
        "unreachable.background": "#8389941a",
        "unreachable.border": "#464b57ff",
        "warning": "#dec184ff",
@@ -211,7 +211,7 @@
            "font_weight": null
          },
          "embedded": {
-            "color": "#dce0e5ff",
+            "color": "#c8ccd4ff",
            "font_style": null,
            "font_weight": null
          },
@@ -236,7 +236,7 @@
            "font_weight": null
          },
          "hint": {
-            "color": "#788ca6ff",
+            "color": "#5a6f89ff",
            "font_style": null,
            "font_weight": 700
          },
@@ -276,7 +276,7 @@
            "font_weight": null
          },
          "preproc": {
-            "color": "#dce0e5ff",
+            "color": "#c8ccd4ff",
            "font_style": null,
            "font_weight": null
          },
@@ -361,7 +361,7 @@
            "font_weight": null
          },
          "variable": {
-            "color": "#dce0e5ff",
+            "color": "#c8ccd4ff",
            "font_style": null,
            "font_weight": null
          },
@@ -402,15 +402,15 @@
        "ghost_element.active": "#cacacaff",
        "ghost_element.selected": "#cacacaff",
        "ghost_element.disabled": "#ebebecff",
-        "text": "#242529ff",
-        "text.muted": "#58585aff",
-        "text.placeholder": "#7e8086ff",
-        "text.disabled": "#7e8086ff",
+        "text": "#383a41ff",
+        "text.muted": "#7e8087ff",
+        "text.placeholder": "#a1a1a3ff",
+        "text.disabled": "#a1a1a3ff",
        "text.accent": "#5c78e2ff",
-        "icon": "#242529ff",
-        "icon.muted": "#58585aff",
-        "icon.disabled": "#7e8086ff",
-        "icon.placeholder": "#58585aff",
+        "icon": "#383a41ff",
+        "icon.muted": "#7e8087ff",
+        "icon.disabled": "#a1a1a3ff",
+        "icon.placeholder": "#7e8087ff",
        "icon.accent": "#5c78e2ff",
        "status_bar.background": "#dcdcddff",
        "title_bar.background": "#dcdcddff",
@@ -428,26 +428,26 @@
        "scrollbar.thumb.border": "#dfdfe0ff",
        "scrollbar.track.background": "#00000000",
        "scrollbar.track.border": "#eeeeeeff",
-        "editor.foreground": "#242529ff",
+        "editor.foreground": "#383a41ff",
        "editor.background": "#fafafaff",
        "editor.gutter.background": "#fafafaff",
        "editor.subheader.background": "#ebebecff",
        "editor.active_line.background": "#ebebecbf",
        "editor.highlighted_line.background": "#ebebecff",
        "editor.line_number": "#383a4159",
-        "editor.active_line_number": "#242529ff",
+        "editor.active_line_number": "#383a41ff",
        "editor.invisible": "#a3a3a4ff",
        "editor.wrap_guide": "#383a410d",
        "editor.active_wrap_guide": "#383a411a",
        "editor.document_highlight.read_background": "#5c78e21a",
        "editor.document_highlight.write_background": "#a3a3a466",
        "terminal.background": "#fafafaff",
-        "terminal.foreground": "#242529ff",
-        "terminal.bright_foreground": "#242529ff",
+        "terminal.foreground": "#383a41ff",
+        "terminal.bright_foreground": "#383a41ff",
        "terminal.dim_foreground": "#fafafaff",
        "terminal.ansi.black": "#fafafaff",
        "terminal.ansi.bright_black": "#aaaaaaff",
-        "terminal.ansi.dim_black": "#242529ff",
+        "terminal.ansi.dim_black": "#383a41ff",
        "terminal.ansi.red": "#d36151ff",
        "terminal.ansi.bright_red": "#f0b0a4ff",
        "terminal.ansi.dim_red": "#6f312aff",
@@ -466,11 +466,11 @@
        "terminal.ansi.cyan": "#3a82b7ff",
        "terminal.ansi.bright_cyan": "#a3bedaff",
        "terminal.ansi.dim_cyan": "#254058ff",
-        "terminal.ansi.white": "#242529ff",
-        "terminal.ansi.bright_white": "#242529ff",
+        "terminal.ansi.white": "#383a41ff",
+        "terminal.ansi.bright_white": "#383a41ff",
        "terminal.ansi.dim_white": "#97979aff",
        "link_text.hover": "#5c78e2ff",
-        "conflict": "#a48819ff",
+        "conflict": "#dec184ff",
        "conflict.background": "#faf2e6ff",
        "conflict.border": "#f4e7d1ff",
        "created": "#669f59ff",
@@ -482,19 +482,19 @@
        "error": "#d36151ff",
        "error.background": "#fbdfd9ff",
        "error.border": "#f6c6bdff",
-        "hidden": "#7e8086ff",
+        "hidden": "#a1a1a3ff",
        "hidden.background": "#dcdcddff",
        "hidden.border": "#d3d3d4ff",
-        "hint": "#7274a7ff",
+        "hint": "#9294beff",
        "hint.background": "#e2e2faff",
        "hint.border": "#cbcdf6ff",
-        "ignored": "#7e8086ff",
+        "ignored": "#a1a1a3ff",
        "ignored.background": "#dcdcddff",
        "ignored.border": "#c9c9caff",
        "info": "#5c78e2ff",
        "info.background": "#e2e2faff",
        "info.border": "#cbcdf6ff",
-        "modified": "#a48819ff",
+        "modified": "#a47a23ff",
        "modified.background": "#faf2e6ff",
        "modified.border": "#f4e7d1ff",
        "predictive": "#9b9ec6ff",
@@ -506,10 +506,10 @@
        "success": "#669f59ff",
        "success.background": "#dfeadbff",
        "success.border": "#c8dcc1ff",
-        "unreachable": "#58585aff",
+        "unreachable": "#7e8087ff",
        "unreachable.background": "#dcdcddff",
        "unreachable.border": "#c9c9caff",
-        "warning": "#a48819ff",
+        "warning": "#dec184ff",
        "warning.background": "#faf2e6ff",
        "warning.border": "#f4e7d1ff",
        "players": [
@@ -544,7 +544,7 @@
            "selection": "#d361513d"
          },
          {
-            "cursor": "#a48819ff",
+            "cursor": "#dec184ff",
            "background": "#dec184ff",
            "selection": "#dec1843d"
          },
@@ -586,7 +586,7 @@
            "font_weight": null
          },
          "embedded": {
-            "color": "#242529ff",
+            "color": "#383a41ff",
            "font_style": null,
            "font_weight": null
          },
@@ -611,7 +611,7 @@
            "font_weight": null
          },
          "hint": {
-            "color": "#7274a7ff",
+            "color": "#9294beff",
            "font_style": null,
            "font_weight": 700
          },
@@ -651,12 +651,12 @@
            "font_weight": null
          },
          "preproc": {
-            "color": "#242529ff",
+            "color": "#383a41ff",
            "font_style": null,
            "font_weight": null
          },
          "primary": {
-            "color": "#242529ff",
+            "color": "#383a41ff",
            "font_style": null,
            "font_weight": null
          },
@@ -666,7 +666,7 @@
            "font_weight": null
          },
          "punctuation": {
-            "color": "#242529ff",
+            "color": "#383a41ff",
            "font_style": null,
            "font_weight": null
          },
@@ -736,7 +736,7 @@
            "font_weight": null
          },
          "variable": {
-            "color": "#242529ff",
+            "color": "#383a41ff",
            "font_style": null,
            "font_weight": null
          },
--- a/assets/themes/solarized/solarized.json
+++ b/assets/themes/solarized/solarized.json
@@ -519,8 +519,8 @@
            "selection": "#d337813d"
          },
          {
-            "cursor": "#cb4b16ff",
-            "background": "#cb4b16ff",
+            "cursor": "#cb4b17ff",
+            "background": "#cb4b17ff",
            "selection": "#cb4b173d"
          },
          {
@@ -596,7 +596,7 @@
            "font_weight": 700
          },
          "enum": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
@@ -621,7 +621,7 @@
            "font_weight": null
          },
          "link_text": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": "italic",
            "font_weight": null
          },
@@ -636,7 +636,7 @@
            "font_weight": null
          },
          "operator": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
@@ -686,7 +686,7 @@
            "font_weight": null
          },
          "string": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
@@ -696,17 +696,17 @@
            "font_weight": null
          },
          "string.regex": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
          "string.special": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
          "string.special.symbol": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
@@ -716,7 +716,7 @@
            "font_weight": null
          },
          "text.literal": {
-            "color": "#cb4b16ff",
+            "color": "#cb4b17ff",
            "font_style": null,
            "font_weight": null
          },
--- a/clippy.toml
+++ b/clippy.toml
@@ -1,2 +1 @@
 allow-private-module-inception = true
-avoid-breaking-exported-api = false
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "activity_indicator"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/activity_indicator.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+auto_update.workspace = true
+editor.workspace = true
+extension.workspace = true
+futures.workspace = true
+gpui.workspace = true
+language.workspace = true
+project.workspace = true
+smallvec.workspace = true
+ui.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+editor = { workspace = true, features = ["test-support"] }
--- a/crates/activity_indicator/LICENSE-GPL
+++ b/crates/activity_indicator/LICENSE-GPL
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -1,19 +1,19 @@
-use crate::auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage};
+use auto_update::{AutoUpdateStatus, AutoUpdater, DismissErrorMessage};
 use editor::Editor;
-use extension_host::ExtensionStore;
+use extension::ExtensionStore;
 use futures::StreamExt;
 use gpui::{
    actions, percentage, Animation, AnimationExt as _, AppContext, CursorStyle, EventEmitter,
    InteractiveElement as _, Model, ParentElement as _, Render, SharedString,
    StatefulInteractiveElement, Styled, Transformation, View, ViewContext, VisualContext as _,
 };
-use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
-use lsp::LanguageServerName;
-use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
+use language::{
+    LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId, LanguageServerName,
+};
+use project::{LanguageServerProgress, Project};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
-use ui::{prelude::*, ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
-use util::truncate_and_trailoff;
+use ui::{prelude::*, ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle};
 use workspace::{item::ItemHandle, StatusItemView, Workspace};

 actions!(activity_indicator, [ShowErrorMessage]);
@@ -101,7 +101,6 @@ impl ActivityIndicator {
                            None,
                            cx,
                        );
-                        buffer.set_capability(language::Capability::ReadOnly, cx);
                    })?;
                    workspace.update(&mut cx, |workspace, cx| {
                        workspace.add_item_to_active_pane(
@@ -176,31 +175,7 @@ impl ActivityIndicator {
            .flatten()
    }

-    fn pending_environment_errors<'a>(
-        &'a self,
-        cx: &'a AppContext,
-    ) -> impl Iterator<Item = (&'a WorktreeId, &'a EnvironmentErrorMessage)> {
-        self.project.read(cx).shell_environment_errors(cx)
-    }
-
    fn content_to_render(&mut self, cx: &mut ViewContext<Self>) -> Option<Content> {
-        // Show if any direnv calls failed
-        if let Some((&worktree_id, error)) = self.pending_environment_errors(cx).next() {
-            return Some(Content {
-                icon: Some(
-                    Icon::new(IconName::Warning)
-                        .size(IconSize::Small)
-                        .into_any_element(),
-                ),
-                message: error.0.clone(),
-                on_click: Some(Arc::new(move |this, cx| {
-                    this.project.update(cx, |project, cx| {
-                        project.remove_environment_error(cx, worktree_id);
-                    });
-                    cx.dispatch_action(Box::new(workspace::OpenLog));
-                })),
-            });
-        }
        // Show any language server has pending activity.
        let mut pending_work = self.pending_language_server_work(cx);
        if let Some(PendingWork {
@@ -351,10 +326,7 @@ impl ActivityIndicator {
                        .into_any_element(),
                ),
                message: format!("Formatting failed: {}. Click to see logs.", failure),
-                on_click: Some(Arc::new(|indicator, cx| {
-                    indicator.project.update(cx, |project, cx| {
-                        project.reset_last_formatting_failure(cx);
-                    });
+                on_click: Some(Arc::new(|_, cx| {
                    cx.dispatch_action(Box::new(workspace::OpenLog));
                })),
            });
@@ -449,8 +421,6 @@ impl ActivityIndicator {

 impl EventEmitter<Event> for ActivityIndicator {}

-const MAX_MESSAGE_LEN: usize = 50;
-
 impl Render for ActivityIndicator {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        let result = h_flex()
@@ -461,7 +431,6 @@ impl Render for ActivityIndicator {
            return result;
        };
        let this = cx.view().downgrade();
-        let truncate_content = content.message.len() > MAX_MESSAGE_LEN;
        result.gap_2().child(
            PopoverMenu::new("activity-indicator-popover")
                .trigger(
@@ -470,21 +439,7 @@ impl Render for ActivityIndicator {
                            .id("activity-indicator-status")
                            .gap_2()
                            .children(content.icon)
-                            .map(|button| {
-                                if truncate_content {
-                                    button
-                                        .child(
-                                            Label::new(truncate_and_trailoff(
-                                                &content.message,
-                                                MAX_MESSAGE_LEN,
-                                            ))
-                                            .size(LabelSize::Small),
-                                        )
-                                        .tooltip(move |cx| Tooltip::text(&content.message, cx))
-                                } else {
-                                    button.child(Label::new(content.message).size(LabelSize::Small))
-                                }
-                            })
+                            .child(Label::new(content.message).size(LabelSize::Small))
                            .when_some(content.on_click, |this, handler| {
                                this.on_click(cx.listener(move |this, _, cx| {
                                    handler(this, cx);
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -26,3 +26,6 @@ serde_json.workspace = true
 strum.workspace = true
 thiserror.workspace = true
 util.workspace = true
+
+[dev-dependencies]
+tokio.workspace = true
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -29,13 +29,13 @@ pub struct AnthropicModelCacheConfiguration {
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
    #[default]
-    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
+    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-20240620")]
    Claude3_5Sonnet,
-    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
+    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-20240229")]
    Claude3Opus,
-    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-latest")]
+    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-20240229")]
    Claude3Sonnet,
-    #[serde(rename = "claude-3-haiku", alias = "claude-3-haiku-latest")]
+    #[serde(rename = "claude-3-haiku", alias = "claude-3-haiku-20240307")]
    Claude3Haiku,
    #[serde(rename = "custom")]
    Custom {
@@ -69,10 +69,10 @@ impl Model {

    pub fn id(&self) -> &str {
        match self {
-            Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Model::Claude3Opus => "claude-3-opus-latest",
-            Model::Claude3Sonnet => "claude-3-sonnet-latest",
-            Model::Claude3Haiku => "claude-3-haiku-latest",
+            Model::Claude3_5Sonnet => "claude-3-5-sonnet-20240620",
+            Model::Claude3Opus => "claude-3-opus-20240229",
+            Model::Claude3Sonnet => "claude-3-sonnet-20240229",
+            Model::Claude3Haiku => "claude-3-haiku-20240307",
            Self::Custom { name, .. } => name,
        }
    }
@@ -521,10 +521,6 @@ pub struct Usage {
    pub input_tokens: Option<u32>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub output_tokens: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cache_creation_input_tokens: Option<u32>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub cache_read_input_tokens: Option<u32>,
 }

 #[derive(Debug, Serialize, Deserialize)]
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -0,0 +1,105 @@
+[package]
+name = "assistant"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant.rs"
+doctest = false
+
+[features]
+test-support = [
+    "editor/test-support",
+    "language/test-support",
+    "project/test-support",
+    "text/test-support",
+]
+
+[dependencies]
+anthropic = { workspace = true, features = ["schemars"] }
+anyhow.workspace = true
+assets.workspace = true
+assistant_slash_command.workspace = true
+assistant_tool.workspace = true
+async-watch.workspace = true
+cargo_toml.workspace = true
+chrono.workspace = true
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+command_palette_hooks.workspace = true
+context_servers.workspace = true
+db.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+futures.workspace = true
+fuzzy.workspace = true
+globset.workspace = true
+gpui.workspace = true
+handlebars.workspace = true
+heed.workspace = true
+html_to_markdown.workspace = true
+http_client.workspace = true
+indexed_docs.workspace = true
+indoc.workspace = true
+language.workspace = true
+language_model.workspace = true
+log.workspace = true
+lsp.workspace = true
+markdown.workspace = true
+menu.workspace = true
+multi_buffer.workspace = true
+ollama = { workspace = true, features = ["schemars"] }
+open_ai = { workspace = true, features = ["schemars"] }
+ordered-float.workspace = true
+parking_lot.workspace = true
+paths.workspace = true
+picker.workspace = true
+project.workspace = true
+proto.workspace = true
+regex.workspace = true
+release_channel.workspace = true
+rope.workspace = true
+rpc.workspace = true
+schemars.workspace = true
+search.workspace = true
+semantic_index.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+similar.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+strum.workspace = true
+telemetry_events.workspace = true
+terminal.workspace = true
+terminal_view.workspace = true
+text.workspace = true
+theme.workspace = true
+toml.workspace = true
+ui.workspace = true
+util.workspace = true
+uuid.workspace = true
+workspace.workspace = true
+zed_actions.workspace = true
+
+[dev-dependencies]
+ctor.workspace = true
+editor = { workspace = true, features = ["test-support"] }
+env_logger.workspace = true
+language = { workspace = true, features = ["test-support"] }
+language_model = { workspace = true, features = ["test-support"] }
+languages = { workspace = true, features = ["test-support"] }
+log.workspace = true
+project = { workspace = true, features = ["test-support"] }
+rand.workspace = true
+serde_json_lenient.workspace = true
+text = { workspace = true, features = ["test-support"] }
+tree-sitter-md.workspace = true
+unindent.workspace = true
--- a/crates/reqwest_client/LICENSE-GPL
+++ b/crates/reqwest_client/LICENSE-GPL
--- a/crates/zed_common/src/assistant/mod.rs
+++ b/crates/zed_common/src/assistant/mod.rs
@@ -6,63 +6,58 @@ mod context;
 pub mod context_store;
 mod inline_assistant;
 mod model_selector;
-mod patch;
 mod prompt_library;
 mod prompts;
 mod slash_command;
 pub(crate) mod slash_command_picker;
 pub mod slash_command_settings;
-mod slash_command_working_set;
 mod streaming_diff;
 mod terminal_inline_assistant;
-mod tool_working_set;
 mod tools;
+mod workflow;

-pub use crate::assistant::slash_command_working_set::{SlashCommandId, SlashCommandWorkingSet};
-pub use crate::assistant::tool_working_set::{ToolId, ToolWorkingSet};
-use crate::assistant_slash_command::SlashCommandRegistry;
-use crate::language_model::{
-    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
-};
-use crate::semantic_index::{CloudEmbeddingProvider, SemanticDb};
 pub use assistant_panel::{AssistantPanel, AssistantPanelEvent};
 use assistant_settings::AssistantSettings;
+use assistant_slash_command::SlashCommandRegistry;
 use assistant_tool::ToolRegistry;
 use client::{proto, Client};
 use command_palette_hooks::CommandPaletteFilter;
 pub use context::*;
+use context_servers::ContextServerRegistry;
 pub use context_store::*;
 use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
-use gpui::impl_actions;
 use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
+use gpui::{impl_actions, Context as _};
 use indexed_docs::IndexedDocsRegistry;
 pub(crate) use inline_assistant::*;
+use language_model::{
+    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
+};
 pub(crate) use model_selector::*;
-pub use patch::*;
 pub use prompts::PromptBuilder;
 use prompts::PromptLoadingParams;
+use semantic_index::{CloudEmbeddingProvider, SemanticDb};
 use serde::{Deserialize, Serialize};
 use settings::{update_settings_file, Settings, SettingsStore};
-use slash_command::search_command::SearchSlashCommandFeatureFlag;
 use slash_command::{
-    auto_command, cargo_workspace_command, default_command, delta_command, diagnostics_command,
-    docs_command, fetch_command, file_command, now_command, project_command, prompt_command,
-    search_command, selection_command, symbols_command, tab_command, terminal_command,
+    auto_command, cargo_workspace_command, context_server_command, default_command, delta_command,
+    diagnostics_command, docs_command, fetch_command, file_command, now_command, project_command,
+    prompt_command, search_command, symbols_command, tab_command, terminal_command,
+    workflow_command,
 };
 use std::path::PathBuf;
 use std::sync::Arc;
 pub(crate) use streaming_diff::*;
 use util::ResultExt;
+pub use workflow::*;

-use crate::assistant::slash_command::streaming_example_command;
-use crate::assistant::slash_command_settings::SlashCommandSettings;
+use crate::slash_command_settings::SlashCommandSettings;

 actions!(
    assistant,
    [
        Assist,
-        Edit,
        Split,
        CopyCode,
        CycleMessageRole,
@@ -215,28 +210,26 @@ pub fn init(
        });
    }

-    if cx.has_flag::<SearchSlashCommandFeatureFlag>() {
-        cx.spawn(|mut cx| {
-            let client = client.clone();
-            async move {
-                let embedding_provider = CloudEmbeddingProvider::new(client.clone());
-                let semantic_index = SemanticDb::new(
-                    paths::embeddings_dir().join("semantic-index-db.0.mdb"),
-                    Arc::new(embedding_provider),
-                    &mut cx,
-                )
-                .await?;
+    cx.spawn(|mut cx| {
+        let client = client.clone();
+        async move {
+            let embedding_provider = CloudEmbeddingProvider::new(client.clone());
+            let semantic_index = SemanticDb::new(
+                paths::embeddings_dir().join("semantic-index-db.0.mdb"),
+                Arc::new(embedding_provider),
+                &mut cx,
+            )
+            .await?;

-                cx.update(|cx| cx.set_global(semantic_index))
-            }
-        })
-        .detach();
-    }
+            cx.update(|cx| cx.set_global(semantic_index))
+        }
+    })
+    .detach();

    context_store::init(&client.clone().into());
    prompt_library::init(cx);
    init_language_model_settings(cx);
-    crate::assistant_slash_command::init(cx);
+    assistant_slash_command::init(cx);
    assistant_tool::init(cx);
    assistant_panel::init(cx);
    context_servers::init(cx);
@@ -283,9 +276,69 @@ pub fn init(
    })
    .detach();

+    register_context_server_handlers(cx);
+
    prompt_builder
 }

+fn register_context_server_handlers(cx: &mut AppContext) {
+    cx.subscribe(
+        &context_servers::manager::ContextServerManager::global(cx),
+        |manager, event, cx| match event {
+            context_servers::manager::Event::ServerStarted { server_id } => {
+                cx.update_model(
+                    &manager,
+                    |manager: &mut context_servers::manager::ContextServerManager, cx| {
+                        let slash_command_registry = SlashCommandRegistry::global(cx);
+                        let context_server_registry = ContextServerRegistry::global(cx);
+                        if let Some(server) = manager.get_server(server_id) {
+                            cx.spawn(|_, _| async move {
+                                let Some(protocol) = server.client.read().clone() else {
+                                    return;
+                                };
+
+                                if let Some(prompts) = protocol.list_prompts().await.log_err() {
+                                    for prompt in prompts
+                                        .into_iter()
+                                        .filter(context_server_command::acceptable_prompt)
+                                    {
+                                        log::info!(
+                                            "registering context server command: {:?}",
+                                            prompt.name
+                                        );
+                                        context_server_registry.register_command(
+                                            server.id.clone(),
+                                            prompt.name.as_str(),
+                                        );
+                                        slash_command_registry.register_command(
+                                            context_server_command::ContextServerSlashCommand::new(
+                                                &server, prompt,
+                                            ),
+                                            true,
+                                        );
+                                    }
+                                }
+                            })
+                            .detach();
+                        }
+                    },
+                );
+            }
+            context_servers::manager::Event::ServerStopped { server_id } => {
+                let slash_command_registry = SlashCommandRegistry::global(cx);
+                let context_server_registry = ContextServerRegistry::global(cx);
+                if let Some(commands) = context_server_registry.get_commands(server_id) {
+                    for command_name in commands {
+                        slash_command_registry.unregister_command_by_name(&command_name);
+                        context_server_registry.unregister_command(&server_id, &command_name);
+                    }
+                }
+            }
+        },
+    )
+    .detach();
+}
+
 fn init_language_model_settings(cx: &mut AppContext) {
    update_active_language_model_from_settings(cx);

@@ -293,10 +346,10 @@ fn init_language_model_settings(cx: &mut AppContext) {
        .detach();
    cx.subscribe(
        &LanguageModelRegistry::global(cx),
-        |_, event: &crate::language_model::Event, cx| match event {
-            crate::language_model::Event::ProviderStateChanged
-            | crate::language_model::Event::AddedProvider(_)
-            | crate::language_model::Event::RemovedProvider(_) => {
+        |_, event: &language_model::Event, cx| match event {
+            language_model::Event::ProviderStateChanged
+            | language_model::Event::AddedProvider(_)
+            | language_model::Event::RemovedProvider(_) => {
                update_active_language_model_from_settings(cx);
            }
            _ => {}
@@ -335,15 +388,17 @@ fn register_slash_commands(prompt_builder: Option<Arc<PromptBuilder>>, cx: &mut
    slash_command_registry
        .register_command(cargo_workspace_command::CargoWorkspaceSlashCommand, true);
    slash_command_registry.register_command(prompt_command::PromptSlashCommand, true);
-    slash_command_registry.register_command(selection_command::SelectionCommand, true);
    slash_command_registry.register_command(default_command::DefaultSlashCommand, false);
    slash_command_registry.register_command(terminal_command::TerminalSlashCommand, true);
    slash_command_registry.register_command(now_command::NowSlashCommand, false);
    slash_command_registry.register_command(diagnostics_command::DiagnosticsSlashCommand, true);
    slash_command_registry.register_command(fetch_command::FetchSlashCommand, false);
-    slash_command_registry.register_command(fetch_command::FetchSlashCommand, false);

    if let Some(prompt_builder) = prompt_builder {
+        slash_command_registry.register_command(
+            workflow_command::WorkflowSlashCommand::new(prompt_builder.clone()),
+            true,
+        );
        cx.observe_flag::<project_command::ProjectSlashCommandFeatureFlag, _>({
            let slash_command_registry = slash_command_registry.clone();
            move |is_enabled, _cx| {
@@ -369,19 +424,6 @@ fn register_slash_commands(prompt_builder: Option<Arc<PromptBuilder>>, cx: &mut
    })
    .detach();

-    cx.observe_flag::<streaming_example_command::StreamingExampleSlashCommandFeatureFlag, _>({
-        let slash_command_registry = slash_command_registry.clone();
-        move |is_enabled, _cx| {
-            if is_enabled {
-                slash_command_registry.register_command(
-                    streaming_example_command::StreamingExampleSlashCommand,
-                    false,
-                );
-            }
-        }
-    })
-    .detach();
-
    update_slash_commands_from_settings(cx);
    cx.observe_global::<SettingsStore>(update_slash_commands_from_settings)
        .detach();
--- a/crates/zed_common/src/assistant/assistant_panel.rs
+++ b/crates/zed_common/src/assistant/assistant_panel.rs
--- a/crates/zed_common/src/assistant/assistant_settings.rs
+++ b/crates/zed_common/src/assistant/assistant_settings.rs
@@ -1,17 +1,16 @@
 use std::sync::Arc;

-use crate::language_model::provider::open_ai;
-use crate::language_model::settings::{
+use ::open_ai::Model as OpenAiModel;
+use anthropic::Model as AnthropicModel;
+use fs::Fs;
+use gpui::{AppContext, Pixels};
+use language_model::provider::open_ai;
+use language_model::settings::{
    AnthropicSettingsContent, AnthropicSettingsContentV1, OllamaSettingsContent,
    OpenAiSettingsContent, OpenAiSettingsContentV1, VersionedAnthropicSettingsContent,
    VersionedOpenAiSettingsContent,
 };
-use crate::language_model::{settings::AllLanguageModelSettings, CloudModel, LanguageModel};
-use ::open_ai::Model as OpenAiModel;
-use anthropic::Model as AnthropicModel;
-use feature_flags::FeatureFlagAppExt;
-use fs::Fs;
-use gpui::{AppContext, Pixels};
+use language_model::{settings::AllLanguageModelSettings, CloudModel, LanguageModel};
 use ollama::Model as OllamaModel;
 use schemars::{schema::Schema, JsonSchema};
 use serde::{Deserialize, Serialize};
@@ -62,13 +61,6 @@ pub struct AssistantSettings {
    pub default_model: LanguageModelSelection,
    pub inline_alternatives: Vec<LanguageModelSelection>,
    pub using_outdated_settings_version: bool,
-    pub enable_experimental_live_diffs: bool,
-}
-
-impl AssistantSettings {
-    pub fn are_live_diffs_enabled(&self, cx: &AppContext) -> bool {
-        cx.is_staff() || self.enable_experimental_live_diffs
-    }
 }

 /// Assistant panel settings
@@ -246,7 +238,6 @@ impl AssistantSettingsContent {
                            }
                        }),
                    inline_alternatives: None,
-                    enable_experimental_live_diffs: None,
                },
                VersionedAssistantSettingsContent::V2(settings) => settings.clone(),
            },
@@ -266,7 +257,6 @@ impl AssistantSettingsContent {
                        .to_string(),
                }),
                inline_alternatives: None,
-                enable_experimental_live_diffs: None,
            },
        }
    }
@@ -383,7 +373,6 @@ impl Default for VersionedAssistantSettingsContent {
            default_height: None,
            default_model: None,
            inline_alternatives: None,
-            enable_experimental_live_diffs: None,
        })
    }
 }
@@ -410,14 +399,10 @@ pub struct AssistantSettingsContentV2 {
    ///
    /// Default: 320
    default_height: Option<f32>,
-    /// The default model to use when creating new chats.
+    /// The default model to use when creating new contexts.
    default_model: Option<LanguageModelSelection>,
    /// Additional models with which to generate alternatives when performing inline assists.
    inline_alternatives: Option<Vec<LanguageModelSelection>>,
-    /// Enable experimental live diffs in the assistant panel.
-    ///
-    /// Default: false
-    enable_experimental_live_diffs: Option<bool>,
 }

 #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
@@ -498,11 +483,11 @@ pub struct LegacyAssistantSettingsContent {
    ///
    /// Default: 320
    pub default_height: Option<f32>,
-    /// The default OpenAI model to use when creating new chats.
+    /// The default OpenAI model to use when creating new contexts.
    ///
    /// Default: gpt-4-1106-preview
    pub default_open_ai_model: Option<OpenAiModel>,
-    /// OpenAI API base URL to use when creating new chats.
+    /// OpenAI API base URL to use when creating new contexts.
    ///
    /// Default: https://api.openai.com/v1
    pub openai_api_url: Option<String>,
@@ -540,10 +525,7 @@ impl Settings for AssistantSettings {
            );
            merge(&mut settings.default_model, value.default_model);
            merge(&mut settings.inline_alternatives, value.inline_alternatives);
-            merge(
-                &mut settings.enable_experimental_live_diffs,
-                value.enable_experimental_live_diffs,
-            );
+            // merge(&mut settings.infer_context, value.infer_context); TODO re-enable this once we ship context inference
        }

        Ok(settings)
@@ -602,7 +584,6 @@ mod tests {
                            dock: None,
                            default_width: None,
                            default_height: None,
-                            enable_experimental_live_diffs: None,
                        }),
                    )
                },
--- a/crates/zed_common/src/assistant/context.rs
+++ b/crates/zed_common/src/assistant/context.rs
--- a/crates/zed_common/src/assistant/context/context_tests.rs
+++ b/crates/zed_common/src/assistant/context/context_tests.rs
--- a/crates/zed_common/src/assistant/context_store.rs
+++ b/crates/zed_common/src/assistant/context_store.rs
@@ -1,16 +1,10 @@
-use crate::assistant::slash_command::context_server_command;
-use crate::assistant::{
-    prompts::PromptBuilder, slash_command_working_set::SlashCommandWorkingSet, Context,
-    ContextEvent, ContextId, ContextOperation, ContextVersion, SavedContext, SavedContextMetadata,
+use crate::{
+    prompts::PromptBuilder, Context, ContextEvent, ContextId, ContextOperation, ContextVersion,
+    SavedContext, SavedContextMetadata,
 };
-use crate::assistant::{tools, SlashCommandId, ToolId, ToolWorkingSet};
 use anyhow::{anyhow, Context as _, Result};
 use client::{proto, telemetry::Telemetry, Client, TypedEnvelope};
 use clock::ReplicaId;
-use collections::HashMap;
-use command_palette_hooks::CommandPaletteFilter;
-use context_servers::manager::{ContextServerManager, ContextServerSettings};
-use context_servers::{ContextServerFactoryRegistry, CONTEXT_SERVERS_NAMESPACE};
 use fs::Fs;
 use futures::StreamExt;
 use fuzzy::StringMatchCandidate;
@@ -22,7 +16,6 @@ use paths::contexts_dir;
 use project::Project;
 use regex::Regex;
 use rpc::AnyProtoClient;
-use settings::{Settings as _, SettingsStore};
 use std::{
    cmp::Reverse,
    ffi::OsStr,
@@ -50,14 +43,9 @@ pub struct RemoteContextMetadata {
 pub struct ContextStore {
    contexts: Vec<ContextHandle>,
    contexts_metadata: Vec<SavedContextMetadata>,
-    context_server_manager: Model<ContextServerManager>,
-    context_server_slash_command_ids: HashMap<Arc<str>, Vec<SlashCommandId>>,
-    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    host_contexts: Vec<RemoteContextMetadata>,
    fs: Arc<dyn Fs>,
    languages: Arc<LanguageRegistry>,
-    slash_commands: Arc<SlashCommandWorkingSet>,
-    tools: Arc<ToolWorkingSet>,
    telemetry: Arc<Telemetry>,
    _watch_updates: Task<Option<()>>,
    client: Arc<Client>,
@@ -99,8 +87,6 @@ impl ContextStore {
    pub fn new(
        project: Model<Project>,
        prompt_builder: Arc<PromptBuilder>,
-        slash_commands: Arc<SlashCommandWorkingSet>,
-        tools: Arc<ToolWorkingSet>,
        cx: &mut AppContext,
    ) -> Task<Result<Model<Self>>> {
        let fs = project.read(cx).fs().clone();
@@ -111,18 +97,12 @@ impl ContextStore {
            let (mut events, _) = fs.watch(contexts_dir(), CONTEXT_WATCH_DURATION).await;

            let this = cx.new_model(|cx: &mut ModelContext<Self>| {
-                let context_server_manager = cx.new_model(|_cx| ContextServerManager::new());
                let mut this = Self {
                    contexts: Vec::new(),
                    contexts_metadata: Vec::new(),
-                    context_server_manager,
-                    context_server_slash_command_ids: HashMap::default(),
-                    context_server_tool_ids: HashMap::default(),
                    host_contexts: Vec::new(),
                    fs,
                    languages,
-                    slash_commands,
-                    tools,
                    telemetry,
                    _watch_updates: cx.spawn(|this, mut cx| {
                        async move {
@@ -147,89 +127,15 @@ impl ContextStore {
                };
                this.handle_project_changed(project, cx);
                this.synchronize_contexts(cx);
-                this.register_context_server_handlers(cx);
-
-                // TODO: At the time when we construct the `ContextStore` we may not have yet initialized the extensions.
-                // In order to register the context servers when the extension is loaded, we're periodically looping to
-                // see if there are context servers to register.
-                //
-                // I tried doing this in a subscription on the `ExtensionStore`, but it never seemed to fire.
-                //
-                // We should find a more elegant way to do this.
-                let context_server_factory_registry =
-                    ContextServerFactoryRegistry::default_global(cx);
-                cx.spawn(|context_store, mut cx| async move {
-                    loop {
-                        let mut servers_to_register = Vec::new();
-                        for (_id, factory) in
-                            context_server_factory_registry.context_server_factories()
-                        {
-                            if let Some(server) = factory(&cx).await.log_err() {
-                                servers_to_register.push(server);
-                            }
-                        }
-
-                        let Some(_) = context_store
-                            .update(&mut cx, |this, cx| {
-                                this.context_server_manager.update(cx, |this, cx| {
-                                    for server in servers_to_register {
-                                        this.add_server(server, cx).detach_and_log_err(cx);
-                                    }
-                                })
-                            })
-                            .log_err()
-                        else {
-                            break;
-                        };
-
-                        smol::Timer::after(Duration::from_millis(100)).await;
-                    }
-
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx);
-
                this
            })?;
            this.update(&mut cx, |this, cx| this.reload(cx))?
                .await
                .log_err();
-
-            this.update(&mut cx, |this, cx| {
-                this.watch_context_server_settings(cx);
-            })
-            .log_err();
-
            Ok(this)
        })
    }

-    fn watch_context_server_settings(&self, cx: &mut ModelContext<Self>) {
-        cx.observe_global::<SettingsStore>(move |this, cx| {
-            this.context_server_manager.update(cx, |manager, cx| {
-                let location = this.project.read(cx).worktrees(cx).next().map(|worktree| {
-                    settings::SettingsLocation {
-                        worktree_id: worktree.read(cx).id(),
-                        path: Path::new(""),
-                    }
-                });
-                let settings = ContextServerSettings::get(location, cx);
-
-                manager.maintain_servers(settings, cx);
-
-                let has_any_context_servers = !manager.servers().is_empty();
-                CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                    if has_any_context_servers {
-                        filter.show_namespace(CONTEXT_SERVERS_NAMESPACE);
-                    } else {
-                        filter.hide_namespace(CONTEXT_SERVERS_NAMESPACE);
-                    }
-                });
-            })
-        })
-        .detach();
-    }
-
    async fn handle_advertise_contexts(
        this: Model<Self>,
        envelope: TypedEnvelope<proto::AdvertiseContexts>,
@@ -436,8 +342,6 @@ impl ContextStore {
                Some(self.project.clone()),
                Some(self.telemetry.clone()),
                self.prompt_builder.clone(),
-                self.slash_commands.clone(),
-                self.tools.clone(),
                cx,
            )
        });
@@ -460,8 +364,6 @@ impl ContextStore {
        let project = self.project.clone();
        let telemetry = self.telemetry.clone();
        let prompt_builder = self.prompt_builder.clone();
-        let slash_commands = self.slash_commands.clone();
-        let tools = self.tools.clone();
        let request = self.client.request(proto::CreateContext { project_id });
        cx.spawn(|this, mut cx| async move {
            let response = request.await?;
@@ -474,8 +376,6 @@ impl ContextStore {
                    capability,
                    language_registry,
                    prompt_builder,
-                    slash_commands,
-                    tools,
                    Some(project),
                    Some(telemetry),
                    cx,
@@ -525,8 +425,6 @@ impl ContextStore {
            }
        });
        let prompt_builder = self.prompt_builder.clone();
-        let slash_commands = self.slash_commands.clone();
-        let tools = self.tools.clone();

        cx.spawn(|this, mut cx| async move {
            let saved_context = load.await?;
@@ -536,8 +434,6 @@ impl ContextStore {
                    path.clone(),
                    languages,
                    prompt_builder,
-                    slash_commands,
-                    tools,
                    Some(project),
                    Some(telemetry),
                    cx,
@@ -604,8 +500,6 @@ impl ContextStore {
            context_id: context_id.to_proto(),
        });
        let prompt_builder = self.prompt_builder.clone();
-        let slash_commands = self.slash_commands.clone();
-        let tools = self.tools.clone();
        cx.spawn(|this, mut cx| async move {
            let response = request.await?;
            let context_proto = response.context.context("invalid context")?;
@@ -616,8 +510,6 @@ impl ContextStore {
                    capability,
                    language_registry,
                    prompt_builder,
-                    slash_commands,
-                    tools,
                    Some(project),
                    Some(telemetry),
                    cx,
@@ -853,114 +745,4 @@ impl ContextStore {
            })
        })
    }
-
-    pub fn restart_context_servers(&mut self, cx: &mut ModelContext<Self>) {
-        cx.update_model(
-            &self.context_server_manager,
-            |context_server_manager, cx| {
-                for server in context_server_manager.servers() {
-                    context_server_manager
-                        .restart_server(&server.id(), cx)
-                        .detach_and_log_err(cx);
-                }
-            },
-        );
-    }
-
-    fn register_context_server_handlers(&self, cx: &mut ModelContext<Self>) {
-        cx.subscribe(
-            &self.context_server_manager.clone(),
-            Self::handle_context_server_event,
-        )
-        .detach();
-    }
-
-    fn handle_context_server_event(
-        &mut self,
-        context_server_manager: Model<ContextServerManager>,
-        event: &context_servers::manager::Event,
-        cx: &mut ModelContext<Self>,
-    ) {
-        let slash_command_working_set = self.slash_commands.clone();
-        let tool_working_set = self.tools.clone();
-        match event {
-            context_servers::manager::Event::ServerStarted { server_id } => {
-                if let Some(server) = context_server_manager.read(cx).get_server(server_id) {
-                    let context_server_manager = context_server_manager.clone();
-                    cx.spawn({
-                        let server = server.clone();
-                        let server_id = server_id.clone();
-                        |this, mut cx| async move {
-                            let Some(protocol) = server.client() else {
-                                return;
-                            };
-
-                            if protocol.capable(context_servers::protocol::ServerCapability::Prompts) {
-                                if let Some(prompts) = protocol.list_prompts().await.log_err() {
-                                    let slash_command_ids = prompts
-                                        .into_iter()
-                                        .filter(context_server_command::acceptable_prompt)
-                                        .map(|prompt| {
-                                            log::info!(
-                                                "registering context server command: {:?}",
-                                                prompt.name
-                                            );
-                                            slash_command_working_set.insert(Arc::new(
-                                                context_server_command::ContextServerSlashCommand::new(
-                                                    context_server_manager.clone(),
-                                                    &server,
-                                                    prompt,
-                                                ),
-                                            ))
-                                        })
-                                        .collect::<Vec<_>>();
-
-                                    this.update(&mut cx, |this, _cx| {
-                                        this.context_server_slash_command_ids
-                                            .insert(server_id.clone(), slash_command_ids);
-                                    })
-                                    .log_err();
-                                }
-                            }
-
-                            if protocol.capable(context_servers::protocol::ServerCapability::Tools) {
-                                if let Some(tools) = protocol.list_tools().await.log_err() {
-                                    let tool_ids = tools.tools.into_iter().map(|tool| {
-                                        log::info!("registering context server tool: {:?}", tool.name);
-                                        tool_working_set.insert(
-                                            Arc::new(tools::context_server_tool::ContextServerTool::new(
-                                                context_server_manager.clone(),
-                                                server.id(),
-                                                tool,
-                                            )),
-                                        )
-
-                                    }).collect::<Vec<_>>();
-
-
-                                    this.update(&mut cx, |this, _cx| {
-                                        this.context_server_tool_ids
-                                            .insert(server_id, tool_ids);
-                                    })
-                                    .log_err();
-                                }
-                            }
-                        }
-                    })
-                    .detach();
-                }
-            }
-            context_servers::manager::Event::ServerStopped { server_id } => {
-                if let Some(slash_command_ids) =
-                    self.context_server_slash_command_ids.remove(server_id)
-                {
-                    slash_command_working_set.remove(&slash_command_ids);
-                }
-
-                if let Some(tool_ids) = self.context_server_tool_ids.remove(server_id) {
-                    tool_working_set.remove(&tool_ids);
-                }
-            }
-        }
-    }
 }
--- a/crates/zed_common/src/assistant/inline_assistant.rs
+++ b/crates/zed_common/src/assistant/inline_assistant.rs
@@ -1,20 +1,15 @@
-use crate::assistant::{
+use crate::{
    assistant_settings::AssistantSettings, humanize_token_count, prompts::PromptBuilder,
    AssistantPanel, AssistantPanelEvent, CharOperation, CycleNextInlineAssist,
-    CyclePreviousInlineAssist, LineDiff, LineOperation, ModelSelector, RequestType, StreamingDiff,
+    CyclePreviousInlineAssist, LineDiff, LineOperation, ModelSelector, StreamingDiff,
 };
-use crate::language_model::{
-    logging::report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelTextStream, Role,
-};
-use crate::terminal_view::terminal_panel::TerminalPanel;
 use anyhow::{anyhow, Context as _, Result};
 use client::{telemetry::Telemetry, ErrorExt};
 use collections::{hash_map, HashMap, HashSet, VecDeque};
 use editor::{
    actions::{MoveDown, MoveUp, SelectAll},
    display_map::{
-        BlockContext, BlockPlacement, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
+        BlockContext, BlockDisposition, BlockProperties, BlockStyle, CustomBlockId, RenderBlock,
        ToDisplayPoint,
    },
    Anchor, AnchorRangeExt, CodeActionProvider, Editor, EditorElement, EditorEvent, EditorMode,
@@ -26,7 +21,9 @@ use fs::Fs;
 use futures::{
    channel::mpsc,
    future::{BoxFuture, LocalBoxFuture},
-    join, SinkExt, Stream, StreamExt,
+    join,
+    stream::{self, BoxStream},
+    SinkExt, Stream, StreamExt,
 };
 use gpui::{
    anchored, deferred, point, AnyElement, AppContext, ClickEvent, EventEmitter, FocusHandle,
@@ -34,6 +31,9 @@ use gpui::{
    TextStyle, UpdateGlobal, View, ViewContext, WeakView, WindowContext,
 };
 use language::{Buffer, IndentKind, Point, Selection, TransactionId};
+use language_model::{
+    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
+};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
@@ -50,12 +50,10 @@ use std::{
    task::{self, Poll},
    time::{Duration, Instant},
 };
-use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
+use terminal_view::terminal_panel::TerminalPanel;
 use text::{OffsetRangeExt, ToPoint as _};
 use theme::ThemeSettings;
-use ui::{
-    prelude::*, text_for_action, CheckboxWithLabel, IconButtonShape, KeyBinding, Popover, Tooltip,
-};
+use ui::{prelude::*, CheckboxWithLabel, IconButtonShape, Popover, Tooltip};
 use util::{RangeExt, ResultExt};
 use workspace::{notifications::NotificationId, ItemHandle, Toast, Workspace};

@@ -83,13 +81,33 @@ pub struct InlineAssistant {
    assists: HashMap<InlineAssistId, InlineAssist>,
    assists_by_editor: HashMap<WeakView<Editor>, EditorInlineAssists>,
    assist_groups: HashMap<InlineAssistGroupId, InlineAssistGroup>,
+    assist_observations: HashMap<
+        InlineAssistId,
+        (
+            async_watch::Sender<AssistStatus>,
+            async_watch::Receiver<AssistStatus>,
+        ),
+    >,
    confirmed_assists: HashMap<InlineAssistId, Model<CodegenAlternative>>,
    prompt_history: VecDeque<String>,
    prompt_builder: Arc<PromptBuilder>,
-    telemetry: Arc<Telemetry>,
+    telemetry: Option<Arc<Telemetry>>,
    fs: Arc<dyn Fs>,
 }

+pub enum AssistStatus {
+    Idle,
+    Started,
+    Stopped,
+    Finished,
+}
+
+impl AssistStatus {
+    pub fn is_done(&self) -> bool {
+        matches!(self, Self::Stopped | Self::Finished)
+    }
+}
+
 impl Global for InlineAssistant {}

 impl InlineAssistant {
@@ -104,10 +122,11 @@ impl InlineAssistant {
            assists: HashMap::default(),
            assists_by_editor: HashMap::default(),
            assist_groups: HashMap::default(),
+            assist_observations: HashMap::default(),
            confirmed_assists: HashMap::default(),
            prompt_history: VecDeque::default(),
            prompt_builder,
-            telemetry,
+            telemetry: Some(telemetry),
            fs,
        }
    }
@@ -190,16 +209,23 @@ impl InlineAssistant {
        initial_prompt: Option<String>,
        cx: &mut WindowContext,
    ) {
-        let (snapshot, initial_selections) = editor.update(cx, |editor, cx| {
-            (
-                editor.buffer().read(cx).snapshot(cx),
-                editor.selections.all::<Point>(cx),
-            )
-        });
+        if let Some(telemetry) = self.telemetry.as_ref() {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
+                telemetry.report_assistant_event(
+                    None,
+                    telemetry_events::AssistantKind::Inline,
+                    telemetry_events::AssistantPhase::Invoked,
+                    model.telemetry_id(),
+                    None,
+                    None,
+                );
+            }
+        }
+        let snapshot = editor.read(cx).buffer().read(cx).snapshot(cx);

        let mut selections = Vec::<Selection<Point>>::new();
        let mut newest_selection = None;
-        for mut selection in initial_selections {
+        for mut selection in editor.read(cx).selections.all::<Point>(cx) {
            if selection.end > selection.start {
                selection.start.column = 0;
                // If the selection ends at the start of the line, we don't want to include it.
@@ -241,20 +267,6 @@ impl InlineAssistant {
                text_anchor: buffer.anchor_after(buffer_range.end),
            };
            codegen_ranges.push(start..end);
-
-            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
-                self.telemetry.report_assistant_event(AssistantEvent {
-                    conversation_id: None,
-                    kind: AssistantKind::Inline,
-                    phase: AssistantPhase::Invoked,
-                    message_id: None,
-                    model: model.telemetry_id(),
-                    model_provider: model.provider_id().to_string(),
-                    response_latency: None,
-                    error_message: None,
-                    language_name: buffer.language().map(|language| language.name().to_proto()),
-                });
-            }
        }

        let assist_group_id = self.next_assist_group_id.post_inc();
@@ -451,14 +463,15 @@ impl InlineAssistant {
        let assist_blocks = vec![
            BlockProperties {
                style: BlockStyle::Sticky,
-                placement: BlockPlacement::Above(range.start),
+                position: range.start,
                height: prompt_editor_height,
                render: build_assist_editor_renderer(prompt_editor),
+                disposition: BlockDisposition::Above,
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Sticky,
-                placement: BlockPlacement::Below(range.end),
+                position: range.end,
                height: 0,
                render: Box::new(|cx| {
                    v_flex()
@@ -468,6 +481,7 @@ impl InlineAssistant {
                        .border_color(cx.theme().status().info_border)
                        .into_any_element()
                }),
+                disposition: BlockDisposition::Below,
                priority: 0,
            },
        ];
@@ -571,13 +585,10 @@ impl InlineAssistant {
            return;
        };

-        if editor.read(cx).selections.count() == 1 {
-            let (selection, buffer) = editor.update(cx, |editor, cx| {
-                (
-                    editor.selections.newest::<usize>(cx),
-                    editor.buffer().read(cx).snapshot(cx),
-                )
-            });
+        let editor = editor.read(cx);
+        if editor.selections.count() == 1 {
+            let selection = editor.selections.newest::<usize>(cx);
+            let buffer = editor.buffer().read(cx).snapshot(cx);
            for assist_id in &editor_assists.assist_ids {
                let assist = &self.assists[assist_id];
                let assist_range = assist.range.to_offset(&buffer);
@@ -602,13 +613,10 @@ impl InlineAssistant {
            return;
        };

-        if editor.read(cx).selections.count() == 1 {
-            let (selection, buffer) = editor.update(cx, |editor, cx| {
-                (
-                    editor.selections.newest::<usize>(cx),
-                    editor.buffer().read(cx).snapshot(cx),
-                )
-            });
+        let editor = editor.read(cx);
+        if editor.selections.count() == 1 {
+            let selection = editor.selections.newest::<usize>(cx);
+            let buffer = editor.buffer().read(cx).snapshot(cx);
            let mut closest_assist_fallback = None;
            for assist_id in &editor_assists.assist_ids {
                let assist = &self.assists[assist_id];
@@ -753,6 +761,22 @@ impl InlineAssistant {
    }

    pub fn finish_assist(&mut self, assist_id: InlineAssistId, undo: bool, cx: &mut WindowContext) {
+        if let Some(telemetry) = self.telemetry.as_ref() {
+            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
+                telemetry.report_assistant_event(
+                    None,
+                    telemetry_events::AssistantKind::Inline,
+                    if undo {
+                        telemetry_events::AssistantPhase::Rejected
+                    } else {
+                        telemetry_events::AssistantPhase::Accepted
+                    },
+                    model.telemetry_id(),
+                    None,
+                    None,
+                );
+            }
+        }
        if let Some(assist) = self.assists.get(&assist_id) {
            let assist_group_id = assist.group_id;
            if self.assist_groups[&assist_group_id].linked {
@@ -788,47 +812,25 @@ impl InlineAssistant {
                }
            }

-            let active_alternative = assist.codegen.read(cx).active_alternative().clone();
-            let message_id = active_alternative.read(cx).message_id.clone();
-
-            if let Some(model) = LanguageModelRegistry::read_global(cx).active_model() {
-                let language_name = assist.editor.upgrade().and_then(|editor| {
-                    let multibuffer = editor.read(cx).buffer().read(cx);
-                    let ranges = multibuffer.range_to_buffer_ranges(assist.range.clone(), cx);
-                    ranges
-                        .first()
-                        .and_then(|(buffer, _, _)| buffer.read(cx).language())
-                        .map(|language| language.name())
-                });
-                report_assistant_event(
-                    AssistantEvent {
-                        conversation_id: None,
-                        kind: AssistantKind::Inline,
-                        message_id,
-                        phase: if undo {
-                            AssistantPhase::Rejected
-                        } else {
-                            AssistantPhase::Accepted
-                        },
-                        model: model.telemetry_id(),
-                        model_provider: model.provider_id().to_string(),
-                        response_latency: None,
-                        error_message: None,
-                        language_name: language_name.map(|name| name.to_proto()),
-                    },
-                    Some(self.telemetry.clone()),
-                    cx.http_client(),
-                    model.api_key(cx),
-                    cx.background_executor(),
-                );
-            }
-
            if undo {
                assist.codegen.update(cx, |codegen, cx| codegen.undo(cx));
            } else {
-                self.confirmed_assists.insert(assist_id, active_alternative);
+                let confirmed_alternative = assist.codegen.read(cx).active_alternative().clone();
+                self.confirmed_assists
+                    .insert(assist_id, confirmed_alternative);
            }
        }
+
+        // Remove the assist from the status updates map
+        self.assist_observations.remove(&assist_id);
+    }
+
+    pub fn undo_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) -> bool {
+        let Some(codegen) = self.confirmed_assists.remove(&assist_id) else {
+            return false;
+        };
+        codegen.update(cx, |this, cx| this.undo(cx));
+        true
    }

    fn dismiss_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) -> bool {
@@ -1022,6 +1024,10 @@ impl InlineAssistant {
                codegen.start(user_prompt, assistant_panel_context, cx)
            })
            .log_err();
+
+        if let Some((tx, _)) = self.assist_observations.get(&assist_id) {
+            tx.send(AssistStatus::Started).ok();
+        }
    }

    pub fn stop_assist(&mut self, assist_id: InlineAssistId, cx: &mut WindowContext) {
@@ -1032,6 +1038,25 @@ impl InlineAssistant {
        };

        assist.codegen.update(cx, |codegen, cx| codegen.stop(cx));
+
+        if let Some((tx, _)) = self.assist_observations.get(&assist_id) {
+            tx.send(AssistStatus::Stopped).ok();
+        }
+    }
+
+    pub fn assist_status(&self, assist_id: InlineAssistId, cx: &AppContext) -> InlineAssistStatus {
+        if let Some(assist) = self.assists.get(&assist_id) {
+            match assist.codegen.read(cx).status(cx) {
+                CodegenStatus::Idle => InlineAssistStatus::Idle,
+                CodegenStatus::Pending => InlineAssistStatus::Pending,
+                CodegenStatus::Done => InlineAssistStatus::Done,
+                CodegenStatus::Error(_) => InlineAssistStatus::Error,
+            }
+        } else if self.confirmed_assists.contains_key(&assist_id) {
+            InlineAssistStatus::Confirmed
+        } else {
+            InlineAssistStatus::Canceled
+        }
    }

    fn update_editor_highlights(&self, editor: &View<Editor>, cx: &mut WindowContext) {
@@ -1194,7 +1219,7 @@ impl InlineAssistant {
                let height =
                    deleted_lines_editor.update(cx, |editor, cx| editor.max_point(cx).row().0 + 1);
                new_blocks.push(BlockProperties {
-                    placement: BlockPlacement::Above(new_row),
+                    position: new_row,
                    height,
                    style: BlockStyle::Flex,
                    render: Box::new(move |cx| {
@@ -1206,6 +1231,7 @@ impl InlineAssistant {
                            .child(deleted_lines_editor.clone())
                            .into_any_element()
                    }),
+                    disposition: BlockDisposition::Above,
                    priority: 0,
                });
            }
@@ -1216,6 +1242,42 @@ impl InlineAssistant {
                .collect();
        })
    }
+
+    pub fn observe_assist(
+        &mut self,
+        assist_id: InlineAssistId,
+    ) -> async_watch::Receiver<AssistStatus> {
+        if let Some((_, rx)) = self.assist_observations.get(&assist_id) {
+            rx.clone()
+        } else {
+            let (tx, rx) = async_watch::channel(AssistStatus::Idle);
+            self.assist_observations.insert(assist_id, (tx, rx.clone()));
+            rx
+        }
+    }
+}
+
+pub enum InlineAssistStatus {
+    Idle,
+    Pending,
+    Done,
+    Error,
+    Confirmed,
+    Canceled,
+}
+
+impl InlineAssistStatus {
+    pub(crate) fn is_pending(&self) -> bool {
+        matches!(self, Self::Pending)
+    }
+
+    pub(crate) fn is_confirmed(&self) -> bool {
+        matches!(self, Self::Confirmed)
+    }
+
+    pub(crate) fn is_done(&self) -> bool {
+        matches!(self, Self::Done)
+    }
 }

 struct EditorInlineAssists {
@@ -1613,7 +1675,7 @@ impl PromptEditor {
            // always show the cursor (even when it isn't focused) because
            // typing in one will make what you typed appear in all of them.
            editor.set_show_cursor_when_unfocused(true, cx);
-            editor.set_placeholder_text(Self::placeholder_text(codegen.read(cx), cx), cx);
+            editor.set_placeholder_text("Add a prompt…", cx);
            editor
        });

@@ -1670,7 +1732,6 @@ impl PromptEditor {
        self.editor = cx.new_view(|cx| {
            let mut editor = Editor::auto_height(Self::MAX_LINES as usize, cx);
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text(Self::placeholder_text(self.codegen.read(cx), cx), cx);
            editor.set_placeholder_text("Add a prompt…", cx);
            editor.set_text(prompt, cx);
            if focus {
@@ -1681,20 +1742,6 @@ impl PromptEditor {
        self.subscribe_to_editor(cx);
    }

-    fn placeholder_text(codegen: &Codegen, cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::assistant::ToggleFocus, cx)
-            .map(|keybinding| format!(" • {keybinding} for context"))
-            .unwrap_or_default();
-
-        let action = if codegen.is_insertion {
-            "Generate"
-        } else {
-            "Transform"
-        };
-
-        format!("{action}…{context_keybinding} • ↓↑ for history")
-    }
-
    fn prompt(&self, cx: &AppContext) -> String {
        self.editor.read(cx).text(cx)
    }
@@ -1757,20 +1804,6 @@ impl PromptEditor {
    ) {
        match event {
            EditorEvent::Edited { .. } => {
-                if let Some(workspace) = cx.window_handle().downcast::<Workspace>() {
-                    workspace
-                        .update(cx, |workspace, cx| {
-                            let is_via_ssh = workspace
-                                .project()
-                                .update(cx, |project, _| project.is_via_ssh());
-
-                            workspace
-                                .client()
-                                .telemetry()
-                                .log_edit_event("inline assist", is_via_ssh);
-                        })
-                        .log_err();
-                }
                let prompt = self.editor.read(cx).text(cx);
                if self
                    .prompt_history_ix
@@ -1913,58 +1946,21 @@ impl PromptEditor {
        let codegen = self.codegen.read(cx);
        let disabled = matches!(codegen.status(cx), CodegenStatus::Idle);

-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let default_model = model_registry.active_model();
-        let alternative_models = model_registry.inline_alternative_models();
-
-        let get_model_name = |index: usize| -> String {
-            let name = |model: &Arc<dyn LanguageModel>| model.name().0.to_string();
-
-            match index {
-                0 => default_model.as_ref().map_or_else(String::new, name),
-                index if index <= alternative_models.len() => alternative_models
-                    .get(index - 1)
-                    .map_or_else(String::new, name),
-                _ => String::new(),
-            }
-        };
-
-        let total_models = alternative_models.len() + 1;
-
-        if total_models <= 1 {
-            return div().into_any_element();
-        }
-
-        let current_index = codegen.active_alternative;
-        let prev_index = (current_index + total_models - 1) % total_models;
-        let next_index = (current_index + 1) % total_models;
-
-        let prev_model_name = get_model_name(prev_index);
-        let next_model_name = get_model_name(next_index);
-
        h_flex()
            .child(
                IconButton::new("previous", IconName::ChevronLeft)
                    .icon_color(Color::Muted)
-                    .disabled(disabled || current_index == 0)
+                    .disabled(disabled)
                    .shape(IconButtonShape::Square)
                    .tooltip({
                        let focus_handle = self.editor.focus_handle(cx);
                        move |cx| {
-                            cx.new_view(|cx| {
-                                let mut tooltip = Tooltip::new("Previous Alternative").key_binding(
-                                    KeyBinding::for_action_in(
-                                        &CyclePreviousInlineAssist,
-                                        &focus_handle,
-                                        cx,
-                                    ),
-                                );
-                                if !disabled && current_index != 0 {
-                                    tooltip = tooltip.meta(prev_model_name.clone());
-                                }
-                                tooltip
-                            })
-                            .into()
+                            Tooltip::for_action_in(
+                                "Previous Alternative",
+                                &CyclePreviousInlineAssist,
+                                &focus_handle,
+                                cx,
+                            )
                        }
                    })
                    .on_click(cx.listener(|this, _, cx| {
@@ -1988,25 +1984,17 @@ impl PromptEditor {
            .child(
                IconButton::new("next", IconName::ChevronRight)
                    .icon_color(Color::Muted)
-                    .disabled(disabled || current_index == total_models - 1)
+                    .disabled(disabled)
                    .shape(IconButtonShape::Square)
                    .tooltip({
                        let focus_handle = self.editor.focus_handle(cx);
                        move |cx| {
-                            cx.new_view(|cx| {
-                                let mut tooltip = Tooltip::new("Next Alternative").key_binding(
-                                    KeyBinding::for_action_in(
-                                        &CycleNextInlineAssist,
-                                        &focus_handle,
-                                        cx,
-                                    ),
-                                );
-                                if !disabled && current_index != total_models - 1 {
-                                    tooltip = tooltip.meta(next_model_name.clone());
-                                }
-                                tooltip
-                            })
-                            .into()
+                            Tooltip::for_action_in(
+                                "Next Alternative",
+                                &CycleNextInlineAssist,
+                                &focus_handle,
+                                cx,
+                            )
                        }
                    })
                    .on_click(cx.listener(|this, _, cx| {
@@ -2275,7 +2263,7 @@ impl InlineAssist {
                                            struct InlineAssistantError;

                                            let id =
-                                                NotificationId::composite::<InlineAssistantError>(
+                                                NotificationId::identified::<InlineAssistantError>(
                                                    assist_id.0,
                                                );

@@ -2287,6 +2275,8 @@ impl InlineAssist {

                            if assist.decorations.is_none() {
                                this.finish_assist(assist_id, false, cx);
+                            } else if let Some(tx) = this.assist_observations.get(&assist_id) {
+                                tx.0.send(AssistStatus::Finished).ok();
                            }
                        }
                    })
@@ -2310,7 +2300,7 @@ impl InlineAssist {
                    .read(cx)
                    .active_context(cx)?
                    .read(cx)
-                    .to_completion_request(RequestType::Chat, cx),
+                    .to_completion_request(cx),
            )
        } else {
            None
@@ -2344,14 +2334,12 @@ pub enum CodegenEvent {
 pub struct Codegen {
    alternatives: Vec<Model<CodegenAlternative>>,
    active_alternative: usize,
-    seen_alternatives: HashSet<usize>,
    subscriptions: Vec<Subscription>,
    buffer: Model<MultiBuffer>,
    range: Range<Anchor>,
    initial_transaction_id: Option<TransactionId>,
-    telemetry: Arc<Telemetry>,
+    telemetry: Option<Arc<Telemetry>>,
    builder: Arc<PromptBuilder>,
-    is_insertion: bool,
 }

 impl Codegen {
@@ -2359,7 +2347,7 @@ impl Codegen {
        buffer: Model<MultiBuffer>,
        range: Range<Anchor>,
        initial_transaction_id: Option<TransactionId>,
-        telemetry: Arc<Telemetry>,
+        telemetry: Option<Arc<Telemetry>>,
        builder: Arc<PromptBuilder>,
        cx: &mut ModelContext<Self>,
    ) -> Self {
@@ -2368,16 +2356,14 @@ impl Codegen {
                buffer.clone(),
                range.clone(),
                false,
-                Some(telemetry.clone()),
+                telemetry.clone(),
                builder.clone(),
                cx,
            )
        });
        let mut this = Self {
-            is_insertion: range.to_offset(&buffer.read(cx).snapshot(cx)).is_empty(),
            alternatives: vec![codegen],
            active_alternative: 0,
-            seen_alternatives: HashSet::default(),
            subscriptions: Vec::new(),
            buffer,
            range,
@@ -2430,7 +2416,6 @@ impl Codegen {
    fn activate(&mut self, index: usize, cx: &mut ModelContext<Self>) {
        self.active_alternative()
            .update(cx, |codegen, cx| codegen.set_active(false, cx));
-        self.seen_alternatives.insert(index);
        self.active_alternative = index;
        self.active_alternative()
            .update(cx, |codegen, cx| codegen.set_active(true, cx));
@@ -2459,7 +2444,7 @@ impl Codegen {
                    self.buffer.clone(),
                    self.range.clone(),
                    false,
-                    Some(self.telemetry.clone()),
+                    self.telemetry.clone(),
                    self.builder.clone(),
                    cx,
                )
@@ -2560,10 +2545,6 @@ pub struct CodegenAlternative {
    active: bool,
    edits: Vec<(Range<Anchor>, String)>,
    line_operations: Vec<LineOperation>,
-    request: Option<LanguageModelRequest>,
-    elapsed_time: Option<f64>,
-    completion: Option<String>,
-    message_id: Option<String>,
 }

 enum CodegenStatus {
@@ -2622,7 +2603,6 @@ impl CodegenAlternative {
            buffer: buffer.clone(),
            old_buffer,
            edit_position: None,
-            message_id: None,
            snapshot,
            last_equal_ranges: Default::default(),
            transformation_transaction_id: None,
@@ -2636,9 +2616,6 @@ impl CodegenAlternative {
            edits: Vec::new(),
            line_operations: Vec::new(),
            range,
-            request: None,
-            elapsed_time: None,
-            completion: None,
        }
    }

@@ -2728,20 +2705,18 @@ impl CodegenAlternative {

        self.edit_position = Some(self.range.start.bias_right(&self.snapshot));

-        let api_key = model.api_key(cx);
        let telemetry_id = model.telemetry_id();
-        let provider_id = model.provider_id();
-        let stream: LocalBoxFuture<Result<LanguageModelTextStream>> =
+        let chunks: LocalBoxFuture<Result<BoxStream<Result<String>>>> =
            if user_prompt.trim().to_lowercase() == "delete" {
-                async { Ok(LanguageModelTextStream::default()) }.boxed_local()
+                async { Ok(stream::empty().boxed()) }.boxed_local()
            } else {
                let request = self.build_request(user_prompt, assistant_panel_context, cx)?;
-                self.request = Some(request.clone());

-                cx.spawn(|_, cx| async move { model.stream_completion_text(request, &cx).await })
-                    .boxed_local()
+                let chunks = cx
+                    .spawn(|_, cx| async move { model.stream_completion_text(request, &cx).await });
+                async move { Ok(chunks.await?.boxed()) }.boxed_local()
            };
-        self.handle_stream(telemetry_id, provider_id.to_string(), api_key, stream, cx);
+        self.handle_stream(telemetry_id, chunks, cx);
        Ok(())
    }

@@ -2780,7 +2755,7 @@ impl CodegenAlternative {

        let prompt = self
            .builder
-            .generate_inline_transformation_prompt(user_prompt, language_name, buffer, range)
+            .generate_content_prompt(user_prompt, language_name, buffer, range)
            .map_err(|e| anyhow::anyhow!("Failed to generate content prompt: {}", e))?;

        let mut messages = Vec::new();
@@ -2805,12 +2780,9 @@ impl CodegenAlternative {
    pub fn handle_stream(
        &mut self,
        model_telemetry_id: String,
-        model_provider_id: String,
-        model_api_key: Option<String>,
-        stream: impl 'static + Future<Output = Result<LanguageModelTextStream>>,
+        stream: impl 'static + Future<Output = Result<BoxStream<'static, Result<String>>>>,
        cx: &mut ModelContext<Self>,
    ) {
-        let start_time = Instant::now();
        let snapshot = self.snapshot.clone();
        let selected_text = snapshot
            .text_for_range(self.range.start..self.range.end)
@@ -2837,40 +2809,21 @@ impl CodegenAlternative {
            }
        }

-        let http_client = cx.http_client().clone();
        let telemetry = self.telemetry.clone();
-        let language_name = {
-            let multibuffer = self.buffer.read(cx);
-            let ranges = multibuffer.range_to_buffer_ranges(self.range.clone(), cx);
-            ranges
-                .first()
-                .and_then(|(buffer, _, _)| buffer.read(cx).language())
-                .map(|language| language.name())
-        };
-
        self.diff = Diff::default();
        self.status = CodegenStatus::Pending;
        let mut edit_start = self.range.start.to_offset(&snapshot);
-        let completion = Arc::new(Mutex::new(String::new()));
-        let completion_clone = completion.clone();
-
        self.generation = cx.spawn(|codegen, mut cx| {
            async move {
-                let stream = stream.await;
-                let message_id = stream
-                    .as_ref()
-                    .ok()
-                    .and_then(|stream| stream.message_id.clone());
+                let chunks = stream.await;
                let generate = async {
                    let (mut diff_tx, mut diff_rx) = mpsc::channel(1);
-                    let executor = cx.background_executor().clone();
-                    let message_id = message_id.clone();
                    let line_based_stream_diff: Task<anyhow::Result<()>> =
                        cx.background_executor().spawn(async move {
                            let mut response_latency = None;
                            let request_start = Instant::now();
                            let diff = async {
-                                let chunks = StripInvalidSpans::new(stream?.stream);
+                                let chunks = StripInvalidSpans::new(chunks?);
                                futures::pin_mut!(chunks);
                                let mut diff = StreamingDiff::new(selected_text.to_string());
                                let mut line_diff = LineDiff::default();
@@ -2885,7 +2838,6 @@ impl CodegenAlternative {
                                        response_latency = Some(request_start.elapsed());
                                    }
                                    let chunk = chunk?;
-                                    completion_clone.lock().push_str(&chunk);

                                    let mut lines = chunk.split('\n').peekable();
                                    while let Some(line) = lines.next() {
@@ -2967,23 +2919,16 @@ impl CodegenAlternative {

                            let error_message =
                                result.as_ref().err().map(|error| error.to_string());
-                            report_assistant_event(
-                                AssistantEvent {
-                                    conversation_id: None,
-                                    message_id,
-                                    kind: AssistantKind::Inline,
-                                    phase: AssistantPhase::Response,
-                                    model: model_telemetry_id,
-                                    model_provider: model_provider_id.to_string(),
+                            if let Some(telemetry) = telemetry {
+                                telemetry.report_assistant_event(
+                                    None,
+                                    telemetry_events::AssistantKind::Inline,
+                                    telemetry_events::AssistantPhase::Response,
+                                    model_telemetry_id,
                                    response_latency,
                                    error_message,
-                                    language_name: language_name.map(|name| name.to_proto()),
-                                },
-                                telemetry,
-                                http_client,
-                                model_api_key,
-                                &executor,
-                            );
+                                );
+                            }

                            result?;
                            Ok(())
@@ -3043,19 +2988,14 @@ impl CodegenAlternative {
                };

                let result = generate.await;
-                let elapsed_time = start_time.elapsed().as_secs_f64();
-
                codegen
                    .update(&mut cx, |this, cx| {
-                        this.message_id = message_id;
                        this.last_equal_ranges.clear();
                        if let Err(error) = result {
                            this.status = CodegenStatus::Error(error);
                        } else {
                            this.status = CodegenStatus::Done;
                        }
-                        this.elapsed_time = Some(elapsed_time);
-                        this.completion = Some(completion.lock().clone());
                        cx.emit(CodegenEvent::Finished);
                        cx.notify();
                    })
@@ -3402,10 +3342,6 @@ impl CodeActionProvider for AssistantCodeActionProvider {
        range: Range<text::Anchor>,
        cx: &mut WindowContext,
    ) -> Task<Result<Vec<CodeAction>>> {
-        if !AssistantSettings::get_global(cx).enabled {
-            return Task::ready(Ok(Vec::new()));
-        }
-
        let snapshot = buffer.read(cx).snapshot();
        let mut range = range.to_point(&snapshot);

@@ -3549,7 +3485,6 @@ fn merge_ranges(ranges: &mut Vec<Range<Anchor>>, buffer: &MultiBufferSnapshot) {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::language_model::LanguageModelRegistry;
    use futures::stream::{self};
    use gpui::{Context, TestAppContext};
    use indoc::indoc;
@@ -3557,6 +3492,7 @@ mod tests {
        language_settings, tree_sitter_rust, Buffer, Language, LanguageConfig, LanguageMatcher,
        Point,
    };
+    use language_model::LanguageModelRegistry;
    use rand::prelude::*;
    use serde::Serialize;
    use settings::SettingsStore;
@@ -3570,7 +3506,7 @@ mod tests {
    #[gpui::test(iterations = 10)]
    async fn test_transform_autoindent(cx: &mut TestAppContext, mut rng: StdRng) {
        cx.set_global(cx.update(SettingsStore::test));
-        cx.update(crate::language_model::LanguageModelRegistry::test);
+        cx.update(language_model::LanguageModelRegistry::test);
        cx.update(language_settings::init);

        let text = indoc! {"
@@ -3600,7 +3536,14 @@ mod tests {
            )
        });

-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let (chunks_tx, chunks_rx) = mpsc::unbounded();
+        codegen.update(cx, |codegen, cx| {
+            codegen.handle_stream(
+                String::new(),
+                future::ready(Ok(chunks_rx.map(Ok).boxed())),
+                cx,
+            )
+        });

        let mut new_text = concat!(
            "       let mut x = 0;\n",
@@ -3664,7 +3607,14 @@ mod tests {
            )
        });

-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let (chunks_tx, chunks_rx) = mpsc::unbounded();
+        codegen.update(cx, |codegen, cx| {
+            codegen.handle_stream(
+                String::new(),
+                future::ready(Ok(chunks_rx.map(Ok).boxed())),
+                cx,
+            )
+        });

        cx.background_executor.run_until_parked();

@@ -3731,7 +3681,14 @@ mod tests {
            )
        });

-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let (chunks_tx, chunks_rx) = mpsc::unbounded();
+        codegen.update(cx, |codegen, cx| {
+            codegen.handle_stream(
+                String::new(),
+                future::ready(Ok(chunks_rx.map(Ok).boxed())),
+                cx,
+            )
+        });

        cx.background_executor.run_until_parked();

@@ -3797,7 +3754,15 @@ mod tests {
            )
        });

-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let (chunks_tx, chunks_rx) = mpsc::unbounded();
+        codegen.update(cx, |codegen, cx| {
+            codegen.handle_stream(
+                String::new(),
+                future::ready(Ok(chunks_rx.map(Ok).boxed())),
+                cx,
+            )
+        });
+
        let new_text = concat!(
            "func main() {\n",
            "\tx := 0\n",
@@ -3852,7 +3817,15 @@ mod tests {
            )
        });

-        let chunks_tx = simulate_response_stream(codegen.clone(), cx);
+        let (chunks_tx, chunks_rx) = mpsc::unbounded();
+        codegen.update(cx, |codegen, cx| {
+            codegen.handle_stream(
+                String::new(),
+                future::ready(Ok(chunks_rx.map(Ok).boxed())),
+                cx,
+            )
+        });
+
        chunks_tx
            .unbounded_send("let mut x = 0;\nx += 1;".to_string())
            .unwrap();
@@ -3926,26 +3899,6 @@ mod tests {
        }
    }

-    fn simulate_response_stream(
-        codegen: Model<CodegenAlternative>,
-        cx: &mut TestAppContext,
-    ) -> mpsc::UnboundedSender<String> {
-        let (chunks_tx, chunks_rx) = mpsc::unbounded();
-        codegen.update(cx, |codegen, cx| {
-            codegen.handle_stream(
-                String::new(),
-                String::new(),
-                None,
-                future::ready(Ok(LanguageModelTextStream {
-                    message_id: None,
-                    stream: chunks_rx.map(Ok).boxed(),
-                })),
-                cx,
-            );
-        });
-        chunks_tx
-    }
-
    fn rust_lang() -> Language {
        Language::new(
            LanguageConfig {
--- a/crates/zed_common/src/assistant/model_selector.rs
+++ b/crates/zed_common/src/assistant/model_selector.rs
@@ -1,17 +1,21 @@
 use feature_flags::ZedPro;
+use gpui::Action;
+use gpui::DismissEvent;

-use crate::language_model::{LanguageModel, LanguageModelAvailability, LanguageModelRegistry};
+use language_model::{LanguageModel, LanguageModelAvailability, LanguageModelRegistry};
 use proto::Plan;
 use workspace::ShowConfiguration;

 use std::sync::Arc;
+use ui::ListItemSpacing;

-use crate::assistant::assistant_settings::AssistantSettings;
+use crate::assistant_settings::AssistantSettings;
 use fs::Fs;
-use gpui::{Action, AnyElement, DismissEvent, SharedString, Task};
+use gpui::SharedString;
+use gpui::Task;
 use picker::{Picker, PickerDelegate};
 use settings::update_settings_file;
-use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverMenuHandle, PopoverTrigger};
+use ui::{prelude::*, ListItem, PopoverMenu, PopoverMenuHandle, PopoverTrigger};

 const TRY_ZED_PRO_URL: &str = "https://zed.dev/pro";

@@ -81,36 +85,14 @@ impl PickerDelegate for ModelPickerDelegate {

    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
        let all_models = self.all_models.clone();
-
-        let llm_registry = LanguageModelRegistry::global(cx);
-
-        let configured_models: Vec<_> = llm_registry
-            .read(cx)
-            .providers()
-            .iter()
-            .filter(|provider| provider.is_authenticated(cx))
-            .map(|provider| provider.id())
-            .collect();
-
        cx.spawn(|this, mut cx| async move {
            let filtered_models = cx
                .background_executor()
                .spawn(async move {
-                    let displayed_models = if configured_models.is_empty() {
-                        all_models
-                    } else {
-                        all_models
-                            .into_iter()
-                            .filter(|model_info| {
-                                configured_models.contains(&model_info.model.provider_id())
-                            })
-                            .collect::<Vec<_>>()
-                    };
-
                    if query.is_empty() {
-                        displayed_models
+                        all_models
                    } else {
-                        displayed_models
+                        all_models
                            .into_iter()
                            .filter(|model_info| {
                                model_info
@@ -159,29 +141,6 @@ impl PickerDelegate for ModelPickerDelegate {

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

-    fn render_header(&self, cx: &mut ViewContext<Picker<Self>>) -> Option<AnyElement> {
-        let configured_models_count = LanguageModelRegistry::global(cx)
-            .read(cx)
-            .providers()
-            .iter()
-            .filter(|provider| provider.is_authenticated(cx))
-            .count();
-
-        if configured_models_count > 0 {
-            Some(
-                Label::new("Configured Models")
-                    .size(LabelSize::Small)
-                    .color(Color::Muted)
-                    .mt_1()
-                    .mb_0p5()
-                    .ml_3()
-                    .into_any_element(),
-            )
-        } else {
-            None
-        }
-    }
-
    fn render_match(
        &self,
        ix: usize,
@@ -189,10 +148,9 @@ impl PickerDelegate for ModelPickerDelegate {
        cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
        use feature_flags::FeatureFlagAppExt;
-        let show_badges = cx.has_flag::<ZedPro>();
-
        let model_info = self.filtered_models.get(ix)?;
-        let provider_name: String = model_info.model.provider_name().0.clone().into();
+        let show_badges = cx.has_flag::<ZedPro>();
+        let provider_name: String = model_info.model.provider_name().0.into();

        Some(
            ListItem::new(ix)
@@ -200,7 +158,7 @@ impl PickerDelegate for ModelPickerDelegate {
                .spacing(ListItemSpacing::Sparse)
                .selected(selected)
                .start_slot(
-                    div().pr_0p5().child(
+                    div().pr_1().child(
                        Icon::new(model_info.icon)
                            .color(Color::Muted)
                            .size(IconSize::Medium),
@@ -209,13 +167,13 @@ impl PickerDelegate for ModelPickerDelegate {
                .child(
                    h_flex()
                        .w_full()
-                        .items_center()
-                        .gap_1p5()
-                        .min_w(px(200.))
-                        .child(Label::new(model_info.model.name().0.clone()))
+                        .justify_between()
+                        .font_buffer(cx)
+                        .min_w(px(240.))
                        .child(
                            h_flex()
-                                .gap_0p5()
+                                .gap_2()
+                                .child(Label::new(model_info.model.name().0.clone()))
                                .child(
                                    Label::new(provider_name)
                                        .size(LabelSize::XSmall)
@@ -254,13 +212,13 @@ impl PickerDelegate for ModelPickerDelegate {
            h_flex()
                .w_full()
                .border_t_1()
-                .border_color(cx.theme().colors().border_variant)
+                .border_color(cx.theme().colors().border)
                .p_1()
                .gap_4()
                .justify_between()
                .when(cx.has_flag::<ZedPro>(), |this| {
                    this.child(match plan {
-                        // Already a Zed Pro subscriber
+                        // Already a zed pro subscriber
                        Plan::ZedPro => Button::new("zed-pro", "Zed Pro")
                            .icon(IconName::ZedAssistant)
                            .icon_size(IconSize::Small)
@@ -301,7 +259,6 @@ impl<T: PopoverTrigger> RenderOnce for ModelSelector<T> {
        let selected_provider = LanguageModelRegistry::read_global(cx)
            .active_provider()
            .map(|m| m.id());
-
        let selected_model = LanguageModelRegistry::read_global(cx)
            .active_model()
            .map(|m| m.id());
--- a/crates/zed_common/src/assistant/prompt_library.rs
+++ b/crates/zed_common/src/assistant/prompt_library.rs
@@ -1,10 +1,4 @@
-use crate::assistant::SlashCommandWorkingSet;
-use crate::assistant::{
-    slash_command::SlashCommandCompletionProvider, AssistantPanel, InlineAssistant,
-};
-use crate::language_model::{
-    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
-};
+use crate::{slash_command::SlashCommandCompletionProvider, AssistantPanel, InlineAssistant};
 use anyhow::{anyhow, Result};
 use chrono::{DateTime, Utc};
 use collections::{HashMap, HashSet};
@@ -24,6 +18,9 @@ use heed::{
    Database, RoTxn,
 };
 use language::{language_settings::SoftWrap, Buffer, LanguageRegistry};
+use language_model::{
+    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
+};
 use parking_lot::RwLock;
 use picker::{Picker, PickerDelegate};
 use release_channel::ReleaseChannel;
@@ -524,13 +521,9 @@ impl PromptLibrary {
                            editor.set_show_indent_guides(false, cx);
                            editor.set_use_modal_editing(false);
                            editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
-                            editor.set_completion_provider(Some(Box::new(
-                                SlashCommandCompletionProvider::new(
-                                    Arc::new(SlashCommandWorkingSet::default()),
-                                    None,
-                                    None,
-                                ),
-                            )));
+                            editor.set_completion_provider(Box::new(
+                                SlashCommandCompletionProvider::new(None, None),
+                            ));
                            if focus {
                                editor.focus(cx);
                            }
@@ -832,7 +825,7 @@ impl PromptLibrary {
            .overflow_x_hidden()
            .child(
                h_flex()
-                    .p(DynamicSpacing::Base04.rems(cx))
+                    .p(Spacing::Small.rems(cx))
                    .h_9()
                    .w_full()
                    .flex_none()
@@ -873,17 +866,17 @@ impl PromptLibrary {
                        .size_full()
                        .relative()
                        .overflow_hidden()
-                        .pl(DynamicSpacing::Base16.rems(cx))
-                        .pt(DynamicSpacing::Base08.rems(cx))
+                        .pl(Spacing::XXLarge.rems(cx))
+                        .pt(Spacing::Large.rems(cx))
                        .on_click(cx.listener(move |_, _, cx| {
                            cx.focus(&focus_handle);
                        }))
                        .child(
                            h_flex()
                                .group("active-editor-header")
-                                .pr(DynamicSpacing::Base16.rems(cx))
-                                .pt(DynamicSpacing::Base02.rems(cx))
-                                .pb(DynamicSpacing::Base08.rems(cx))
+                                .pr(Spacing::XXLarge.rems(cx))
+                                .pt(Spacing::XSmall.rems(cx))
+                                .pb(Spacing::Large.rems(cx))
                                .justify_between()
                                .child(
                                    h_flex().gap_1().child(
@@ -917,7 +910,7 @@ impl PromptLibrary {
                                                            .features
                                                            .clone(),
                                                        font_size: HeadlineSize::Large
-                                                            .rems()
+                                                            .size()
                                                            .into(),
                                                        font_weight: settings.ui_font.weight,
                                                        line_height: relative(
@@ -945,13 +938,13 @@ impl PromptLibrary {
                                        .child(
                                            h_flex()
                                                .h_full()
-                                                .gap(DynamicSpacing::Base16.rems(cx))
+                                                .gap(Spacing::XXLarge.rems(cx))
                                                .child(div()),
                                        )
                                        .child(
                                            h_flex()
                                                .h_full()
-                                                .gap(DynamicSpacing::Base16.rems(cx))
+                                                .gap(Spacing::XXLarge.rems(cx))
                                                .children(prompt_editor.token_count.map(
                                                    |token_count| {
                                                        let token_count: SharedString =
--- a/crates/zed_common/src/assistant/prompts.rs
+++ b/crates/zed_common/src/assistant/prompts.rs
@@ -45,6 +45,15 @@ pub struct ProjectSlashCommandPromptContext {
    pub context_buffer: String,
 }

+/// Context required to generate a workflow step resolution prompt.
+#[derive(Debug, Serialize)]
+pub struct StepResolutionContext {
+    /// The full context, including <step>...</step> tags
+    pub workflow_context: String,
+    /// The text of the specific step from the context to resolve
+    pub step_to_resolve: String,
+}
+
 pub struct PromptLoadingParams<'a> {
    pub fs: Arc<dyn Fs>,
    pub repo_path: Option<PathBuf>,
@@ -149,7 +158,7 @@ impl PromptBuilder {
                            if file_path.to_string_lossy().ends_with(".hbs") {
                                if let Ok(content) = params.fs.load(&file_path).await {
                                    let file_name = file_path.file_stem().unwrap().to_string_lossy();
-                                    log::debug!("Registering prompt template override: {}", file_name);
+                                    log::info!("Registering prompt template override: {}", file_name);
                                    handlebars.lock().register_template_string(&file_name, content).log_err();
                                }
                            }
@@ -194,7 +203,7 @@ impl PromptBuilder {
        for path in Assets.list("prompts")? {
            if let Some(id) = path.split('/').last().and_then(|s| s.strip_suffix(".hbs")) {
                if let Some(prompt) = Assets.load(path.as_ref()).log_err().flatten() {
-                    log::debug!("Registering built-in prompt template: {}", id);
+                    log::info!("Registering built-in prompt template: {}", id);
                    let prompt = String::from_utf8_lossy(prompt.as_ref());
                    handlebars.register_template_string(id, LineEnding::normalize_cow(prompt))?
                }
@@ -204,7 +213,7 @@ impl PromptBuilder {
        Ok(())
    }

-    pub fn generate_inline_transformation_prompt(
+    pub fn generate_content_prompt(
        &self,
        user_prompt: String,
        language_name: Option<&LanguageName>,
@@ -310,8 +319,8 @@ impl PromptBuilder {
            .render("terminal_assistant_prompt", &context)
    }

-    pub fn generate_suggest_edits_prompt(&self) -> Result<String, RenderError> {
-        self.handlebars.lock().render("suggest_edits", &())
+    pub fn generate_workflow_prompt(&self) -> Result<String, RenderError> {
+        self.handlebars.lock().render("edit_workflow", &())
    }

    pub fn generate_project_slash_command_prompt(
--- a/crates/zed_common/src/assistant/slash_command.rs
+++ b/crates/zed_common/src/assistant/slash_command.rs
@@ -1,8 +1,7 @@
-use crate::assistant::assistant_panel::ContextEditor;
-use crate::assistant::SlashCommandWorkingSet;
-use crate::assistant_slash_command::AfterCompletion;
-pub use crate::assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandRegistry};
+use crate::assistant_panel::ContextEditor;
 use anyhow::Result;
+use assistant_slash_command::AfterCompletion;
+pub use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandRegistry};
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{AppContext, Model, Task, ViewContext, WeakView, WindowContext};
@@ -32,15 +31,13 @@ pub mod now_command;
 pub mod project_command;
 pub mod prompt_command;
 pub mod search_command;
-pub mod selection_command;
-pub mod streaming_example_command;
 pub mod symbols_command;
 pub mod tab_command;
 pub mod terminal_command;
+pub mod workflow_command;

 pub(crate) struct SlashCommandCompletionProvider {
    cancel_flag: Mutex<Arc<AtomicBool>>,
-    slash_commands: Arc<SlashCommandWorkingSet>,
    editor: Option<WeakView<ContextEditor>>,
    workspace: Option<WeakView<Workspace>>,
 }
@@ -54,13 +51,11 @@ pub(crate) struct SlashCommandLine {

 impl SlashCommandCompletionProvider {
    pub fn new(
-        slash_commands: Arc<SlashCommandWorkingSet>,
        editor: Option<WeakView<ContextEditor>>,
        workspace: Option<WeakView<Workspace>>,
    ) -> Self {
        Self {
            cancel_flag: Mutex::new(Arc::new(AtomicBool::new(false))),
-            slash_commands,
            editor,
            workspace,
        }
@@ -73,9 +68,9 @@ impl SlashCommandCompletionProvider {
        name_range: Range<Anchor>,
        cx: &mut WindowContext,
    ) -> Task<Result<Vec<project::Completion>>> {
-        let slash_commands = self.slash_commands.clone();
-        let candidates = slash_commands
-            .command_names(cx)
+        let commands = SlashCommandRegistry::global(cx);
+        let candidates = commands
+            .command_names()
            .into_iter()
            .enumerate()
            .map(|(ix, def)| StringMatchCandidate {
@@ -102,7 +97,7 @@ impl SlashCommandCompletionProvider {
                matches
                    .into_iter()
                    .filter_map(|mat| {
-                        let command = slash_commands.command(&mat.string, cx)?;
+                        let command = commands.command(&mat.string)?;
                        let mut new_text = mat.string.clone();
                        let requires_argument = command.requires_argument();
                        let accepts_arguments = command.accepts_arguments();
@@ -131,6 +126,7 @@ impl SlashCommandCompletionProvider {
                                                            &command_name,
                                                            &[],
                                                            true,
+                                                            false,
                                                            workspace.clone(),
                                                            cx,
                                                        );
@@ -215,6 +211,7 @@ impl SlashCommandCompletionProvider {
                                                            &command_name,
                                                            &completed_arguments,
                                                            true,
+                                                            false,
                                                            workspace.clone(),
                                                            cx,
                                                        );
--- a/crates/zed_common/src/assistant/slash_command/auto_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/auto_command.rs
@@ -1,25 +1,22 @@
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-use crate::language_model::{
-    LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
-};
-use crate::semantic_index::{FileSummary, SemanticDb};
+use super::create_label_for_command;
+use super::{SlashCommand, SlashCommandOutput};
 use anyhow::{anyhow, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use feature_flags::FeatureFlag;
 use futures::StreamExt;
 use gpui::{AppContext, AsyncAppContext, Task, WeakView};
 use language::{CodeLabel, LspAdapterDelegate};
+use language_model::{
+    LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
+    LanguageModelRequestMessage, Role,
+};
+use semantic_index::{FileSummary, SemanticDb};
 use smol::channel;
 use std::sync::{atomic::AtomicBool, Arc};
-use ui::{prelude::*, BorrowAppContext, WindowContext};
+use ui::{BorrowAppContext, WindowContext};
 use util::ResultExt;
 use workspace::Workspace;

-use crate::assistant::slash_command::create_label_for_command;
-
 pub struct AutoSlashCommandFeatureFlag;

 impl FeatureFlag for AutoSlashCommandFeatureFlag {
@@ -34,15 +31,11 @@ impl SlashCommand for AutoCommand {
    }

    fn description(&self) -> String {
-        "Automatically infer what context to add".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Wand
+        "Automatically infer what context to add, based on your prompt".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Automatically Infer Context".into()
    }

    fn label(&self, cx: &AppContext) -> CodeLabel {
@@ -99,7 +92,7 @@ impl SlashCommand for AutoCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let Some(workspace) = workspace.upgrade() else {
            return Task::ready(Err(anyhow::anyhow!("workspace was dropped")));
        };
@@ -151,8 +144,7 @@ impl SlashCommand for AutoCommand {
                text: prompt,
                sections: Vec::new(),
                run_commands_in_text: true,
-            }
-            .to_event_stream())
+            })
        })
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/cargo_workspace_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/cargo_workspace_command.rs
@@ -1,8 +1,6 @@
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
+use super::{SlashCommand, SlashCommandOutput};
 use anyhow::{anyhow, Context, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use fs::Fs;
 use gpui::{AppContext, Model, Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
@@ -125,7 +123,7 @@ impl SlashCommand for CargoWorkspaceSlashCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let output = workspace.update(cx, |workspace, cx| {
            let project = workspace.project().clone();
            let fs = workspace.project().read(cx).fs().clone();
@@ -147,8 +145,7 @@ impl SlashCommand for CargoWorkspaceSlashCommand {
                        metadata: None,
                    }],
                    run_commands_in_text: false,
-                }
-                .to_event_stream())
+                })
            })
        });
        output.unwrap_or_else(|error| Task::ready(Err(error)))
--- a/crates/zed_common/src/assistant/slash_command/context_server_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/context_server_command.rs
@@ -1,14 +1,14 @@
-use crate::assistant_slash_command::{
-    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
-    SlashCommandOutputSection, SlashCommandResult,
-};
 use anyhow::{anyhow, Result};
+use assistant_slash_command::{
+    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandOutput,
+    SlashCommandOutputSection,
+};
 use collections::HashMap;
 use context_servers::{
    manager::{ContextServer, ContextServerManager},
-    types::Prompt,
+    protocol::PromptInfo,
 };
-use gpui::{AppContext, Model, Task, WeakView, WindowContext};
+use gpui::{Task, WeakView, WindowContext};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
@@ -16,24 +16,16 @@ use text::LineEnding;
 use ui::{IconName, SharedString};
 use workspace::Workspace;

-use crate::assistant::slash_command::create_label_for_command;
-
 pub struct ContextServerSlashCommand {
-    server_manager: Model<ContextServerManager>,
-    server_id: Arc<str>,
-    prompt: Prompt,
+    server_id: String,
+    prompt: PromptInfo,
 }

 impl ContextServerSlashCommand {
-    pub fn new(
-        server_manager: Model<ContextServerManager>,
-        server: &Arc<dyn ContextServer>,
-        prompt: Prompt,
-    ) -> Self {
+    pub fn new(server: &Arc<ContextServer>, prompt: PromptInfo) -> Self {
        Self {
-            server_id: server.id(),
+            server_id: server.id.clone(),
            prompt,
-            server_manager,
        }
    }
 }
@@ -43,28 +35,12 @@ impl SlashCommand for ContextServerSlashCommand {
        self.prompt.name.clone()
    }

-    fn label(&self, cx: &AppContext) -> language::CodeLabel {
-        let mut parts = vec![self.prompt.name.as_str()];
-        if let Some(args) = &self.prompt.arguments {
-            if let Some(arg) = args.first() {
-                parts.push(arg.name.as_str());
-            }
-        }
-        create_label_for_command(&parts[0], &parts[1..], cx)
-    }
-
    fn description(&self) -> String {
-        match &self.prompt.description {
-            Some(desc) => desc.clone(),
-            None => format!("Run '{}' from {}", self.prompt.name, self.server_id),
-        }
+        format!("Run context server command: {}", self.prompt.name)
    }

    fn menu_text(&self) -> String {
-        match &self.prompt.description {
-            Some(desc) => desc.clone(),
-            None => format!("Run '{}' from {}", self.prompt.name, self.server_id),
-        }
+        format!("Run '{}' from {}", self.prompt.name, self.server_id)
    }

    fn requires_argument(&self) -> bool {
@@ -80,16 +56,20 @@ impl SlashCommand for ContextServerSlashCommand {
        _workspace: Option<WeakView<Workspace>>,
        cx: &mut WindowContext,
    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let Ok((arg_name, arg_value)) = completion_argument(&self.prompt, arguments) else {
-            return Task::ready(Err(anyhow!("Failed to complete argument")));
-        };
-
        let server_id = self.server_id.clone();
        let prompt_name = self.prompt.name.clone();
+        let manager = ContextServerManager::global(cx);
+        let manager = manager.read(cx);

-        if let Some(server) = self.server_manager.read(cx).get_server(&server_id) {
+        let (arg_name, arg_val) = match completion_argument(&self.prompt, arguments) {
+            Ok(tp) => tp,
+            Err(e) => {
+                return Task::ready(Err(e));
+            }
+        };
+        if let Some(server) = manager.get_server(&server_id) {
            cx.foreground_executor().spawn(async move {
-                let Some(protocol) = server.client() else {
+                let Some(protocol) = server.client.read().clone() else {
                    return Err(anyhow!("Context server not initialized"));
                };

@@ -102,7 +82,7 @@ impl SlashCommand for ContextServerSlashCommand {
                            },
                        ),
                        arg_name,
-                        arg_value,
+                        arg_val,
                    )
                    .await?;

@@ -131,7 +111,7 @@ impl SlashCommand for ContextServerSlashCommand {
        _workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let server_id = self.server_id.clone();
        let prompt_name = self.prompt.name.clone();

@@ -140,35 +120,15 @@ impl SlashCommand for ContextServerSlashCommand {
            Err(e) => return Task::ready(Err(e)),
        };

-        let manager = self.server_manager.read(cx);
+        let manager = ContextServerManager::global(cx);
+        let manager = manager.read(cx);
        if let Some(server) = manager.get_server(&server_id) {
            cx.foreground_executor().spawn(async move {
-                let Some(protocol) = server.client() else {
+                let Some(protocol) = server.client.read().clone() else {
                    return Err(anyhow!("Context server not initialized"));
                };
                let result = protocol.run_prompt(&prompt_name, prompt_args).await?;
-
-                // Check that there are only user roles
-                if result
-                    .messages
-                    .iter()
-                    .any(|msg| !matches!(msg.role, context_servers::types::SamplingRole::User))
-                {
-                    return Err(anyhow!(
-                        "Prompt contains non-user roles, which is not supported"
-                    ));
-                }
-
-                // Extract text from user messages into a single prompt string
-                let mut prompt = result
-                    .messages
-                    .into_iter()
-                    .filter_map(|msg| match msg.content {
-                        context_servers::types::SamplingContent::Text { text } => Some(text),
-                        _ => None,
-                    })
-                    .collect::<Vec<String>>()
-                    .join("\n\n");
+                let mut prompt = result.prompt;

                // We must normalize the line endings here, since servers might return CR characters.
                LineEnding::normalize(&mut prompt);
@@ -186,8 +146,7 @@ impl SlashCommand for ContextServerSlashCommand {
                    }],
                    text: prompt,
                    run_commands_in_text: false,
-                }
-                .to_event_stream())
+                })
            })
        } else {
            Task::ready(Err(anyhow!("Context server not found")))
@@ -195,7 +154,7 @@ impl SlashCommand for ContextServerSlashCommand {
    }
 }

-fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String, String)> {
+fn completion_argument(prompt: &PromptInfo, arguments: &[String]) -> Result<(String, String)> {
    if arguments.is_empty() {
        return Err(anyhow!("No arguments given"));
    }
@@ -211,7 +170,7 @@ fn completion_argument(prompt: &Prompt, arguments: &[String]) -> Result<(String,
    }
 }

-fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<String, String>> {
+fn prompt_arguments(prompt: &PromptInfo, arguments: &[String]) -> Result<HashMap<String, String>> {
    match &prompt.arguments {
        Some(args) if args.len() > 1 => Err(anyhow!(
            "Prompt has more than one argument, which is not supported"
@@ -240,7 +199,7 @@ fn prompt_arguments(prompt: &Prompt, arguments: &[String]) -> Result<HashMap<Str
 /// MCP servers can return prompts with multiple arguments. Since we only
 /// support one argument, we ignore all others. This is the necessary predicate
 /// for this.
-pub fn acceptable_prompt(prompt: &Prompt) -> bool {
+pub fn acceptable_prompt(prompt: &PromptInfo) -> bool {
    match &prompt.arguments {
        None => true,
        Some(args) if args.len() <= 1 => true,
--- a/crates/zed_common/src/assistant/slash_command/default_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/default_command.rs
@@ -1,9 +1,7 @@
-use crate::assistant::prompt_library::PromptStore;
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
+use super::{SlashCommand, SlashCommandOutput};
+use crate::prompt_library::PromptStore;
 use anyhow::{anyhow, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::{
@@ -50,7 +48,7 @@ impl SlashCommand for DefaultSlashCommand {
        _workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let store = PromptStore::global(cx);
        cx.background_executor().spawn(async move {
            let store = store.await?;
@@ -78,8 +76,7 @@ impl SlashCommand for DefaultSlashCommand {
                }],
                text,
                run_commands_in_text: true,
-            }
-            .to_event_stream())
+            })
        })
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/delta_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/delta_command.rs
@@ -1,16 +1,14 @@
-use crate::assistant::slash_command::file_command::{FileCommandMetadata, FileSlashCommand};
-use crate::assistant_slash_command::{
+use crate::slash_command::file_command::{FileCommandMetadata, FileSlashCommand};
+use anyhow::Result;
+use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
 };
-use anyhow::{anyhow, Result};
 use collections::HashSet;
 use futures::future;
 use gpui::{Task, WeakView, WindowContext};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::sync::{atomic::AtomicBool, Arc};
 use text::OffsetRangeExt;
-use ui::prelude::*;
 use workspace::Workspace;

 pub(crate) struct DeltaSlashCommand;
@@ -21,15 +19,11 @@ impl SlashCommand for DeltaSlashCommand {
    }

    fn description(&self) -> String {
-        "Re-insert changed files".into()
+        "re-insert changed files".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Diff
+        "Re-insert Changed Files".into()
    }

    fn requires_argument(&self) -> bool {
@@ -43,7 +37,7 @@ impl SlashCommand for DeltaSlashCommand {
        _workspace: Option<WeakView<Workspace>>,
        _cx: &mut WindowContext,
    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
+        unimplemented!()
    }

    fn run(
@@ -54,11 +48,10 @@ impl SlashCommand for DeltaSlashCommand {
        workspace: WeakView<Workspace>,
        delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let mut paths = HashSet::default();
        let mut file_command_old_outputs = Vec::new();
        let mut file_command_new_outputs = Vec::new();
-
        for section in context_slash_command_output_sections.iter().rev() {
            if let Some(metadata) = section
                .metadata
@@ -85,7 +78,6 @@ impl SlashCommand for DeltaSlashCommand {

        cx.background_executor().spawn(async move {
            let mut output = SlashCommandOutput::default();
-            let mut changes_detected = false;

            let file_command_new_outputs = future::join_all(file_command_new_outputs).await;
            for (old_text, new_output) in file_command_old_outputs
@@ -93,33 +85,25 @@ impl SlashCommand for DeltaSlashCommand {
                .zip(file_command_new_outputs)
            {
                if let Ok(new_output) = new_output {
-                    if let Ok(new_output) = SlashCommandOutput::from_event_stream(new_output).await
-                    {
-                        if let Some(file_command_range) = new_output.sections.first() {
-                            let new_text = &new_output.text[file_command_range.range.clone()];
-                            if old_text.chars().ne(new_text.chars()) {
-                                changes_detected = true;
-                                output.sections.extend(new_output.sections.into_iter().map(
-                                    |section| SlashCommandOutputSection {
-                                        range: output.text.len() + section.range.start
-                                            ..output.text.len() + section.range.end,
-                                        icon: section.icon,
-                                        label: section.label,
-                                        metadata: section.metadata,
-                                    },
-                                ));
-                                output.text.push_str(&new_output.text);
-                            }
+                    if let Some(file_command_range) = new_output.sections.first() {
+                        let new_text = &new_output.text[file_command_range.range.clone()];
+                        if old_text.chars().ne(new_text.chars()) {
+                            output.sections.extend(new_output.sections.into_iter().map(
+                                |section| SlashCommandOutputSection {
+                                    range: output.text.len() + section.range.start
+                                        ..output.text.len() + section.range.end,
+                                    icon: section.icon,
+                                    label: section.label,
+                                    metadata: section.metadata,
+                                },
+                            ));
+                            output.text.push_str(&new_output.text);
                        }
                    }
                }
            }

-            if !changes_detected {
-                return Err(anyhow!("no new changes detected"));
-            }
-
-            Ok(output.to_event_stream())
+            Ok(output)
        })
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/diagnostics_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/diagnostics_command.rs
@@ -1,8 +1,6 @@
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
+use super::{create_label_for_command, SlashCommand, SlashCommandOutput};
 use anyhow::{anyhow, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use fuzzy::{PathMatch, StringMatchCandidate};
 use gpui::{AppContext, Model, Task, View, WeakView};
 use language::{
@@ -21,8 +19,6 @@ use util::paths::PathMatcher;
 use util::ResultExt;
 use workspace::Workspace;

-use crate::assistant::slash_command::create_label_for_command;
-
 pub(crate) struct DiagnosticsSlashCommand;

 impl DiagnosticsSlashCommand {
@@ -98,12 +94,8 @@ impl SlashCommand for DiagnosticsSlashCommand {
        "Insert diagnostics".into()
    }

-    fn icon(&self) -> IconName {
-        IconName::XCircle
-    }
-
    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Diagnostics".into()
    }

    fn requires_argument(&self) -> bool {
@@ -160,7 +152,7 @@ impl SlashCommand for DiagnosticsSlashCommand {
                .map(|completion| ArgumentCompletion {
                    label: completion.clone().into(),
                    new_text: completion,
-                    after_completion: crate::assistant_slash_command::AfterCompletion::Run,
+                    after_completion: assistant_slash_command::AfterCompletion::Run,
                    replace_previous_arguments: false,
                })
                .collect())
@@ -175,7 +167,7 @@ impl SlashCommand for DiagnosticsSlashCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let Some(workspace) = workspace.upgrade() else {
            return Task::ready(Err(anyhow!("workspace was dropped")));
        };
@@ -184,11 +176,7 @@ impl SlashCommand for DiagnosticsSlashCommand {

        let task = collect_diagnostics(workspace.read(cx).project().clone(), options, cx);

-        cx.spawn(move |_| async move {
-            task.await?
-                .map(|output| output.to_event_stream())
-                .ok_or_else(|| anyhow!("No diagnostics found"))
-        })
+        cx.spawn(move |_| async move { task.await?.ok_or_else(|| anyhow!("No diagnostics found")) })
    }
 }

--- a/crates/zed_common/src/assistant/slash_command/docs_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/docs_command.rs
@@ -3,11 +3,10 @@ use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 use std::time::Duration;

-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
 use anyhow::{anyhow, bail, Result};
+use assistant_slash_command::{
+    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
+};
 use gpui::{AppContext, BackgroundExecutor, Model, Task, WeakView};
 use indexed_docs::{
    DocsDotRsProvider, IndexedDocsRegistry, IndexedDocsStore, LocalRustdocProvider, PackageName,
@@ -182,7 +181,7 @@ impl SlashCommand for DocsSlashCommand {
                    .map(|item| ArgumentCompletion {
                        label: item.clone().into(),
                        new_text: item.to_string(),
-                        after_completion: crate::assistant_slash_command::AfterCompletion::Run,
+                        after_completion: assistant_slash_command::AfterCompletion::Run,
                        replace_previous_arguments: false,
                    })
                    .collect()
@@ -275,7 +274,7 @@ impl SlashCommand for DocsSlashCommand {
        _workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        if arguments.is_empty() {
            return Task::ready(Err(anyhow!("missing an argument")));
        };
@@ -356,8 +355,7 @@ impl SlashCommand for DocsSlashCommand {
                    })
                    .collect(),
                run_commands_in_text: false,
-            }
-            .to_event_stream())
+            })
        })
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/fetch_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/fetch_command.rs
@@ -3,11 +3,10 @@ use std::rc::Rc;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
 use anyhow::{anyhow, bail, Context, Result};
+use assistant_slash_command::{
+    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
+};
 use futures::AsyncReadExt;
 use gpui::{Task, WeakView};
 use html_to_markdown::{convert_html_to_markdown, markdown, TagHandler};
@@ -105,11 +104,11 @@ impl SlashCommand for FetchSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert fetched URL contents".into()
+        "insert URL contents".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert fetched URL contents".into()
    }

    fn requires_argument(&self) -> bool {
@@ -134,7 +133,7 @@ impl SlashCommand for FetchSlashCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let Some(argument) = arguments.first() else {
            return Task::ready(Err(anyhow!("missing URL")));
        };
@@ -167,8 +166,7 @@ impl SlashCommand for FetchSlashCommand {
                    metadata: None,
                }],
                run_commands_in_text: false,
-            }
-            .to_event_stream())
+            })
        })
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/file_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/file_command.rs
@@ -1,16 +1,11 @@
-use crate::assistant_slash_command::{
-    AfterCompletion, ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
-    SlashCommandOutput, SlashCommandOutputSection, SlashCommandResult,
-};
+use super::{diagnostics_command::collect_buffer_diagnostics, SlashCommand, SlashCommandOutput};
 use anyhow::{anyhow, Context as _, Result};
-use futures::channel::mpsc;
-use futures::Stream;
+use assistant_slash_command::{AfterCompletion, ArgumentCompletion, SlashCommandOutputSection};
 use fuzzy::PathMatch;
 use gpui::{AppContext, Model, Task, View, WeakView};
 use language::{BufferSnapshot, CodeLabel, HighlightId, LineEnding, LspAdapterDelegate};
 use project::{PathMatchCandidateSet, Project};
 use serde::{Deserialize, Serialize};
-use smol::stream::StreamExt;
 use std::{
    fmt::Write,
    ops::{Range, RangeInclusive},
@@ -115,21 +110,17 @@ impl SlashCommand for FileSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert file and/or directory".into()
+        "insert file".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert File".into()
    }

    fn requires_argument(&self) -> bool {
        true
    }

-    fn icon(&self) -> IconName {
-        IconName::File
-    }
-
    fn complete_argument(
        self: Arc<Self>,
        arguments: &[String],
@@ -190,7 +181,7 @@ impl SlashCommand for FileSlashCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let Some(workspace) = workspace.upgrade() else {
            return Task::ready(Err(anyhow!("workspace was dropped")));
        };
@@ -199,12 +190,7 @@ impl SlashCommand for FileSlashCommand {
            return Task::ready(Err(anyhow!("missing path")));
        };

-        Task::ready(Ok(collect_files(
-            workspace.read(cx).project().clone(),
-            arguments,
-            cx,
-        )
-        .boxed()))
+        collect_files(workspace.read(cx).project().clone(), arguments, cx)
    }
 }

@@ -212,7 +198,7 @@ fn collect_files(
    project: Model<Project>,
    glob_inputs: &[String],
    cx: &mut AppContext,
-) -> impl Stream<Item = Result<SlashCommandEvent>> {
+) -> Task<Result<SlashCommandOutput>> {
    let Ok(matchers) = glob_inputs
        .into_iter()
        .map(|glob_input| {
@@ -221,7 +207,7 @@ fn collect_files(
        })
        .collect::<anyhow::Result<Vec<custom_path_matcher::PathMatcher>>>()
    else {
-        return futures::stream::once(async { Err(anyhow!("invalid path")) }).boxed();
+        return Task::ready(Err(anyhow!("invalid path")));
    };

    let project_handle = project.downgrade();
@@ -231,11 +217,11 @@ fn collect_files(
        .map(|worktree| worktree.read(cx).snapshot())
        .collect::<Vec<_>>();

-    let (events_tx, events_rx) = mpsc::unbounded();
    cx.spawn(|mut cx| async move {
+        let mut output = SlashCommandOutput::default();
        for snapshot in snapshots {
            let worktree_id = snapshot.id();
-            let mut directory_stack: Vec<Arc<Path>> = Vec::new();
+            let mut directory_stack: Vec<(Arc<Path>, String, usize)> = Vec::new();
            let mut folded_directory_names_stack = Vec::new();
            let mut is_top_level_directory = true;

@@ -251,18 +237,17 @@ fn collect_files(
                    continue;
                }

-                while let Some(dir) = directory_stack.last() {
+                while let Some((dir, _, _)) = directory_stack.last() {
                    if entry.path.starts_with(dir) {
                        break;
                    }
-                    directory_stack.pop().unwrap();
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                        SlashCommandContent::Text {
-                            text: "\n".into(),
-                            run_commands_in_text: false,
-                        },
-                    )))?;
+                    let (_, entry_name, start) = directory_stack.pop().unwrap();
+                    output.sections.push(build_entry_output_section(
+                        start..output.text.len().saturating_sub(1),
+                        Some(&PathBuf::from(entry_name)),
+                        true,
+                        None,
+                    ));
                }

                let filename = entry
@@ -294,46 +279,23 @@ fn collect_files(
                        continue;
                    }
                    let prefix_paths = folded_directory_names_stack.drain(..).as_slice().join("/");
+                    let entry_start = output.text.len();
                    if prefix_paths.is_empty() {
-                        let label = if is_top_level_directory {
+                        if is_top_level_directory {
+                            output
+                                .text
+                                .push_str(&path_including_worktree_name.to_string_lossy());
                            is_top_level_directory = false;
-                            path_including_worktree_name.to_string_lossy().to_string()
                        } else {
-                            filename
-                        };
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                            icon: IconName::Folder,
-                            label: label.clone().into(),
-                            metadata: None,
-                        }))?;
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                            SlashCommandContent::Text {
-                                text: label,
-                                run_commands_in_text: false,
-                            },
-                        )))?;
-                        directory_stack.push(entry.path.clone());
+                            output.text.push_str(&filename);
+                        }
+                        directory_stack.push((entry.path.clone(), filename, entry_start));
                    } else {
                        let entry_name = format!("{}/{}", prefix_paths, &filename);
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                            icon: IconName::Folder,
-                            label: entry_name.clone().into(),
-                            metadata: None,
-                        }))?;
-                        events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                            SlashCommandContent::Text {
-                                text: entry_name,
-                                run_commands_in_text: false,
-                            },
-                        )))?;
-                        directory_stack.push(entry.path.clone());
+                        output.text.push_str(&entry_name);
+                        directory_stack.push((entry.path.clone(), entry_name, entry_start));
                    }
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                        SlashCommandContent::Text {
-                            text: "\n".into(),
-                            run_commands_in_text: false,
-                        },
-                    )))?;
+                    output.text.push('\n');
                } else if entry.is_file() {
                    let Some(open_buffer_task) = project_handle
                        .update(&mut cx, |project, cx| {
@@ -344,7 +306,6 @@ fn collect_files(
                        continue;
                    };
                    if let Some(buffer) = open_buffer_task.await.log_err() {
-                        let mut output = SlashCommandOutput::default();
                        let snapshot = buffer.read_with(&cx, |buffer, _| buffer.snapshot())?;
                        append_buffer_to_output(
                            &snapshot,
@@ -352,24 +313,33 @@ fn collect_files(
                            &mut output,
                        )
                        .log_err();
-                        let mut buffer_events = output.to_event_stream();
-                        while let Some(event) = buffer_events.next().await {
-                            events_tx.unbounded_send(event)?;
-                        }
                    }
                }
            }

-            while let Some(_) = directory_stack.pop() {
-                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+            while let Some((dir, entry, start)) = directory_stack.pop() {
+                if directory_stack.is_empty() {
+                    let mut root_path = PathBuf::new();
+                    root_path.push(snapshot.root_name());
+                    root_path.push(&dir);
+                    output.sections.push(build_entry_output_section(
+                        start..output.text.len(),
+                        Some(&root_path),
+                        true,
+                        None,
+                    ));
+                } else {
+                    output.sections.push(build_entry_output_section(
+                        start..output.text.len(),
+                        Some(&PathBuf::from(entry.as_str())),
+                        true,
+                        None,
+                    ));
+                }
            }
        }
-
-        anyhow::Ok(())
+        Ok(output)
    })
-    .detach_and_log_err(cx);
-
-    events_rx.boxed()
 }

 pub fn codeblock_fence_for_path(
@@ -540,6 +510,8 @@ pub fn append_buffer_to_output(
    output.text.push('\n');

    let section_ix = output.sections.len();
+    collect_buffer_diagnostics(output, buffer, false);
+
    output.sections.insert(
        section_ix,
        build_entry_output_section(prev_len..output.text.len(), path, false, None),
@@ -552,15 +524,13 @@ pub fn append_buffer_to_output(

 #[cfg(test)]
 mod test {
-    use crate::assistant::slash_command::file_command::collect_files;
-    use crate::assistant_slash_command::SlashCommandOutput;
    use fs::FakeFs;
    use gpui::TestAppContext;
-    use pretty_assertions::assert_eq;
    use project::Project;
    use serde_json::json;
    use settings::SettingsStore;
-    use smol::stream::StreamExt;
+
+    use crate::slash_command::file_command::collect_files;

    pub fn init_test(cx: &mut gpui::TestAppContext) {
        if std::env::var("RUST_LOG").is_ok() {
@@ -599,9 +569,8 @@ mod test {

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

-        let result_1 =
-            cx.update(|cx| collect_files(project.clone(), &["root/dir".to_string()], cx));
-        let result_1 = SlashCommandOutput::from_event_stream(result_1.boxed())
+        let result_1 = cx
+            .update(|cx| collect_files(project.clone(), &["root/dir".to_string()], cx))
            .await
            .unwrap();

@@ -609,17 +578,17 @@ mod test {
        // 4 files + 2 directories
        assert_eq!(result_1.sections.len(), 6);

-        let result_2 =
-            cx.update(|cx| collect_files(project.clone(), &["root/dir/".to_string()], cx));
-        let result_2 = SlashCommandOutput::from_event_stream(result_2.boxed())
+        let result_2 = cx
+            .update(|cx| collect_files(project.clone(), &["root/dir/".to_string()], cx))
            .await
            .unwrap();

        assert_eq!(result_1, result_2);

-        let result =
-            cx.update(|cx| collect_files(project.clone(), &["root/dir*".to_string()], cx).boxed());
-        let result = SlashCommandOutput::from_event_stream(result).await.unwrap();
+        let result = cx
+            .update(|cx| collect_files(project.clone(), &["root/dir*".to_string()], cx))
+            .await
+            .unwrap();

        assert!(result.text.starts_with("root/dir"));
        // 5 files + 2 directories
@@ -662,9 +631,8 @@ mod test {

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

-        let result =
-            cx.update(|cx| collect_files(project.clone(), &["zed/assets/themes".to_string()], cx));
-        let result = SlashCommandOutput::from_event_stream(result.boxed())
+        let result = cx
+            .update(|cx| collect_files(project.clone(), &["zed/assets/themes".to_string()], cx))
            .await
            .unwrap();

@@ -724,9 +692,8 @@ mod test {

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

-        let result =
-            cx.update(|cx| collect_files(project.clone(), &["zed/assets/themes".to_string()], cx));
-        let result = SlashCommandOutput::from_event_stream(result.boxed())
+        let result = cx
+            .update(|cx| collect_files(project.clone(), &["zed/assets/themes".to_string()], cx))
            .await
            .unwrap();

@@ -749,8 +716,6 @@ mod test {
        assert_eq!(result.sections[6].label, "summercamp");
        assert_eq!(result.sections[7].label, "zed/assets/themes");

-        assert_eq!(result.text, "zed/assets/themes\n```zed/assets/themes/LICENSE\n1\n```\n\nsummercamp\n```zed/assets/themes/summercamp/LICENSE\n1\n```\n\nsubdir\n```zed/assets/themes/summercamp/subdir/LICENSE\n1\n```\n\nsubsubdir\n```zed/assets/themes/summercamp/subdir/subsubdir/LICENSE\n3\n```\n\n");
-
        // Ensure that the project lasts until after the last await
        drop(project);
    }
--- a/crates/zed_common/src/assistant/slash_command/now_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/now_command.rs
@@ -1,11 +1,10 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
 use anyhow::Result;
+use assistant_slash_command::{
+    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
+};
 use chrono::Local;
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
@@ -20,11 +19,11 @@ impl SlashCommand for NowSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert current date and time".into()
+        "insert the current date and time".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Current Date and Time".into()
    }

    fn requires_argument(&self) -> bool {
@@ -49,7 +48,7 @@ impl SlashCommand for NowSlashCommand {
        _workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        _cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let now = Local::now();
        let text = format!("Today is {now}.", now = now.to_rfc2822());
        let range = 0..text.len();
@@ -63,7 +62,6 @@ impl SlashCommand for NowSlashCommand {
                metadata: None,
            }],
            run_commands_in_text: false,
-        }
-        .to_event_stream()))
+        }))
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/project_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/project_command.rs
@@ -2,17 +2,15 @@ use super::{
    create_label_for_command, search_command::add_search_result_section, SlashCommand,
    SlashCommandOutput,
 };
-use crate::assistant::PromptBuilder;
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommandOutputSection, SlashCommandResult,
-};
-use crate::language_model::{LanguageModelRegistry, LanguageModelTool};
-use crate::semantic_index::SemanticDb;
+use crate::PromptBuilder;
 use anyhow::{anyhow, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use feature_flags::FeatureFlag;
 use gpui::{AppContext, Task, WeakView, WindowContext};
 use language::{Anchor, CodeLabel, LspAdapterDelegate};
+use language_model::{LanguageModelRegistry, LanguageModelTool};
 use schemars::JsonSchema;
+use semantic_index::SemanticDb;
 use serde::Deserialize;

 pub struct ProjectSlashCommandFeatureFlag;
@@ -26,8 +24,7 @@ use std::{
    ops::DerefMut,
    sync::{atomic::AtomicBool, Arc},
 };
-
-use ui::prelude::*;
+use ui::{BorrowAppContext as _, IconName};
 use workspace::Workspace;

 pub struct ProjectSlashCommand {
@@ -50,15 +47,11 @@ impl SlashCommand for ProjectSlashCommand {
    }

    fn description(&self) -> String {
-        "Generate a semantic search based on context".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Folder
+        "Generate semantic searches based on the current context".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Project Context".into()
    }

    fn requires_argument(&self) -> bool {
@@ -83,7 +76,7 @@ impl SlashCommand for ProjectSlashCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let model_registry = LanguageModelRegistry::read_global(cx);
        let current_model = model_registry.active_model();
        let prompt_builder = self.prompt_builder.clone();
@@ -107,10 +100,10 @@ impl SlashCommand for ProjectSlashCommand {

            let search_queries = current_model
                .use_tool::<SearchQueries>(
-                    crate::language_model::LanguageModelRequest {
-                        messages: vec![crate::language_model::LanguageModelRequestMessage {
-                            role: crate::language_model::Role::User,
-                            content: vec![crate::language_model::MessageContent::Text(prompt)],
+                    language_model::LanguageModelRequest {
+                        messages: vec![language_model::LanguageModelRequestMessage {
+                            role: language_model::Role::User,
+                            content: vec![language_model::MessageContent::Text(prompt)],
                            cache: false,
                        }],
                        tools: vec![],
@@ -169,8 +162,7 @@ impl SlashCommand for ProjectSlashCommand {
                        text: output,
                        sections,
                        run_commands_in_text: true,
-                    }
-                    .to_event_stream())
+                    })
                })
                .await
        })
--- a/crates/zed_common/src/assistant/slash_command/prompt_after_summary.txt
+++ b/crates/zed_common/src/assistant/slash_command/prompt_after_summary.txt
--- a/crates/zed_common/src/assistant/slash_command/prompt_before_summary.txt
+++ b/crates/zed_common/src/assistant/slash_command/prompt_before_summary.txt
--- a/crates/zed_common/src/assistant/slash_command/prompt_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/prompt_command.rs
@@ -1,9 +1,7 @@
-use crate::assistant::prompt_library::PromptStore;
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
+use super::{SlashCommand, SlashCommandOutput};
+use crate::prompt_library::PromptStore;
 use anyhow::{anyhow, Context, Result};
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::sync::{atomic::AtomicBool, Arc};
@@ -18,15 +16,11 @@ impl SlashCommand for PromptSlashCommand {
    }

    fn description(&self) -> String {
-        "Insert prompt from library".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Library
+        "insert prompt from library".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Insert Prompt from Library".into()
    }

    fn requires_argument(&self) -> bool {
@@ -67,7 +61,7 @@ impl SlashCommand for PromptSlashCommand {
        _workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let title = arguments.to_owned().join(" ");
        if title.trim().is_empty() {
            return Task::ready(Err(anyhow!("missing prompt name")));
@@ -106,8 +100,7 @@ impl SlashCommand for PromptSlashCommand {
                    metadata: None,
                }],
                run_commands_in_text: true,
-            }
-            .to_event_stream())
+            })
        })
    }
 }
--- a/crates/zed_common/src/assistant/slash_command/search_command.rs
+++ b/crates/zed_common/src/assistant/slash_command/search_command.rs
@@ -1,12 +1,14 @@
-use crate::assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
+use super::{
+    create_label_for_command,
+    file_command::{build_entry_output_section, codeblock_fence_for_path},
+    SlashCommand, SlashCommandOutput,
 };
-use crate::semantic_index::{LoadedSearchResult, SemanticDb};
 use anyhow::Result;
+use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection};
 use feature_flags::FeatureFlag;
 use gpui::{AppContext, Task, WeakView};
 use language::{CodeLabel, LspAdapterDelegate};
+use semantic_index::{LoadedSearchResult, SemanticDb};
 use std::{
    fmt::Write,
    sync::{atomic::AtomicBool, Arc},
@@ -14,19 +16,10 @@ use std::{
 use ui::{prelude::*, IconName};
 use workspace::Workspace;

-use crate::assistant::slash_command::create_label_for_command;
-use crate::assistant::slash_command::file_command::{
-    build_entry_output_section, codeblock_fence_for_path,
-};
-
 pub(crate) struct SearchSlashCommandFeatureFlag;

 impl FeatureFlag for SearchSlashCommandFeatureFlag {
    const NAME: &'static str = "search-slash-command";
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
 }

 pub(crate) struct SearchSlashCommand;
@@ -41,15 +34,11 @@ impl SlashCommand for SearchSlashCommand {
    }

    fn description(&self) -> String {
-        "Search your project semantically".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::SearchCode
+        "semantic search".into()
    }

    fn menu_text(&self) -> String {
-        self.description()
+        "Semantic Search".into()
    }

    fn requires_argument(&self) -> bool {
@@ -74,7 +63,7 @@ impl SlashCommand for SearchSlashCommand {
        workspace: WeakView<Workspace>,
        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
+    ) -> Task<Result<SlashCommandOutput>> {
        let Some(workspace) = workspace.upgrade() else {
            return Task::ready(Err(anyhow::anyhow!("workspace was dropped")));
        };
@@ -140,7 +129,6 @@ impl SlashCommand for SearchSlashCommand {
                        sections,
                        run_commands_in_text: false,
                    }
-                    .to_event_stream()
                })
                .await;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Piotr Osiewicz	022ce7d883	Merge branch 'main' into v3-editor-layout-floatie	2024-09-30 10:28:16 +02:00
Piotr Osiewicz	d3d0c279b7	WIP	2024-07-19 11:28:14 +02:00
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-diff"><path d="M12 3v14"/><path d="M5 10h14"/><path d="M5 21h14"/></svg>`