Work around when the model quotes paths

.github/ISSUE_TEMPLATE/0_git_beta_bug_report.yml

@@ -0,0 +1,51 @@
+name: Git Beta
+description: There is a bug related to new Git features in Zed
+type: "Bug"
+labels: [git]
+title: "Git Beta: <a short description of the Git bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+
+        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        Actual Behavior:
+
+        Expected Behavior:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
+      placeholder: |
+        Output of "zed: Copy System Specs Into Clipboard"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
+      description: |
+        macOS: `~/Library/Logs/Zed/Zed.log`
+        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>
+
+        <!-- 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>
+    validations:
+      required: false

.github/workflows/ci.yml

@@ -23,53 +23,9 @@ env:
   RUST_BACKTRACE: 1
 
 jobs:
-  job_spec:
-    name: Decide which jobs to run
-    if: github.repository_owner == 'zed-industries'
-    outputs:
-      run_tests: ${{ steps.filter.outputs.run_tests }}
-      run_license: ${{ steps.filter.outputs.run_license }}
-    runs-on:
-      - ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-        with:
-          # 350 is arbitrary; ~10days of history on main (5secs); full history is ~25secs
-          fetch-depth: ${{ github.ref == 'refs/heads/main' && 2 || 350 }}
-      - name: Fetch git history and generate output filters
-        id: filter
-        run: |
-          if [ -z "$GITHUB_BASE_REF" ]; then
-            echo "Not in a PR context (i.e., push to main/stable/preview)"
-            COMPARE_REV=$(git rev-parse HEAD~1)
-          else
-            echo "In a PR context comparing to pull_request.base.ref"
-            git fetch origin "$GITHUB_BASE_REF" --depth=350
-            COMPARE_REV=$(git merge-base "origin/${GITHUB_BASE_REF}" HEAD)
-          fi
-          # Specify anything which should skip full CI in this regex:
-          # - docs/
-          # - .github/ISSUE_TEMPLATE/
-          # - .github/workflows/  (except .github/workflows/ci.yml)
-          SKIP_REGEX='^(docs/|\.github/(ISSUE_TEMPLATE|workflows/(?!ci)))'
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep -vP "$SKIP_REGEX") ]]; then
-            echo "run_tests=true" >> $GITHUB_OUTPUT
-          else
-            echo "run_tests=false" >> $GITHUB_OUTPUT
-          fi
-          if [[ $(git diff --name-only $COMPARE_REV ${{ github.sha }} | grep '^Cargo.lock') ]]; then
-            echo "run_license=true" >> $GITHUB_OUTPUT
-          else
-            echo "run_license=false" >> $GITHUB_OUTPUT
-          fi
-
   migration_checks:
     name: Check Postgres and Protobuf migrations, mergability
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
+    if: github.repository_owner == 'zed-industries'
     timeout-minutes: 60
     runs-on:
       - self-hosted
@@ -113,7 +69,6 @@ jobs:
   style:
     timeout-minutes: 60
     name: Check formatting and spelling
-    needs: [job_spec]
     if: github.repository_owner == 'zed-industries'
     runs-on:
       - buildjet-8vcpu-ubuntu-2204
@@ -121,21 +76,6 @@ jobs:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
-        with:
-          version: 9
-
-      - name: Prettier Check on /docs
-        working-directory: ./docs
-        run: |
-          pnpm dlx prettier@${PRETTIER_VERSION} . --check || {
-            echo "To fix, run from the root of the zed repo:"
-            echo "  cd docs && pnpm dlx prettier@${PRETTIER_VERSION} . --write && cd .."
-            false
-          }
-        env:
-          PRETTIER_VERSION: 3.5.0
-
       # To support writing comments that they will certainly be revisited.
       - name: Check for todo! and FIXME comments
         run: script/check-todos
@@ -151,10 +91,7 @@ jobs:
   macos_tests:
     timeout-minutes: 60
     name: (macOS) Run Clippy and tests
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
+    if: github.repository_owner == 'zed-industries'
     runs-on:
       - self-hosted
       - test
@@ -186,9 +123,7 @@ jobs:
       - name: Check licenses
         run: |
           script/check-licenses
-          if [[ "${{ needs.job_spec.outputs.run_license }}" == "true" ]]; then
-            script/generate-licenses /tmp/zed_licenses_output
-          fi
+          script/generate-licenses /tmp/zed_licenses_output
 
       - name: Check for new vulnerable dependencies
         if: github.event_name == 'pull_request'
@@ -219,10 +154,7 @@ jobs:
   linux_tests:
     timeout-minutes: 60
     name: (Linux) Run Clippy and tests
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
+    if: github.repository_owner == 'zed-industries'
     runs-on:
       - buildjet-16vcpu-ubuntu-2204
     steps:
@@ -271,12 +203,9 @@ jobs:
   build_remote_server:
     timeout-minutes: 60
     name: (Linux) Build Remote Server
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
+    if: github.repository_owner == 'zed-industries'
     runs-on:
-      - buildjet-8vcpu-ubuntu-2204
+      - buildjet-16vcpu-ubuntu-2204
     steps:
       - name: Add Rust to the PATH
         run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
@@ -310,12 +239,21 @@ jobs:
   windows_clippy:
     timeout-minutes: 60
     name: (Windows) Run Clippy
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
-    runs-on: windows-2025-16
+    if: github.repository_owner == 'zed-industries'
+    runs-on: hosted-windows-2
     steps:
+      # Temporarily Collect some metadata about the hardware behind our runners.
+      - name: GHA Runner Info
+        run: |
+          Invoke-RestMethod -Headers @{"Metadata"="true"} -Method GET -Uri "http://169.254.169.254/metadata/instance/compute?api-version=2023-07-01" |
+            ConvertTo-Json -Depth 10 |
+            jq "{ vm_size: .vmSize, location: .location, os_disk_gb: (.storageProfile.osDisk.diskSizeGB | tonumber), rs_disk_gb: (.storageProfile.resourceDisk.size | tonumber / 1024) }"
+          @{
+              Cores = (Get-CimInstance Win32_Processor).NumberOfCores
+              vCPUs = (Get-CimInstance Win32_Processor).NumberOfLogicalProcessors
+              RamGb = [math]::Round((Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory / 1GB, 2)
+              cpuid = (Get-CimInstance Win32_Processor).Name.Trim()
+          } | ConvertTo-Json
       # more info here:- https://github.com/rust-lang/cargo/issues/13020
       - name: Enable longer pathnames for git
         run: git config --system core.longpaths true
@@ -368,13 +306,21 @@ jobs:
   windows_tests:
     timeout-minutes: 60
     name: (Windows) Run Tests
-    needs: [job_spec]
-    if: |
-      github.repository_owner == 'zed-industries' &&
-      needs.job_spec.outputs.run_tests == 'true'
-    # Use bigger runners for PRs (speed); smaller for async (cost)
-    runs-on: ${{ github.event_name == 'pull_request' && 'windows-2025-32' || 'windows-2025-16' }}
+    if: ${{ github.repository_owner == 'zed-industries' && (github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'windows')) }}
+    runs-on: hosted-windows-2
     steps:
+      # Temporarily Collect some metadata about the hardware behind our runners.
+      - name: GHA Runner Info
+        run: |
+          Invoke-RestMethod -Headers @{"Metadata"="true"} -Method GET -Uri "http://169.254.169.254/metadata/instance/compute?api-version=2023-07-01" |
+            ConvertTo-Json -Depth 10 |
+            jq "{ vm_size: .vmSize, location: .location, os_disk_gb: (.storageProfile.osDisk.diskSizeGB | tonumber), rs_disk_gb: (.storageProfile.resourceDisk.size | tonumber / 1024) }"
+          @{
+              Cores = (Get-CimInstance Win32_Processor).NumberOfCores
+              vCPUs = (Get-CimInstance Win32_Processor).NumberOfLogicalProcessors
+              RamGb = [math]::Round((Get-CimInstance Win32_ComputerSystem).TotalPhysicalMemory / 1GB, 2)
+              cpuid = (Get-CimInstance Win32_Processor).Name.Trim()
+          } | ConvertTo-Json
       # more info here:- https://github.com/rust-lang/cargo/issues/13020
       - name: Enable longer pathnames for git
         run: git config --system core.longpaths true
@@ -426,50 +372,13 @@ jobs:
             Remove-Item -Path "${{ env.CARGO_HOME }}/config.toml"  -Force
           }
 
-  tests_pass:
-    name: Tests Pass
-    runs-on: ubuntu-latest
-    needs:
-      - job_spec
-      - style
-      - migration_checks
-      - linux_tests
-      - build_remote_server
-      - macos_tests
-      - windows_clippy
-      - windows_tests
-    if: always()
-    steps:
-      - name: Check all tests passed
-        run: |
-          # Check dependent jobs...
-          RET_CODE=0
-          # Always check style
-          [[ "${{ needs.style.result }}" != 'success' ]] && { RET_CODE=1; echo "style tests failed"; }
-
-          # Only check test jobs if they were supposed to run
-          if [[ "${{ needs.job_spec.outputs.run_tests }}" == "true" ]]; then
-            [[ "${{ needs.macos_tests.result }}"          != 'success' ]] && { RET_CODE=1; echo "macOS tests failed"; }
-            [[ "${{ needs.linux_tests.result }}"          != 'success' ]] && { RET_CODE=1; echo "Linux tests failed"; }
-            [[ "${{ needs.windows_tests.result }}"        != 'success' ]] && { RET_CODE=1; echo "Windows tests failed"; }
-            [[ "${{ needs.windows_clippy.result }}"       != 'success' ]] && { RET_CODE=1; echo "Windows clippy failed"; }
-            [[ "${{ needs.migration_checks.result }}"     != 'success' ]] && { RET_CODE=1; echo "Migration checks failed"; }
-            [[ "${{ needs.build_remote_server.result }}"  != 'success' ]] && { RET_CODE=1; echo "Remote server build failed"; }
-          fi
-          if [[ "$RET_CODE" -eq 0 ]]; then
-            echo "All tests passed successfully!"
-          fi
-          exit $RET_CODE
-
   bundle-mac:
     timeout-minutes: 120
     name: Create a macOS bundle
     runs-on:
       - self-hosted
       - bundle
-    if: |
-      startsWith(github.ref, 'refs/tags/v')
-      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
     needs: [macos_tests]
     env:
       MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
@@ -559,9 +468,7 @@ jobs:
     name: Linux x86_x64 release bundle
     runs-on:
       - buildjet-16vcpu-ubuntu-2004
-    if: |
-      startsWith(github.ref, 'refs/tags/v')
-      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
     needs: [linux_tests]
     env:
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
@@ -578,7 +485,7 @@ jobs:
         run: ./script/linux && ./script/install-mold 2.34.0
 
       - name: Determine version and release channel
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         run: |
           # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
           script/determine-release-channel
@@ -588,18 +495,14 @@ jobs:
 
       - name: Upload Linux bundle to workflow run if main branch or specific label
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-        if: |
-          github.ref == 'refs/heads/main'
-          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        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
           path: target/release/zed-*.tar.gz
 
       - name: Upload Linux remote server to workflow run if main branch or specific label
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-        if: |
-          github.ref == 'refs/heads/main'
-          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
         with:
           name: zed-remote-server-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.gz
           path: target/zed-remote-server-linux-x86_64.gz
@@ -620,9 +523,7 @@ jobs:
     name: Linux arm64 release bundle
     runs-on:
       - buildjet-16vcpu-ubuntu-2204-arm
-    if: |
-      startsWith(github.ref, 'refs/tags/v')
-      || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
     needs: [linux_tests]
     env:
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
@@ -639,7 +540,7 @@ jobs:
         run: ./script/linux
 
       - name: Determine version and release channel
-        if: startsWith(github.ref, 'refs/tags/v')
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         run: |
           # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
           script/determine-release-channel
@@ -649,18 +550,14 @@ jobs:
 
       - name: Upload Linux bundle to workflow run if main branch or specific label
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-        if: |
-          github.ref == 'refs/heads/main'
-          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        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
           path: target/release/zed-*.tar.gz
 
       - name: Upload Linux remote server to workflow run if main branch or specific label
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
-        if: |
-          github.ref == 'refs/heads/main'
-          || contains(github.event.pull_request.labels.*.name, 'run-bundling')
+        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
         with:
           name: zed-remote-server-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.gz
           path: target/zed-remote-server-linux-aarch64.gz
@@ -678,9 +575,7 @@ jobs:
 
   auto-release-preview:
     name: Auto release preview
-    if: |
-      startsWith(github.ref, 'refs/tags/v')
-      && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')
+    if: ${{ startsWith(github.ref, 'refs/tags/v') && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre') }}
     needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64]
     runs-on:
       - self-hosted

.github/workflows/docs.yml

@@ -0,0 +1,39 @@
+name: Docs
+
+on:
+  pull_request:
+    paths:
+      - "docs/**"
+  push:
+    branches:
+      - main
+
+jobs:
+  check_formatting:
+    name: "Check formatting"
+    if: github.repository_owner == 'zed-industries'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+        with:
+          version: 9
+
+      - name: Prettier Check on /docs
+        working-directory: ./docs
+        run: |
+          pnpm dlx prettier@${PRETTIER_VERSION} . --check || {
+            echo "To fix, run from the root of the zed repo:"
+            echo "  cd docs && pnpm dlx prettier@${PRETTIER_VERSION} . --write && cd .."
+            false
+          }
+        env:
+          PRETTIER_VERSION: 3.5.0
+
+      - name: Check for Typos with Typos-CLI
+        uses: crate-ci/typos@8e6a4285bcbde632c5d79900a7779746e8b7ea3f # v1.24.6
+        with:
+          config: ./typos.toml
+          files: ./docs/

Cargo.toml

@@ -174,11 +174,15 @@ members = [
     "extensions/html",
     "extensions/perplexity",
     "extensions/proto",
+    "extensions/purescript",
     "extensions/ruff",
     "extensions/slash-commands-example",
     "extensions/snippets",
+    "extensions/terraform",
     "extensions/test-extension",
     "extensions/toml",
+    "extensions/uiua",
+    "extensions/zig",
 
     #
     # Tooling

assets/icons/expand_down.svg

@@ -1,4 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.5 8.5L7.5 11.5M7.5 11.5L4.5 8.5M7.5 11.5L7.5 5.5" stroke="black" stroke-linecap="square"/>
-<path d="M5 3.5L10 3.5" stroke="black"/>
-</svg>

assets/icons/expand_up.svg

@@ -1,4 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 6.5L7.5 3.5M7.5 3.5L10.5 6.5M7.5 3.5V9.5" stroke="black" stroke-linecap="square"/>
-<path d="M5 11.5H10" stroke="black"/>
-</svg>

assets/icons/git_onboarding_bg.svg

@@ -1,40 +0,0 @@
-<svg width="400" height="120" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <pattern id="tilePattern" width="124" height="24" patternUnits="userSpaceOnUse">
-      <svg width="124" height="24" viewBox="0 0 124 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <g opacity="0.2">
-          <path d="M16.666 12.0013L11.9993 16.668L7.33268 12.0013" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M12 7.33464L12 16.668" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path fill-rule="evenodd" clip-rule="evenodd" d="M29 8.33464C29.3682 8.33464 29.6667 8.03616 29.6667 7.66797C29.6667 7.29978 29.3682 7.0013 29 7.0013C28.6318 7.0013 28.3333 7.29978 28.3333 7.66797C28.3333 8.03616 28.6318 8.33464 29 8.33464ZM29 9.66797C30.1046 9.66797 31 8.77254 31 7.66797C31 6.5634 30.1046 5.66797 29 5.66797C27.8954 5.66797 27 6.5634 27 7.66797C27 8.77254 27.8954 9.66797 29 9.66797Z" fill="white"/>
-          <path fill-rule="evenodd" clip-rule="evenodd" d="M35 8.33464C35.3682 8.33464 35.6667 8.03616 35.6667 7.66797C35.6667 7.29978 35.3682 7.0013 35 7.0013C34.6318 7.0013 34.3333 7.29978 34.3333 7.66797C34.3333 8.03616 34.6318 8.33464 35 8.33464ZM35 9.66797C36.1046 9.66797 37 8.77254 37 7.66797C37 6.5634 36.1046 5.66797 35 5.66797C33.8954 5.66797 33 6.5634 33 7.66797C33 8.77254 33.8954 9.66797 35 9.66797Z" fill="white"/>
-          <path fill-rule="evenodd" clip-rule="evenodd" d="M29 16.9987C29.3682 16.9987 29.6667 16.7002 29.6667 16.332C29.6667 15.9638 29.3682 15.6654 29 15.6654C28.6318 15.6654 28.3333 15.9638 28.3333 16.332C28.3333 16.7002 28.6318 16.9987 29 16.9987ZM29 18.332C30.1046 18.332 31 17.4366 31 16.332C31 15.2275 30.1046 14.332 29 14.332C27.8954 14.332 27 15.2275 27 16.332C27 17.4366 27.8954 18.332 29 18.332Z" fill="white"/>
-          <path fill-rule="evenodd" clip-rule="evenodd" d="M28.334 9H29.6673V11.4615C30.2383 11.1443 31.0005 11 32.0007 11H33.6675C34.0356 11 34.334 10.7017 34.334 10.3333V9H35.6673V10.3333C35.6673 11.4378 34.7723 12.3333 33.6675 12.3333H32.0007C30.8614 12.3333 30.3692 12.5484 30.1298 12.7549C29.9016 12.9516 29.7857 13.2347 29.6673 13.742V15H28.334V9Z" fill="white"/>
-          <path d="M48.668 8.66406H55.3346V15.3307" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M48.668 15.3307L55.3346 8.66406" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M76.5871 9.40624C76.8514 9.14195 77 8.78346 77 8.40965C77 8.03583 76.8516 7.67731 76.5873 7.41295C76.323 7.14859 75.9645 7.00005 75.5907 7C75.2169 6.99995 74.8584 7.14841 74.594 7.4127L67.921 14.0874C67.8049 14.2031 67.719 14.3456 67.671 14.5024L67.0105 16.6784C66.9975 16.7217 66.9966 16.7676 67.0076 16.8113C67.0187 16.8551 67.0414 16.895 67.0734 16.9269C67.1053 16.9588 67.1453 16.9815 67.1891 16.9925C67.2328 17.0035 67.2788 17.0024 67.322 16.9894L69.4985 16.3294C69.6551 16.2818 69.7976 16.1964 69.9135 16.0809L76.5871 9.40624Z" stroke="white" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M74 8L76 10" stroke="white" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M70.3877 7.53516V6.53516" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M73.5693 16.6992V17.6992" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M66.3877 10.5352H67.3877" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M77.5693 13.6992H76.5693" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M68.3877 8.53516L67.3877 7.53516" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M75.5693 15.6992L76.5693 16.6992" stroke="white" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M87.334 11.9987L92.0007 7.33203L96.6673 11.9987" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M92 16.6654V7.33203" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M117 12C117 10.6739 116.473 9.40215 115.536 8.46447C114.598 7.52678 113.326 7 112 7C110.602 7.00526 109.261 7.55068 108.256 8.52222L107 9.77778" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M107 7V9.77778H109.778" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M107 12C107 13.3261 107.527 14.5979 108.464 15.5355C109.402 16.4732 110.674 17 112 17C113.398 16.9947 114.739 16.4493 115.744 15.4778L117 14.2222" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-          <path d="M114.223 14.2188H117V16.9965" stroke="white" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
-        </g>
-      </svg>
-    </pattern>
-    <linearGradient id="fade" y2="1" x2="0">
-      <stop offset="0" stop-color="white" stop-opacity=".52"/>
-      <stop offset="1" stop-color="white" stop-opacity="0"/>
-    </linearGradient>
-    <mask id="fadeMask" maskContentUnits="objectBoundingBox">
-      <rect width="1" height="1" fill="url(#fade)"/>
-    </mask>
-  </defs>
-  <rect width="100%" height="100%" fill="url(#tilePattern)" mask="url(#fadeMask)"/>
-</svg>

assets/keymaps/default-linux.json

@@ -393,7 +393,6 @@
       "alt-shift-open": "projects::OpenRemote",
       "alt-ctrl-shift-o": "projects::OpenRemote",
       "alt-ctrl-shift-b": "branches::OpenRecent",
-      "alt-shift-enter": "toast::RunAction",
       "ctrl-~": "workspace::NewTerminal",
       "save": "workspace::Save",
       "ctrl-s": "workspace::Save",
@@ -862,22 +861,21 @@
       "alt-b": ["terminal::SendText", "\u001bb"],
       "alt-f": ["terminal::SendText", "\u001bf"],
       // Overrides for conflicting keybindings
-      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
-      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
-      "ctrl-o": ["terminal::SendKeystroke", "ctrl-o"],
       "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
       "ctrl-shift-a": "editor::SelectAll",
       "find": "buffer_search::Deploy",
       "ctrl-shift-f": "buffer_search::Deploy",
       "ctrl-shift-l": "terminal::Clear",
       "ctrl-shift-w": "pane::CloseActiveItem",
+      "ctrl-e": ["terminal::SendKeystroke", "ctrl-e"],
       "up": ["terminal::SendKeystroke", "up"],
       "pageup": ["terminal::SendKeystroke", "pageup"],
       "down": ["terminal::SendKeystroke", "down"],
       "pagedown": ["terminal::SendKeystroke", "pagedown"],
       "escape": ["terminal::SendKeystroke", "escape"],
       "enter": ["terminal::SendKeystroke", "enter"],
+      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
+      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
       "shift-pageup": "terminal::ScrollPageUp",
       "shift-pagedown": "terminal::ScrollPageDown",
       "shift-up": "terminal::ScrollLineUp",

assets/keymaps/default-macos.json

@@ -514,7 +514,6 @@
       "ctrl-~": "workspace::NewTerminal",
       "cmd-s": "workspace::Save",
       "cmd-k s": "workspace::SaveWithoutFormat",
-      "alt-shift-enter": "toast::RunAction",
       "cmd-shift-s": "workspace::SaveAs",
       "cmd-shift-n": "workspace::NewWindow",
       "ctrl-`": "terminal_panel::ToggleFocus",

assets/prompts/assistant_system_prompt.hbs

@@ -1,18 +0,0 @@
-You are an AI assistant integrated into a text editor. Your goal is to do one of the following two things:
-
-1. Help users answer questions and perform tasks related to their codebase.
-2. Answer general-purpose questions unrelated to their particular codebase.
-
-It will be up to you to decide which of these you are doing based on what the user has told you. When unclear, ask clarifying questions to understand the user's intent before proceeding.
-
-You should only perform actions that modify the user’s system if explicitly requested by the user:
-- If the user asks a question about how to accomplish a task, provide guidance or information, and use read-only tools (e.g., search) to assist. You may suggest potential actions, but do not directly modify the user’s system without explicit instruction.
-- If the user clearly requests that you perform an action, carry out the action directly without explaining why you are doing so.
-
-Be concise and direct in your responses.
-
-The user has opened a project that contains the following root directories/files:
-
-{{#each worktrees}}
-- {{root_name}} (absolute path: {{abs_path}})
-{{/each}}

assets/settings/default.json

@@ -336,14 +336,14 @@
     "active_line_width": 1,
     // Determines how indent guides are colored.
     // This setting can take the following three values:
-    //
+    ///
     // 1. "disabled"
     // 2. "fixed"
     // 3. "indent_aware"
     "coloring": "fixed",
     // Determines how indent guide backgrounds are colored.
     // This setting can take the following two values:
-    //
+    ///
     // 1. "disabled"
     // 2. "indent_aware"
     "background_coloring": "disabled"
@@ -402,8 +402,8 @@
     // Time to wait after scrolling the buffer, before requesting the hints,
     // set to 0 to disable debouncing.
     "scroll_debounce_ms": 50,
-    // A set of modifiers which, when pressed, will toggle the visibility of inlay hints.
-    // If the set if empty or not all the modifiers specified are pressed, inlay hints will not be toggled.
+    /// A set of modifiers which, when pressed, will toggle the visibility of inlay hints.
+    /// If the set if empty or not all the modifiers specified are pressed, inlay hints will not be toggled.
     "toggle_on_modifiers_press": {
       "control": false,
       "shift": false,
@@ -440,7 +440,7 @@
     "scrollbar": {
       // When to show the scrollbar in the project panel.
       // This setting can take five values:
-      //
+      ///
       // 1. null (default): Inherit editor settings
       // 2. Show the scrollbar if there's important information or
       //    follow the system's configured behavior (default):
@@ -455,7 +455,7 @@
     },
     // Which files containing diagnostic errors/warnings to mark in the project panel.
     // This setting can take the following three values:
-    //
+    ///
     // 1. Do not mark any files:
     //    "off"
     // 2. Only mark files with errors:
@@ -512,7 +512,7 @@
     "scrollbar": {
       // When to show the scrollbar in the project panel.
       // This setting can take five values:
-      //
+      ///
       // 1. null (default): Inherit editor settings
       // 2. Show the scrollbar if there's important information or
       //    follow the system's configured behavior (default):
@@ -547,7 +547,7 @@
   "git_panel": {
     // Whether to show the git panel button in the status bar.
     "button": true,
-    // Where to show the git panel. Can be 'left' or 'right'.
+    // Where to the git panel. Can be 'left' or 'right'.
     "dock": "left",
     // Default width of the git panel.
     "default_width": 360,
@@ -555,12 +555,6 @@
     //
     // Default: icon
     "status_style": "icon",
-    // What branch name to use if init.defaultBranch
-    // is not set
-    //
-    // Default: main
-    "fallback_branch_name": "main",
-
     "scrollbar": {
       // When to show the scrollbar in the git panel.
       //
@@ -600,13 +594,6 @@
       "provider": "zed.dev",
       // The model to use.
       "model": "claude-3-5-sonnet-latest"
-    },
-    // The model to use when applying edits from the assistant.
-    "editor_model": {
-      // The provider to use.
-      "provider": "zed.dev",
-      // The model to use.
-      "model": "claude-3-5-sonnet-latest"
     }
   },
   // The settings for slash commands.
@@ -686,7 +673,7 @@
     // Which files containing diagnostic errors/warnings to mark in the tabs.
     // Diagnostics are only shown when file icons are also active.
     // This setting only works when can take the following three values:
-    //
+    ///
     // 1. Do not mark any files:
     //    "off"
     // 2. Only mark files with errors:
@@ -850,7 +837,15 @@
       //
       // The minimum column number to show the inline blame information at
       // "min_column": 0
-    }
+    },
+    // How git hunks are displayed visually in the editor.
+    // This setting can take two values:
+    //
+    // 1. Show unstaged hunks with a transparent background (default):
+    //    "hunk_style": "transparent"
+    // 2. Show unstaged hunks with a pattern background:
+    //    "hunk_style": "pattern"
+    "hunk_style": "staged_border"
   },
   // Configuration for how direnv configuration should be loaded. May take 2 values:
   // 1. Load direnv configuration using `direnv export json` directly.
@@ -1014,7 +1009,7 @@
     "scrollbar": {
       // When to show the scrollbar in the terminal.
       // This setting can take five values:
-      //
+      ///
       // 1. null (default): Inherit editor settings
       // 2. Show the scrollbar if there's important information or
       //    follow the system's configured behavior (default):
@@ -1085,31 +1080,6 @@
   "auto_install_extensions": {
     "html": true
   },
-  // Controls how completions are processed for this language.
-  "completions": {
-    // Controls how words are completed.
-    // For large documents, not all words may be fetched for completion.
-    //
-    // May take 3 values:
-    // 1. "enabled"
-    //   Always fetch document's words for completions.
-    // 2. "fallback"
-    //   Only if LSP response errors/times out/is empty, use document's words to show completions.
-    // 3. "disabled"
-    //   Never fetch or complete document's words for completions.
-    //
-    // Default: fallback
-    "words": "fallback",
-    // Whether to fetch LSP completions or not.
-    //
-    // Default: true
-    "lsp": true,
-    // When fetching LSP completions, determines how long to wait for a response of a particular server.
-    // When set to 0, waits indefinitely.
-    //
-    // Default: 500
-    "lsp_fetch_timeout_ms": 500
-  },
   // Different settings for specific languages.
   "languages": {
     "Astro": {
@@ -1330,7 +1300,8 @@
   },
   // Settings for auto-closing of JSX tags.
   "jsx_tag_auto_close": {
-    "enabled": true
+    // // Whether to auto-close JSX tags.
+    // "enabled": true
   },
   // LSP Specific settings.
   "lsp": {

assets/themes/gruvbox/gruvbox.json

@@ -6,7 +6,15 @@
     {
       "name": "Gruvbox Dark",
       "appearance": "dark",
-      "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
       "style": {
         "border": "#5b534dff",
         "border.variant": "#494340ff",
@@ -97,9 +105,9 @@
         "terminal.ansi.bright_white": "#fbf1c7ff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.deleted": "#fb4a35ff",
+        "version_control_added": "#b7bb26ff",
+        "version_control_modified": "#f9bd2fff",
+        "version_control_deleted": "#fb4a35ff",
         "conflict": "#f9bd2fff",
         "conflict.background": "#572e10ff",
         "conflict.border": "#754916ff",
@@ -391,7 +399,15 @@
     {
       "name": "Gruvbox Dark Hard",
       "appearance": "dark",
-      "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
       "style": {
         "border": "#5b534dff",
         "border.variant": "#494340ff",
@@ -482,9 +498,9 @@
         "terminal.ansi.bright_white": "#fbf1c7ff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.deleted": "#fb4a35ff",
+        "version_control_added": "#b7bb26ff",
+        "version_control_modified": "#f9bd2fff",
+        "version_control_deleted": "#fb4a35ff",
         "conflict": "#f9bd2fff",
         "conflict.background": "#572e10ff",
         "conflict.border": "#754916ff",
@@ -776,7 +792,15 @@
     {
       "name": "Gruvbox Dark Soft",
       "appearance": "dark",
-      "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
       "style": {
         "border": "#5b534dff",
         "border.variant": "#494340ff",
@@ -867,9 +891,9 @@
         "terminal.ansi.bright_white": "#fbf1c7ff",
         "terminal.ansi.dim_white": "#b0a189ff",
         "link_text.hover": "#83a598ff",
-        "version_control.added": "#b7bb26ff",
-        "version_control.modified": "#f9bd2fff",
-        "version_control.deleted": "#fb4a35ff",
+        "version_control_added": "#b7bb26ff",
+        "version_control_modified": "#f9bd2fff",
+        "version_control_deleted": "#fb4a35ff",
         "conflict": "#f9bd2fff",
         "conflict.background": "#572e10ff",
         "conflict.border": "#754916ff",
@@ -1161,7 +1185,15 @@
     {
       "name": "Gruvbox Light",
       "appearance": "light",
-      "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
       "style": {
         "border": "#c8b899ff",
         "border.variant": "#ddcca7ff",
@@ -1252,9 +1284,9 @@
         "terminal.ansi.bright_white": "#282828ff",
         "terminal.ansi.dim_white": "#73675eff",
         "link_text.hover": "#0b6678ff",
-        "version_control.added": "#797410ff",
-        "version_control.modified": "#b57615ff",
-        "version_control.deleted": "#9d0308ff",
+        "version_control_added": "#797410ff",
+        "version_control_modified": "#b57615ff",
+        "version_control_deleted": "#9d0308ff",
         "conflict": "#b57615ff",
         "conflict.background": "#f5e2d0ff",
         "conflict.border": "#ebccabff",
@@ -1546,7 +1578,15 @@
     {
       "name": "Gruvbox Light Hard",
       "appearance": "light",
-      "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
       "style": {
         "border": "#c8b899ff",
         "border.variant": "#ddcca7ff",
@@ -1637,9 +1677,9 @@
         "terminal.ansi.bright_white": "#282828ff",
         "terminal.ansi.dim_white": "#73675eff",
         "link_text.hover": "#0b6678ff",
-        "version_control.added": "#797410ff",
-        "version_control.modified": "#b57615ff",
-        "version_control.deleted": "#9d0308ff",
+        "version_control_added": "#797410ff",
+        "version_control_modified": "#b57615ff",
+        "version_control_deleted": "#9d0308ff",
         "conflict": "#b57615ff",
         "conflict.background": "#f5e2d0ff",
         "conflict.border": "#ebccabff",
@@ -1931,7 +1971,15 @@
     {
       "name": "Gruvbox Light Soft",
       "appearance": "light",
-      "accents": ["#cc241dff", "#98971aff", "#d79921ff", "#458588ff", "#b16286ff", "#689d6aff", "#d65d0eff"],
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
       "style": {
         "border": "#c8b899ff",
         "border.variant": "#ddcca7ff",
@@ -2022,9 +2070,9 @@
         "terminal.ansi.bright_white": "#282828ff",
         "terminal.ansi.dim_white": "#73675eff",
         "link_text.hover": "#0b6678ff",
-        "version_control.added": "#797410ff",
-        "version_control.modified": "#b57615ff",
-        "version_control.deleted": "#9d0308ff",
+        "version_control_added": "#797410ff",
+        "version_control_modified": "#b57615ff",
+        "version_control_deleted": "#9d0308ff",
         "conflict": "#b57615ff",
         "conflict.background": "#f5e2d0ff",
         "conflict.border": "#ebccabff",

assets/themes/one/one.json

@@ -96,9 +96,9 @@
         "terminal.ansi.bright_white": "#dce0e5ff",
         "terminal.ansi.dim_white": "#575d65ff",
         "link_text.hover": "#74ade8ff",
-        "version_control.added": "#27a657ff",
-        "version_control.modified": "#d3b020ff",
-        "version_control.deleted": "#e06c76ff",
+        "version_control_added": "#a7c088ff",
+        "version_control_modified": "#dec184ff",
+        "version_control_deleted": "#d07277ff",
         "conflict": "#dec184ff",
         "conflict.background": "#dec1841a",
         "conflict.border": "#5d4c2fff",
@@ -475,9 +475,9 @@
         "terminal.ansi.bright_white": "#242529ff",
         "terminal.ansi.dim_white": "#97979aff",
         "link_text.hover": "#5c78e2ff",
-        "version_control.added": "#27a657ff",
-        "version_control.modified": "#d3b020ff",
-        "version_control.deleted": "#e06c76ff",
+        "version_control_added": "#669f59ff",
+        "version_control_modified": "#a48819ff",
+        "version_control_deleted": "#d36151ff",
         "conflict": "#a48819ff",
         "conflict.background": "#faf2e6ff",
         "conflict.border": "#f4e7d1ff",

crates/anthropic/src/anthropic.rs

@@ -553,7 +553,7 @@ pub struct Metadata {
     pub user_id: Option<String>,
 }
 
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct Usage {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub input_tokens: Option<u32>,

crates/assistant/src/assistant.rs

@@ -186,12 +186,8 @@ fn init_language_model_settings(cx: &mut App) {
 
 fn update_active_language_model_from_settings(cx: &mut App) {
     let settings = AssistantSettings::get_global(cx);
-    let active_model_provider_name =
-        LanguageModelProviderId::from(settings.default_model.provider.clone());
-    let active_model_id = LanguageModelId::from(settings.default_model.model.clone());
-    let editor_provider_name =
-        LanguageModelProviderId::from(settings.editor_model.provider.clone());
-    let editor_model_id = LanguageModelId::from(settings.editor_model.model.clone());
+    let provider_name = LanguageModelProviderId::from(settings.default_model.provider.clone());
+    let model_id = LanguageModelId::from(settings.default_model.model.clone());
     let inline_alternatives = settings
         .inline_alternatives
         .iter()
@@ -203,8 +199,7 @@ fn update_active_language_model_from_settings(cx: &mut App) {
         })
         .collect::<Vec<_>>();
     LanguageModelRegistry::global(cx).update(cx, |registry, cx| {
-        registry.select_active_model(&active_model_provider_name, &active_model_id, cx);
-        registry.select_editor_model(&editor_provider_name, &editor_model_id, cx);
+        registry.select_active_model(&provider_name, &model_id, cx);
         registry.select_inline_alternative_models(inline_alternatives, cx);
     });
 }

crates/assistant/src/assistant_panel.rs

@@ -297,8 +297,7 @@ impl AssistantPanel {
                 &LanguageModelRegistry::global(cx),
                 window,
                 |this, _, event: &language_model::Event, window, cx| match event {
-                    language_model::Event::ActiveModelChanged
-                    | language_model::Event::EditorModelChanged => {
+                    language_model::Event::ActiveModelChanged => {
                         this.completion_provider_changed(window, cx);
                     }
                     language_model::Event::ProviderStateChanged => {

crates/assistant/src/inline_assistant.rs

@@ -1246,7 +1246,7 @@ impl InlineAssistant {
                     });
 
                     enum DeletedLines {}
-                    let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
+                    let mut editor = Editor::for_multibuffer(multi_buffer, None, true, window, cx);
                     editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
                     editor.set_show_wrap_guides(false, cx);
                     editor.set_show_gutter(false, cx);
@@ -1693,6 +1693,7 @@ impl PromptEditor {
                 },
                 prompt_buffer,
                 None,
+                false,
                 window,
                 cx,
             );

crates/assistant/src/terminal_inline_assistant.rs

@@ -720,6 +720,7 @@ impl PromptEditor {
                 },
                 prompt_buffer,
                 None,
+                false,
                 window,
                 cx,
             );

crates/assistant2/src/active_thread.rs

@@ -1,13 +1,11 @@
 use std::sync::Arc;
-use std::time::Duration;
 
 use collections::HashMap;
 use editor::{Editor, MultiBuffer};
 use gpui::{
-    list, percentage, AbsoluteLength, Animation, AnimationExt, AnyElement, App, ClickEvent,
-    DefiniteLength, EdgesRefinement, Empty, Entity, Focusable, Length, ListAlignment, ListOffset,
-    ListState, StyleRefinement, Subscription, Task, TextStyleRefinement, Transformation,
-    UnderlineStyle,
+    list, AbsoluteLength, AnyElement, App, ClickEvent, DefiniteLength, EdgesRefinement, Empty,
+    Entity, Focusable, FontWeight, Length, ListAlignment, ListOffset, ListState, StyleRefinement,
+    Subscription, Task, TextStyleRefinement, UnderlineStyle,
 };
 use language::{Buffer, LanguageRegistry};
 use language_model::{LanguageModelRegistry, LanguageModelToolUseId, Role};
@@ -31,7 +29,8 @@ pub struct ActiveThread {
     messages: Vec<MessageId>,
     list_state: ListState,
     rendered_messages_by_id: HashMap<MessageId, Entity<Markdown>>,
-    rendered_scripting_tool_uses: HashMap<LanguageModelToolUseId, Entity<Markdown>>,
+    rendered_scripting_tool_uses:
+        HashMap<LanguageModelToolUseId, (Entity<Markdown>, Option<String>)>,
     editing_message: Option<(MessageId, EditMessageState)>,
     expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
     last_error: Option<ThreadError>,
@@ -206,7 +205,7 @@ impl ActiveThread {
                     right: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
                     bottom: Some(DefiniteLength::Absolute(AbsoluteLength::Pixels(Pixels(8.)))),
                 },
-                background: Some(colors.editor_background.into()),
+                background: Some(colors.terminal_background.into()), 
                 border_color: Some(colors.border_variant),
                 border_widths: EdgesRefinement {
                     top: Some(AbsoluteLength::Pixels(Pixels(1.))),
@@ -269,15 +268,19 @@ impl ActiveThread {
             return;
         }
 
-        let lua_script = serde_json::from_value::<ScriptingToolInput>(tool_input)
-            .map(|input| input.lua_script)
-            .unwrap_or_default();
+        let tool_input_result = serde_json::from_value::<ScriptingToolInput>(tool_input);
+
+        let (lua_script, summary) = if let Ok(input) = tool_input_result {
+            (input.lua_script, input.summary)
+        } else {
+            (String::new(), None)
+        };
 
         let lua_script =
             self.render_markdown(format!("```lua\n{lua_script}\n```").into(), window, cx);
 
         self.rendered_scripting_tool_uses
-            .insert(tool_use_id, lua_script);
+            .insert(tool_use_id, (lua_script, summary));
     }
 
     fn handle_thread_event(
@@ -396,6 +399,7 @@ impl ActiveThread {
                 editor::EditorMode::AutoHeight { max_lines: 8 },
                 buffer,
                 None,
+                false,
                 window,
                 cx,
             );
@@ -448,7 +452,7 @@ impl ActiveThread {
         };
 
         self.thread.update(cx, |thread, cx| {
-            thread.send_to_model(model, RequestKind::Chat, cx)
+            thread.send_to_model(model, RequestKind::Chat, false, cx)
         });
         cx.notify();
     }
@@ -653,7 +657,7 @@ impl ActiveThread {
                         )
                         .child(message_content),
                 ),
-            Role::Assistant => v_flex()
+            Role::Assistant => div()
                 .id(("message-container", ix))
                 .child(message_content)
                 .map(|parent| {
@@ -702,13 +706,13 @@ impl ActiveThread {
                 .child(
                     h_flex()
                         .justify_between()
-                        .py_1()
+                        .py_0p5()
                         .pl_1()
                         .pr_2()
-                        .bg(cx.theme().colors().editor_foreground.opacity(0.025))
+                        .bg(cx.theme().colors().editor_foreground.opacity(0.02))
                         .map(|element| {
                             if is_open {
-                                element.border_b_1().rounded_t_md()
+                                element.border_b_1().rounded_t(px(6.))
                             } else {
                                 element.rounded_md()
                             }
@@ -732,35 +736,16 @@ impl ActiveThread {
                                 ))
                                 .child(Label::new(tool_use.name)),
                         )
-                        .child({
-                            let (icon_name, color, animated) = match &tool_use.status {
-                                ToolUseStatus::Pending => {
-                                    (IconName::Warning, Color::Warning, false)
-                                }
-                                ToolUseStatus::Running => {
-                                    (IconName::ArrowCircle, Color::Accent, true)
-                                }
-                                ToolUseStatus::Finished(_) => {
-                                    (IconName::Check, Color::Success, false)
-                                }
-                                ToolUseStatus::Error(_) => (IconName::Close, Color::Error, false),
-                            };
-
-                            let icon = Icon::new(icon_name).color(color).size(IconSize::Small);
-
-                            if animated {
-                                icon.with_animation(
-                                    "arrow-circle",
-                                    Animation::new(Duration::from_secs(2)).repeat(),
-                                    |icon, delta| {
-                                        icon.transform(Transformation::rotate(percentage(delta)))
-                                    },
-                                )
-                                .into_any_element()
-                            } else {
-                                icon.into_any_element()
-                            }
-                        }),
+                        .child(
+                            Label::new(match tool_use.status {
+                                ToolUseStatus::Pending => "Pending",
+                                ToolUseStatus::Running => "Running",
+                                ToolUseStatus::Finished(_) => "Finished",
+                                ToolUseStatus::Error(_) => "Error",
+                            })
+                            .size(LabelSize::XSmall)
+                            .buffer_font(cx),
+                        ),
                 )
                 .map(|parent| {
                     if !is_open {
@@ -832,7 +817,7 @@ impl ActiveThread {
                         .bg(cx.theme().colors().editor_foreground.opacity(0.02))
                         .map(|element| {
                             if is_open {
-                                element.border_b_1().rounded_t_md()
+                                element.border_b_1().rounded_t(px(6.))
                             } else {
                                 element.rounded_md()
                             }
@@ -872,9 +857,14 @@ impl ActiveThread {
                         return parent;
                     }
 
-                    let lua_script_markdown =
+                    let scripting_tool_result =
                         self.rendered_scripting_tool_uses.get(&tool_use.id).cloned();
 
+                    let (lua_script_markdown, summary) = match scripting_tool_result {
+                        Some((markdown, summary)) => (Some(markdown), summary),
+                        None => (None, None),
+                    };
+
                     parent.child(
                         v_flex()
                             .child(
@@ -884,7 +874,22 @@ impl ActiveThread {
                                     .px_2p5()
                                     .border_b_1()
                                     .border_color(cx.theme().colors().border)
-                                    .child(Label::new("Input:"))
+                                    .child(v_flex().when_some(
+                                        summary.clone(),
+                                        |parent, summary| {
+                                            parent.child(
+                                                v_flex()
+                                                    .gap_0p5()
+                                                    .child(
+                                                        Label::new("Summary:")
+                                                            .weight(FontWeight::SEMIBOLD),
+                                                    )
+                                                    .child(Label::new(summary))
+                                                    .pb_1(),
+                                            )
+                                        },
+                                    ))
+                                    .child(Label::new("Input:").weight(FontWeight::SEMIBOLD))
                                     .map(|parent| {
                                         if let Some(markdown) = lua_script_markdown {
                                             parent.child(markdown)

crates/assistant2/src/assistant.rs

@@ -16,7 +16,6 @@ mod terminal_inline_assistant;
 mod thread;
 mod thread_history;
 mod thread_store;
-mod tool_selector;
 mod tool_use;
 mod ui;
 
@@ -53,8 +52,7 @@ actions!(
         FocusLeft,
         FocusRight,
         RemoveFocusedContext,
-        AcceptSuggestedContext,
-        OpenActiveThreadAsMarkdown
+        AcceptSuggestedContext
     ]
 );
 

crates/assistant2/src/assistant_panel.rs

@@ -11,7 +11,7 @@ use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
 
 use client::zed_urls;
-use editor::{Editor, MultiBuffer};
+use editor::Editor;
 use fs::Fs;
 use gpui::{
     prelude::*, Action, AnyElement, App, AsyncWindowContext, Corner, Entity, EventEmitter,
@@ -38,10 +38,7 @@ use crate::message_editor::MessageEditor;
 use crate::thread::{Thread, ThreadError, ThreadId};
 use crate::thread_history::{PastContext, PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
-use crate::{
-    InlineAssistant, NewPromptEditor, NewThread, OpenActiveThreadAsMarkdown, OpenConfiguration,
-    OpenHistory,
-};
+use crate::{InlineAssistant, NewPromptEditor, NewThread, OpenConfiguration, OpenHistory};
 
 pub fn init(cx: &mut App) {
     cx.observe_new(
@@ -115,7 +112,7 @@ impl AssistantPanel {
             log::info!("[assistant2-debug] initializing ThreadStore");
             let thread_store = workspace.update(&mut cx, |workspace, cx| {
                 let project = workspace.project().clone();
-                ThreadStore::new(project, tools.clone(), prompt_builder.clone(), cx)
+                ThreadStore::new(project, tools.clone(), cx)
             })??;
             log::info!("[assistant2-debug] finished initializing ThreadStore");
 
@@ -414,65 +411,6 @@ impl AssistantPanel {
         }
     }
 
-    pub(crate) fn open_active_thread_as_markdown(
-        &mut self,
-        _: &OpenActiveThreadAsMarkdown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let Some(workspace) = self
-            .workspace
-            .upgrade()
-            .ok_or_else(|| anyhow!("workspace dropped"))
-            .log_err()
-        else {
-            return;
-        };
-
-        let markdown_language_task = workspace
-            .read(cx)
-            .app_state()
-            .languages
-            .language_for_name("Markdown");
-        let thread = self.active_thread(cx);
-        cx.spawn_in(window, |_this, mut cx| async move {
-            let markdown_language = markdown_language_task.await?;
-
-            workspace.update_in(&mut cx, |workspace, window, cx| {
-                let thread = thread.read(cx);
-                let markdown = thread.to_markdown()?;
-                let thread_summary = thread
-                    .summary()
-                    .map(|summary| summary.to_string())
-                    .unwrap_or_else(|| "Thread".to_string());
-
-                let project = workspace.project().clone();
-                let buffer = project.update(cx, |project, cx| {
-                    project.create_local_buffer(&markdown, Some(markdown_language), cx)
-                });
-                let buffer = cx.new(|cx| {
-                    MultiBuffer::singleton(buffer, cx).with_title(thread_summary.clone())
-                });
-
-                workspace.add_item_to_active_pane(
-                    Box::new(cx.new(|cx| {
-                        let mut editor =
-                            Editor::for_multibuffer(buffer, Some(project.clone()), window, cx);
-                        editor.set_breadcrumb_header(thread_summary);
-                        editor
-                    })),
-                    None,
-                    true,
-                    window,
-                    cx,
-                );
-
-                anyhow::Ok(())
-            })
-        })
-        .detach_and_log_err(cx);
-    }
-
     fn handle_assistant_configuration_event(
         &mut self,
         _entity: &Entity<AssistantConfiguration>,
@@ -1073,7 +1011,6 @@ impl Render for AssistantPanel {
             .on_action(cx.listener(|this, _: &OpenHistory, window, cx| {
                 this.open_history(window, cx);
             }))
-            .on_action(cx.listener(Self::open_active_thread_as_markdown))
             .on_action(cx.listener(Self::deploy_prompt_library))
             .child(self.render_toolbar(cx))
             .map(|parent| match self.active_view {

crates/assistant2/src/inline_assistant.rs

@@ -1341,7 +1341,7 @@ impl InlineAssistant {
                     });
 
                     enum DeletedLines {}
-                    let mut editor = Editor::for_multibuffer(multi_buffer, None, window, cx);
+                    let mut editor = Editor::for_multibuffer(multi_buffer, None, true, window, cx);
                     editor.set_soft_wrap_mode(language::language_settings::SoftWrap::None, cx);
                     editor.set_show_wrap_guides(false, cx);
                     editor.set_show_gutter(false, cx);

crates/assistant2/src/inline_prompt_editor.rs

@@ -843,6 +843,7 @@ impl PromptEditor<BufferCodegen> {
                 },
                 prompt_buffer,
                 None,
+                false,
                 window,
                 cx,
             );
@@ -1000,6 +1001,7 @@ impl PromptEditor<TerminalCodegen> {
                 },
                 prompt_buffer,
                 None,
+                false,
                 window,
                 cx,
             );

crates/assistant2/src/message_editor.rs

@@ -17,7 +17,7 @@ use text::Bias;
 use theme::ThemeSettings;
 use ui::{
     prelude::*, ButtonLike, Disclosure, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle,
-    Tooltip,
+    Switch, Tooltip,
 };
 use vim_mode_setting::VimModeSetting;
 use workspace::Workspace;
@@ -28,7 +28,6 @@ use crate::context_store::{refresh_context_store_text, ContextStore};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
-use crate::tool_selector::ToolSelector;
 use crate::{Chat, ChatMode, RemoveAllContext, ToggleContextPicker};
 
 pub struct MessageEditor {
@@ -40,7 +39,7 @@ pub struct MessageEditor {
     inline_context_picker: Entity<ContextPicker>,
     inline_context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
     model_selector: Entity<AssistantModelSelector>,
-    tool_selector: Entity<ToolSelector>,
+    use_tools: bool,
     edits_expanded: bool,
     _subscriptions: Vec<Subscription>,
 }
@@ -54,7 +53,6 @@ impl MessageEditor {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        let tools = thread.read(cx).tools().clone();
         let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));
         let context_picker_menu_handle = PopoverMenuHandle::default();
         let inline_context_picker_menu_handle = PopoverMenuHandle::default();
@@ -120,13 +118,14 @@ impl MessageEditor {
                     cx,
                 )
             }),
-            tool_selector: cx.new(|cx| ToolSelector::new(tools, cx)),
+            use_tools: false,
             edits_expanded: false,
             _subscriptions: subscriptions,
         }
     }
 
     fn toggle_chat_mode(&mut self, _: &ChatMode, _window: &mut Window, cx: &mut Context<Self>) {
+        self.use_tools = !self.use_tools;
         cx.notify();
     }
 
@@ -150,14 +149,6 @@ impl MessageEditor {
     }
 
     fn chat(&mut self, _: &Chat, window: &mut Window, cx: &mut Context<Self>) {
-        if self.is_editor_empty(cx) {
-            return;
-        }
-
-        if self.thread.read(cx).is_streaming() {
-            return;
-        }
-
         self.send_to_model(RequestKind::Chat, window, cx);
     }
 
@@ -201,13 +192,14 @@ impl MessageEditor {
 
         let thread = self.thread.clone();
         let context_store = self.context_store.clone();
+        let use_tools = self.use_tools;
         cx.spawn(move |_, mut cx| async move {
             refresh_task.await;
             thread
                 .update(&mut cx, |thread, cx| {
                     let context = context_store.read(cx).snapshot(cx).collect::<Vec<_>>();
                     thread.insert_user_message(user_message, context, cx);
-                    thread.send_to_model(model, request_kind, cx);
+                    thread.send_to_model(model, request_kind, use_tools, cx);
                 })
                 .ok();
         })
@@ -545,7 +537,25 @@ impl Render for MessageEditor {
                             .child(
                                 h_flex()
                                     .justify_between()
-                                    .child(h_flex().gap_2().child(self.tool_selector.clone()))
+                                    .child(
+                                        Switch::new("use-tools", self.use_tools.into())
+                                            .label("Tools")
+                                            .on_click(cx.listener(
+                                                |this, selection, _window, _cx| {
+                                                    this.use_tools = match selection {
+                                                        ToggleState::Selected => true,
+                                                        ToggleState::Unselected
+                                                        | ToggleState::Indeterminate => false,
+                                                    };
+                                                },
+                                            ))
+                                            .key_binding(KeyBinding::for_action_in(
+                                                &ChatMode,
+                                                &focus_handle,
+                                                window,
+                                                cx,
+                                            )),
+                                    )
                                     .child(
                                         h_flex().gap_1().child(self.model_selector.clone()).child(
                                             ButtonLike::new("submit-message")

crates/assistant2/src/thread.rs

@@ -1,7 +1,6 @@
-use std::io::Write;
 use std::sync::Arc;
 
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use assistant_tool::ToolWorkingSet;
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap, HashSet};
@@ -11,13 +10,12 @@ use language_model::{
     LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
     LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
     LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
-    Role, StopReason, TokenUsage,
+    Role, StopReason,
 };
 use project::Project;
-use prompt_store::{AssistantSystemPromptWorktree, PromptBuilder};
 use scripting_tool::{ScriptingSession, ScriptingTool};
 use serde::{Deserialize, Serialize};
-use util::{post_inc, ResultExt, TryFutureExt as _};
+use util::{post_inc, TryFutureExt as _};
 use uuid::Uuid;
 
 use crate::context::{attach_context_to_message, ContextId, ContextSnapshot};
@@ -76,19 +74,16 @@ pub struct Thread {
     completion_count: usize,
     pending_completions: Vec<PendingCompletion>,
     project: Entity<Project>,
-    prompt_builder: Arc<PromptBuilder>,
     tools: Arc<ToolWorkingSet>,
     tool_use: ToolUseState,
     scripting_session: Entity<ScriptingSession>,
     scripting_tool_use: ToolUseState,
-    cumulative_token_usage: TokenUsage,
 }
 
 impl Thread {
     pub fn new(
         project: Entity<Project>,
         tools: Arc<ToolWorkingSet>,
-        prompt_builder: Arc<PromptBuilder>,
         cx: &mut Context<Self>,
     ) -> Self {
         let scripting_session = cx.new(|cx| ScriptingSession::new(project.clone(), cx));
@@ -105,12 +100,10 @@ impl Thread {
             completion_count: 0,
             pending_completions: Vec::new(),
             project,
-            prompt_builder,
             tools,
             tool_use: ToolUseState::new(),
             scripting_session,
             scripting_tool_use: ToolUseState::new(),
-            cumulative_token_usage: TokenUsage::default(),
         }
     }
 
@@ -119,7 +112,6 @@ impl Thread {
         saved: SavedThread,
         project: Entity<Project>,
         tools: Arc<ToolWorkingSet>,
-        prompt_builder: Arc<PromptBuilder>,
         cx: &mut Context<Self>,
     ) -> Self {
         let next_message_id = MessageId(
@@ -155,13 +147,10 @@ impl Thread {
             completion_count: 0,
             pending_completions: Vec::new(),
             project,
-            prompt_builder,
             tools,
             tool_use,
             scripting_session,
             scripting_tool_use,
-            // TODO: persist token usage?
-            cumulative_token_usage: TokenUsage::default(),
         }
     }
 
@@ -204,7 +193,7 @@ impl Thread {
     }
 
     pub fn is_streaming(&self) -> bool {
-        !self.pending_completions.is_empty() || !self.all_tools_finished()
+        !self.pending_completions.is_empty()
     }
 
     pub fn tools(&self) -> &Arc<ToolWorkingSet> {
@@ -353,30 +342,32 @@ impl Thread {
         &mut self,
         model: Arc<dyn LanguageModel>,
         request_kind: RequestKind,
+        use_tools: bool,
         cx: &mut Context<Self>,
     ) {
         let mut request = self.to_completion_request(request_kind, cx);
-        request.tools = {
+
+        if use_tools {
             let mut tools = Vec::new();
+            tools.push(LanguageModelRequestTool {
+                name: ScriptingTool::NAME.into(),
+                description: ScriptingTool::DESCRIPTION.into(),
+                input_schema: ScriptingTool::input_schema(),
+            });
 
-            if self.tools.is_scripting_tool_enabled() {
-                tools.push(LanguageModelRequestTool {
-                    name: ScriptingTool::NAME.into(),
-                    description: ScriptingTool::DESCRIPTION.into(),
-                    input_schema: ScriptingTool::input_schema(),
-                });
-            }
+            tools.extend(
+                self.tools()
+                    .tools(cx)
+                    .into_iter()
+                    .map(|tool| LanguageModelRequestTool {
+                        name: tool.name(),
+                        description: tool.description(),
+                        input_schema: tool.input_schema(),
+                    }),
+            );
 
-            tools.extend(self.tools().enabled_tools(cx).into_iter().map(|tool| {
-                LanguageModelRequestTool {
-                    name: tool.name(),
-                    description: tool.description(),
-                    input_schema: tool.input_schema(),
-                }
-            }));
-
-            tools
-        };
+            request.tools = tools;
+        }
 
         self.stream_completion(request, model, cx);
     }
@@ -384,33 +375,10 @@ impl Thread {
     pub fn to_completion_request(
         &self,
         request_kind: RequestKind,
-        cx: &App,
+        _cx: &App,
     ) -> LanguageModelRequest {
-        let worktree_root_names = self
-            .project
-            .read(cx)
-            .visible_worktrees(cx)
-            .map(|worktree| {
-                let worktree = worktree.read(cx);
-                AssistantSystemPromptWorktree {
-                    root_name: worktree.root_name().into(),
-                    abs_path: worktree.abs_path(),
-                }
-            })
-            .collect::<Vec<_>>();
-        let system_prompt = self
-            .prompt_builder
-            .generate_assistant_system_prompt(worktree_root_names)
-            .context("failed to generate assistant system prompt")
-            .log_err()
-            .unwrap_or_default();
-
         let mut request = LanguageModelRequest {
-            messages: vec![LanguageModelRequestMessage {
-                role: Role::System,
-                content: vec![MessageContent::Text(system_prompt)],
-                cache: true,
-            }],
+            messages: vec![],
             tools: Vec::new(),
             stop: Vec::new(),
             temperature: None,
@@ -494,7 +462,6 @@ impl Thread {
             let stream_completion = async {
                 let mut events = stream.await?;
                 let mut stop_reason = StopReason::EndTurn;
-                let mut current_token_usage = TokenUsage::default();
 
                 while let Some(event) = events.next().await {
                     let event = event?;
@@ -507,12 +474,6 @@ impl Thread {
                             LanguageModelCompletionEvent::Stop(reason) => {
                                 stop_reason = reason;
                             }
-                            LanguageModelCompletionEvent::UsageUpdate(token_usage) => {
-                                thread.cumulative_token_usage =
-                                    thread.cumulative_token_usage.clone() + token_usage.clone()
-                                        - current_token_usage.clone();
-                                current_token_usage = token_usage;
-                            }
                             LanguageModelCompletionEvent::Text(chunk) => {
                                 if let Some(last_message) = thread.messages.last_mut() {
                                     if last_message.role == Role::Assistant {
@@ -664,7 +625,6 @@ impl Thread {
     }
 
     pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) {
-        let request = self.to_completion_request(RequestKind::Chat, cx);
         let pending_tool_uses = self
             .tool_use
             .pending_tool_uses()
@@ -675,7 +635,7 @@ impl Thread {
 
         for tool_use in pending_tool_uses {
             if let Some(tool) = self.tools.tool(&tool_use.name, cx) {
-                let task = tool.run(tool_use.input, &request.messages, self.project.clone(), cx);
+                let task = tool.run(tool_use.input, self.project.clone(), cx);
 
                 self.insert_tool_output(tool_use.id.clone(), task, cx);
             }
@@ -793,7 +753,7 @@ impl Thread {
             Vec::new(),
             cx,
         );
-        self.send_to_model(model, RequestKind::Chat, cx);
+        self.send_to_model(model, RequestKind::Chat, true, cx);
     }
 
     /// Cancels the last pending completion, if there are any pending.
@@ -806,58 +766,6 @@ impl Thread {
             false
         }
     }
-
-    pub fn to_markdown(&self) -> Result<String> {
-        let mut markdown = Vec::new();
-
-        if let Some(summary) = self.summary() {
-            writeln!(markdown, "# {summary}\n")?;
-        };
-
-        for message in self.messages() {
-            writeln!(
-                markdown,
-                "## {role}\n",
-                role = match message.role {
-                    Role::User => "User",
-                    Role::Assistant => "Assistant",
-                    Role::System => "System",
-                }
-            )?;
-            writeln!(markdown, "{}\n", message.text)?;
-
-            for tool_use in self.tool_uses_for_message(message.id) {
-                writeln!(
-                    markdown,
-                    "**Use Tool: {} ({})**",
-                    tool_use.name, tool_use.id
-                )?;
-                writeln!(markdown, "```json")?;
-                writeln!(
-                    markdown,
-                    "{}",
-                    serde_json::to_string_pretty(&tool_use.input)?
-                )?;
-                writeln!(markdown, "```")?;
-            }
-
-            for tool_result in self.tool_results_for_message(message.id) {
-                write!(markdown, "**Tool Results: {}", tool_result.tool_use_id)?;
-                if tool_result.is_error {
-                    write!(markdown, " (Error)")?;
-                }
-
-                writeln!(markdown, "**\n")?;
-                writeln!(markdown, "{}", tool_result.content)?;
-            }
-        }
-
-        Ok(String::from_utf8_lossy(&markdown).to_string())
-    }
-
-    pub fn cumulative_token_usage(&self) -> TokenUsage {
-        self.cumulative_token_usage.clone()
-    }
 }
 
 #[derive(Debug, Clone)]

crates/assistant2/src/thread_store.rs

@@ -16,7 +16,6 @@ use heed::types::{SerdeBincode, SerdeJson};
 use heed::Database;
 use language_model::{LanguageModelToolUseId, Role};
 use project::Project;
-use prompt_store::PromptBuilder;
 use serde::{Deserialize, Serialize};
 use util::ResultExt as _;
 
@@ -29,7 +28,6 @@ pub fn init(cx: &mut App) {
 pub struct ThreadStore {
     project: Entity<Project>,
     tools: Arc<ToolWorkingSet>,
-    prompt_builder: Arc<PromptBuilder>,
     context_server_manager: Entity<ContextServerManager>,
     context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
     threads: Vec<SavedThreadMetadata>,
@@ -39,7 +37,6 @@ impl ThreadStore {
     pub fn new(
         project: Entity<Project>,
         tools: Arc<ToolWorkingSet>,
-        prompt_builder: Arc<PromptBuilder>,
         cx: &mut App,
     ) -> Result<Entity<Self>> {
         let this = cx.new(|cx| {
@@ -51,7 +48,6 @@ impl ThreadStore {
             let this = Self {
                 project,
                 tools,
-                prompt_builder,
                 context_server_manager,
                 context_server_tool_ids: HashMap::default(),
                 threads: Vec::new(),
@@ -81,14 +77,7 @@ impl ThreadStore {
     }
 
     pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
-        cx.new(|cx| {
-            Thread::new(
-                self.project.clone(),
-                self.tools.clone(),
-                self.prompt_builder.clone(),
-                cx,
-            )
-        })
+        cx.new(|cx| Thread::new(self.project.clone(), self.tools.clone(), cx))
     }
 
     pub fn open_thread(
@@ -112,7 +101,6 @@ impl ThreadStore {
                         thread,
                         this.project.clone(),
                         this.tools.clone(),
-                        this.prompt_builder.clone(),
                         cx,
                     )
                 })

crates/assistant2/src/tool_selector.rs

@@ -1,134 +0,0 @@
-use std::sync::Arc;
-
-use assistant_tool::{ToolSource, ToolWorkingSet};
-use gpui::Entity;
-use scripting_tool::ScriptingTool;
-use ui::{prelude::*, ContextMenu, IconButtonShape, PopoverMenu, Tooltip};
-
-pub struct ToolSelector {
-    tools: Arc<ToolWorkingSet>,
-}
-
-impl ToolSelector {
-    pub fn new(tools: Arc<ToolWorkingSet>, _cx: &mut Context<Self>) -> Self {
-        Self { tools }
-    }
-
-    fn build_context_menu(
-        &self,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Entity<ContextMenu> {
-        ContextMenu::build(window, cx, |mut menu, _window, cx| {
-            let icon_position = IconPosition::End;
-            let tools_by_source = self.tools.tools_by_source(cx);
-
-            let all_tools_enabled = self.tools.are_all_tools_enabled();
-            menu = menu.header("Tools").toggleable_entry(
-                "All Tools",
-                all_tools_enabled,
-                icon_position,
-                None,
-                {
-                    let tools = self.tools.clone();
-                    move |_window, cx| {
-                        if all_tools_enabled {
-                            tools.disable_all_tools(cx);
-                        } else {
-                            tools.enable_all_tools();
-                        }
-                    }
-                },
-            );
-
-            for (source, tools) in tools_by_source {
-                let mut tools = tools
-                    .into_iter()
-                    .map(|tool| {
-                        let source = tool.source();
-                        let name = tool.name().into();
-                        let is_enabled = self.tools.is_enabled(&source, &name);
-
-                        (source, name, is_enabled)
-                    })
-                    .collect::<Vec<_>>();
-
-                if ToolSource::Native == source {
-                    tools.push((
-                        ToolSource::Native,
-                        ScriptingTool::NAME.into(),
-                        self.tools.is_scripting_tool_enabled(),
-                    ));
-                    tools.sort_by(|(_, name_a, _), (_, name_b, _)| name_a.cmp(name_b));
-                }
-
-                menu = match &source {
-                    ToolSource::Native => menu.header("Zed"),
-                    ToolSource::ContextServer { id } => {
-                        let all_tools_from_source_enabled =
-                            self.tools.are_all_tools_from_source_enabled(&source);
-
-                        menu.separator().header(id).toggleable_entry(
-                            "All Tools",
-                            all_tools_from_source_enabled,
-                            icon_position,
-                            None,
-                            {
-                                let tools = self.tools.clone();
-                                let source = source.clone();
-                                move |_window, cx| {
-                                    if all_tools_from_source_enabled {
-                                        tools.disable_source(source.clone(), cx);
-                                    } else {
-                                        tools.enable_source(&source);
-                                    }
-                                }
-                            },
-                        )
-                    }
-                };
-
-                for (source, name, is_enabled) in tools {
-                    menu = menu.toggleable_entry(name.clone(), is_enabled, icon_position, None, {
-                        let tools = self.tools.clone();
-                        move |_window, _cx| {
-                            if name.as_ref() == ScriptingTool::NAME {
-                                if is_enabled {
-                                    tools.disable_scripting_tool();
-                                } else {
-                                    tools.enable_scripting_tool();
-                                }
-                            } else {
-                                if is_enabled {
-                                    tools.disable(source.clone(), &[name.clone()]);
-                                } else {
-                                    tools.enable(source.clone(), &[name.clone()]);
-                                }
-                            }
-                        }
-                    });
-                }
-            }
-
-            menu
-        })
-    }
-}
-
-impl Render for ToolSelector {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<'_, Self>) -> impl IntoElement {
-        let this = cx.entity().clone();
-        PopoverMenu::new("tool-selector")
-            .menu(move |window, cx| {
-                Some(this.update(cx, |this, cx| this.build_context_menu(window, cx)))
-            })
-            .trigger_with_tooltip(
-                IconButton::new("tool-selector-button", IconName::SettingsAlt)
-                    .shape(IconButtonShape::Square)
-                    .icon_size(IconSize::Small)
-                    .icon_color(Color::Muted),
-                Tooltip::text("Customize Tools"),
-            )
-            .anchor(gpui::Corner::BottomLeft)
-    }
-}

crates/assistant2/src/ui/context_pill.rs

@@ -126,13 +126,7 @@ impl RenderOnce for ContextPill {
                     h_flex()
                         .id("context-data")
                         .gap_1()
-                        .child(
-                            div().max_w_64().child(
-                                Label::new(context.name.clone())
-                                    .size(LabelSize::Small)
-                                    .truncate(),
-                            ),
-                        )
+                        .child(Label::new(context.name.clone()).size(LabelSize::Small))
                         .when_some(context.parent.as_ref(), |element, parent_name| {
                             if *dupe_name {
                                 element.child(
@@ -180,22 +174,21 @@ impl RenderOnce for ContextPill {
                 })
                 .hover(|style| style.bg(color.element_hover.opacity(0.5)))
                 .child(
-                    div().px_0p5().max_w_64().child(
-                        Label::new(name.clone())
-                            .size(LabelSize::Small)
-                            .color(Color::Muted)
-                            .truncate(),
-                    ),
+                    Label::new(name.clone())
+                        .size(LabelSize::Small)
+                        .color(Color::Muted),
                 )
                 .child(
-                    Label::new(match kind {
-                        ContextKind::File => "Active Tab",
-                        ContextKind::Thread | ContextKind::Directory | ContextKind::FetchedUrl => {
-                            "Active"
-                        }
-                    })
-                    .size(LabelSize::XSmall)
-                    .color(Color::Muted),
+                    div().px_0p5().child(
+                        Label::new(match kind {
+                            ContextKind::File => "Active Tab",
+                            ContextKind::Thread
+                            | ContextKind::Directory
+                            | ContextKind::FetchedUrl => "Active",
+                        })
+                        .size(LabelSize::XSmall)
+                        .color(Color::Muted),
+                    ),
                 )
                 .child(
                     Icon::new(IconName::Plus)

crates/assistant_context_editor/src/context.rs

@@ -2254,7 +2254,6 @@ impl AssistantContext {
                                         );
                                     }
                                     LanguageModelCompletionEvent::ToolUse(_) => {}
-                                    LanguageModelCompletionEvent::UsageUpdate(_) => {}
                                 }
                             });
 

crates/assistant_settings/src/assistant_settings.rs

@@ -62,7 +62,6 @@ pub struct AssistantSettings {
     pub default_width: Pixels,
     pub default_height: Pixels,
     pub default_model: LanguageModelSelection,
-    pub editor_model: LanguageModelSelection,
     pub inline_alternatives: Vec<LanguageModelSelection>,
     pub using_outdated_settings_version: bool,
     pub enable_experimental_live_diffs: bool,
@@ -163,7 +162,6 @@ impl AssistantSettingsContent {
                                 })
                             }
                         }),
-                    editor_model: None,
                     inline_alternatives: None,
                     enable_experimental_live_diffs: None,
                 },
@@ -184,7 +182,6 @@ impl AssistantSettingsContent {
                         .id()
                         .to_string(),
                 }),
-                editor_model: None,
                 inline_alternatives: None,
                 enable_experimental_live_diffs: None,
             },
@@ -313,7 +310,6 @@ impl Default for VersionedAssistantSettingsContent {
             default_width: None,
             default_height: None,
             default_model: None,
-            editor_model: None,
             inline_alternatives: None,
             enable_experimental_live_diffs: None,
         })
@@ -344,8 +340,6 @@ pub struct AssistantSettingsContentV2 {
     default_height: Option<f32>,
     /// The default model to use when creating new chats.
     default_model: Option<LanguageModelSelection>,
-    /// The model to use when applying edits from the assistant.
-    editor_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.
@@ -476,7 +470,6 @@ impl Settings for AssistantSettings {
                 value.default_height.map(Into::into),
             );
             merge(&mut settings.default_model, value.default_model);
-            merge(&mut settings.editor_model, value.editor_model);
             merge(&mut settings.inline_alternatives, value.inline_alternatives);
             merge(
                 &mut settings.enable_experimental_live_diffs,
@@ -535,10 +528,6 @@ mod tests {
                                 provider: "test-provider".into(),
                                 model: "gpt-99".into(),
                             }),
-                            editor_model: Some(LanguageModelSelection {
-                                provider: "test-provider".into(),
-                                model: "gpt-99".into(),
-                            }),
                             inline_alternatives: None,
                             enabled: None,
                             button: None,

crates/assistant_tool/Cargo.toml

@@ -15,7 +15,6 @@ path = "src/assistant_tool.rs"
 anyhow.workspace = true
 collections.workspace = true
 derive_more.workspace = true
-language_model.workspace = true
 gpui.workspace = true
 parking_lot.workspace = true
 project.workspace = true

crates/assistant_tool/src/assistant_tool.rs

@@ -4,8 +4,7 @@ mod tool_working_set;
 use std::sync::Arc;
 
 use anyhow::Result;
-use gpui::{App, Entity, SharedString, Task};
-use language_model::LanguageModelRequestMessage;
+use gpui::{App, Entity, Task};
 use project::Project;
 
 pub use crate::tool_registry::*;
@@ -15,14 +14,6 @@ pub fn init(cx: &mut App) {
     ToolRegistry::default_global(cx);
 }
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone)]
-pub enum ToolSource {
-    /// A native tool built-in to Zed.
-    Native,
-    /// A tool provided by a context server.
-    ContextServer { id: SharedString },
-}
-
 /// A tool that can be used by a language model.
 pub trait Tool: 'static + Send + Sync {
     /// Returns the name of the tool.
@@ -31,11 +22,6 @@ pub trait Tool: 'static + Send + Sync {
     /// Returns the description of the tool.
     fn description(&self) -> String;
 
-    /// Returns the source of the tool.
-    fn source(&self) -> ToolSource {
-        ToolSource::Native
-    }
-
     /// Returns the JSON schema that describes the tool's input.
     fn input_schema(&self) -> serde_json::Value {
         serde_json::Value::Object(serde_json::Map::default())
@@ -45,7 +31,6 @@ pub trait Tool: 'static + Send + Sync {
     fn run(
         self: Arc<Self>,
         input: serde_json::Value,
-        messages: &[LanguageModelRequestMessage],
         project: Entity<Project>,
         cx: &mut App,
     ) -> Task<Result<String>>;

crates/assistant_tool/src/tool_working_set.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use collections::{HashMap, HashSet, IndexMap};
+use collections::HashMap;
 use gpui::App;
 use parking_lot::Mutex;
 
-use crate::{Tool, ToolRegistry, ToolSource};
+use crate::{Tool, ToolRegistry};
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Default)]
 pub struct ToolId(usize);
@@ -15,26 +15,13 @@ pub struct ToolWorkingSet {
     state: Mutex<WorkingSetState>,
 }
 
+#[derive(Default)]
 struct WorkingSetState {
     context_server_tools_by_id: HashMap<ToolId, Arc<dyn Tool>>,
     context_server_tools_by_name: HashMap<String, Arc<dyn Tool>>,
-    disabled_tools_by_source: HashMap<ToolSource, HashSet<Arc<str>>>,
-    is_scripting_tool_disabled: bool,
     next_tool_id: ToolId,
 }
 
-impl Default for WorkingSetState {
-    fn default() -> Self {
-        Self {
-            context_server_tools_by_id: HashMap::default(),
-            context_server_tools_by_name: HashMap::default(),
-            disabled_tools_by_source: HashMap::default(),
-            is_scripting_tool_disabled: true,
-            next_tool_id: ToolId::default(),
-        }
-    }
-}
-
 impl ToolWorkingSet {
     pub fn tool(&self, name: &str, cx: &App) -> Option<Arc<dyn Tool>> {
         self.state
@@ -46,99 +33,36 @@ impl ToolWorkingSet {
     }
 
     pub fn tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        self.state.lock().tools(cx)
+        let mut tools = ToolRegistry::global(cx).tools();
+        tools.extend(
+            self.state
+                .lock()
+                .context_server_tools_by_id
+                .values()
+                .cloned(),
+        );
+
+        tools
     }
 
-    pub fn tools_by_source(&self, cx: &App) -> IndexMap<ToolSource, Vec<Arc<dyn Tool>>> {
-        self.state.lock().tools_by_source(cx)
-    }
-
-    pub fn are_all_tools_enabled(&self) -> bool {
-        let state = self.state.lock();
-        state.disabled_tools_by_source.is_empty() && !state.is_scripting_tool_disabled
-    }
-
-    pub fn are_all_tools_from_source_enabled(&self, source: &ToolSource) -> bool {
-        let state = self.state.lock();
-        !state.disabled_tools_by_source.contains_key(source)
-    }
-
-    pub fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        self.state.lock().enabled_tools(cx)
-    }
-
-    pub fn enable_all_tools(&self) {
+    pub fn insert(&self, command: Arc<dyn Tool>) -> ToolId {
         let mut state = self.state.lock();
-        state.disabled_tools_by_source.clear();
-        state.enable_scripting_tool();
-    }
-
-    pub fn disable_all_tools(&self, cx: &App) {
-        let mut state = self.state.lock();
-        state.disable_all_tools(cx);
-    }
-
-    pub fn enable_source(&self, source: &ToolSource) {
-        let mut state = self.state.lock();
-        state.enable_source(source);
-    }
-
-    pub fn disable_source(&self, source: ToolSource, cx: &App) {
-        let mut state = self.state.lock();
-        state.disable_source(source, cx);
-    }
-
-    pub fn insert(&self, tool: Arc<dyn Tool>) -> ToolId {
-        let mut state = self.state.lock();
-        let tool_id = state.next_tool_id;
+        let command_id = state.next_tool_id;
         state.next_tool_id.0 += 1;
         state
             .context_server_tools_by_id
-            .insert(tool_id, tool.clone());
+            .insert(command_id, command.clone());
         state.tools_changed();
-        tool_id
+        command_id
     }
 
-    pub fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
-        self.state.lock().is_enabled(source, name)
-    }
-
-    pub fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
-        self.state.lock().is_disabled(source, name)
-    }
-
-    pub fn enable(&self, source: ToolSource, tools_to_enable: &[Arc<str>]) {
-        let mut state = self.state.lock();
-        state.enable(source, tools_to_enable);
-    }
-
-    pub fn disable(&self, source: ToolSource, tools_to_disable: &[Arc<str>]) {
-        let mut state = self.state.lock();
-        state.disable(source, tools_to_disable);
-    }
-
-    pub fn remove(&self, tool_ids_to_remove: &[ToolId]) {
+    pub fn remove(&self, command_ids_to_remove: &[ToolId]) {
         let mut state = self.state.lock();
         state
             .context_server_tools_by_id
-            .retain(|id, _| !tool_ids_to_remove.contains(id));
+            .retain(|id, _| !command_ids_to_remove.contains(id));
         state.tools_changed();
     }
-
-    pub fn is_scripting_tool_enabled(&self) -> bool {
-        let state = self.state.lock();
-        !state.is_scripting_tool_disabled
-    }
-
-    pub fn enable_scripting_tool(&self) {
-        let mut state = self.state.lock();
-        state.enable_scripting_tool();
-    }
-
-    pub fn disable_scripting_tool(&self) {
-        let mut state = self.state.lock();
-        state.disable_scripting_tool();
-    }
 }
 
 impl WorkingSetState {
@@ -147,108 +71,7 @@ impl WorkingSetState {
         self.context_server_tools_by_name.extend(
             self.context_server_tools_by_id
                 .values()
-                .map(|tool| (tool.name(), tool.clone())),
+                .map(|command| (command.name(), command.clone())),
         );
     }
-
-    fn tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        let mut tools = ToolRegistry::global(cx).tools();
-        tools.extend(self.context_server_tools_by_id.values().cloned());
-
-        tools
-    }
-
-    fn tools_by_source(&self, cx: &App) -> IndexMap<ToolSource, Vec<Arc<dyn Tool>>> {
-        let mut tools_by_source = IndexMap::default();
-
-        for tool in self.tools(cx) {
-            tools_by_source
-                .entry(tool.source())
-                .or_insert_with(Vec::new)
-                .push(tool);
-        }
-
-        for tools in tools_by_source.values_mut() {
-            tools.sort_by_key(|tool| tool.name());
-        }
-
-        tools_by_source.sort_unstable_keys();
-
-        tools_by_source
-    }
-
-    fn enabled_tools(&self, cx: &App) -> Vec<Arc<dyn Tool>> {
-        let all_tools = self.tools(cx);
-
-        all_tools
-            .into_iter()
-            .filter(|tool| self.is_enabled(&tool.source(), &tool.name().into()))
-            .collect()
-    }
-
-    fn is_enabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
-        !self.is_disabled(source, name)
-    }
-
-    fn is_disabled(&self, source: &ToolSource, name: &Arc<str>) -> bool {
-        self.disabled_tools_by_source
-            .get(source)
-            .map_or(false, |disabled_tools| disabled_tools.contains(name))
-    }
-
-    fn enable(&mut self, source: ToolSource, tools_to_enable: &[Arc<str>]) {
-        self.disabled_tools_by_source
-            .entry(source)
-            .or_default()
-            .retain(|name| !tools_to_enable.contains(name));
-    }
-
-    fn disable(&mut self, source: ToolSource, tools_to_disable: &[Arc<str>]) {
-        self.disabled_tools_by_source
-            .entry(source)
-            .or_default()
-            .extend(tools_to_disable.into_iter().cloned());
-    }
-
-    fn enable_source(&mut self, source: &ToolSource) {
-        self.disabled_tools_by_source.remove(source);
-    }
-
-    fn disable_source(&mut self, source: ToolSource, cx: &App) {
-        let tools_by_source = self.tools_by_source(cx);
-        let Some(tools) = tools_by_source.get(&source) else {
-            return;
-        };
-
-        self.disabled_tools_by_source.insert(
-            source,
-            tools
-                .into_iter()
-                .map(|tool| tool.name().into())
-                .collect::<HashSet<_>>(),
-        );
-    }
-
-    fn disable_all_tools(&mut self, cx: &App) {
-        let tools = self.tools_by_source(cx);
-
-        for (source, tools) in tools {
-            let tool_names = tools
-                .into_iter()
-                .map(|tool| tool.name().into())
-                .collect::<Vec<_>>();
-
-            self.disable(source, &tool_names);
-        }
-
-        self.disable_scripting_tool();
-    }
-
-    fn enable_scripting_tool(&mut self) {
-        self.is_scripting_tool_disabled = false;
-    }
-
-    fn disable_scripting_tool(&mut self) {
-        self.is_scripting_tool_disabled = true;
-    }
 }

crates/assistant_tools/Cargo.toml

@@ -15,26 +15,8 @@ path = "src/assistant_tools.rs"
 anyhow.workspace = true
 assistant_tool.workspace = true
 chrono.workspace = true
-collections.workspace = true
-feature_flags.workspace = true
-futures.workspace = true
 gpui.workspace = true
-language.workspace = true
-language_model.workspace = true
 project.workspace = true
-release_channel.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-settings.workspace = true
-
-[dev-dependencies]
-rand.workspace = true
-collections = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-project = { workspace = true, features = ["test-support"] }

crates/assistant_tools/src/assistant_tools.rs

@@ -1,38 +1,19 @@
-mod bash_tool;
-mod delete_path_tool;
-mod diagnostics_tool;
-mod edit_files_tool;
-mod list_directory_tool;
+mod list_worktrees_tool;
 mod now_tool;
-mod path_search_tool;
 mod read_file_tool;
-mod regex_search;
 
 use assistant_tool::ToolRegistry;
 use gpui::App;
 
-use crate::bash_tool::BashTool;
-use crate::delete_path_tool::DeletePathTool;
-use crate::diagnostics_tool::DiagnosticsTool;
-use crate::edit_files_tool::EditFilesTool;
-use crate::list_directory_tool::ListDirectoryTool;
+use crate::list_worktrees_tool::ListWorktreesTool;
 use crate::now_tool::NowTool;
-use crate::path_search_tool::PathSearchTool;
 use crate::read_file_tool::ReadFileTool;
-use crate::regex_search::RegexSearchTool;
 
 pub fn init(cx: &mut App) {
     assistant_tool::init(cx);
-    crate::edit_files_tool::log::init(cx);
 
     let registry = ToolRegistry::global(cx);
-    registry.register_tool(BashTool);
-    registry.register_tool(DeletePathTool);
-    registry.register_tool(DiagnosticsTool);
-    registry.register_tool(EditFilesTool);
-    registry.register_tool(ListDirectoryTool);
     registry.register_tool(NowTool);
-    registry.register_tool(PathSearchTool);
+    registry.register_tool(ListWorktreesTool);
     registry.register_tool(ReadFileTool);
-    registry.register_tool(RegexSearchTool);
 }

crates/assistant_tools/src/bash_tool.rs

@@ -1,81 +0,0 @@
-use anyhow::{anyhow, Context as _, Result};
-use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::sync::Arc;
-use util::command::new_smol_command;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct BashToolInput {
-    /// The bash command to execute as a one-liner.
-    command: String,
-    /// Working directory for the command. This must be one of the root directories of the project.
-    cd: String,
-}
-
-pub struct BashTool;
-
-impl Tool for BashTool {
-    fn name(&self) -> String {
-        "bash".to_string()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./bash_tool/description.md").to_string()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(BashToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let input: BashToolInput = match serde_json::from_value(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        let Some(worktree) = project.read(cx).worktree_for_root_name(&input.cd, cx) else {
-            return Task::ready(Err(anyhow!("Working directory not found in the project")));
-        };
-        let working_directory = worktree.read(cx).abs_path();
-
-        cx.spawn(|_| async move {
-            // Add 2>&1 to merge stderr into stdout for proper interleaving.
-            let command = format!("({}) 2>&1", input.command);
-
-            let output = new_smol_command("bash")
-                .arg("-c")
-                .arg(&command)
-                .current_dir(working_directory)
-                .output()
-                .await
-                .context("Failed to execute bash command")?;
-
-            let output_string = String::from_utf8_lossy(&output.stdout).to_string();
-
-            if output.status.success() {
-                if output_string.is_empty() {
-                    Ok("Command executed successfully.".to_string())
-                } else {
-                    Ok(output_string)
-                }
-            } else {
-                Ok(format!(
-                    "Command failed with exit code {}\n{}",
-                    output.status.code().unwrap_or(-1),
-                    &output_string
-                ))
-            }
-        })
-    }
-}

crates/assistant_tools/src/bash_tool/description.md

@@ -1,7 +0,0 @@
-Executes a bash one-liner and returns the combined output.
-
-This tool spawns a bash process, combines stdout and stderr into one interleaved stream as they are produced (preserving the order of writes), and captures that stream into a string which is returned.
-
-Make sure you use the `cd` parameter to navigate to one of the root directories of the project. NEVER do it as part of the `command` itself, otherwise it will error.
-
-Remember that each invocation of this tool will spawn a new bash process, so you can't rely on any state from previous invocations.

crates/assistant_tools/src/delete_path_tool.rs

@@ -1,165 +0,0 @@
-use anyhow::{anyhow, Result};
-use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{fs, path::PathBuf, sync::Arc};
-use util::paths::PathMatcher;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct DeletePathToolInput {
-    /// The glob to match files in the project to delete.
-    ///
-    /// <example>
-    /// If the project has the following files:
-    ///
-    /// - directory1/a/something.txt
-    /// - directory2/a/things.txt
-    /// - directory3/a/other.txt
-    ///
-    /// You can delete the first two files by providing a glob of "*thing*.txt"
-    /// </example>
-    pub glob: String,
-}
-
-pub struct DeletePathTool;
-
-impl Tool for DeletePathTool {
-    fn name(&self) -> String {
-        "delete-path".into()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./delete_path_tool/description.md").into()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(DeletePathToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let glob = match serde_json::from_value::<DeletePathToolInput>(input) {
-            Ok(input) => input.glob,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-        let path_matcher = match PathMatcher::new(&[glob.clone()]) {
-            Ok(matcher) => matcher,
-            Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {}", err))),
-        };
-
-        struct Match {
-            display_path: String,
-            path: PathBuf,
-        }
-
-        let mut matches = Vec::new();
-        let mut deleted_paths = Vec::new();
-        let mut errors = Vec::new();
-
-        for worktree_handle in project.read(cx).worktrees(cx) {
-            let worktree = worktree_handle.read(cx);
-            let worktree_root = worktree.abs_path().to_path_buf();
-
-            // Don't consider ignored entries.
-            for entry in worktree.entries(false, 0) {
-                if path_matcher.is_match(&entry.path) {
-                    matches.push(Match {
-                        path: worktree_root.join(&entry.path),
-                        display_path: entry.path.display().to_string(),
-                    });
-                }
-            }
-        }
-
-        if matches.is_empty() {
-            return Task::ready(Ok(format!("No paths in the project matched {glob:?}")));
-        }
-
-        let paths_matched = matches.len();
-
-        // Delete the files
-        for Match { path, display_path } in matches {
-            match fs::remove_file(&path) {
-                Ok(()) => {
-                    deleted_paths.push(display_path);
-                }
-                Err(file_err) => {
-                    // Try to remove directory if it's not a file. Retrying as a directory
-                    // on error saves a syscall compared to checking whether it's
-                    // a directory up front for every single file.
-                    if let Err(dir_err) = fs::remove_dir_all(&path) {
-                        let error = if path.is_dir() {
-                            format!("Failed to delete directory {}: {dir_err}", display_path)
-                        } else {
-                            format!("Failed to delete file {}: {file_err}", display_path)
-                        };
-
-                        errors.push(error);
-                    } else {
-                        deleted_paths.push(display_path);
-                    }
-                }
-            }
-        }
-
-        if errors.is_empty() {
-            // 0 deleted paths should never happen if there were no errors;
-            // we already returned if matches was empty.
-            let answer = if deleted_paths.len() == 1 {
-                format!(
-                    "Deleted {}",
-                    deleted_paths.first().unwrap_or(&String::new())
-                )
-            } else {
-                // Sort to group entries in the same directory together
-                deleted_paths.sort();
-
-                let mut buf = format!("Deleted these {} paths:\n", deleted_paths.len());
-
-                for path in deleted_paths.iter() {
-                    buf.push('\n');
-                    buf.push_str(path);
-                }
-
-                buf
-            };
-
-            Task::ready(Ok(answer))
-        } else {
-            if deleted_paths.is_empty() {
-                Task::ready(Err(anyhow!(
-                    "{glob:?} matched {} deleted because of {}:\n{}",
-                    if paths_matched == 1 {
-                        "1 path, but it was not".to_string()
-                    } else {
-                        format!("{} paths, but none were", paths_matched)
-                    },
-                    if errors.len() == 1 {
-                        "this error".to_string()
-                    } else {
-                        format!("{} errors", errors.len())
-                    },
-                    errors.join("\n")
-                )))
-            } else {
-                // Sort to group entries in the same directory together
-                deleted_paths.sort();
-                Task::ready(Ok(format!(
-                    "Deleted {} paths matching glob {glob:?}:\n{}\n\nErrors:\n{}",
-                    deleted_paths.len(),
-                    deleted_paths.join("\n"),
-                    errors.join("\n")
-                )))
-            }
-        }
-    }
-}

crates/assistant_tools/src/delete_path_tool/description.md

@@ -1 +0,0 @@
-Deletes all files and directories in the project which match the given glob, and returns a list of the paths that were deleted.

crates/assistant_tools/src/diagnostics_tool.rs

@@ -1,127 +0,0 @@
-use anyhow::{anyhow, Result};
-use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use language::{DiagnosticSeverity, OffsetRangeExt};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{
-    fmt::Write,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct DiagnosticsToolInput {
-    /// The path to get diagnostics for. If not provided, returns a project-wide summary.
-    ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - lorem
-    /// - ipsum
-    ///
-    /// If you wanna access diagnostics for `dolor.txt` in `ipsum`, you should use the path `ipsum/dolor.txt`.
-    /// </example>
-    pub path: Option<PathBuf>,
-}
-
-pub struct DiagnosticsTool;
-
-impl Tool for DiagnosticsTool {
-    fn name(&self) -> String {
-        "diagnostics".into()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./diagnostics_tool/description.md").into()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(DiagnosticsToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let input = match serde_json::from_value::<DiagnosticsToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        if let Some(path) = input.path {
-            let Some(project_path) = project.read(cx).find_project_path(&path, cx) else {
-                return Task::ready(Err(anyhow!("Could not find path in project")));
-            };
-            let buffer = project.update(cx, |project, cx| project.open_buffer(project_path, cx));
-
-            cx.spawn(|cx| async move {
-                let mut output = String::new();
-                let buffer = buffer.await?;
-                let snapshot = buffer.read_with(&cx, |buffer, _cx| buffer.snapshot())?;
-
-                for (_, group) in snapshot.diagnostic_groups(None) {
-                    let entry = &group.entries[group.primary_ix];
-                    let range = entry.range.to_point(&snapshot);
-                    let severity = match entry.diagnostic.severity {
-                        DiagnosticSeverity::ERROR => "error",
-                        DiagnosticSeverity::WARNING => "warning",
-                        _ => continue,
-                    };
-
-                    writeln!(
-                        output,
-                        "{} at line {}: {}",
-                        severity,
-                        range.start.row + 1,
-                        entry.diagnostic.message
-                    )?;
-                }
-
-                if output.is_empty() {
-                    Ok("File doesn't have errors or warnings!".to_string())
-                } else {
-                    Ok(output)
-                }
-            })
-        } else {
-            let project = project.read(cx);
-            let mut output = String::new();
-            let mut has_diagnostics = false;
-
-            for (project_path, _, summary) in project.diagnostic_summaries(true, cx) {
-                if summary.error_count > 0 || summary.warning_count > 0 {
-                    let Some(worktree) = project.worktree_for_id(project_path.worktree_id, cx)
-                    else {
-                        continue;
-                    };
-
-                    has_diagnostics = true;
-                    output.push_str(&format!(
-                        "{}: {} error(s), {} warning(s)\n",
-                        Path::new(worktree.read(cx).root_name())
-                            .join(project_path.path)
-                            .display(),
-                        summary.error_count,
-                        summary.warning_count
-                    ));
-                }
-            }
-
-            if has_diagnostics {
-                Task::ready(Ok(output))
-            } else {
-                Task::ready(Ok("No errors or warnings found in the project.".to_string()))
-            }
-        }
-    }
-}

crates/assistant_tools/src/diagnostics_tool/description.md

@@ -1,16 +0,0 @@
-Get errors and warnings for the project or a specific file.
-
-This tool can be invoked after a series of edits to determine if further edits are necessary, or if the user asks to fix errors or warnings in their codebase.
-
-When a path is provided, shows all diagnostics for that specific file.
-When no path is provided, shows a summary of error and warning counts for all files in the project.
-
-<example>
-To get diagnostics for a specific file:
-{
-    "path": "src/main.rs"
-}
-
-To get a project-wide diagnostic summary:
-{}
-</example>

crates/assistant_tools/src/edit_files_tool.rs

@@ -1,375 +0,0 @@
-mod edit_action;
-pub mod log;
-
-use anyhow::{anyhow, Context, Result};
-use assistant_tool::Tool;
-use collections::HashSet;
-use edit_action::{EditAction, EditActionParser};
-use futures::StreamExt;
-use gpui::{App, AsyncApp, Entity, Task};
-use language_model::{
-    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
-};
-use log::{EditToolLog, EditToolRequestId};
-use project::{search::SearchQuery, Project};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::fmt::Write;
-use std::sync::Arc;
-use util::paths::PathMatcher;
-use util::ResultExt;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct EditFilesToolInput {
-    /// High-level edit instructions. These will be interpreted by a smaller
-    /// model, so explain the changes you want that model to make and which
-    /// file paths need changing.
-    ///
-    /// The description should be concise and clear. We will show this
-    /// description to the user as well.
-    ///
-    /// WARNING: When specifying which file paths need changing, you MUST
-    /// start each path with one of the project's root directories.
-    ///
-    /// WARNING: NEVER include code blocks or snippets in edit instructions.
-    /// Only provide natural language descriptions of the changes needed! The tool will
-    /// reject any instructions that contain code blocks or snippets.
-    ///
-    /// The following examples assume we have two root directories in the project:
-    /// - root-1
-    /// - root-2
-    ///
-    /// <example>
-    /// If you want to introduce a new quit function to kill the process, your
-    /// instructions should be: "Add a new `quit` function to
-    /// `root-1/src/main.rs` to kill the process".
-    ///
-    /// Notice how the file path starts with root-1. Without that, the path
-    /// would be ambiguous and the call would fail!
-    /// </example>
-    ///
-    /// <example>
-    /// If you want to change documentation to always start with a capital
-    /// letter, your instructions should be: "In `root-2/db.js`,
-    /// `root-2/inMemory.js` and `root-2/sql.js`, change all the documentation
-    /// to start with a capital letter".
-    ///
-    /// Notice how we never specify code snippets in the instructions!
-    /// </example>
-    pub edit_instructions: String,
-}
-
-pub struct EditFilesTool;
-
-impl Tool for EditFilesTool {
-    fn name(&self) -> String {
-        "edit-files".into()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./edit_files_tool/description.md").into()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(EditFilesToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let input = match serde_json::from_value::<EditFilesToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        match EditToolLog::try_global(cx) {
-            Some(log) => {
-                let req_id = log.update(cx, |log, cx| {
-                    log.new_request(input.edit_instructions.clone(), cx)
-                });
-
-                let task =
-                    EditToolRequest::new(input, messages, project, Some((log.clone(), req_id)), cx);
-
-                cx.spawn(|mut cx| async move {
-                    let result = task.await;
-
-                    let str_result = match &result {
-                        Ok(out) => Ok(out.clone()),
-                        Err(err) => Err(err.to_string()),
-                    };
-
-                    log.update(&mut cx, |log, cx| {
-                        log.set_tool_output(req_id, str_result, cx)
-                    })
-                    .log_err();
-
-                    result
-                })
-            }
-
-            None => EditToolRequest::new(input, messages, project, None, cx),
-        }
-    }
-}
-
-struct EditToolRequest {
-    parser: EditActionParser,
-    changed_buffers: HashSet<Entity<language::Buffer>>,
-    bad_searches: Vec<BadSearch>,
-    project: Entity<Project>,
-    log: Option<(Entity<EditToolLog>, EditToolRequestId)>,
-}
-
-#[derive(Debug)]
-enum DiffResult {
-    BadSearch(BadSearch),
-    Diff(language::Diff),
-}
-
-#[derive(Debug)]
-struct BadSearch {
-    file_path: String,
-    search: String,
-}
-
-impl EditToolRequest {
-    fn new(
-        input: EditFilesToolInput,
-        messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        log: Option<(Entity<EditToolLog>, EditToolRequestId)>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let model_registry = LanguageModelRegistry::read_global(cx);
-        let Some(model) = model_registry.editor_model() else {
-            return Task::ready(Err(anyhow!("No editor model configured")));
-        };
-
-        let mut messages = messages.to_vec();
-        if let Some(last_message) = messages.last_mut() {
-            // Strip out tool use from the last message because we're in the middle of executing a tool call.
-            last_message
-                .content
-                .retain(|content| !matches!(content, language_model::MessageContent::ToolUse(_)))
-        }
-        messages.push(LanguageModelRequestMessage {
-            role: Role::User,
-            content: vec![
-                include_str!("./edit_files_tool/edit_prompt.md").into(),
-                input.edit_instructions.into(),
-            ],
-            cache: false,
-        });
-
-        cx.spawn(|mut cx| async move {
-            let llm_request = LanguageModelRequest {
-                messages,
-                tools: vec![],
-                stop: vec![],
-                temperature: Some(0.0),
-            };
-
-            let stream = model.stream_completion_text(llm_request, &cx);
-            let mut chunks = stream.await?;
-
-            let mut request = Self {
-                parser: EditActionParser::new(),
-                changed_buffers: HashSet::default(),
-                bad_searches: Vec::new(),
-                project,
-                log,
-            };
-
-            while let Some(chunk) = chunks.stream.next().await {
-                request.process_response_chunk(&chunk?, &mut cx).await?;
-            }
-
-            request.finalize(&mut cx).await
-        })
-    }
-
-    async fn process_response_chunk(&mut self, chunk: &str, cx: &mut AsyncApp) -> Result<()> {
-        let new_actions = self.parser.parse_chunk(chunk);
-
-        if let Some((ref log, req_id)) = self.log {
-            log.update(cx, |log, cx| {
-                log.push_editor_response_chunk(req_id, chunk, &new_actions, cx)
-            })
-            .log_err();
-        }
-
-        for action in new_actions {
-            self.apply_action(action, cx).await?;
-        }
-
-        Ok(())
-    }
-
-    async fn apply_action(&mut self, action: EditAction, cx: &mut AsyncApp) -> Result<()> {
-        let project_path = self.project.read_with(cx, |project, cx| {
-            project
-                .find_project_path(action.file_path(), cx)
-                .context("Path not found in project")
-        })??;
-
-        let buffer = self
-            .project
-            .update(cx, |project, cx| project.open_buffer(project_path, cx))?
-            .await?;
-
-        let result = match action {
-            EditAction::Replace {
-                old,
-                new,
-                file_path,
-            } => {
-                let snapshot = buffer.read_with(cx, |buffer, _cx| buffer.snapshot())?;
-
-                cx.background_executor()
-                    .spawn(Self::replace_diff(old, new, file_path, snapshot))
-                    .await
-            }
-            EditAction::Write { content, .. } => Ok(DiffResult::Diff(
-                buffer
-                    .read_with(cx, |buffer, cx| buffer.diff(content, cx))?
-                    .await,
-            )),
-        }?;
-
-        match result {
-            DiffResult::BadSearch(invalid_replace) => {
-                self.bad_searches.push(invalid_replace);
-            }
-            DiffResult::Diff(diff) => {
-                let _clock = buffer.update(cx, |buffer, cx| buffer.apply_diff(diff, cx))?;
-
-                self.changed_buffers.insert(buffer);
-            }
-        }
-
-        Ok(())
-    }
-
-    async fn replace_diff(
-        old: String,
-        new: String,
-        file_path: std::path::PathBuf,
-        snapshot: language::BufferSnapshot,
-    ) -> Result<DiffResult> {
-        let query = SearchQuery::text(
-            old.clone(),
-            false,
-            true,
-            true,
-            PathMatcher::new(&[])?,
-            PathMatcher::new(&[])?,
-            None,
-        )?;
-
-        let matches = query.search(&snapshot, None).await;
-
-        if matches.is_empty() {
-            return Ok(DiffResult::BadSearch(BadSearch {
-                search: new.clone(),
-                file_path: file_path.display().to_string(),
-            }));
-        }
-
-        let edit_range = matches[0].clone();
-        let diff = language::text_diff(&old, &new);
-
-        let edits = diff
-            .into_iter()
-            .map(|(old_range, text)| {
-                let start = edit_range.start + old_range.start;
-                let end = edit_range.start + old_range.end;
-                (start..end, text)
-            })
-            .collect::<Vec<_>>();
-
-        let diff = language::Diff {
-            base_version: snapshot.version().clone(),
-            line_ending: snapshot.line_ending(),
-            edits,
-        };
-
-        anyhow::Ok(DiffResult::Diff(diff))
-    }
-
-    async fn finalize(self, cx: &mut AsyncApp) -> Result<String> {
-        let mut answer = match self.changed_buffers.len() {
-            0 => "No files were edited.".to_string(),
-            1 => "Successfully edited ".to_string(),
-            _ => "Successfully edited these files:\n\n".to_string(),
-        };
-
-        // Save each buffer once at the end
-        for buffer in self.changed_buffers {
-            let (path, save_task) = self.project.update(cx, |project, cx| {
-                let path = buffer
-                    .read(cx)
-                    .file()
-                    .map(|file| file.path().display().to_string());
-
-                let task = project.save_buffer(buffer.clone(), cx);
-
-                (path, task)
-            })?;
-
-            save_task.await?;
-
-            if let Some(path) = path {
-                writeln!(&mut answer, "{}", path)?;
-            }
-        }
-
-        let errors = self.parser.errors();
-
-        if errors.is_empty() && self.bad_searches.is_empty() {
-            Ok(answer.trim_end().to_string())
-        } else {
-            if !self.bad_searches.is_empty() {
-                writeln!(
-                    &mut answer,
-                    "\nThese searches failed because they didn't match any strings:"
-                )?;
-
-                for replace in self.bad_searches {
-                    writeln!(
-                        &mut answer,
-                        "- '{}' does not appear in `{}`",
-                        replace.search.replace("\r", "\\r").replace("\n", "\\n"),
-                        replace.file_path
-                    )?;
-                }
-
-                writeln!(&mut answer, "Make sure to use exact searches.")?;
-            }
-
-            if !errors.is_empty() {
-                writeln!(
-                    &mut answer,
-                    "\nThese SEARCH/REPLACE blocks failed to parse:"
-                )?;
-
-                for error in errors {
-                    writeln!(&mut answer, "- {}", error)?;
-                }
-            }
-
-            writeln!(
-                &mut answer,
-                "\nYou can fix errors by running the tool again. You can include instructions,\
-                but errors are part of the conversation so you don't need to repeat them."
-            )?;
-
-            Err(anyhow!(answer))
-        }
-    }
-}

crates/assistant_tools/src/edit_files_tool/description.md

@@ -1,5 +0,0 @@
-Edit files in the current project by specifying instructions in natural language.
-
-When using this tool, you should suggest one coherent edit that can be made to the codebase.
-
-When the set of edits you want to make is large or complex, feel free to invoke this tool multiple times, each time focusing on a specific change you wanna make.

crates/assistant_tools/src/edit_files_tool/edit_action.rs

@@ -1,907 +0,0 @@
-use std::path::{Path, PathBuf};
-use util::ResultExt;
-
-/// Represents an edit action to be performed on a file.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum EditAction {
-    /// Replace specific content in a file with new content
-    Replace {
-        file_path: PathBuf,
-        old: String,
-        new: String,
-    },
-    /// Write content to a file (create or overwrite)
-    Write { file_path: PathBuf, content: String },
-}
-
-impl EditAction {
-    pub fn file_path(&self) -> &Path {
-        match self {
-            EditAction::Replace { file_path, .. } => file_path,
-            EditAction::Write { file_path, .. } => file_path,
-        }
-    }
-}
-
-/// Parses edit actions from an LLM response.
-/// See system.md for more details on the format.
-#[derive(Debug)]
-pub struct EditActionParser {
-    state: State,
-    pre_fence_line: Vec<u8>,
-    marker_ix: usize,
-    line: usize,
-    column: usize,
-    old_bytes: Vec<u8>,
-    new_bytes: Vec<u8>,
-    errors: Vec<ParseError>,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-enum State {
-    /// Anywhere outside an action
-    Default,
-    /// After opening ```, in optional language tag
-    OpenFence,
-    /// In SEARCH marker
-    SearchMarker,
-    /// In search block or divider
-    SearchBlock,
-    /// In replace block or REPLACE marker
-    ReplaceBlock,
-    /// In closing ```
-    CloseFence,
-}
-
-impl EditActionParser {
-    /// Creates a new `EditActionParser`
-    pub fn new() -> Self {
-        Self {
-            state: State::Default,
-            pre_fence_line: Vec::new(),
-            marker_ix: 0,
-            line: 1,
-            column: 0,
-            old_bytes: Vec::new(),
-            new_bytes: Vec::new(),
-            errors: Vec::new(),
-        }
-    }
-
-    /// Processes a chunk of input text and returns any completed edit actions.
-    ///
-    /// This method can be called repeatedly with fragments of input. The parser
-    /// maintains its state between calls, allowing you to process streaming input
-    /// as it becomes available. Actions are only inserted once they are fully parsed.
-    ///
-    /// If a block fails to parse, it will simply be skipped and an error will be recorded.
-    /// All errors can be accessed through the `EditActionsParser::errors` method.
-    pub fn parse_chunk(&mut self, input: &str) -> Vec<EditAction> {
-        use State::*;
-
-        const FENCE: &[u8] = b"```";
-        const SEARCH_MARKER: &[u8] = b"<<<<<<< SEARCH";
-        const DIVIDER: &[u8] = b"=======";
-        const NL_DIVIDER: &[u8] = b"\n=======";
-        const REPLACE_MARKER: &[u8] = b">>>>>>> REPLACE";
-        const NL_REPLACE_MARKER: &[u8] = b"\n>>>>>>> REPLACE";
-
-        let mut actions = Vec::new();
-
-        for byte in input.bytes() {
-            // Update line and column tracking
-            if byte == b'\n' {
-                self.line += 1;
-                self.column = 0;
-            } else {
-                self.column += 1;
-            }
-
-            match &self.state {
-                Default => match match_marker(byte, FENCE, false, &mut self.marker_ix) {
-                    MarkerMatch::Complete => {
-                        self.to_state(OpenFence);
-                    }
-                    MarkerMatch::Partial => {}
-                    MarkerMatch::None => {
-                        if self.marker_ix > 0 {
-                            self.marker_ix = 0;
-                        } else if self.pre_fence_line.ends_with(b"\n") {
-                            self.pre_fence_line.clear();
-                        }
-
-                        self.pre_fence_line.push(byte);
-                    }
-                },
-                OpenFence => {
-                    // skip language tag
-                    if byte == b'\n' {
-                        self.to_state(SearchMarker);
-                    }
-                }
-                SearchMarker => {
-                    if self.expect_marker(byte, SEARCH_MARKER, true) {
-                        self.to_state(SearchBlock);
-                    }
-                }
-                SearchBlock => {
-                    if collect_until_marker(
-                        byte,
-                        DIVIDER,
-                        NL_DIVIDER,
-                        true,
-                        &mut self.marker_ix,
-                        &mut self.old_bytes,
-                    ) {
-                        self.to_state(ReplaceBlock);
-                    }
-                }
-                ReplaceBlock => {
-                    if collect_until_marker(
-                        byte,
-                        REPLACE_MARKER,
-                        NL_REPLACE_MARKER,
-                        true,
-                        &mut self.marker_ix,
-                        &mut self.new_bytes,
-                    ) {
-                        self.to_state(CloseFence);
-                    }
-                }
-                CloseFence => {
-                    if self.expect_marker(byte, FENCE, false) {
-                        if let Some(action) = self.action() {
-                            actions.push(action);
-                        }
-                        self.errors();
-                        self.reset();
-                    }
-                }
-            };
-        }
-
-        actions
-    }
-
-    /// Returns a reference to the errors encountered during parsing.
-    pub fn errors(&self) -> &[ParseError] {
-        &self.errors
-    }
-
-    fn action(&mut self) -> Option<EditAction> {
-        if self.old_bytes.is_empty() && self.new_bytes.is_empty() {
-            self.push_error(ParseErrorKind::NoOp);
-            return None;
-        }
-
-        let mut pre_fence_line = std::mem::take(&mut self.pre_fence_line);
-
-        if pre_fence_line.ends_with(b"\n") {
-            pre_fence_line.pop();
-            pop_carriage_return(&mut pre_fence_line);
-        }
-
-        let file_path = PathBuf::from(String::from_utf8(pre_fence_line).log_err()?);
-        let content = String::from_utf8(std::mem::take(&mut self.new_bytes)).log_err()?;
-
-        if self.old_bytes.is_empty() {
-            Some(EditAction::Write { file_path, content })
-        } else {
-            let old = String::from_utf8(std::mem::take(&mut self.old_bytes)).log_err()?;
-
-            Some(EditAction::Replace {
-                file_path,
-                old,
-                new: content,
-            })
-        }
-    }
-
-    fn expect_marker(&mut self, byte: u8, marker: &'static [u8], trailing_newline: bool) -> bool {
-        match match_marker(byte, marker, trailing_newline, &mut self.marker_ix) {
-            MarkerMatch::Complete => true,
-            MarkerMatch::Partial => false,
-            MarkerMatch::None => {
-                self.push_error(ParseErrorKind::ExpectedMarker {
-                    expected: marker,
-                    found: byte,
-                });
-                self.reset();
-                false
-            }
-        }
-    }
-
-    fn to_state(&mut self, state: State) {
-        self.state = state;
-        self.marker_ix = 0;
-    }
-
-    fn reset(&mut self) {
-        self.pre_fence_line.clear();
-        self.old_bytes.clear();
-        self.new_bytes.clear();
-        self.to_state(State::Default);
-    }
-
-    fn push_error(&mut self, kind: ParseErrorKind) {
-        self.errors.push(ParseError {
-            line: self.line,
-            column: self.column,
-            kind,
-        });
-    }
-}
-
-#[derive(Debug)]
-enum MarkerMatch {
-    None,
-    Partial,
-    Complete,
-}
-
-fn match_marker(
-    byte: u8,
-    marker: &[u8],
-    trailing_newline: bool,
-    marker_ix: &mut usize,
-) -> MarkerMatch {
-    if trailing_newline && *marker_ix >= marker.len() {
-        if byte == b'\n' {
-            MarkerMatch::Complete
-        } else if byte == b'\r' {
-            MarkerMatch::Partial
-        } else {
-            MarkerMatch::None
-        }
-    } else if byte == marker[*marker_ix] {
-        *marker_ix += 1;
-
-        if *marker_ix < marker.len() || trailing_newline {
-            MarkerMatch::Partial
-        } else {
-            MarkerMatch::Complete
-        }
-    } else {
-        MarkerMatch::None
-    }
-}
-
-fn collect_until_marker(
-    byte: u8,
-    marker: &[u8],
-    nl_marker: &[u8],
-    trailing_newline: bool,
-    marker_ix: &mut usize,
-    buf: &mut Vec<u8>,
-) -> bool {
-    let marker = if buf.is_empty() {
-        // do not require another newline if block is empty
-        marker
-    } else {
-        nl_marker
-    };
-
-    match match_marker(byte, marker, trailing_newline, marker_ix) {
-        MarkerMatch::Complete => {
-            pop_carriage_return(buf);
-            true
-        }
-        MarkerMatch::Partial => false,
-        MarkerMatch::None => {
-            if *marker_ix > 0 {
-                buf.extend_from_slice(&marker[..*marker_ix]);
-                *marker_ix = 0;
-
-                // The beginning of marker might match current byte
-                match match_marker(byte, marker, trailing_newline, marker_ix) {
-                    MarkerMatch::Complete => return true,
-                    MarkerMatch::Partial => return false,
-                    MarkerMatch::None => { /* no match, keep collecting */ }
-                }
-            }
-
-            buf.push(byte);
-
-            false
-        }
-    }
-}
-
-fn pop_carriage_return(buf: &mut Vec<u8>) {
-    if buf.ends_with(b"\r") {
-        buf.pop();
-    }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct ParseError {
-    line: usize,
-    column: usize,
-    kind: ParseErrorKind,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum ParseErrorKind {
-    ExpectedMarker { expected: &'static [u8], found: u8 },
-    NoOp,
-}
-
-impl std::fmt::Display for ParseErrorKind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            ParseErrorKind::ExpectedMarker { expected, found } => {
-                write!(
-                    f,
-                    "Expected marker {:?}, found {:?}",
-                    String::from_utf8_lossy(expected),
-                    *found as char
-                )
-            }
-            ParseErrorKind::NoOp => {
-                write!(f, "No search or replace")
-            }
-        }
-    }
-}
-
-impl std::fmt::Display for ParseError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "input:{}:{}: {}", self.line, self.column, self.kind)
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use rand::prelude::*;
-
-    #[test]
-    fn test_simple_edit_action() {
-        let input = r#"src/main.rs
-```
-<<<<<<< SEARCH
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn original() {}".to_string(),
-                new: "fn replacement() {}".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_with_language_tag() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< SEARCH
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn original() {}".to_string(),
-                new: "fn replacement() {}".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_with_surrounding_text() {
-        let input = r#"Here's a modification I'd like to make to the file:
-
-src/main.rs
-```rust
-<<<<<<< SEARCH
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-```
-
-This change makes the function better.
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn original() {}".to_string(),
-                new: "fn replacement() {}".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_multiple_edit_actions() {
-        let input = r#"First change:
-src/main.rs
-```
-<<<<<<< SEARCH
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-```
-
-Second change:
-src/utils.rs
-```rust
-<<<<<<< SEARCH
-fn old_util() -> bool { false }
-=======
-fn new_util() -> bool { true }
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        assert_eq!(actions.len(), 2);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn original() {}".to_string(),
-                new: "fn replacement() {}".to_string(),
-            }
-        );
-        assert_eq!(
-            actions[1],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/utils.rs"),
-                old: "fn old_util() -> bool { false }".to_string(),
-                new: "fn new_util() -> bool { true }".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_multiline() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< SEARCH
-fn original() {
-    println!("This is the original function");
-    let x = 42;
-    if x > 0 {
-        println!("Positive number");
-    }
-}
-=======
-fn replacement() {
-    println!("This is the replacement function");
-    let x = 100;
-    if x > 50 {
-        println!("Large number");
-    } else {
-        println!("Small number");
-    }
-}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn original() {\n    println!(\"This is the original function\");\n    let x = 42;\n    if x > 0 {\n        println!(\"Positive number\");\n    }\n}".to_string(),
-                new: "fn replacement() {\n    println!(\"This is the replacement function\");\n    let x = 100;\n    if x > 50 {\n        println!(\"Large number\");\n    } else {\n        println!(\"Small number\");\n    }\n}".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_write_action() {
-        let input = r#"Create a new main.rs file:
-
-src/main.rs
-```rust
-<<<<<<< SEARCH
-=======
-fn new_function() {
-    println!("This function is being added");
-}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Write {
-                file_path: PathBuf::from("src/main.rs"),
-                content: "fn new_function() {\n    println!(\"This function is being added\");\n}"
-                    .to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_empty_replace() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< SEARCH
-fn this_will_be_deleted() {
-    println!("Deleting this function");
-}
-=======
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(&input);
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn this_will_be_deleted() {\n    println!(\"Deleting this function\");\n}"
-                    .to_string(),
-                new: "".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-
-        let actions = parser.parse_chunk(&input.replace("\n", "\r\n"));
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old:
-                    "fn this_will_be_deleted() {\r\n    println!(\"Deleting this function\");\r\n}"
-                        .to_string(),
-                new: "".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_empty_both() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< SEARCH
-=======
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        // Should not create an action when both sections are empty
-        assert_eq!(actions.len(), 0);
-
-        // Check that the NoOp error was added
-        assert_eq!(parser.errors().len(), 1);
-        match parser.errors()[0].kind {
-            ParseErrorKind::NoOp => {}
-            _ => panic!("Expected NoOp error"),
-        }
-    }
-
-    #[test]
-    fn test_resumability() {
-        let input_part1 = r#"src/main.rs
-```rust
-<<<<<<< SEARCH
-fn ori"#;
-
-        let input_part2 = r#"ginal() {}
-=======
-fn replacement() {}"#;
-
-        let input_part3 = r#"
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions1 = parser.parse_chunk(input_part1);
-        assert_eq!(actions1.len(), 0);
-        assert_eq!(parser.errors().len(), 0);
-
-        let actions2 = parser.parse_chunk(input_part2);
-        // No actions should be complete yet
-        assert_eq!(actions2.len(), 0);
-        assert_eq!(parser.errors().len(), 0);
-
-        let actions3 = parser.parse_chunk(input_part3);
-        // The third chunk should complete the action
-        assert_eq!(actions3.len(), 1);
-        assert_eq!(
-            actions3[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/main.rs"),
-                old: "fn original() {}".to_string(),
-                new: "fn replacement() {}".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_parser_state_preservation() {
-        let mut parser = EditActionParser::new();
-        let actions1 = parser.parse_chunk("src/main.rs\n```rust\n<<<<<<< SEARCH\n");
-
-        // Check parser is in the correct state
-        assert_eq!(parser.state, State::SearchBlock);
-        assert_eq!(parser.pre_fence_line, b"src/main.rs\n");
-        assert_eq!(parser.errors().len(), 0);
-
-        // Continue parsing
-        let actions2 = parser.parse_chunk("original code\n=======\n");
-        assert_eq!(parser.state, State::ReplaceBlock);
-        assert_eq!(parser.old_bytes, b"original code");
-        assert_eq!(parser.errors().len(), 0);
-
-        let actions3 = parser.parse_chunk("replacement code\n>>>>>>> REPLACE\n```\n");
-
-        // After complete parsing, state should reset
-        assert_eq!(parser.state, State::Default);
-        assert_eq!(parser.pre_fence_line, b"\n");
-        assert!(parser.old_bytes.is_empty());
-        assert!(parser.new_bytes.is_empty());
-
-        assert_eq!(actions1.len(), 0);
-        assert_eq!(actions2.len(), 0);
-        assert_eq!(actions3.len(), 1);
-        assert_eq!(parser.errors().len(), 0);
-    }
-
-    #[test]
-    fn test_invalid_search_marker() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< WRONG_MARKER
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-        assert_eq!(actions.len(), 0);
-
-        assert_eq!(parser.errors().len(), 1);
-        let error = &parser.errors()[0];
-
-        assert_eq!(
-            error.to_string(),
-            "input:3:9: Expected marker \"<<<<<<< SEARCH\", found 'W'"
-        );
-    }
-
-    #[test]
-    fn test_missing_closing_fence() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< SEARCH
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-<!-- Missing closing fence -->
-
-src/utils.rs
-```rust
-<<<<<<< SEARCH
-fn utils_func() {}
-=======
-fn new_utils_func() {}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(input);
-
-        // Only the second block should be parsed
-        assert_eq!(actions.len(), 1);
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("src/utils.rs"),
-                old: "fn utils_func() {}".to_string(),
-                new: "fn new_utils_func() {}".to_string(),
-            }
-        );
-        assert_eq!(parser.errors().len(), 1);
-        assert_eq!(
-            parser.errors()[0].to_string(),
-            "input:8:1: Expected marker \"```\", found '<'".to_string()
-        );
-
-        // The parser should continue after an error
-        assert_eq!(parser.state, State::Default);
-    }
-
-    const SYSTEM_PROMPT: &str = include_str!("./edit_prompt.md");
-
-    #[test]
-    fn test_parse_examples_in_system_prompt() {
-        let mut parser = EditActionParser::new();
-        let actions = parser.parse_chunk(SYSTEM_PROMPT);
-        assert_examples_in_system_prompt(&actions, parser.errors());
-    }
-
-    #[gpui::test(iterations = 10)]
-    fn test_random_chunking_of_system_prompt(mut rng: StdRng) {
-        let mut parser = EditActionParser::new();
-        let mut remaining = SYSTEM_PROMPT;
-        let mut actions = Vec::with_capacity(5);
-
-        while !remaining.is_empty() {
-            let chunk_size = rng.gen_range(1..=std::cmp::min(remaining.len(), 100));
-
-            let (chunk, rest) = remaining.split_at(chunk_size);
-
-            actions.extend(parser.parse_chunk(chunk));
-            remaining = rest;
-        }
-
-        assert_examples_in_system_prompt(&actions, parser.errors());
-    }
-
-    fn assert_examples_in_system_prompt(actions: &[EditAction], errors: &[ParseError]) {
-        assert_eq!(actions.len(), 5);
-
-        assert_eq!(
-            actions[0],
-            EditAction::Replace {
-                file_path: PathBuf::from("mathweb/flask/app.py"),
-                old: "from flask import Flask".to_string(),
-                new: "import math\nfrom flask import Flask".to_string(),
-            }
-            .fix_lf(),
-        );
-
-        assert_eq!(
-            actions[1],
-            EditAction::Replace {
-                file_path: PathBuf::from("mathweb/flask/app.py"),
-                old: "def factorial(n):\n    \"compute factorial\"\n\n    if n == 0:\n        return 1\n    else:\n        return n * factorial(n-1)\n".to_string(),
-                new: "".to_string(),
-            }
-            .fix_lf()
-        );
-
-        assert_eq!(
-            actions[2],
-            EditAction::Replace {
-                file_path: PathBuf::from("mathweb/flask/app.py"),
-                old: "    return str(factorial(n))".to_string(),
-                new: "    return str(math.factorial(n))".to_string(),
-            }
-            .fix_lf(),
-        );
-
-        assert_eq!(
-            actions[3],
-            EditAction::Write {
-                file_path: PathBuf::from("hello.py"),
-                content: "def hello():\n    \"print a greeting\"\n\n    print(\"hello\")"
-                    .to_string(),
-            }
-            .fix_lf(),
-        );
-
-        assert_eq!(
-            actions[4],
-            EditAction::Replace {
-                file_path: PathBuf::from("main.py"),
-                old: "def hello():\n    \"print a greeting\"\n\n    print(\"hello\")".to_string(),
-                new: "from hello import hello".to_string(),
-            }
-            .fix_lf(),
-        );
-
-        // The system prompt includes some text that would produce errors
-        assert_eq!(
-            errors[0].to_string(),
-            "input:102:1: Expected marker \"<<<<<<< SEARCH\", found '3'"
-        );
-        #[cfg(not(windows))]
-        assert_eq!(
-            errors[1].to_string(),
-            "input:109:0: Expected marker \"<<<<<<< SEARCH\", found '\\n'"
-        );
-        #[cfg(windows)]
-        assert_eq!(
-            errors[1].to_string(),
-            "input:108:1: Expected marker \"<<<<<<< SEARCH\", found '\\r'"
-        );
-    }
-
-    impl EditAction {
-        fn fix_lf(self: EditAction) -> EditAction {
-            #[cfg(windows)]
-            match self {
-                EditAction::Replace {
-                    file_path,
-                    old,
-                    new,
-                } => EditAction::Replace {
-                    file_path: file_path.clone(),
-                    old: old.replace("\n", "\r\n"),
-                    new: new.replace("\n", "\r\n"),
-                },
-                EditAction::Write { file_path, content } => EditAction::Write {
-                    file_path: file_path.clone(),
-                    content: content.replace("\n", "\r\n"),
-                },
-            }
-            #[cfg(not(windows))]
-            self
-        }
-    }
-
-    #[test]
-    fn test_print_error() {
-        let input = r#"src/main.rs
-```rust
-<<<<<<< WRONG_MARKER
-fn original() {}
-=======
-fn replacement() {}
->>>>>>> REPLACE
-```
-"#;
-
-        let mut parser = EditActionParser::new();
-        parser.parse_chunk(input);
-
-        assert_eq!(parser.errors().len(), 1);
-        let error = &parser.errors()[0];
-        let expected_error = r#"input:3:9: Expected marker "<<<<<<< SEARCH", found 'W'"#;
-
-        assert_eq!(format!("{}", error), expected_error);
-    }
-}

crates/assistant_tools/src/edit_files_tool/edit_prompt.md

@@ -1,134 +0,0 @@
-Act as an expert software developer.
-Always use best practices when coding.
-Respect and use existing conventions, libraries, etc that are already present in the code base.
-
-Take requests for changes to the supplied code.
-Always reply to the user in the same language they are using.
-
-Once you understand the request, you MUST:
-
-1. Decide if you need to propose *SEARCH/REPLACE* edits to any files that haven't been added to the chat. You can create new files without asking!
-
-2. Think step-by-step and explain the needed changes in a few short sentences.
-
-3. Describe each change with a *SEARCH/REPLACE block* per the examples below.
-
-All changes to files must use this *SEARCH/REPLACE block* format.
-ONLY EVER RETURN CODE IN A *SEARCH/REPLACE BLOCK*!
-
-# Example conversations:
-
-## USER: Change get_factorial() to use math.factorial
-
-## ASSISTANT: To make this change we need to modify `mathweb/flask/app.py` to:
-
-1. Import the math package.
-2. Remove the existing factorial() function.
-3. Update get_factorial() to call math.factorial instead.
-
-Here are the *SEARCH/REPLACE* blocks:
-
-mathweb/flask/app.py
-```python
-<<<<<<< SEARCH
-from flask import Flask
-=======
-import math
-from flask import Flask
->>>>>>> REPLACE
-```
-
-mathweb/flask/app.py
-```python
-<<<<<<< SEARCH
-def factorial(n):
-    "compute factorial"
-
-    if n == 0:
-        return 1
-    else:
-        return n * factorial(n-1)
-
-=======
->>>>>>> REPLACE
-```
-
-mathweb/flask/app.py
-```python
-<<<<<<< SEARCH
-    return str(factorial(n))
-=======
-    return str(math.factorial(n))
->>>>>>> REPLACE
-```
-
-
-## USER: Refactor hello() into its own file.
-
-## ASSISTANT: To make this change we need to modify `main.py` and make a new file `hello.py`:
-
-1. Make a new hello.py file with hello() in it.
-2. Remove hello() from main.py and replace it with an import.
-
-Here are the *SEARCH/REPLACE* blocks:
-
-hello.py
-```python
-<<<<<<< SEARCH
-=======
-def hello():
-    "print a greeting"
-
-    print("hello")
->>>>>>> REPLACE
-```
-
-main.py
-```python
-<<<<<<< SEARCH
-def hello():
-    "print a greeting"
-
-    print("hello")
-=======
-from hello import hello
->>>>>>> REPLACE
-```
-# *SEARCH/REPLACE block* Rules:
-
-Every *SEARCH/REPLACE block* must use this format:
-1. The *FULL* file path alone on a line, verbatim. No bold asterisks, no quotes around it, no escaping of characters, etc.
-2. The opening fence and code language, eg: ```python
-3. The start of search block: <<<<<<< SEARCH
-4. A contiguous chunk of lines to search for in the existing source code
-5. The dividing line: =======
-6. The lines to replace into the source code
-7. The end of the replace block: >>>>>>> REPLACE
-8. The closing fence: ```
-
-Use the *FULL* file path, as shown to you by the user. Make sure to include the project's root directory name at the start of the path. *NEVER* specify the absolute path of the file!
-
-Every *SEARCH* section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
-If the file contains code or other data wrapped/escaped in json/xml/quotes or other containers, you need to propose edits to the literal contents of the file, including the container markup.
-
-*SEARCH/REPLACE* blocks will *only* replace the first match occurrence.
-Including multiple unique *SEARCH/REPLACE* blocks if needed.
-Include enough lines in each SEARCH section to uniquely match each set of lines that need to change.
-
-Keep *SEARCH/REPLACE* blocks concise.
-Break large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.
-Include just the changing lines, and a few surrounding lines if needed for uniqueness.
-Do not include long runs of unchanging lines in *SEARCH/REPLACE* blocks.
-
-Only create *SEARCH/REPLACE* blocks for files that the user has added to the chat!
-
-To move code within a file, use 2 *SEARCH/REPLACE* blocks: 1 to delete it from its current location, 1 to insert it in the new location.
-
-Pay attention to which filenames the user wants you to edit, especially if they are asking you to create a new file.
-
-If you want to put code in a new file, use a *SEARCH/REPLACE block* with:
-- A new file path, including dir name if needed
-- An empty `SEARCH` section
-- The new file's contents in the `REPLACE` section
-
-ONLY EVER RETURN CODE IN A *SEARCH/REPLACE BLOCK*!

crates/assistant_tools/src/edit_files_tool/log.rs

@@ -1,415 +0,0 @@
-use std::path::Path;
-
-use collections::HashSet;
-use feature_flags::FeatureFlagAppExt;
-use gpui::{
-    actions, list, prelude::*, App, Empty, Entity, EventEmitter, FocusHandle, Focusable, Global,
-    ListAlignment, ListState, SharedString, Subscription, Window,
-};
-use release_channel::ReleaseChannel;
-use settings::Settings;
-use ui::prelude::*;
-use workspace::{item::ItemEvent, Item, Workspace, WorkspaceId};
-
-use super::edit_action::EditAction;
-
-actions!(debug, [EditTool]);
-
-pub fn init(cx: &mut App) {
-    if cx.is_staff() || ReleaseChannel::global(cx) == ReleaseChannel::Dev {
-        // Track events even before opening the log
-        EditToolLog::global(cx);
-    }
-
-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, _: &EditTool, window, cx| {
-            let viewer = cx.new(EditToolLogViewer::new);
-            workspace.add_item_to_active_pane(Box::new(viewer), None, true, window, cx)
-        });
-    })
-    .detach();
-}
-
-pub struct GlobalEditToolLog(Entity<EditToolLog>);
-
-impl Global for GlobalEditToolLog {}
-
-#[derive(Default)]
-pub struct EditToolLog {
-    requests: Vec<EditToolRequest>,
-}
-
-#[derive(Clone, Copy, Hash, Eq, PartialEq)]
-pub struct EditToolRequestId(u32);
-
-impl EditToolLog {
-    pub fn global(cx: &mut App) -> Entity<Self> {
-        match Self::try_global(cx) {
-            Some(entity) => entity,
-            None => {
-                let entity = cx.new(|_cx| Self::default());
-                cx.set_global(GlobalEditToolLog(entity.clone()));
-                entity
-            }
-        }
-    }
-
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalEditToolLog>()
-            .map(|log| log.0.clone())
-    }
-
-    pub fn new_request(
-        &mut self,
-        instructions: String,
-        cx: &mut Context<Self>,
-    ) -> EditToolRequestId {
-        let id = EditToolRequestId(self.requests.len() as u32);
-        self.requests.push(EditToolRequest {
-            id,
-            instructions,
-            editor_response: None,
-            tool_output: None,
-            parsed_edits: Vec::new(),
-        });
-        cx.emit(EditToolLogEvent::Inserted);
-        id
-    }
-
-    pub fn push_editor_response_chunk(
-        &mut self,
-        id: EditToolRequestId,
-        chunk: &str,
-        new_actions: &[EditAction],
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(request) = self.requests.get_mut(id.0 as usize) {
-            match &mut request.editor_response {
-                None => {
-                    request.editor_response = Some(chunk.to_string());
-                }
-                Some(response) => {
-                    response.push_str(chunk);
-                }
-            }
-            request.parsed_edits.extend(new_actions.iter().cloned());
-
-            cx.emit(EditToolLogEvent::Updated);
-        }
-    }
-
-    pub fn set_tool_output(
-        &mut self,
-        id: EditToolRequestId,
-        tool_output: Result<String, String>,
-        cx: &mut Context<Self>,
-    ) {
-        if let Some(request) = self.requests.get_mut(id.0 as usize) {
-            request.tool_output = Some(tool_output);
-            cx.emit(EditToolLogEvent::Updated);
-        }
-    }
-}
-
-enum EditToolLogEvent {
-    Inserted,
-    Updated,
-}
-
-impl EventEmitter<EditToolLogEvent> for EditToolLog {}
-
-pub struct EditToolRequest {
-    id: EditToolRequestId,
-    instructions: String,
-    // we don't use a result here because the error might have occurred after we got a response
-    editor_response: Option<String>,
-    parsed_edits: Vec<EditAction>,
-    tool_output: Option<Result<String, String>>,
-}
-
-pub struct EditToolLogViewer {
-    focus_handle: FocusHandle,
-    log: Entity<EditToolLog>,
-    list_state: ListState,
-    expanded_edits: HashSet<(EditToolRequestId, usize)>,
-    _subscription: Subscription,
-}
-
-impl EditToolLogViewer {
-    pub fn new(cx: &mut Context<Self>) -> Self {
-        let log = EditToolLog::global(cx);
-
-        let subscription = cx.subscribe(&log, Self::handle_log_event);
-
-        Self {
-            focus_handle: cx.focus_handle(),
-            log: log.clone(),
-            list_state: ListState::new(
-                log.read(cx).requests.len(),
-                ListAlignment::Bottom,
-                px(1024.),
-                {
-                    let this = cx.entity().downgrade();
-                    move |ix, window: &mut Window, cx: &mut App| {
-                        this.update(cx, |this, cx| this.render_request(ix, window, cx))
-                            .unwrap()
-                    }
-                },
-            ),
-            expanded_edits: HashSet::default(),
-            _subscription: subscription,
-        }
-    }
-
-    fn handle_log_event(
-        &mut self,
-        _: Entity<EditToolLog>,
-        event: &EditToolLogEvent,
-        cx: &mut Context<Self>,
-    ) {
-        match event {
-            EditToolLogEvent::Inserted => {
-                let count = self.list_state.item_count();
-                self.list_state.splice(count..count, 1);
-            }
-            EditToolLogEvent::Updated => {}
-        }
-
-        cx.notify();
-    }
-
-    fn render_request(
-        &self,
-        index: usize,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> AnyElement {
-        let requests = &self.log.read(cx).requests;
-        let request = &requests[index];
-
-        v_flex()
-            .gap_3()
-            .child(Self::render_section(IconName::ArrowRight, "Tool Input"))
-            .child(request.instructions.clone())
-            .py_5()
-            .when(index + 1 < requests.len(), |element| {
-                element
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-            })
-            .map(|parent| match &request.editor_response {
-                None => {
-                    if request.tool_output.is_none() {
-                        parent.child("...")
-                    } else {
-                        parent
-                    }
-                }
-                Some(response) => parent
-                    .child(Self::render_section(
-                        IconName::ZedAssistant,
-                        "Editor Response",
-                    ))
-                    .child(Label::new(response.clone()).buffer_font(cx)),
-            })
-            .when(!request.parsed_edits.is_empty(), |parent| {
-                parent
-                    .child(Self::render_section(IconName::Microscope, "Parsed Edits"))
-                    .child(
-                        v_flex()
-                            .gap_2()
-                            .children(request.parsed_edits.iter().enumerate().map(
-                                |(index, edit)| {
-                                    self.render_edit_action(edit, request.id, index, cx)
-                                },
-                            )),
-                    )
-            })
-            .when_some(request.tool_output.as_ref(), |parent, output| {
-                parent
-                    .child(Self::render_section(IconName::ArrowLeft, "Tool Output"))
-                    .child(match output {
-                        Ok(output) => Label::new(output.clone()).color(Color::Success),
-                        Err(error) => Label::new(error.clone()).color(Color::Error),
-                    })
-            })
-            .into_any()
-    }
-
-    fn render_section(icon: IconName, title: &'static str) -> AnyElement {
-        h_flex()
-            .gap_1()
-            .child(Icon::new(icon).color(Color::Muted))
-            .child(Label::new(title).size(LabelSize::Small).color(Color::Muted))
-            .into_any()
-    }
-
-    fn render_edit_action(
-        &self,
-        edit_action: &EditAction,
-        request_id: EditToolRequestId,
-        index: usize,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let expanded_id = (request_id, index);
-
-        match edit_action {
-            EditAction::Replace {
-                file_path,
-                old,
-                new,
-            } => self
-                .render_edit_action_container(
-                    expanded_id,
-                    &file_path,
-                    [
-                        Self::render_block(IconName::MagnifyingGlass, "Search", old.clone(), cx)
-                            .border_r_1()
-                            .border_color(cx.theme().colors().border)
-                            .into_any(),
-                        Self::render_block(IconName::Replace, "Replace", new.clone(), cx)
-                            .into_any(),
-                    ],
-                    cx,
-                )
-                .into_any(),
-            EditAction::Write { file_path, content } => self
-                .render_edit_action_container(
-                    expanded_id,
-                    &file_path,
-                    [
-                        Self::render_block(IconName::Pencil, "Write", content.clone(), cx)
-                            .into_any(),
-                    ],
-                    cx,
-                )
-                .into_any(),
-        }
-    }
-
-    fn render_edit_action_container(
-        &self,
-        expanded_id: (EditToolRequestId, usize),
-        file_path: &Path,
-        content: impl IntoIterator<Item = AnyElement>,
-        cx: &Context<Self>,
-    ) -> AnyElement {
-        let is_expanded = self.expanded_edits.contains(&expanded_id);
-
-        v_flex()
-            .child(
-                h_flex()
-                    .bg(cx.theme().colors().element_background)
-                    .border_1()
-                    .border_color(cx.theme().colors().border)
-                    .rounded_t_md()
-                    .when(!is_expanded, |el| el.rounded_b_md())
-                    .py_1()
-                    .px_2()
-                    .gap_1()
-                    .child(
-                        ui::Disclosure::new(ElementId::Integer(expanded_id.1), is_expanded)
-                            .on_click(cx.listener(move |this, _ev, _window, cx| {
-                                if is_expanded {
-                                    this.expanded_edits.remove(&expanded_id);
-                                } else {
-                                    this.expanded_edits.insert(expanded_id);
-                                }
-
-                                cx.notify();
-                            })),
-                    )
-                    .child(Label::new(file_path.display().to_string()).size(LabelSize::Small)),
-            )
-            .child(if is_expanded {
-                h_flex()
-                    .border_1()
-                    .border_t_0()
-                    .border_color(cx.theme().colors().border)
-                    .rounded_b_md()
-                    .children(content)
-                    .into_any()
-            } else {
-                Empty.into_any()
-            })
-            .into_any()
-    }
-
-    fn render_block(icon: IconName, title: &'static str, content: String, cx: &App) -> Div {
-        v_flex()
-            .p_1()
-            .gap_1()
-            .flex_1()
-            .h_full()
-            .child(
-                h_flex()
-                    .gap_1()
-                    .child(Icon::new(icon).color(Color::Muted))
-                    .child(Label::new(title).size(LabelSize::Small).color(Color::Muted)),
-            )
-            .font(theme::ThemeSettings::get_global(cx).buffer_font.clone())
-            .text_sm()
-            .child(content)
-            .child(div().flex_1())
-    }
-}
-
-impl EventEmitter<()> for EditToolLogViewer {}
-
-impl Focusable for EditToolLogViewer {
-    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Item for EditToolLogViewer {
-    type Event = ();
-
-    fn to_item_events(_: &Self::Event, _: impl FnMut(ItemEvent)) {}
-
-    fn tab_content_text(&self, _window: &Window, _cx: &App) -> Option<SharedString> {
-        Some("Edit Tool Log".into())
-    }
-
-    fn telemetry_event_text(&self) -> Option<&'static str> {
-        None
-    }
-
-    fn clone_on_split(
-        &self,
-        _workspace_id: Option<WorkspaceId>,
-        _window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Option<Entity<Self>>
-    where
-        Self: Sized,
-    {
-        Some(cx.new(Self::new))
-    }
-}
-
-impl Render for EditToolLogViewer {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if self.list_state.item_count() == 0 {
-            return v_flex()
-                .justify_center()
-                .size_full()
-                .gap_1()
-                .bg(cx.theme().colors().editor_background)
-                .text_center()
-                .text_lg()
-                .child("No requests yet")
-                .child(
-                    div()
-                        .text_ui(cx)
-                        .child("Go ask the assistant to perform some edits"),
-                );
-        }
-
-        v_flex()
-            .p_4()
-            .bg(cx.theme().colors().editor_background)
-            .size_full()
-            .child(list(self.list_state.clone()).flex_grow())
-    }
-}

crates/assistant_tools/src/list_directory_tool.rs

@@ -1,98 +0,0 @@
-use anyhow::{anyhow, Result};
-use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{fmt::Write, path::Path, sync::Arc};
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct ListDirectoryToolInput {
-    /// The relative path of the directory to list.
-    ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - directory1
-    /// - directory2
-    ///
-    /// You can list the contents of `directory1` by using the path `directory1`.
-    /// </example>
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - foo
-    /// - bar
-    ///
-    /// If you wanna list contents in the directory `foo/baz`, you should use the path `foo/baz`.
-    /// </example>
-    pub path: Arc<Path>,
-}
-
-pub struct ListDirectoryTool;
-
-impl Tool for ListDirectoryTool {
-    fn name(&self) -> String {
-        "list-directory".into()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./list_directory_tool/description.md").into()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(ListDirectoryToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let input = match serde_json::from_value::<ListDirectoryToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!("Path not found in project")));
-        };
-        let Some(worktree) = project
-            .read(cx)
-            .worktree_for_id(project_path.worktree_id, cx)
-        else {
-            return Task::ready(Err(anyhow!("Worktree not found")));
-        };
-        let worktree = worktree.read(cx);
-
-        let Some(entry) = worktree.entry_for_path(&project_path.path) else {
-            return Task::ready(Err(anyhow!("Path not found: {}", input.path.display())));
-        };
-
-        if !entry.is_dir() {
-            return Task::ready(Err(anyhow!("{} is a file.", input.path.display())));
-        }
-
-        let mut output = String::new();
-        for entry in worktree.child_entries(&project_path.path) {
-            writeln!(
-                output,
-                "{}",
-                Path::new(worktree.root_name()).join(&entry.path).display(),
-            )
-            .unwrap();
-        }
-        if output.is_empty() {
-            return Task::ready(Ok(format!("{} is empty.", input.path.display())));
-        }
-        Task::ready(Ok(output))
-    }
-}

crates/assistant_tools/src/list_directory_tool/description.md

@@ -1 +0,0 @@
-Lists files and directories in a given path.

crates/assistant_tools/src/list_worktrees_tool.rs

@@ -0,0 +1,77 @@
+use std::sync::Arc;
+
+use anyhow::Result;
+use assistant_tool::Tool;
+use gpui::{App, Entity, Task};
+use project::Project;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct ListWorktreesToolInput {}
+
+pub struct ListWorktreesTool;
+
+impl Tool for ListWorktreesTool {
+    fn name(&self) -> String {
+        "list-worktrees".into()
+    }
+
+    fn description(&self) -> String {
+        "Lists all worktrees in the current project. Use this tool when you need to find available worktrees and their IDs.".into()
+    }
+
+    fn input_schema(&self) -> serde_json::Value {
+        serde_json::json!(
+            {
+                "type": "object",
+                "properties": {},
+                "required": []
+            }
+        )
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _input: serde_json::Value,
+        project: Entity<Project>,
+        cx: &mut App,
+    ) -> Task<Result<String>> {
+        cx.spawn(|cx| async move {
+            cx.update(|cx| {
+                #[derive(Debug, Serialize)]
+                struct WorktreeInfo {
+                    id: usize,
+                    root_name: String,
+                    root_dir: Option<String>,
+                }
+
+                let worktrees = project.update(cx, |project, cx| {
+                    project
+                        .visible_worktrees(cx)
+                        .map(|worktree| {
+                            worktree.read_with(cx, |worktree, _cx| WorktreeInfo {
+                                id: worktree.id().to_usize(),
+                                root_dir: worktree
+                                    .root_dir()
+                                    .map(|root_dir| root_dir.to_string_lossy().to_string()),
+                                root_name: worktree.root_name().to_string(),
+                            })
+                        })
+                        .collect::<Vec<_>>()
+                });
+
+                if worktrees.is_empty() {
+                    return Ok("No worktrees found in the current project.".to_string());
+                }
+
+                let mut result = String::from("Worktrees in the current project:\n\n");
+                for worktree in worktrees {
+                    result.push_str(&serde_json::to_string(&worktree)?);
+                }
+
+                Ok(result)
+            })?
+        })
+    }
+}

crates/assistant_tools/src/now_tool.rs

@@ -4,7 +4,6 @@ use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
 use chrono::{Local, Utc};
 use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
 use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -43,7 +42,6 @@ impl Tool for NowTool {
     fn run(
         self: Arc<Self>,
         input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
         _project: Entity<Project>,
         _cx: &mut App,
     ) -> Task<Result<String>> {

crates/assistant_tools/src/path_search_tool.rs

@@ -1,88 +0,0 @@
-use anyhow::{anyhow, Result};
-use assistant_tool::Tool;
-use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{path::PathBuf, sync::Arc};
-use util::paths::PathMatcher;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct PathSearchToolInput {
-    /// The glob to search all project paths for.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - directory1/a/something.txt
-    /// - directory2/a/things.txt
-    /// - directory3/a/other.txt
-    ///
-    /// You can get back the first two paths by providing a glob of "*thing*.txt"
-    /// </example>
-    pub glob: String,
-}
-
-pub struct PathSearchTool;
-
-impl Tool for PathSearchTool {
-    fn name(&self) -> String {
-        "path-search".into()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./path_search_tool/description.md").into()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(PathSearchToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        let glob = match serde_json::from_value::<PathSearchToolInput>(input) {
-            Ok(input) => input.glob,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-        let path_matcher = match PathMatcher::new(&[glob.clone()]) {
-            Ok(matcher) => matcher,
-            Err(err) => return Task::ready(Err(anyhow!("Invalid glob: {}", err))),
-        };
-
-        let mut matches = Vec::new();
-
-        for worktree_handle in project.read(cx).worktrees(cx) {
-            let worktree = worktree_handle.read(cx);
-            let root_name = worktree.root_name();
-
-            // Don't consider ignored entries.
-            for entry in worktree.entries(false, 0) {
-                if path_matcher.is_match(&entry.path) {
-                    matches.push(
-                        PathBuf::from(root_name)
-                            .join(&entry.path)
-                            .to_string_lossy()
-                            .to_string(),
-                    );
-                }
-            }
-        }
-
-        if matches.is_empty() {
-            Task::ready(Ok(format!(
-                "No paths in the project matched the glob {glob:?}"
-            )))
-        } else {
-            // Sort to group entries in the same directory together.
-            matches.sort();
-            Task::ready(Ok(matches.join("\n")))
-        }
-    }
-}

crates/assistant_tools/src/path_search_tool/description.md

@@ -1 +0,0 @@
-Returns all the paths in the project which match the given glob.

crates/assistant_tools/src/read_file_tool.rs

@@ -4,27 +4,17 @@ use std::sync::Arc;
 use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
 use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
-use project::Project;
+use project::{Project, ProjectPath, WorktreeId};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
 pub struct ReadFileToolInput {
-    /// The relative path of the file to read.
+    /// The ID of the worktree in which the file resides.
+    pub worktree_id: usize,
+    /// The path to the file to read.
     ///
-    /// This path should never be absolute, and the first component
-    /// of the path should always be a root directory in a project.
-    ///
-    /// <example>
-    /// If the project has the following root directories:
-    ///
-    /// - directory1
-    /// - directory2
-    ///
-    /// If you wanna access `file.txt` in `directory1`, you should use the path `directory1/file.txt`.
-    /// If you wanna access `file.txt` in `directory2`, you should use the path `directory2/file.txt`.
-    /// </example>
+    /// This path is relative to the worktree root, it must not be an absolute path.
     pub path: Arc<Path>,
 }
 
@@ -36,7 +26,7 @@ impl Tool for ReadFileTool {
     }
 
     fn description(&self) -> String {
-        include_str!("./read_file_tool/description.md").into()
+        "Reads the content of a file specified by a worktree ID and path. Use this tool when you need to access the contents of a file in the project.".into()
     }
 
     fn input_schema(&self) -> serde_json::Value {
@@ -47,7 +37,6 @@ impl Tool for ReadFileTool {
     fn run(
         self: Arc<Self>,
         input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
         project: Entity<Project>,
         cx: &mut App,
     ) -> Task<Result<String>> {
@@ -56,8 +45,9 @@ impl Tool for ReadFileTool {
             Err(err) => return Task::ready(Err(anyhow!(err))),
         };
 
-        let Some(project_path) = project.read(cx).find_project_path(&input.path, cx) else {
-            return Task::ready(Err(anyhow!("Path not found in project")));
+        let project_path = ProjectPath {
+            worktree_id: WorktreeId::from_usize(input.worktree_id),
+            path: input.path,
         };
         cx.spawn(|cx| async move {
             let buffer = cx
@@ -66,16 +56,7 @@ impl Tool for ReadFileTool {
                 })?
                 .await?;
 
-            buffer.read_with(&cx, |buffer, _cx| {
-                if buffer
-                    .file()
-                    .map_or(false, |file| file.disk_state().exists())
-                {
-                    Ok(buffer.text())
-                } else {
-                    Err(anyhow!("File does not exist"))
-                }
-            })?
+            cx.update(|cx| buffer.read(cx).text())
         })
     }
 }

crates/assistant_tools/src/read_file_tool/description.md

@@ -1 +0,0 @@
-Reads the content of the given file in the project.

crates/assistant_tools/src/regex_search.rs

@@ -1,119 +0,0 @@
-use anyhow::{anyhow, Result};
-use assistant_tool::Tool;
-use futures::StreamExt;
-use gpui::{App, Entity, Task};
-use language::OffsetRangeExt;
-use language_model::LanguageModelRequestMessage;
-use project::{search::SearchQuery, Project};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use std::{cmp, fmt::Write, sync::Arc};
-use util::paths::PathMatcher;
-
-#[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct RegexSearchToolInput {
-    /// A regex pattern to search for in the entire project. Note that the regex
-    /// will be parsed by the Rust `regex` crate.
-    pub regex: String,
-}
-
-pub struct RegexSearchTool;
-
-impl Tool for RegexSearchTool {
-    fn name(&self) -> String {
-        "regex-search".into()
-    }
-
-    fn description(&self) -> String {
-        include_str!("./regex_search_tool/description.md").into()
-    }
-
-    fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(RegexSearchToolInput);
-        serde_json::to_value(&schema).unwrap()
-    }
-
-    fn run(
-        self: Arc<Self>,
-        input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
-        project: Entity<Project>,
-        cx: &mut App,
-    ) -> Task<Result<String>> {
-        const CONTEXT_LINES: u32 = 2;
-
-        let input = match serde_json::from_value::<RegexSearchToolInput>(input) {
-            Ok(input) => input,
-            Err(err) => return Task::ready(Err(anyhow!(err))),
-        };
-
-        let query = match SearchQuery::regex(
-            &input.regex,
-            false,
-            false,
-            false,
-            PathMatcher::default(),
-            PathMatcher::default(),
-            None,
-        ) {
-            Ok(query) => query,
-            Err(error) => return Task::ready(Err(error)),
-        };
-
-        let results = project.update(cx, |project, cx| project.search(query, cx));
-        cx.spawn(|cx| async move {
-            futures::pin_mut!(results);
-
-            let mut output = String::new();
-            while let Some(project::search::SearchResult::Buffer { buffer, ranges }) =
-                results.next().await
-            {
-                if ranges.is_empty() {
-                    continue;
-                }
-
-                buffer.read_with(&cx, |buffer, cx| {
-                    if let Some(path) = buffer.file().map(|file| file.full_path(cx)) {
-                        writeln!(output, "### Found matches in {}:\n", path.display()).unwrap();
-                        let mut ranges = ranges
-                            .into_iter()
-                            .map(|range| {
-                                let mut point_range = range.to_point(buffer);
-                                point_range.start.row =
-                                    point_range.start.row.saturating_sub(CONTEXT_LINES);
-                                point_range.start.column = 0;
-                                point_range.end.row = cmp::min(
-                                    buffer.max_point().row,
-                                    point_range.end.row + CONTEXT_LINES,
-                                );
-                                point_range.end.column = buffer.line_len(point_range.end.row);
-                                point_range
-                            })
-                            .peekable();
-
-                        while let Some(mut range) = ranges.next() {
-                            while let Some(next_range) = ranges.peek() {
-                                if range.end.row >= next_range.start.row {
-                                    range.end = next_range.end;
-                                    ranges.next();
-                                } else {
-                                    break;
-                                }
-                            }
-
-                            writeln!(output, "```").unwrap();
-                            output.extend(buffer.text_for_range(range));
-                            writeln!(output, "\n```\n").unwrap();
-                        }
-                    }
-                })?;
-            }
-
-            if output.is_empty() {
-                Ok("No matches found".into())
-            } else {
-                Ok(output)
-            }
-        })
-    }
-}

crates/assistant_tools/src/regex_search_tool/description.md

@@ -1,3 +0,0 @@
-Searches the entire project for the given regular expression.
-
-Returns a list of paths that matched the query. For each path, it returns a list of excerpts of the matched text.

crates/auto_update_ui/src/auto_update_ui.rs

@@ -93,7 +93,7 @@ fn view_release_notes_locally(
 
                             let tab_description = SharedString::from(body.title.to_string());
                             let editor = cx.new(|cx| {
-                                Editor::for_multibuffer(buffer, Some(project), window, cx)
+                                Editor::for_multibuffer(buffer, Some(project), true, window, cx)
                             });
                             let workspace_handle = workspace.weak_handle();
                             let markdown_preview: Entity<MarkdownPreviewView> =

crates/buffer_diff/Cargo.toml

@@ -22,7 +22,6 @@ git2.workspace = true
 gpui.workspace = true
 language.workspace = true
 log.workspace = true
-pretty_assertions.workspace = true
 rope.workspace = true
 sum_tree.workspace = true
 text.workspace = true
@@ -32,6 +31,7 @@ util.workspace = true
 ctor.workspace = true
 env_logger.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
+pretty_assertions.workspace = true
 rand.workspace = true
 serde_json.workspace = true
 text = { workspace = true, features = ["test-support"] }

crates/buffer_diff/src/buffer_diff.rs

@@ -6,9 +6,9 @@ use rope::Rope;
 use std::cmp::Ordering;
 use std::mem;
 use std::{future::Future, iter, ops::Range, sync::Arc};
-use sum_tree::SumTree;
+use sum_tree::{SumTree, TreeMap};
+use text::ToOffset as _;
 use text::{Anchor, Bias, BufferId, OffsetRangeExt, Point};
-use text::{AnchorRangeExt, ToOffset as _};
 use util::ResultExt;
 
 pub struct BufferDiff {
@@ -26,7 +26,7 @@ pub struct BufferDiffSnapshot {
 #[derive(Clone)]
 struct BufferDiffInner {
     hunks: SumTree<InternalDiffHunk>,
-    pending_hunks: SumTree<PendingHunk>,
+    pending_hunks: TreeMap<usize, PendingHunk>,
     base_text: language::BufferSnapshot,
     base_text_exists: bool,
 }
@@ -48,7 +48,7 @@ pub enum DiffHunkStatusKind {
 pub enum DiffHunkSecondaryStatus {
     HasSecondaryHunk,
     OverlapsWithSecondaryHunk,
-    NoSecondaryHunk,
+    None,
     SecondaryHunkAdditionPending,
     SecondaryHunkRemovalPending,
 }
@@ -74,8 +74,6 @@ struct InternalDiffHunk {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct PendingHunk {
-    buffer_range: Range<Anchor>,
-    diff_base_byte_range: Range<usize>,
     buffer_version: clock::Global,
     new_status: DiffHunkSecondaryStatus,
 }
@@ -95,16 +93,6 @@ impl sum_tree::Item for InternalDiffHunk {
     }
 }
 
-impl sum_tree::Item for PendingHunk {
-    type Summary = DiffHunkSummary;
-
-    fn summary(&self, _cx: &text::BufferSnapshot) -> Self::Summary {
-        DiffHunkSummary {
-            buffer_range: self.buffer_range.clone(),
-        }
-    }
-}
-
 impl sum_tree::Summary for DiffHunkSummary {
     type Context = text::BufferSnapshot;
 
@@ -188,7 +176,6 @@ impl BufferDiffSnapshot {
 }
 
 impl BufferDiffInner {
-    /// Returns the new index text and new pending hunks.
     fn stage_or_unstage_hunks(
         &mut self,
         unstaged_diff: &Self,
@@ -196,7 +183,7 @@ impl BufferDiffInner {
         hunks: &[DiffHunk],
         buffer: &text::BufferSnapshot,
         file_exists: bool,
-    ) -> (Option<Rope>, SumTree<PendingHunk>) {
+    ) -> (Option<Rope>, Vec<(usize, PendingHunk)>) {
         let head_text = self
             .base_text_exists
             .then(|| self.base_text.as_rope().clone());
@@ -208,41 +195,41 @@ impl BufferDiffInner {
         // entire file must be either created or deleted in the index.
         let (index_text, head_text) = match (index_text, head_text) {
             (Some(index_text), Some(head_text)) if file_exists || !stage => (index_text, head_text),
-            (index_text, head_text) => {
-                let (rope, new_status) = if stage {
+            (_, head_text @ _) => {
+                if stage {
                     log::debug!("stage all");
-                    (
+                    return (
                         file_exists.then(|| buffer.as_rope().clone()),
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending,
-                    )
+                        vec![(
+                            0,
+                            PendingHunk {
+                                buffer_version: buffer.version().clone(),
+                                new_status: DiffHunkSecondaryStatus::SecondaryHunkRemovalPending,
+                            },
+                        )],
+                    );
                 } else {
                     log::debug!("unstage all");
-                    (
+                    return (
                         head_text,
-                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending,
-                    )
-                };
-
-                let hunk = PendingHunk {
-                    buffer_range: Anchor::MIN..Anchor::MAX,
-                    diff_base_byte_range: 0..index_text.map_or(0, |rope| rope.len()),
-                    buffer_version: buffer.version().clone(),
-                    new_status,
-                };
-                let tree = SumTree::from_item(hunk, buffer);
-                return (rope, tree);
+                        vec![(
+                            0,
+                            PendingHunk {
+                                buffer_version: buffer.version().clone(),
+                                new_status: DiffHunkSecondaryStatus::SecondaryHunkAdditionPending,
+                            },
+                        )],
+                    );
+                }
             }
         };
 
         let mut unstaged_hunk_cursor = unstaged_diff.hunks.cursor::<DiffHunkSummary>(buffer);
         unstaged_hunk_cursor.next(buffer);
-
-        let mut pending_hunks = SumTree::new(buffer);
-        let mut old_pending_hunks = unstaged_diff
-            .pending_hunks
-            .cursor::<DiffHunkSummary>(buffer);
-
-        // first, merge new hunks into pending_hunks
+        let mut edits = Vec::new();
+        let mut pending_hunks = Vec::new();
+        let mut prev_unstaged_hunk_buffer_offset = 0;
+        let mut prev_unstaged_hunk_base_text_offset = 0;
         for DiffHunk {
             buffer_range,
             diff_base_byte_range,
@@ -250,58 +237,12 @@ impl BufferDiffInner {
             ..
         } in hunks.iter().cloned()
         {
-            let preceding_pending_hunks =
-                old_pending_hunks.slice(&buffer_range.start, Bias::Left, buffer);
-
-            pending_hunks.append(preceding_pending_hunks, buffer);
-
-            // skip all overlapping old pending hunks
-            while old_pending_hunks
-                .item()
-                .is_some_and(|preceding_pending_hunk_item| {
-                    preceding_pending_hunk_item
-                        .buffer_range
-                        .overlaps(&buffer_range, buffer)
-                })
-            {
-                old_pending_hunks.next(buffer);
-            }
-
-            // merge into pending hunks
-            if (stage && secondary_status == DiffHunkSecondaryStatus::NoSecondaryHunk)
+            if (stage && secondary_status == DiffHunkSecondaryStatus::None)
                 || (!stage && secondary_status == DiffHunkSecondaryStatus::HasSecondaryHunk)
             {
                 continue;
             }
 
-            pending_hunks.push(
-                PendingHunk {
-                    buffer_range,
-                    diff_base_byte_range,
-                    buffer_version: buffer.version().clone(),
-                    new_status: if stage {
-                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
-                    } else {
-                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
-                    },
-                },
-                buffer,
-            );
-        }
-        // append the remainder
-        pending_hunks.append(old_pending_hunks.suffix(buffer), buffer);
-
-        let mut prev_unstaged_hunk_buffer_offset = 0;
-        let mut prev_unstaged_hunk_base_text_offset = 0;
-        let mut edits = Vec::<(Range<usize>, String)>::new();
-
-        // then, iterate over all pending hunks (both new ones and the existing ones) and compute the edits
-        for PendingHunk {
-            buffer_range,
-            diff_base_byte_range,
-            ..
-        } in pending_hunks.iter().cloned()
-        {
             let skipped_hunks = unstaged_hunk_cursor.slice(&buffer_range.start, Bias::Left, buffer);
 
             if let Some(secondary_hunk) = skipped_hunks.last() {
@@ -353,15 +294,22 @@ impl BufferDiffInner {
                     .chunks_in_range(diff_base_byte_range.clone())
                     .collect::<String>()
             };
-
+            pending_hunks.push((
+                diff_base_byte_range.start,
+                PendingHunk {
+                    buffer_version: buffer.version().clone(),
+                    new_status: if stage {
+                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
+                    } else {
+                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
+                    },
+                },
+            ));
             edits.push((index_range, replacement_text));
         }
 
-        debug_assert!(edits.iter().is_sorted_by_key(|(range, _)| range.start));
-
         let mut new_index_text = Rope::new();
         let mut index_cursor = index_text.cursor(0);
-
         for (old_range, replacement_text) in edits {
             new_index_text.append(index_cursor.slice(old_range.start));
             index_cursor.seek_forward(old_range.end);
@@ -406,14 +354,12 @@ impl BufferDiffInner {
         });
 
         let mut secondary_cursor = None;
-        let mut pending_hunks_cursor = None;
+        let mut pending_hunks = TreeMap::default();
         if let Some(secondary) = secondary.as_ref() {
             let mut cursor = secondary.hunks.cursor::<DiffHunkSummary>(buffer);
             cursor.next(buffer);
             secondary_cursor = Some(cursor);
-            let mut cursor = secondary.pending_hunks.cursor::<DiffHunkSummary>(buffer);
-            cursor.next(buffer);
-            pending_hunks_cursor = Some(cursor);
+            pending_hunks = secondary.pending_hunks.clone();
         }
 
         let max_point = buffer.max_point();
@@ -432,33 +378,16 @@ impl BufferDiffInner {
                 end_anchor = buffer.anchor_before(end_point);
             }
 
-            let mut secondary_status = DiffHunkSecondaryStatus::NoSecondaryHunk;
+            let mut secondary_status = DiffHunkSecondaryStatus::None;
 
             let mut has_pending = false;
-            if let Some(pending_cursor) = pending_hunks_cursor.as_mut() {
-                if start_anchor
-                    .cmp(&pending_cursor.start().buffer_range.start, buffer)
-                    .is_gt()
-                {
-                    pending_cursor.seek_forward(&start_anchor, Bias::Left, buffer);
-                }
-
-                if let Some(pending_hunk) = pending_cursor.item() {
-                    let mut pending_range = pending_hunk.buffer_range.to_point(buffer);
-                    if pending_range.end.column > 0 {
-                        pending_range.end.row += 1;
-                        pending_range.end.column = 0;
-                    }
-
-                    if pending_range == (start_point..end_point) {
-                        if !buffer.has_edits_since_in_range(
-                            &pending_hunk.buffer_version,
-                            start_anchor..end_anchor,
-                        ) {
-                            has_pending = true;
-                            secondary_status = pending_hunk.new_status;
-                        }
-                    }
+            if let Some(pending_hunk) = pending_hunks.get(&start_base) {
+                if !buffer.has_edits_since_in_range(
+                    &pending_hunk.buffer_version,
+                    start_anchor..end_anchor,
+                ) {
+                    has_pending = true;
+                    secondary_status = pending_hunk.new_status;
                 }
             }
 
@@ -520,7 +449,7 @@ impl BufferDiffInner {
                 diff_base_byte_range: hunk.diff_base_byte_range.clone(),
                 buffer_range: hunk.buffer_range.clone(),
                 // The secondary status is not used by callers of this method.
-                secondary_status: DiffHunkSecondaryStatus::NoSecondaryHunk,
+                secondary_status: DiffHunkSecondaryStatus::None,
             })
         })
     }
@@ -795,7 +724,7 @@ impl BufferDiff {
                 base_text,
                 hunks,
                 base_text_exists,
-                pending_hunks: SumTree::new(&buffer),
+                pending_hunks: TreeMap::default(),
             }
         }
     }
@@ -811,8 +740,8 @@ impl BufferDiff {
         cx.background_spawn(async move {
             BufferDiffInner {
                 base_text: base_text_snapshot,
-                pending_hunks: SumTree::new(&buffer),
                 hunks: compute_hunks(base_text_pair, buffer),
+                pending_hunks: TreeMap::default(),
                 base_text_exists,
             }
         })
@@ -822,7 +751,7 @@ impl BufferDiff {
         BufferDiffInner {
             base_text: language::Buffer::build_empty_snapshot(cx),
             hunks: SumTree::new(buffer),
-            pending_hunks: SumTree::new(buffer),
+            pending_hunks: TreeMap::default(),
             base_text_exists: false,
         }
     }
@@ -838,7 +767,7 @@ impl BufferDiff {
     pub fn clear_pending_hunks(&mut self, cx: &mut Context<Self>) {
         if let Some(secondary_diff) = &self.secondary_diff {
             secondary_diff.update(cx, |diff, _| {
-                diff.inner.pending_hunks = SumTree::from_summary(DiffHunkSummary::default());
+                diff.inner.pending_hunks.clear();
             });
             cx.emit(BufferDiffEvent::DiffChanged {
                 changed_range: Some(Anchor::MIN..Anchor::MAX),
@@ -854,17 +783,18 @@ impl BufferDiff {
         file_exists: bool,
         cx: &mut Context<Self>,
     ) -> Option<Rope> {
-        let (new_index_text, new_pending_hunks) = self.inner.stage_or_unstage_hunks(
+        let (new_index_text, pending_hunks) = self.inner.stage_or_unstage_hunks(
             &self.secondary_diff.as_ref()?.read(cx).inner,
             stage,
             &hunks,
             buffer,
             file_exists,
         );
-
         if let Some(unstaged_diff) = &self.secondary_diff {
             unstaged_diff.update(cx, |diff, _| {
-                diff.inner.pending_hunks = new_pending_hunks;
+                for (offset, pending_hunk) in pending_hunks {
+                    diff.inner.pending_hunks.insert(offset, pending_hunk);
+                }
             });
         }
         cx.emit(BufferDiffEvent::HunksStagedOrUnstaged(
@@ -986,9 +916,7 @@ impl BufferDiff {
                 }
                 _ => (true, Some(text::Anchor::MIN..text::Anchor::MAX)),
             };
-
-        let pending_hunks = mem::replace(&mut self.inner.pending_hunks, SumTree::new(buffer));
-
+        let pending_hunks = mem::take(&mut self.inner.pending_hunks);
         self.inner = new_state;
         if !base_text_changed {
             self.inner.pending_hunks = pending_hunks;
@@ -1221,21 +1149,21 @@ impl DiffHunkStatus {
     pub fn deleted_none() -> Self {
         Self {
             kind: DiffHunkStatusKind::Deleted,
-            secondary: DiffHunkSecondaryStatus::NoSecondaryHunk,
+            secondary: DiffHunkSecondaryStatus::None,
         }
     }
 
     pub fn added_none() -> Self {
         Self {
             kind: DiffHunkStatusKind::Added,
-            secondary: DiffHunkSecondaryStatus::NoSecondaryHunk,
+            secondary: DiffHunkSecondaryStatus::None,
         }
     }
 
     pub fn modified_none() -> Self {
         Self {
             kind: DiffHunkStatusKind::Modified,
-            secondary: DiffHunkSecondaryStatus::NoSecondaryHunk,
+            secondary: DiffHunkSecondaryStatus::None,
         }
     }
 }
@@ -1243,14 +1171,13 @@ impl DiffHunkStatus {
 /// Range (crossing new lines), old, new
 #[cfg(any(test, feature = "test-support"))]
 #[track_caller]
-pub fn assert_hunks<ExpectedText, HunkIter>(
-    diff_hunks: HunkIter,
+pub fn assert_hunks<Iter>(
+    diff_hunks: Iter,
     buffer: &text::BufferSnapshot,
     diff_base: &str,
-    expected_hunks: &[(Range<u32>, ExpectedText, ExpectedText, DiffHunkStatus)],
+    expected_hunks: &[(Range<u32>, &str, &str, DiffHunkStatus)],
 ) where
-    HunkIter: Iterator<Item = DiffHunk>,
-    ExpectedText: AsRef<str>,
+    Iter: Iterator<Item = DiffHunk>,
 {
     let actual_hunks = diff_hunks
         .map(|hunk| {
@@ -1270,14 +1197,14 @@ pub fn assert_hunks<ExpectedText, HunkIter>(
         .map(|(r, old_text, new_text, status)| {
             (
                 Point::new(r.start, 0)..Point::new(r.end, 0),
-                old_text.as_ref(),
-                new_text.as_ref().to_string(),
+                *old_text,
+                new_text.to_string(),
                 *status,
             )
         })
         .collect();
 
-    pretty_assertions::assert_eq!(actual_hunks, expected_hunks);
+    assert_eq!(actual_hunks, expected_hunks);
 }
 
 #[cfg(test)]
@@ -1336,7 +1263,7 @@ mod tests {
         );
 
         diff = cx.update(|cx| BufferDiff::build_empty(&buffer, cx));
-        assert_hunks::<&str, _>(
+        assert_hunks(
             diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, None),
             &buffer,
             &diff_base,
@@ -1674,10 +1601,7 @@ mod tests {
                     .hunks_intersecting_range(hunk_range.clone(), &buffer, &cx)
                     .collect::<Vec<_>>();
                 for hunk in &hunks {
-                    assert_ne!(
-                        hunk.secondary_status,
-                        DiffHunkSecondaryStatus::NoSecondaryHunk
-                    )
+                    assert_ne!(hunk.secondary_status, DiffHunkSecondaryStatus::None)
                 }
 
                 let new_index_text = diff
@@ -1956,10 +1880,10 @@ mod tests {
             let hunk_to_change = hunk.clone();
             let stage = match hunk.secondary_status {
                 DiffHunkSecondaryStatus::HasSecondaryHunk => {
-                    hunk.secondary_status = DiffHunkSecondaryStatus::NoSecondaryHunk;
+                    hunk.secondary_status = DiffHunkSecondaryStatus::None;
                     true
                 }
-                DiffHunkSecondaryStatus::NoSecondaryHunk => {
+                DiffHunkSecondaryStatus::None => {
                     hunk.secondary_status = DiffHunkSecondaryStatus::HasSecondaryHunk;
                     false
                 }

crates/cli/src/main.rs

@@ -198,8 +198,6 @@ fn main() -> Result<()> {
     let mut paths = vec![];
     let mut urls = vec![];
     let mut stdin_tmp_file: Option<fs::File> = None;
-    let mut anonymous_fd_tmp_files = vec![];
-
     for path in args.paths_with_position.iter() {
         if path.starts_with("zed://")
             || path.starts_with("http://")
@@ -213,11 +211,6 @@ fn main() -> Result<()> {
             paths.push(file.path().to_string_lossy().to_string());
             let (file, _) = file.keep()?;
             stdin_tmp_file = Some(file);
-        } else if let Some(file) = anonymous_fd(path) {
-            let tmp_file = NamedTempFile::new()?;
-            paths.push(tmp_file.path().to_string_lossy().to_string());
-            let (tmp_file, _) = tmp_file.keep()?;
-            anonymous_fd_tmp_files.push((file, tmp_file));
         } else {
             paths.push(parse_path_with_position(path)?)
         }
@@ -259,33 +252,31 @@ fn main() -> Result<()> {
         }
     });
 
-    let stdin_pipe_handle: Option<JoinHandle<anyhow::Result<()>>> =
-        stdin_tmp_file.map(|tmp_file| {
-            thread::spawn(move || {
-                let stdin = std::io::stdin().lock();
-                if io::IsTerminal::is_terminal(&stdin) {
-                    return Ok(());
+    let pipe_handle: JoinHandle<anyhow::Result<()>> = thread::spawn(move || {
+        if let Some(mut tmp_file) = stdin_tmp_file {
+            let mut stdin = std::io::stdin().lock();
+            if io::IsTerminal::is_terminal(&stdin) {
+                return Ok(());
+            }
+            let mut buffer = [0; 8 * 1024];
+            loop {
+                let bytes_read = io::Read::read(&mut stdin, &mut buffer)?;
+                if bytes_read == 0 {
+                    break;
                 }
-                return pipe_to_tmp(stdin, tmp_file);
-            })
-        });
-
-    let anonymous_fd_pipe_handles: Vec<JoinHandle<anyhow::Result<()>>> = anonymous_fd_tmp_files
-        .into_iter()
-        .map(|(file, tmp_file)| thread::spawn(move || pipe_to_tmp(file, tmp_file)))
-        .collect();
+                io::Write::write(&mut tmp_file, &buffer[..bytes_read])?;
+            }
+            io::Write::flush(&mut tmp_file)?;
+        }
+        Ok(())
+    });
 
     if args.foreground {
         app.run_foreground(url)?;
     } else {
         app.launch(url)?;
         sender.join().unwrap()?;
-        if let Some(handle) = stdin_pipe_handle {
-            handle.join().unwrap()?;
-        }
-        for handle in anonymous_fd_pipe_handles {
-            handle.join().unwrap()?;
-        }
+        pipe_handle.join().unwrap()?;
     }
 
     if let Some(exit_status) = exit_status.lock().take() {
@@ -294,64 +285,6 @@ fn main() -> Result<()> {
     Ok(())
 }
 
-fn pipe_to_tmp(mut src: impl io::Read, mut dest: fs::File) -> Result<()> {
-    let mut buffer = [0; 8 * 1024];
-    loop {
-        let bytes_read = match src.read(&mut buffer) {
-            Err(err) if err.kind() == io::ErrorKind::Interrupted => continue,
-            res => res?,
-        };
-        if bytes_read == 0 {
-            break;
-        }
-        io::Write::write_all(&mut dest, &buffer[..bytes_read])?;
-    }
-    io::Write::flush(&mut dest)?;
-    Ok(())
-}
-
-fn anonymous_fd(path: &str) -> Option<fs::File> {
-    #[cfg(target_os = "linux")]
-    {
-        use std::os::fd::{self, FromRawFd};
-
-        let fd_str = path.strip_prefix("/proc/self/fd/")?;
-
-        let link = fs::read_link(path).ok()?;
-        if !link.starts_with("memfd:") {
-            return None;
-        }
-
-        let fd: fd::RawFd = fd_str.parse().ok()?;
-        let file = unsafe { fs::File::from_raw_fd(fd) };
-        return Some(file);
-    }
-    #[cfg(target_os = "macos")]
-    {
-        use std::os::{
-            fd::{self, FromRawFd},
-            unix::fs::FileTypeExt,
-        };
-
-        let fd_str = path.strip_prefix("/dev/fd/")?;
-
-        let metadata = fs::metadata(path).ok()?;
-        let file_type = metadata.file_type();
-        if !file_type.is_fifo() && !file_type.is_socket() {
-            return None;
-        }
-        let fd: fd::RawFd = fd_str.parse().ok()?;
-        let file = unsafe { fs::File::from_raw_fd(fd) };
-        return Some(file);
-    }
-    #[cfg(not(any(target_os = "linux", target_os = "macos")))]
-    {
-        _ = path;
-        // not implemented for bsd, windows. Could be, but isn't yet
-        return None;
-    }
-}
-
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 mod linux {
     use std::{

crates/collab/src/rpc.rs

@@ -396,7 +396,6 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::Stage>)
             .add_request_handler(forward_mutating_project_request::<proto::Unstage>)
             .add_request_handler(forward_mutating_project_request::<proto::Commit>)
-            .add_request_handler(forward_mutating_project_request::<proto::GitInit>)
             .add_request_handler(forward_read_only_project_request::<proto::GetRemotes>)
             .add_request_handler(forward_read_only_project_request::<proto::GitShow>)
             .add_request_handler(forward_read_only_project_request::<proto::GitReset>)

crates/collab/src/tests/editor_tests.rs

@@ -2038,7 +2038,7 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
     // client_b now requests git blame for the open buffer
     editor_b.update_in(cx_b, |editor_b, window, cx| {
         assert!(editor_b.blame().is_none());
-        editor_b.toggle_git_blame(&git::Blame {}, window, cx);
+        editor_b.toggle_git_blame(&editor::actions::ToggleGitBlame {}, window, cx);
     });
 
     cx_a.executor().run_until_parked();

crates/collab/src/tests/following_tests.rs

@@ -313,8 +313,9 @@ async fn test_basic_following(
         result
     });
     let multibuffer_editor_a = workspace_a.update_in(cx_a, |workspace, window, cx| {
-        let editor = cx
-            .new(|cx| Editor::for_multibuffer(multibuffer_a, Some(project_a.clone()), window, cx));
+        let editor = cx.new(|cx| {
+            Editor::for_multibuffer(multibuffer_a, Some(project_a.clone()), true, window, cx)
+        });
         workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
         editor
     });

crates/collab/src/tests/integration_tests.rs

@@ -6770,7 +6770,7 @@ async fn test_remote_git_branches(
 
     assert_eq!(branches_b, branches_set);
 
-    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch))
         .await
         .unwrap()
         .unwrap();
@@ -6790,23 +6790,15 @@ async fn test_remote_git_branches(
     assert_eq!(host_branch.name, branches[2]);
 
     // Also try creating a new branch
-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .create_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).create_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();
 
-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .change_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();
 
     executor.run_until_parked();
 

crates/collab/src/tests/remote_editing_collaboration_tests.rs

@@ -294,7 +294,7 @@ async fn test_ssh_collaboration_git_branches(
 
     assert_eq!(&branches_b, &branches_set);
 
-    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch))
         .await
         .unwrap()
         .unwrap();
@@ -316,23 +316,15 @@ async fn test_ssh_collaboration_git_branches(
     assert_eq!(server_branch.name, branches[2]);
 
     // Also try creating a new branch
-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .create_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).create_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();
 
-    cx_b.update(|cx| {
-        repo_b
-            .read(cx)
-            .change_branch("totally-new-branch".to_string())
-    })
-    .await
-    .unwrap()
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch("totally-new-branch"))
+        .await
+        .unwrap()
+        .unwrap();
 
     executor.run_until_parked();
 

crates/collab/src/tests/test_server.rs

@@ -271,7 +271,7 @@ impl TestServer {
 
         let git_hosting_provider_registry = cx.update(GitHostingProviderRegistry::default_global);
         git_hosting_provider_registry
-            .register_hosting_provider(Arc::new(git_hosting_providers::Github::new()));
+            .register_hosting_provider(Arc::new(git_hosting_providers::Github));
 
         let user_store = cx.new(|cx| UserStore::new(client.clone(), cx));
         let workspace_store = cx.new(|cx| WorkspaceStore::new(client.clone(), cx));

crates/component_preview/src/component_preview.rs

@@ -417,17 +417,22 @@ impl ComponentPreview {
         }
     }
 
-    fn test_status_toast(&self, cx: &mut Context<Self>) {
+    fn test_status_toast(&self, window: &mut Window, cx: &mut Context<Self>) {
         if let Some(workspace) = self.workspace.upgrade() {
             workspace.update(cx, |workspace, cx| {
-                let status_toast =
-                    StatusToast::new("`zed/new-notification-system` created!", cx, |this, _cx| {
+                let status_toast = StatusToast::new(
+                    "`zed/new-notification-system` created!",
+                    window,
+                    cx,
+                    |this, _, cx| {
                         this.icon(ToastIcon::new(IconName::GitBranchSmall).color(Color::Muted))
-                            .action("Open Pull Request", |_, cx| {
-                                cx.open_url("https://github.com/")
-                            })
-                    });
-                workspace.toggle_status_toast(status_toast, cx)
+                            .action(
+                                "Open Pull Request",
+                                cx.listener(|_, _, _, cx| cx.open_url("https://github.com/")),
+                            )
+                    },
+                );
+                workspace.toggle_status_toast(window, cx, status_toast)
             });
         }
     }
@@ -473,8 +478,8 @@ impl Render for ComponentPreview {
                         div().w_full().pb_4().child(
                             Button::new("toast-test", "Launch Toast")
                                 .on_click(cx.listener({
-                                    move |this, _, _window, cx| {
-                                        this.test_status_toast(cx);
+                                    move |this, _, window, cx| {
+                                        this.test_status_toast(window, cx);
                                         cx.notify();
                                     }
                                 }))

crates/context_server/Cargo.toml

@@ -21,7 +21,6 @@ context_server_settings.workspace = true
 extension.workspace = true
 futures.workspace = true
 gpui.workspace = true
-language_model.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true

crates/context_server/src/context_server_tool.rs

@@ -1,9 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::{anyhow, bail, Result};
-use assistant_tool::{Tool, ToolSource};
+use assistant_tool::Tool;
 use gpui::{App, Entity, Task};
-use language_model::LanguageModelRequestMessage;
 use project::Project;
 
 use crate::manager::ContextServerManager;
@@ -38,12 +37,6 @@ impl Tool for ContextServerTool {
         self.tool.description.clone().unwrap_or_default()
     }
 
-    fn source(&self) -> ToolSource {
-        ToolSource::ContextServer {
-            id: self.server_id.clone().into(),
-        }
-    }
-
     fn input_schema(&self) -> serde_json::Value {
         match &self.tool.input_schema {
             serde_json::Value::Null => {
@@ -59,7 +52,6 @@ impl Tool for ContextServerTool {
     fn run(
         self: Arc<Self>,
         input: serde_json::Value,
-        _messages: &[LanguageModelRequestMessage],
         _project: Entity<Project>,
         cx: &mut App,
     ) -> Task<Result<String>> {

crates/copilot/src/copilot_completion_provider.rs

@@ -271,10 +271,7 @@ mod tests {
     use gpui::{AppContext as _, BackgroundExecutor, TestAppContext, UpdateGlobal};
     use indoc::indoc;
     use language::{
-        language_settings::{
-            AllLanguageSettings, AllLanguageSettingsContent, CompletionSettings,
-            WordsCompletionMode,
-        },
+        language_settings::{AllLanguageSettings, AllLanguageSettingsContent},
         Point,
     };
     use project::Project;
@@ -289,13 +286,7 @@ mod tests {
     #[gpui::test(iterations = 10)]
     async fn test_copilot(executor: BackgroundExecutor, cx: &mut TestAppContext) {
         // flaky
-        init_test(cx, |settings| {
-            settings.defaults.completions = Some(CompletionSettings {
-                words: WordsCompletionMode::Disabled,
-                lsp: true,
-                lsp_fetch_timeout_ms: 0,
-            });
-        });
+        init_test(cx, |_| {});
 
         let (copilot, copilot_lsp) = Copilot::fake(cx);
         let mut cx = EditorLspTestContext::new_rust(
@@ -520,13 +511,7 @@ mod tests {
         cx: &mut TestAppContext,
     ) {
         // flaky
-        init_test(cx, |settings| {
-            settings.defaults.completions = Some(CompletionSettings {
-                words: WordsCompletionMode::Disabled,
-                lsp: true,
-                lsp_fetch_timeout_ms: 0,
-            });
-        });
+        init_test(cx, |_| {});
 
         let (copilot, copilot_lsp) = Copilot::fake(cx);
         let mut cx = EditorLspTestContext::new_rust(
@@ -745,8 +730,8 @@ mod tests {
             );
             multibuffer
         });
-        let editor =
-            cx.add_window(|window, cx| Editor::for_multibuffer(multibuffer, None, window, cx));
+        let editor = cx
+            .add_window(|window, cx| Editor::for_multibuffer(multibuffer, None, true, window, cx));
         editor
             .update(cx, |editor, window, cx| {
                 use gpui::Focusable;
@@ -781,7 +766,7 @@ mod tests {
             assert!(editor.has_active_inline_completion());
             assert_eq!(
                 editor.display_text(cx),
-                "\n\na = 1\nb = 2 + a\n\n\n\nc = 3\nd = 4\n"
+                "\n\n\na = 1\nb = 2 + a\n\n\n\n\n\nc = 3\nd = 4\n\n"
             );
             assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4\n");
         });
@@ -803,7 +788,7 @@ mod tests {
             assert!(!editor.has_active_inline_completion());
             assert_eq!(
                 editor.display_text(cx),
-                "\n\na = 1\nb = 2\n\n\n\nc = 3\nd = 4\n"
+                "\n\n\na = 1\nb = 2\n\n\n\n\n\nc = 3\nd = 4\n\n"
             );
             assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4\n");
 
@@ -812,7 +797,7 @@ mod tests {
             assert!(!editor.has_active_inline_completion());
             assert_eq!(
                 editor.display_text(cx),
-                "\n\na = 1\nb = 2\n\n\n\nc = 3\nd = 4 \n"
+                "\n\n\na = 1\nb = 2\n\n\n\n\n\nc = 3\nd = 4 \n\n"
             );
             assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4 \n");
         });
@@ -823,7 +808,7 @@ mod tests {
             assert!(editor.has_active_inline_completion());
             assert_eq!(
                 editor.display_text(cx),
-                "\n\na = 1\nb = 2\n\n\n\nc = 3\nd = 4 + c\n"
+                "\n\n\na = 1\nb = 2\n\n\n\n\n\nc = 3\nd = 4 + c\n\n"
             );
             assert_eq!(editor.text(cx), "a = 1\nb = 2\n\nc = 3\nd = 4 \n");
         });
@@ -997,8 +982,8 @@ mod tests {
             );
             multibuffer
         });
-        let editor =
-            cx.add_window(|window, cx| Editor::for_multibuffer(multibuffer, None, window, cx));
+        let editor = cx
+            .add_window(|window, cx| Editor::for_multibuffer(multibuffer, None, true, window, cx));
         editor
             .update(cx, |editor, window, cx| {
                 use gpui::Focusable;

crates/diagnostics/src/diagnostics.rs

@@ -198,8 +198,13 @@ impl ProjectDiagnosticsEditor {
 
         let excerpts = cx.new(|cx| MultiBuffer::new(project_handle.read(cx).capability()));
         let editor = cx.new(|cx| {
-            let mut editor =
-                Editor::for_multibuffer(excerpts.clone(), Some(project_handle.clone()), window, cx);
+            let mut editor = Editor::for_multibuffer(
+                excerpts.clone(),
+                Some(project_handle.clone()),
+                true,
+                window,
+                cx,
+            );
             editor.set_vertical_scroll_margin(5, cx);
             editor.disable_inline_diagnostics();
             editor

crates/diagnostics/src/diagnostics_tests.rs

@@ -169,10 +169,10 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(15), EXCERPT_HEADER.into()),
-            (DisplayRow(16), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(25), EXCERPT_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(16), EXCERPT_HEADER.into()),
+            (DisplayRow(18), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(27), EXCERPT_HEADER.into()),
         ]
     );
     assert_eq!(
@@ -186,6 +186,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n", // primary message
             "\n", // padding
+            "\n", // expand
             "    let x = vec![];\n",
             "    let y = vec![];\n",
             "\n", // supporting diagnostic
@@ -197,6 +198,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             "    c(y);\n",
             "\n", // supporting diagnostic
             "    d(x);\n",
+            "\n", // expand
             "\n", // context ellipsis
             // diagnostic group 2
             "\n", // primary message
@@ -208,11 +210,13 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             "    a(x);\n",
             "\n", // supporting diagnostic
             "    b(y);\n",
+            "\n", // expand
             "\n", // context ellipsis
             "    c(y);\n",
             "    d(x);\n",
             "\n", // supporting diagnostic
             "}",
+            "\n", // expand
         )
     );
 
@@ -220,7 +224,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
     editor.update(cx, |editor, cx| {
         assert_eq!(
             editor.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(12), 6)..DisplayPoint::new(DisplayRow(12), 6)]
+            [DisplayPoint::new(DisplayRow(13), 6)..DisplayPoint::new(DisplayRow(13), 6)]
         );
     });
 
@@ -256,12 +260,12 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(7), FILE_HEADER.into()),
-            (DisplayRow(9), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(22), EXCERPT_HEADER.into()),
-            (DisplayRow(23), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(32), EXCERPT_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(8), FILE_HEADER.into()),
+            (DisplayRow(12), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(25), EXCERPT_HEADER.into()),
+            (DisplayRow(27), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(36), EXCERPT_HEADER.into()),
         ]
     );
 
@@ -276,6 +280,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n", // primary message
             "\n", // padding
+            "\n", // expand
             "const a: i32 = 'a';\n",
             "\n", // supporting diagnostic
             "const b: i32 = c;\n",
@@ -287,6 +292,8 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n", // primary message
             "\n", // padding
+            "\n", // expand
+            "\n", // expand
             "    let x = vec![];\n",
             "    let y = vec![];\n",
             "\n", // supporting diagnostic
@@ -302,6 +309,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 2
             "\n", // primary message
             "\n", // filename
+            "\n", // expand
             "fn main() {\n",
             "    let x = vec![];\n",
             "\n", // supporting diagnostic
@@ -309,11 +317,13 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             "    a(x);\n",
             "\n", // supporting diagnostic
             "    b(y);\n",
+            "\n", // expand
             "\n", // context ellipsis
             "    c(y);\n",
             "    d(x);\n",
             "\n", // supporting diagnostic
             "}",
+            "\n", // expand
         )
     );
 
@@ -321,7 +331,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
     editor.update(cx, |editor, cx| {
         assert_eq!(
             editor.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(19), 6)..DisplayPoint::new(DisplayRow(19), 6)]
+            [DisplayPoint::new(DisplayRow(22), 6)..DisplayPoint::new(DisplayRow(22), 6)]
         );
     });
 
@@ -370,14 +380,14 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(7), EXCERPT_HEADER.into()),
-            (DisplayRow(8), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(13), FILE_HEADER.into()),
-            (DisplayRow(15), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(28), EXCERPT_HEADER.into()),
-            (DisplayRow(29), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(38), EXCERPT_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(8), EXCERPT_HEADER.into()),
+            (DisplayRow(10), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(15), FILE_HEADER.into()),
+            (DisplayRow(19), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(32), EXCERPT_HEADER.into()),
+            (DisplayRow(34), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(43), EXCERPT_HEADER.into()),
         ]
     );
 
@@ -392,6 +402,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n", // primary message
             "\n", // padding
+            "\n", // expand
             "const a: i32 = 'a';\n",
             "\n", // supporting diagnostic
             "const b: i32 = c;\n",
@@ -399,6 +410,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 2
             "\n", // primary message
             "\n", // padding
+            "\n", // expand
             "const a: i32 = 'a';\n",
             "const b: i32 = c;\n",
             "\n", // supporting diagnostic
@@ -410,6 +422,8 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n", // primary message
             "\n", // padding
+            "\n", // expand
+            "\n", // expand
             "    let x = vec![];\n",
             "    let y = vec![];\n",
             "\n", // supporting diagnostic
@@ -425,6 +439,7 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             // diagnostic group 2
             "\n", // primary message
             "\n", // filename
+            "\n", // expand
             "fn main() {\n",
             "    let x = vec![];\n",
             "\n", // supporting diagnostic
@@ -432,11 +447,13 @@ async fn test_diagnostics(cx: &mut TestAppContext) {
             "    a(x);\n",
             "\n", // supporting diagnostic
             "    b(y);\n",
+            "\n", // expand
             "\n", // context ellipsis
             "    c(y);\n",
             "    d(x);\n",
             "\n", // supporting diagnostic
             "}",
+            "\n", // expand
         )
     );
 }
@@ -518,7 +535,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
         ]
     );
     assert_eq!(
@@ -529,8 +546,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n",     // primary message
             "\n",     // padding
+            "\n",     // expand
             "a();\n", //
-            "b();",
+            "b();", "\n", // expand
         )
     );
 
@@ -566,9 +584,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(6), EXCERPT_HEADER.into()),
-            (DisplayRow(7), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(7), EXCERPT_HEADER.into()),
+            (DisplayRow(9), DIAGNOSTIC_HEADER.into()),
         ]
     );
     assert_eq!(
@@ -579,8 +597,10 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n",     // primary message
             "\n",     // padding
+            "\n",     // expand
             "a();\n", // location
             "b();\n", //
+            "\n",     // expand
             "\n",     // collapsed context
             // diagnostic group 2
             "\n",     // primary message
@@ -588,6 +608,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             "a();\n", // context
             "b();\n", //
             "c();",   // context
+            "\n",     // expand
         )
     );
 
@@ -634,9 +655,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(7), EXCERPT_HEADER.into()),
-            (DisplayRow(8), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(8), EXCERPT_HEADER.into()),
+            (DisplayRow(10), DIAGNOSTIC_HEADER.into()),
         ]
     );
     assert_eq!(
@@ -647,9 +668,11 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n",     // primary message
             "\n",     // padding
+            "\n",     // expand
             "a();\n", // location
             "b();\n", //
             "c();\n", // context
+            "\n",     // expand
             "\n",     // collapsed context
             // diagnostic group 2
             "\n",     // primary message
@@ -657,6 +680,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             "b();\n", // context
             "c();\n", //
             "d();",   // context
+            "\n",     // expand
         )
     );
 
@@ -692,9 +716,9 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
         editor_blocks(&editor, cx),
         [
             (DisplayRow(0), FILE_HEADER.into()),
-            (DisplayRow(2), DIAGNOSTIC_HEADER.into()),
-            (DisplayRow(7), EXCERPT_HEADER.into()),
-            (DisplayRow(8), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(3), DIAGNOSTIC_HEADER.into()),
+            (DisplayRow(8), EXCERPT_HEADER.into()),
+            (DisplayRow(10), DIAGNOSTIC_HEADER.into()),
         ]
     );
     assert_eq!(
@@ -705,9 +729,11 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             // diagnostic group 1
             "\n",     // primary message
             "\n",     // padding
+            "\n",     // expand
             "b();\n", // location
             "c();\n", //
             "d();\n", // context
+            "\n",     // expand
             "\n",     // collapsed context
             // diagnostic group 2
             "\n",     // primary message
@@ -715,6 +741,7 @@ async fn test_diagnostics_multiple_servers(cx: &mut TestAppContext) {
             "c();\n", // context
             "d();\n", //
             "e();",   // context
+            "\n",     // expand
         )
     );
 }

crates/editor/src/actions.rs

@@ -412,6 +412,7 @@ gpui::actions!(
         Tab,
         Backtab,
         ToggleAutoSignatureHelp,
+        ToggleGitBlame,
         ToggleGitBlameInline,
         ToggleIndentGuides,
         ToggleInlayHints,

crates/editor/src/display_map.rs

@@ -118,8 +118,10 @@ impl DisplayMap {
         font: Font,
         font_size: Pixels,
         wrap_width: Option<Pixels>,
+        show_excerpt_controls: bool,
         buffer_header_height: u32,
         excerpt_header_height: u32,
+        excerpt_footer_height: u32,
         fold_placeholder: FoldPlaceholder,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -132,7 +134,13 @@ impl DisplayMap {
         let (fold_map, snapshot) = FoldMap::new(snapshot);
         let (tab_map, snapshot) = TabMap::new(snapshot, tab_size);
         let (wrap_map, snapshot) = WrapMap::new(snapshot, font, font_size, wrap_width, cx);
-        let block_map = BlockMap::new(snapshot, buffer_header_height, excerpt_header_height);
+        let block_map = BlockMap::new(
+            snapshot,
+            show_excerpt_controls,
+            buffer_header_height,
+            excerpt_header_height,
+            excerpt_footer_height,
+        );
 
         cx.observe(&wrap_map, |_, _, cx| cx.notify()).detach();
 
@@ -547,6 +555,10 @@ impl DisplayMap {
     pub fn is_rewrapping(&self, cx: &gpui::App) -> bool {
         self.wrap_map.read(cx).is_rewrapping()
     }
+
+    pub fn show_excerpt_controls(&self) -> bool {
+        self.block_map.show_excerpt_controls()
+    }
 }
 
 #[derive(Debug, Default)]
@@ -1090,8 +1102,8 @@ impl DisplaySnapshot {
             .map(|(row, block)| (DisplayRow(row), block))
     }
 
-    pub fn sticky_header_excerpt(&self, row: f32) -> Option<StickyHeaderExcerpt<'_>> {
-        self.block_snapshot.sticky_header_excerpt(row)
+    pub fn sticky_header_excerpt(&self, row: DisplayRow) -> Option<StickyHeaderExcerpt<'_>> {
+        self.block_snapshot.sticky_header_excerpt(row.0)
     }
 
     pub fn block_for_id(&self, id: BlockId) -> Option<Block> {
@@ -1289,6 +1301,10 @@ impl DisplaySnapshot {
         self.block_snapshot.buffer_header_height
     }
 
+    pub fn excerpt_footer_height(&self) -> u32 {
+        self.block_snapshot.excerpt_footer_height
+    }
+
     pub fn excerpt_header_height(&self) -> u32 {
         self.block_snapshot.excerpt_header_height
     }
@@ -1498,8 +1514,10 @@ pub mod tests {
                 font,
                 font_size,
                 wrap_width,
+                true,
                 buffer_start_excerpt_header_height,
                 excerpt_header_height,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -1746,8 +1764,10 @@ pub mod tests {
                     font("Helvetica"),
                     font_size,
                     wrap_width,
+                    true,
                     1,
                     1,
+                    0,
                     FoldPlaceholder::test(),
                     cx,
                 )
@@ -1855,8 +1875,10 @@ pub mod tests {
                 font("Helvetica"),
                 font_size,
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -1916,6 +1938,8 @@ pub mod tests {
                 font("Helvetica"),
                 font_size,
                 None,
+                true,
+                1,
                 1,
                 1,
                 FoldPlaceholder::test(),
@@ -2008,6 +2032,8 @@ pub mod tests {
                 font("Helvetica"),
                 font_size,
                 None,
+                true,
+                1,
                 1,
                 1,
                 FoldPlaceholder::test(),
@@ -2108,8 +2134,10 @@ pub mod tests {
                 font("Courier"),
                 px(16.0),
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -2211,8 +2239,10 @@ pub mod tests {
                 font("Courier"),
                 px(16.0),
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -2298,8 +2328,10 @@ pub mod tests {
                 font("Courier"),
                 px(16.0),
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -2440,8 +2472,10 @@ pub mod tests {
                 font("Courier"),
                 font_size,
                 Some(px(40.0)),
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -2522,6 +2556,8 @@ pub mod tests {
                 font("Courier"),
                 font_size,
                 None,
+                true,
+                1,
                 1,
                 1,
                 FoldPlaceholder::test(),
@@ -2646,8 +2682,10 @@ pub mod tests {
                 font("Helvetica"),
                 font_size,
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             );
@@ -2683,8 +2721,10 @@ pub mod tests {
                 font("Helvetica"),
                 font_size,
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )
@@ -2758,8 +2798,10 @@ pub mod tests {
                 font("Helvetica"),
                 font_size,
                 None,
+                true,
                 1,
                 1,
+                0,
                 FoldPlaceholder::test(),
                 cx,
             )

crates/editor/src/display_map/block_map.rs

@@ -37,8 +37,10 @@ pub struct BlockMap {
     custom_blocks: Vec<Arc<CustomBlock>>,
     custom_blocks_by_id: TreeMap<CustomBlockId, Arc<CustomBlock>>,
     transforms: RefCell<SumTree<Transform>>,
+    show_excerpt_controls: bool,
     buffer_header_height: u32,
     excerpt_header_height: u32,
+    excerpt_footer_height: u32,
     pub(super) folded_buffers: HashSet<BufferId>,
 }
 
@@ -56,6 +58,7 @@ pub struct BlockSnapshot {
     custom_blocks_by_id: TreeMap<CustomBlockId, Arc<CustomBlock>>,
     pub(super) buffer_header_height: u32,
     pub(super) excerpt_header_height: u32,
+    pub(super) excerpt_footer_height: u32,
 }
 
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash)]
@@ -282,12 +285,14 @@ pub enum Block {
         first_excerpt: ExcerptInfo,
         prev_excerpt: Option<ExcerptInfo>,
         height: u32,
+        show_excerpt_controls: bool,
     },
     ExcerptBoundary {
         prev_excerpt: Option<ExcerptInfo>,
         next_excerpt: Option<ExcerptInfo>,
         height: u32,
         starts_new_buffer: bool,
+        show_excerpt_controls: bool,
     },
 }
 
@@ -357,11 +362,13 @@ impl Debug for Block {
                 first_excerpt,
                 prev_excerpt,
                 height,
+                show_excerpt_controls,
             } => f
                 .debug_struct("FoldedBuffer")
                 .field("first_excerpt", &first_excerpt)
                 .field("prev_excerpt", prev_excerpt)
                 .field("height", height)
+                .field("show_excerpt_controls", show_excerpt_controls)
                 .finish(),
             Self::ExcerptBoundary {
                 starts_new_buffer,
@@ -406,8 +413,10 @@ pub struct BlockRows<'a> {
 impl BlockMap {
     pub fn new(
         wrap_snapshot: WrapSnapshot,
+        show_excerpt_controls: bool,
         buffer_header_height: u32,
         excerpt_header_height: u32,
+        excerpt_footer_height: u32,
     ) -> Self {
         let row_count = wrap_snapshot.max_point().row() + 1;
         let mut transforms = SumTree::default();
@@ -419,8 +428,10 @@ impl BlockMap {
             folded_buffers: HashSet::default(),
             transforms: RefCell::new(transforms),
             wrap_snapshot: RefCell::new(wrap_snapshot.clone()),
+            show_excerpt_controls,
             buffer_header_height,
             excerpt_header_height,
+            excerpt_footer_height,
         };
         map.sync(
             &wrap_snapshot,
@@ -443,6 +454,7 @@ impl BlockMap {
                 custom_blocks_by_id: self.custom_blocks_by_id.clone(),
                 buffer_header_height: self.buffer_header_height,
                 excerpt_header_height: self.excerpt_header_height,
+                excerpt_footer_height: self.excerpt_footer_height,
             },
         }
     }
@@ -638,6 +650,8 @@ impl BlockMap {
 
             if buffer.show_headers() {
                 blocks_in_edit.extend(BlockMap::header_and_footer_blocks(
+                    self.show_excerpt_controls,
+                    self.excerpt_footer_height,
                     self.buffer_header_height,
                     self.excerpt_header_height,
                     buffer,
@@ -708,7 +722,13 @@ impl BlockMap {
         }
     }
 
+    pub fn show_excerpt_controls(&self) -> bool {
+        self.show_excerpt_controls
+    }
+
     fn header_and_footer_blocks<'a, R, T>(
+        show_excerpt_controls: bool,
+        excerpt_footer_height: u32,
         buffer_header_height: u32,
         excerpt_header_height: u32,
         buffer: &'a multi_buffer::MultiBufferSnapshot,
@@ -754,6 +774,11 @@ impl BlockMap {
                 .filter(|prev| !folded_buffers.contains(&prev.buffer_id));
 
             let mut height = 0;
+            if prev_excerpt.is_some() {
+                if show_excerpt_controls {
+                    height += excerpt_footer_height;
+                }
+            }
 
             if let Some(new_buffer_id) = new_buffer_id {
                 let first_excerpt = excerpt_boundary.next.clone().unwrap();
@@ -787,6 +812,7 @@ impl BlockMap {
                         Block::FoldedBuffer {
                             prev_excerpt,
                             height: height + buffer_header_height,
+                            show_excerpt_controls,
                             first_excerpt,
                         },
                     ));
@@ -796,6 +822,9 @@ impl BlockMap {
             if excerpt_boundary.next.is_some() {
                 if new_buffer_id.is_some() {
                     height += buffer_header_height;
+                    if show_excerpt_controls {
+                        height += excerpt_header_height;
+                    }
                 } else {
                     height += excerpt_header_height;
                 }
@@ -816,6 +845,7 @@ impl BlockMap {
                     next_excerpt: excerpt_boundary.next,
                     height,
                     starts_new_buffer: new_buffer_id.is_some(),
+                    show_excerpt_controls,
                 },
             ))
         })
@@ -1402,8 +1432,7 @@ impl BlockSnapshot {
         })
     }
 
-    pub fn sticky_header_excerpt(&self, position: f32) -> Option<StickyHeaderExcerpt<'_>> {
-        let top_row = position as u32;
+    pub fn sticky_header_excerpt(&self, top_row: u32) -> Option<StickyHeaderExcerpt<'_>> {
         let mut cursor = self.transforms.cursor::<BlockRow>(&());
         cursor.seek(&BlockRow(top_row), Bias::Left, &());
 
@@ -1416,13 +1445,19 @@ impl BlockSnapshot {
                     prev_excerpt,
                     next_excerpt,
                     starts_new_buffer,
+                    show_excerpt_controls,
                     ..
                 }) => {
-                    let matches_start = (start as f32) < position;
+                    let matches_start = if *show_excerpt_controls && prev_excerpt.is_some() {
+                        start < top_row
+                    } else {
+                        start <= top_row
+                    };
 
                     if matches_start && top_row <= end {
                         return next_excerpt.as_ref().map(|excerpt| StickyHeaderExcerpt {
                             next_buffer_row: None,
+                            next_excerpt_controls_present: *show_excerpt_controls,
                             excerpt,
                         });
                     }
@@ -1432,6 +1467,7 @@ impl BlockSnapshot {
                     return prev_excerpt.as_ref().map(|excerpt| StickyHeaderExcerpt {
                         excerpt,
                         next_buffer_row,
+                        next_excerpt_controls_present: *show_excerpt_controls,
                     });
                 }
                 Some(Block::FoldedBuffer {
@@ -1440,6 +1476,7 @@ impl BlockSnapshot {
                 }) if top_row <= start => {
                     return Some(StickyHeaderExcerpt {
                         next_buffer_row: Some(end),
+                        next_excerpt_controls_present: false,
                         excerpt,
                     });
                 }
@@ -1748,6 +1785,7 @@ impl BlockChunks<'_> {
 
 pub struct StickyHeaderExcerpt<'a> {
     pub excerpt: &'a ExcerptInfo,
+    pub next_excerpt_controls_present: bool,
     pub next_buffer_row: Option<u32>,
 }
 
@@ -2028,7 +2066,7 @@ mod tests {
         let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 1.try_into().unwrap());
         let (wrap_map, wraps_snapshot) =
             cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+        let mut block_map = BlockMap::new(wraps_snapshot.clone(), true, 1, 1, 1);
 
         let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
         let block_ids = writer.insert(vec![
@@ -2241,11 +2279,14 @@ mod tests {
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
         let (_, wraps_snapshot) = WrapMap::new(tab_snapshot, font, font_size, Some(wrap_width), cx);
 
-        let block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+        let block_map = BlockMap::new(wraps_snapshot.clone(), true, 1, 1, 1);
         let snapshot = block_map.read(wraps_snapshot, Default::default());
 
         // Each excerpt has a header above and footer below. Excerpts are also *separated* by a newline.
-        assert_eq!(snapshot.text(), "\nBuff\ner 1\n\nBuff\ner 2\n\nBuff\ner 3");
+        assert_eq!(
+            snapshot.text(),
+            "\n\nBuff\ner 1\n\n\n\nBuff\ner 2\n\n\n\nBuff\ner 3\n"
+        );
 
         let blocks: Vec<_> = snapshot
             .blocks_in_range(0..u32::MAX)
@@ -2254,9 +2295,10 @@ mod tests {
         assert_eq!(
             blocks,
             vec![
-                (0..1, BlockId::ExcerptBoundary(Some(excerpt_ids[0]))), // path, header
-                (3..4, BlockId::ExcerptBoundary(Some(excerpt_ids[1]))), // path, header
-                (6..7, BlockId::ExcerptBoundary(Some(excerpt_ids[2]))), // path, header
+                (0..2, BlockId::ExcerptBoundary(Some(excerpt_ids[0]))), // path, header
+                (4..7, BlockId::ExcerptBoundary(Some(excerpt_ids[1]))), // footer, path, header
+                (9..12, BlockId::ExcerptBoundary(Some(excerpt_ids[2]))), // footer, path, header
+                (14..15, BlockId::ExcerptBoundary(None)),               // footer
             ]
         );
     }
@@ -2275,7 +2317,7 @@ mod tests {
         let (_tab_map, tab_snapshot) = TabMap::new(fold_snapshot, 1.try_into().unwrap());
         let (_wrap_map, wraps_snapshot) =
             cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+        let mut block_map = BlockMap::new(wraps_snapshot.clone(), false, 1, 1, 0);
 
         let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
         let block_ids = writer.insert(vec![
@@ -2378,7 +2420,7 @@ mod tests {
         let (_, wraps_snapshot) = cx.update(|cx| {
             WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), Some(px(60.)), cx)
         });
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+        let mut block_map = BlockMap::new(wraps_snapshot.clone(), true, 1, 1, 0);
 
         let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
         writer.insert(vec![
@@ -2422,7 +2464,7 @@ mod tests {
         let (mut tab_map, tab_snapshot) = TabMap::new(fold_snapshot, tab_size);
         let (wrap_map, wraps_snapshot) =
             cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wraps_snapshot.clone(), 1, 1);
+        let mut block_map = BlockMap::new(wraps_snapshot.clone(), false, 1, 1, 0);
 
         let mut writer = block_map.write(wraps_snapshot.clone(), Default::default());
         let replace_block_id = writer.insert(vec![BlockProperties {
@@ -2589,12 +2631,12 @@ mod tests {
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
         let (_, wrap_snapshot) =
             cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wrap_snapshot.clone(), 2, 1);
+        let mut block_map = BlockMap::new(wrap_snapshot.clone(), true, 2, 1, 1);
         let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
 
         assert_eq!(
             blocks_snapshot.text(),
-            "\n\n111\n\n\n222\n\n333\n\n444\n\n\n555\n\n666"
+            "\n\n\n111\n\n\n\n\n222\n\n\n333\n\n\n444\n\n\n\n\n555\n\n\n666\n"
         );
         assert_eq!(
             blocks_snapshot
@@ -2602,21 +2644,30 @@ mod tests {
                 .map(|i| i.buffer_row)
                 .collect::<Vec<_>>(),
             vec![
+                None,
                 None,
                 None,
                 Some(0),
                 None,
                 None,
+                None,
+                None,
                 Some(1),
                 None,
+                None,
                 Some(2),
                 None,
+                None,
                 Some(3),
                 None,
                 None,
+                None,
+                None,
                 Some(4),
                 None,
+                None,
                 Some(5),
+                None,
             ]
         );
 
@@ -2664,7 +2715,7 @@ mod tests {
         let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
         assert_eq!(
             blocks_snapshot.text(),
-            "\n\n111\n\n\n\n222\n\n\n333\n\n444\n\n\n\n\n555\n\n666\n"
+            "\n\n\n111\n\n\n\n\n\n222\n\n\n\n333\n\n\n444\n\n\n\n\n\n\n555\n\n\n666\n\n"
         );
         assert_eq!(
             blocks_snapshot
@@ -2672,26 +2723,35 @@ mod tests {
                 .map(|i| i.buffer_row)
                 .collect::<Vec<_>>(),
             vec![
+                None,
                 None,
                 None,
                 Some(0),
                 None,
                 None,
                 None,
+                None,
+                None,
                 Some(1),
                 None,
                 None,
+                None,
                 Some(2),
                 None,
+                None,
                 Some(3),
                 None,
                 None,
                 None,
                 None,
+                None,
+                None,
                 Some(4),
                 None,
+                None,
                 Some(5),
                 None,
+                None,
             ]
         );
 
@@ -2733,7 +2793,7 @@ mod tests {
         );
         assert_eq!(
             blocks_snapshot.text(),
-            "\n\n\n\n\n222\n\n\n333\n\n444\n\n\n\n\n555\n\n666\n"
+            "\n\n\n\n\n\n222\n\n\n\n333\n\n\n444\n\n\n\n\n\n\n555\n\n\n666\n\n"
         );
         assert_eq!(
             blocks_snapshot
@@ -2746,20 +2806,27 @@ mod tests {
                 None,
                 None,
                 None,
+                None,
                 Some(1),
                 None,
                 None,
+                None,
                 Some(2),
                 None,
+                None,
                 Some(3),
                 None,
                 None,
                 None,
                 None,
+                None,
+                None,
                 Some(4),
                 None,
+                None,
                 Some(5),
                 None,
+                None,
             ]
         );
 
@@ -2795,7 +2862,7 @@ mod tests {
                 .count(),
             "Should have two folded blocks, producing headers"
         );
-        assert_eq!(blocks_snapshot.text(), "\n\n\n\n\n\n\n555\n\n666\n");
+        assert_eq!(blocks_snapshot.text(), "\n\n\n\n\n\n\n\n555\n\n\n666\n\n");
         assert_eq!(
             blocks_snapshot
                 .row_infos(BlockRow(0))
@@ -2809,10 +2876,13 @@ mod tests {
                 None,
                 None,
                 None,
+                None,
                 Some(4),
                 None,
+                None,
                 Some(5),
                 None,
+                None,
             ]
         );
 
@@ -2847,7 +2917,7 @@ mod tests {
         );
         assert_eq!(
             blocks_snapshot.text(),
-            "\n\n\n111\n\n\n\n\n\n555\n\n666\n",
+            "\n\n\n\n111\n\n\n\n\n\n\n\n555\n\n\n666\n\n",
             "Should have extra newline for 111 buffer, due to a new block added when it was folded"
         );
         assert_eq!(
@@ -2859,16 +2929,21 @@ mod tests {
                 None,
                 None,
                 None,
+                None,
                 Some(0),
                 None,
                 None,
                 None,
                 None,
                 None,
+                None,
+                None,
                 Some(4),
                 None,
+                None,
                 Some(5),
                 None,
+                None,
             ]
         );
 
@@ -2899,7 +2974,7 @@ mod tests {
 
         assert_eq!(
             blocks_snapshot.text(),
-            "\n\n\n111\n\n\n\n",
+            "\n\n\n\n111\n\n\n\n\n",
             "Should have a single, first buffer left after folding"
         );
         assert_eq!(
@@ -2907,7 +2982,18 @@ mod tests {
                 .row_infos(BlockRow(0))
                 .map(|i| i.buffer_row)
                 .collect::<Vec<_>>(),
-            vec![None, None, None, Some(0), None, None, None, None,]
+            vec![
+                None,
+                None,
+                None,
+                None,
+                Some(0),
+                None,
+                None,
+                None,
+                None,
+                None,
+            ]
         );
     }
 
@@ -2934,10 +3020,10 @@ mod tests {
         let (_, tab_snapshot) = TabMap::new(fold_snapshot, 4.try_into().unwrap());
         let (_, wrap_snapshot) =
             cx.update(|cx| WrapMap::new(tab_snapshot, font("Helvetica"), px(14.0), None, cx));
-        let mut block_map = BlockMap::new(wrap_snapshot.clone(), 2, 1);
+        let mut block_map = BlockMap::new(wrap_snapshot.clone(), true, 2, 1, 1);
         let blocks_snapshot = block_map.read(wrap_snapshot.clone(), Patch::default());
 
-        assert_eq!(blocks_snapshot.text(), "\n\n111");
+        assert_eq!(blocks_snapshot.text(), "\n\n\n111\n");
 
         let mut writer = block_map.write(wrap_snapshot.clone(), Patch::default());
         buffer.read_with(cx, |buffer, cx| {
@@ -2991,9 +3077,11 @@ mod tests {
         let font_size = px(14.0);
         let buffer_start_header_height = rng.gen_range(1..=5);
         let excerpt_header_height = rng.gen_range(1..=5);
+        let excerpt_footer_height = rng.gen_range(1..=5);
 
         log::info!("Wrap width: {:?}", wrap_width);
         log::info!("Excerpt Header Height: {:?}", excerpt_header_height);
+        log::info!("Excerpt Footer Height: {:?}", excerpt_footer_height);
         let is_singleton = rng.gen();
         let buffer = if is_singleton {
             let len = rng.gen_range(0..10);
@@ -3020,8 +3108,10 @@ mod tests {
             cx.update(|cx| WrapMap::new(tab_snapshot, font, font_size, wrap_width, cx));
         let mut block_map = BlockMap::new(
             wraps_snapshot,
+            true,
             buffer_start_header_height,
             excerpt_header_height,
+            excerpt_footer_height,
         );
 
         for _ in 0..operations {
@@ -3239,6 +3329,8 @@ mod tests {
 
             // Note that this needs to be synced with the related section in BlockMap::sync
             expected_blocks.extend(BlockMap::header_and_footer_blocks(
+                true,
+                excerpt_footer_height,
                 buffer_start_header_height,
                 excerpt_header_height,
                 &buffer_snapshot,

crates/editor/src/display_map/wrap_map.rs

@@ -983,7 +983,6 @@ impl Iterator for WrapRows<'_> {
                 buffer_row: None,
                 multibuffer_row: None,
                 diff_status,
-                expand_info: None,
             }
         } else {
             buffer_row

crates/editor/src/editor.rs

@@ -101,7 +101,6 @@ use itertools::Itertools;
 use language::{
     language_settings::{
         self, all_language_settings, language_settings, InlayHintSettings, RewrapBehavior,
-        WordsCompletionMode,
     },
     point_from_lsp, text_diff_with_options, AutoindentMode, BracketMatch, BracketPair, Buffer,
     Capability, CharKind, CodeLabel, CursorShape, Diagnostic, DiffOptions, EditPredictionsMode,
@@ -134,7 +133,7 @@ pub use multi_buffer::{
 };
 use multi_buffer::{
     ExcerptInfo, ExpandExcerptDirection, MultiBufferDiffHunk, MultiBufferPoint, MultiBufferRow,
-    MultiOrSingleBufferOffsetRange, PathKey, ToOffsetUtf16,
+    MultiOrSingleBufferOffsetRange, ToOffsetUtf16,
 };
 use project::{
     lsp_store::{CompletionDocumentation, FormatTrigger, LspFormatTarget, OpenLspBufferHandle},
@@ -196,6 +195,7 @@ use crate::signature_help::{SignatureHelpHiddenBy, SignatureHelpState};
 
 pub const FILE_HEADER_HEIGHT: u32 = 2;
 pub const MULTI_BUFFER_EXCERPT_HEADER_HEIGHT: u32 = 1;
+pub const MULTI_BUFFER_EXCERPT_FOOTER_HEIGHT: u32 = 1;
 pub const DEFAULT_MULTIBUFFER_CONTEXT: u32 = 2;
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 const MAX_LINE_LEN: usize = 1024;
@@ -607,6 +607,12 @@ pub trait Addon: 'static {
     fn to_any(&self) -> &dyn std::any::Any;
 }
 
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum IsVimMode {
+    Yes,
+    No,
+}
+
 /// Zed's primary implementation of text input, allowing users to edit a [`MultiBuffer`].
 ///
 /// See the [module level documentation](self) for more information.
@@ -638,7 +644,6 @@ pub struct Editor {
     inline_diagnostics_enabled: bool,
     inline_diagnostics: Vec<(Anchor, InlineDiagnostic)>,
     soft_wrap_mode_override: Option<language_settings::SoftWrap>,
-    hard_wrap: Option<usize>,
 
     // TODO: make this a access method
     pub project: Option<Entity<Project>>,
@@ -1091,6 +1096,7 @@ impl Editor {
             EditorMode::SingleLine { auto_width: false },
             buffer,
             None,
+            false,
             window,
             cx,
         )
@@ -1099,7 +1105,7 @@ impl Editor {
     pub fn multi_line(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let buffer = cx.new(|cx| Buffer::local("", cx));
         let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::Full, buffer, None, window, cx)
+        Self::new(EditorMode::Full, buffer, None, false, window, cx)
     }
 
     pub fn auto_width(window: &mut Window, cx: &mut Context<Self>) -> Self {
@@ -1109,6 +1115,7 @@ impl Editor {
             EditorMode::SingleLine { auto_width: true },
             buffer,
             None,
+            false,
             window,
             cx,
         )
@@ -1121,6 +1128,7 @@ impl Editor {
             EditorMode::AutoHeight { max_lines },
             buffer,
             None,
+            false,
             window,
             cx,
         )
@@ -1133,23 +1141,33 @@ impl Editor {
         cx: &mut Context<Self>,
     ) -> Self {
         let buffer = cx.new(|cx| MultiBuffer::singleton(buffer, cx));
-        Self::new(EditorMode::Full, buffer, project, window, cx)
+        Self::new(EditorMode::Full, buffer, project, false, window, cx)
     }
 
     pub fn for_multibuffer(
         buffer: Entity<MultiBuffer>,
         project: Option<Entity<Project>>,
+        show_excerpt_controls: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
-        Self::new(EditorMode::Full, buffer, project, window, cx)
+        Self::new(
+            EditorMode::Full,
+            buffer,
+            project,
+            show_excerpt_controls,
+            window,
+            cx,
+        )
     }
 
     pub fn clone(&self, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let show_excerpt_controls = self.display_map.read(cx).show_excerpt_controls();
         let mut clone = Self::new(
             self.mode,
             self.buffer.clone(),
             self.project.clone(),
+            show_excerpt_controls,
             window,
             cx,
         );
@@ -1169,6 +1187,7 @@ impl Editor {
         mode: EditorMode,
         buffer: Entity<MultiBuffer>,
         project: Option<Entity<Project>>,
+        show_excerpt_controls: bool,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> Self {
@@ -1213,8 +1232,10 @@ impl Editor {
                 style.font(),
                 font_size,
                 None,
+                show_excerpt_controls,
                 FILE_HEADER_HEIGHT,
                 MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
+                MULTI_BUFFER_EXCERPT_FOOTER_HEIGHT,
                 fold_placeholder,
                 cx,
             )
@@ -1334,7 +1355,6 @@ impl Editor {
             inline_diagnostics_update: Task::ready(()),
             inline_diagnostics: Vec::new(),
             soft_wrap_mode_override,
-            hard_wrap: None,
             completion_provider: project.clone().map(|project| Box::new(project) as _),
             semantics_provider: project.clone().map(|project| Rc::new(project) as _),
             collaboration_hub: project.clone().map(|project| Box::new(project) as _),
@@ -3172,19 +3192,6 @@ impl Editor {
 
             let trigger_in_words =
                 this.show_edit_predictions_in_menu() || !had_active_inline_completion;
-            if this.hard_wrap.is_some() {
-                let latest: Range<Point> = this.selections.newest(cx).range();
-                if latest.is_empty()
-                    && this
-                        .buffer()
-                        .read(cx)
-                        .snapshot(cx)
-                        .line_len(MultiBufferRow(latest.start.row))
-                        == latest.start.column
-                {
-                    this.rewrap_impl(true, cx)
-                }
-            }
             this.trigger_completion_on_input(&text, trigger_in_words, window, cx);
             linked_editing_ranges::refresh_linked_ranges(this, window, cx);
             this.refresh_inline_completion(true, false, window, cx);
@@ -4005,8 +4012,9 @@ impl Editor {
             } else {
                 return;
             };
-        let buffer_snapshot = buffer.read(cx).snapshot();
-        let show_completion_documentation = buffer_snapshot
+        let show_completion_documentation = buffer
+            .read(cx)
+            .snapshot()
             .settings_at(buffer_position, cx)
             .show_completion_documentation;
 
@@ -4030,51 +4038,6 @@ impl Editor {
         };
         let completions =
             provider.completions(&buffer, buffer_position, completion_context, window, cx);
-        let (old_range, word_kind) = buffer_snapshot.surrounding_word(buffer_position);
-        let (old_range, word_to_exclude) = if word_kind == Some(CharKind::Word) {
-            let word_to_exclude = buffer_snapshot
-                .text_for_range(old_range.clone())
-                .collect::<String>();
-            (
-                buffer_snapshot.anchor_before(old_range.start)
-                    ..buffer_snapshot.anchor_after(old_range.end),
-                Some(word_to_exclude),
-            )
-        } else {
-            (buffer_position..buffer_position, None)
-        };
-
-        let completion_settings = language_settings(
-            buffer_snapshot
-                .language_at(buffer_position)
-                .map(|language| language.name()),
-            buffer_snapshot.file(),
-            cx,
-        )
-        .completions;
-
-        // The document can be large, so stay in reasonable bounds when searching for words,
-        // otherwise completion pop-up might be slow to appear.
-        const WORD_LOOKUP_ROWS: u32 = 5_000;
-        let buffer_row = text::ToPoint::to_point(&buffer_position, &buffer_snapshot).row;
-        let min_word_search = buffer_snapshot.clip_point(
-            Point::new(buffer_row.saturating_sub(WORD_LOOKUP_ROWS), 0),
-            Bias::Left,
-        );
-        let max_word_search = buffer_snapshot.clip_point(
-            Point::new(buffer_row + WORD_LOOKUP_ROWS, 0).min(buffer_snapshot.max_point()),
-            Bias::Right,
-        );
-        let word_search_range = buffer_snapshot.point_to_offset(min_word_search)
-            ..buffer_snapshot.point_to_offset(max_word_search);
-        let words = match completion_settings.words {
-            WordsCompletionMode::Disabled => Task::ready(HashMap::default()),
-            WordsCompletionMode::Enabled | WordsCompletionMode::Fallback => {
-                cx.background_spawn(async move {
-                    buffer_snapshot.words_in_range(None, word_search_range)
-                })
-            }
-        };
         let sort_completions = provider.sort_completions();
 
         let id = post_inc(&mut self.next_completion_id);
@@ -4083,58 +4046,8 @@ impl Editor {
                 editor.update(&mut cx, |this, _| {
                     this.completion_tasks.retain(|(task_id, _)| *task_id >= id);
                 })?;
-                let mut completions = completions.await.log_err().unwrap_or_default();
-
-                match completion_settings.words {
-                    WordsCompletionMode::Enabled => {
-                        let mut words = words.await;
-                        if let Some(word_to_exclude) = &word_to_exclude {
-                            words.remove(word_to_exclude);
-                        }
-                        for lsp_completion in &completions {
-                            words.remove(&lsp_completion.new_text);
-                        }
-                        completions.extend(words.into_iter().map(|(word, word_range)| {
-                            Completion {
-                                old_range: old_range.clone(),
-                                new_text: word.clone(),
-                                label: CodeLabel::plain(word, None),
-                                documentation: None,
-                                source: CompletionSource::BufferWord {
-                                    word_range,
-                                    resolved: false,
-                                },
-                                confirm: None,
-                            }
-                        }));
-                    }
-                    WordsCompletionMode::Fallback => {
-                        if completions.is_empty() {
-                            completions.extend(
-                                words
-                                    .await
-                                    .into_iter()
-                                    .filter(|(word, _)| word_to_exclude.as_ref() != Some(word))
-                                    .map(|(word, word_range)| Completion {
-                                        old_range: old_range.clone(),
-                                        new_text: word.clone(),
-                                        label: CodeLabel::plain(word, None),
-                                        documentation: None,
-                                        source: CompletionSource::BufferWord {
-                                            word_range,
-                                            resolved: false,
-                                        },
-                                        confirm: None,
-                                    }),
-                            );
-                        }
-                    }
-                    WordsCompletionMode::Disabled => {}
-                }
-
-                let menu = if completions.is_empty() {
-                    None
-                } else {
+                let completions = completions.await.log_err();
+                let menu = if let Some(completions) = completions {
                     let mut menu = CompletionsMenu::new(
                         id,
                         sort_completions,
@@ -4148,6 +4061,8 @@ impl Editor {
                         .await;
 
                     menu.visible().then_some(menu)
+                } else {
+                    None
                 };
 
                 editor.update_in(&mut cx, |editor, window, cx| {
@@ -4659,25 +4574,25 @@ impl Editor {
             let mut multibuffer = MultiBuffer::new(Capability::ReadWrite).with_title(title);
             for (buffer_handle, transaction) in &entries {
                 let buffer = buffer_handle.read(cx);
-                multibuffer.set_excerpts_for_path(
-                    PathKey::for_buffer(&buffer, cx),
-                    buffer_handle.clone(),
-                    buffer
-                        .edited_ranges_for_transaction::<Point>(transaction)
-                        .collect(),
-                    DEFAULT_MULTIBUFFER_CONTEXT,
-                    cx,
+                ranges_to_highlight.extend(
+                    multibuffer.push_excerpts_with_context_lines(
+                        buffer_handle.clone(),
+                        buffer
+                            .edited_ranges_for_transaction::<usize>(transaction)
+                            .collect(),
+                        DEFAULT_MULTIBUFFER_CONTEXT,
+                        cx,
+                    ),
                 );
             }
             multibuffer.push_transaction(entries.iter().map(|(b, t)| (b, t)), cx);
-            ranges_to_highlight.extend(multibuffer.primary_excerpt_ranges(cx));
             multibuffer
         })?;
 
         workspace.update_in(&mut cx, |workspace, window, cx| {
             let project = workspace.project().clone();
-            let editor =
-                cx.new(|cx| Editor::for_multibuffer(excerpt_buffer, Some(project), window, cx));
+            let editor = cx
+                .new(|cx| Editor::for_multibuffer(excerpt_buffer, Some(project), true, window, cx));
             workspace.add_item_to_active_pane(Box::new(editor.clone()), None, true, window, cx);
             editor.update(cx, |editor, cx| {
                 editor.highlight_background::<Self>(
@@ -8592,10 +8507,10 @@ impl Editor {
     }
 
     pub fn rewrap(&mut self, _: &Rewrap, _: &mut Window, cx: &mut Context<Self>) {
-        self.rewrap_impl(false, cx)
+        self.rewrap_impl(IsVimMode::No, cx)
     }
 
-    pub fn rewrap_impl(&mut self, override_language_settings: bool, cx: &mut Context<Self>) {
+    pub fn rewrap_impl(&mut self, is_vim_mode: IsVimMode, cx: &mut Context<Self>) {
         let buffer = self.buffer.read(cx).snapshot(cx);
         let selections = self.selections.all::<Point>(cx);
         let mut selections = selections.iter().peekable();
@@ -8669,9 +8584,7 @@ impl Editor {
                 RewrapBehavior::Anywhere => true,
             };
 
-            let should_rewrap = override_language_settings
-                || allow_rewrap_based_on_language
-                || self.hard_wrap.is_some();
+            let should_rewrap = is_vim_mode == IsVimMode::Yes || allow_rewrap_based_on_language;
             if !should_rewrap {
                 continue;
             }
@@ -8719,11 +8632,9 @@ impl Editor {
                 continue;
             };
 
-            let wrap_column = self.hard_wrap.unwrap_or_else(|| {
-                buffer
-                    .language_settings_at(Point::new(start_row, 0), cx)
-                    .preferred_line_length as usize
-            });
+            let wrap_column = buffer
+                .language_settings_at(Point::new(start_row, 0), cx)
+                .preferred_line_length as usize;
             let wrapped_text = wrap_with_prefix(
                 line_prefix,
                 lines_without_prefixes.join(" "),
@@ -8734,7 +8645,7 @@ impl Editor {
             // TODO: should always use char-based diff while still supporting cursor behavior that
             // matches vim.
             let mut diff_options = DiffOptions::default();
-            if override_language_settings {
+            if is_vim_mode == IsVimMode::Yes {
                 diff_options.max_word_diff_len = 0;
                 diff_options.max_word_diff_line_count = 0;
             } else {
@@ -12328,20 +12239,20 @@ impl Editor {
         // If there are multiple definitions, open them in a multibuffer
         locations.sort_by_key(|location| location.buffer.read(cx).remote_id());
         let mut locations = locations.into_iter().peekable();
+        let mut ranges = Vec::new();
         let capability = workspace.project().read(cx).capability();
 
-        let mut ranges = Vec::new();
         let excerpt_buffer = cx.new(|cx| {
             let mut multibuffer = MultiBuffer::new(capability);
             while let Some(location) = locations.next() {
                 let buffer = location.buffer.read(cx);
                 let mut ranges_for_buffer = Vec::new();
-                let range = location.range.to_point(buffer);
+                let range = location.range.to_offset(buffer);
                 ranges_for_buffer.push(range.clone());
 
                 while let Some(next_location) = locations.peek() {
                     if next_location.buffer == location.buffer {
-                        ranges_for_buffer.push(next_location.range.to_point(buffer));
+                        ranges_for_buffer.push(next_location.range.to_offset(buffer));
                         locations.next();
                     } else {
                         break;
@@ -12349,16 +12260,14 @@ impl Editor {
                 }
 
                 ranges_for_buffer.sort_by_key(|range| (range.start, Reverse(range.end)));
-                multibuffer.set_excerpts_for_path(
-                    PathKey::for_buffer(&buffer, cx),
+                ranges.extend(multibuffer.push_excerpts_with_context_lines(
                     location.buffer.clone(),
                     ranges_for_buffer,
                     DEFAULT_MULTIBUFFER_CONTEXT,
                     cx,
-                );
+                ))
             }
 
-            ranges.extend(multibuffer.primary_excerpt_ranges(cx));
             multibuffer.with_title(title)
         });
 
@@ -12366,6 +12275,7 @@ impl Editor {
             Editor::for_multibuffer(
                 excerpt_buffer,
                 Some(workspace.project().clone()),
+                true,
                 window,
                 cx,
             )
@@ -13945,37 +13855,7 @@ impl Editor {
         }
 
         self.stage_or_unstage_diff_hunks(stage, ranges, cx);
-        let snapshot = self.snapshot(window, cx);
-        let position = self.selections.newest::<Point>(cx).head();
-        let mut row = snapshot
-            .buffer_snapshot
-            .diff_hunks_in_range(position..snapshot.buffer_snapshot.max_point())
-            .find(|hunk| hunk.row_range.start.0 > position.row)
-            .map(|hunk| hunk.row_range.start);
-
-        let all_diff_hunks_expanded = self.buffer().read(cx).all_diff_hunks_expanded();
-        // Outside of the project diff editor, wrap around to the beginning.
-        if !all_diff_hunks_expanded {
-            row = row.or_else(|| {
-                snapshot
-                    .buffer_snapshot
-                    .diff_hunks_in_range(Point::zero()..position)
-                    .find(|hunk| hunk.row_range.end.0 < position.row)
-                    .map(|hunk| hunk.row_range.start)
-            });
-        }
-
-        if let Some(row) = row {
-            let destination = Point::new(row.0, 0);
-            let autoscroll = Autoscroll::center();
-
-            self.unfold_ranges(&[destination..destination], false, false, cx);
-            self.change_selections(Some(autoscroll), window, cx, |s| {
-                s.select_ranges([destination..destination]);
-            });
-        } else if all_diff_hunks_expanded {
-            window.dispatch_action(::git::ExpandCommitEditor.boxed_clone(), cx);
-        }
+        self.go_to_next_hunk(&GoToHunk, window, cx);
     }
 
     fn do_stage_or_unstage(
@@ -14305,11 +14185,6 @@ impl Editor {
         cx.notify();
     }
 
-    pub fn set_hard_wrap(&mut self, hard_wrap: Option<usize>, cx: &mut Context<Self>) {
-        self.hard_wrap = hard_wrap;
-        cx.notify();
-    }
-
     pub fn set_text_style_refinement(&mut self, style: TextStyleRefinement) {
         self.text_style_refinement = Some(style);
     }
@@ -14592,7 +14467,7 @@ impl Editor {
 
     pub fn toggle_git_blame(
         &mut self,
-        _: &::git::Blame,
+        _: &ToggleGitBlame,
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {

crates/editor/src/editor_tests.rs

@@ -16,8 +16,7 @@ use gpui::{
 use indoc::indoc;
 use language::{
     language_settings::{
-        AllLanguageSettings, AllLanguageSettingsContent, CompletionSettings,
-        LanguageSettingsContent, PrettierSettings,
+        AllLanguageSettings, AllLanguageSettingsContent, LanguageSettingsContent, PrettierSettings,
     },
     BracketPairConfig,
     Capability::ReadWrite,
@@ -31,7 +30,7 @@ use pretty_assertions::{assert_eq, assert_ne};
 use project::project_settings::{LspSettings, ProjectSettings};
 use project::FakeFs;
 use serde_json::{self, json};
-use std::{cell::RefCell, future::Future, rc::Rc, sync::atomic::AtomicBool, time::Instant};
+use std::{cell::RefCell, future::Future, rc::Rc, time::Instant};
 use std::{
     iter,
     sync::atomic::{self, AtomicUsize},
@@ -4738,31 +4737,6 @@ async fn test_rewrap(cx: &mut TestAppContext) {
     }
 }
 
-#[gpui::test]
-async fn test_hard_wrap(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-    let mut cx = EditorTestContext::new(cx).await;
-
-    cx.update_editor(|editor, _, cx| {
-        editor.set_hard_wrap(Some(14), cx);
-    });
-
-    cx.set_state(indoc!(
-        "
-        one two three ˇ
-        "
-    ));
-    cx.simulate_input("four");
-    cx.run_until_parked();
-
-    cx.assert_editor_state(indoc!(
-        "
-        one two three
-        fourˇ
-        "
-    ));
-}
-
 #[gpui::test]
 async fn test_clipboard(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
@@ -7676,6 +7650,7 @@ async fn test_multibuffer_format_during_save(cx: &mut TestAppContext) {
             EditorMode::Full,
             multi_buffer,
             Some(project.clone()),
+            true,
             window,
             cx,
         )
@@ -9194,164 +9169,6 @@ async fn test_completion(cx: &mut TestAppContext) {
     apply_additional_edits.await.unwrap();
 }
 
-#[gpui::test]
-async fn test_words_completion(cx: &mut TestAppContext) {
-    let lsp_fetch_timeout_ms = 10;
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettings {
-            words: WordsCompletionMode::Fallback,
-            lsp: true,
-            lsp_fetch_timeout_ms: 10,
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                ..lsp::CompletionOptions::default()
-            }),
-            signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let throttle_completions = Arc::new(AtomicBool::new(false));
-
-    let lsp_throttle_completions = throttle_completions.clone();
-    let _completion_requests_handler =
-        cx.lsp
-            .server
-            .on_request::<lsp::request::Completion, _, _>(move |_, cx| {
-                let lsp_throttle_completions = lsp_throttle_completions.clone();
-                async move {
-                    if lsp_throttle_completions.load(atomic::Ordering::Acquire) {
-                        cx.background_executor()
-                            .timer(Duration::from_millis(lsp_fetch_timeout_ms * 10))
-                            .await;
-                    }
-                    Ok(Some(lsp::CompletionResponse::Array(vec![
-                        lsp::CompletionItem {
-                            label: "first".into(),
-                            ..lsp::CompletionItem::default()
-                        },
-                        lsp::CompletionItem {
-                            label: "last".into(),
-                            ..lsp::CompletionItem::default()
-                        },
-                    ])))
-                }
-            });
-
-    cx.set_state(indoc! {"
-        oneˇ
-        two
-        three
-    "});
-    cx.simulate_keystroke(".");
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, window, cx| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(&menu),
-                &["first", "last"],
-                "When LSP server is fast to reply, no fallback word completions are used"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-        editor.cancel(&Cancel, window, cx);
-    });
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| !editor.context_menu_visible())
-        .await;
-
-    throttle_completions.store(true, atomic::Ordering::Release);
-    cx.simulate_keystroke(".");
-    cx.executor()
-        .advance_clock(Duration::from_millis(lsp_fetch_timeout_ms * 2));
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, _, _| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(completion_menu_entries(&menu), &["one", "three", "two"],
-                "When LSP server is slow, document words can be shown instead, if configured accordingly");
-        } else {
-            panic!("expected completion menu to be open");
-        }
-    });
-}
-
-#[gpui::test]
-async fn test_word_completions_do_not_duplicate_lsp_ones(cx: &mut TestAppContext) {
-    init_test(cx, |language_settings| {
-        language_settings.defaults.completions = Some(CompletionSettings {
-            words: WordsCompletionMode::Enabled,
-            lsp: true,
-            lsp_fetch_timeout_ms: 0,
-        });
-    });
-
-    let mut cx = EditorLspTestContext::new_rust(
-        lsp::ServerCapabilities {
-            completion_provider: Some(lsp::CompletionOptions {
-                trigger_characters: Some(vec![".".to_string(), ":".to_string()]),
-                ..lsp::CompletionOptions::default()
-            }),
-            signature_help_provider: Some(lsp::SignatureHelpOptions::default()),
-            ..lsp::ServerCapabilities::default()
-        },
-        cx,
-    )
-    .await;
-
-    let _completion_requests_handler =
-        cx.lsp
-            .server
-            .on_request::<lsp::request::Completion, _, _>(move |_, _| async move {
-                Ok(Some(lsp::CompletionResponse::Array(vec![
-                    lsp::CompletionItem {
-                        label: "first".into(),
-                        ..lsp::CompletionItem::default()
-                    },
-                    lsp::CompletionItem {
-                        label: "last".into(),
-                        ..lsp::CompletionItem::default()
-                    },
-                ])))
-            });
-
-    cx.set_state(indoc! {"ˇ
-        first
-        last
-        second
-    "});
-    cx.simulate_keystroke(".");
-    cx.executor().run_until_parked();
-    cx.condition(|editor, _| editor.context_menu_visible())
-        .await;
-    cx.update_editor(|editor, window, cx| {
-        if let Some(CodeContextMenu::Completions(menu)) = editor.context_menu.borrow_mut().as_ref()
-        {
-            assert_eq!(
-                completion_menu_entries(&menu),
-                &["first", "last", "second"],
-                "Word completions that has the same edit as the any of the LSP ones, should not be proposed"
-            );
-        } else {
-            panic!("expected completion menu to be open");
-        }
-        editor.cancel(&Cancel, window, cx);
-    });
-}
-
 #[gpui::test]
 async fn test_multiline_completion(cx: &mut TestAppContext) {
     init_test(cx, |_| {});
@@ -13500,6 +13317,7 @@ async fn test_mutlibuffer_in_navigation_history(cx: &mut TestAppContext) {
             EditorMode::Full,
             multi_buffer,
             Some(project.clone()),
+            true,
             window,
             cx,
         )
@@ -13982,8 +13800,9 @@ async fn test_toggle_diff_expand_in_multi_buffer(cx: &mut TestAppContext) {
         multibuffer
     });
 
-    let editor =
-        cx.add_window(|window, cx| Editor::new(EditorMode::Full, multi_buffer, None, window, cx));
+    let editor = cx.add_window(|window, cx| {
+        Editor::new(EditorMode::Full, multi_buffer, None, true, window, cx)
+    });
     editor
         .update(cx, |editor, _window, cx| {
             for (buffer, diff_base) in [
@@ -14102,8 +13921,9 @@ async fn test_expand_diff_hunk_at_excerpt_boundary(cx: &mut TestAppContext) {
         multibuffer
     });
 
-    let editor =
-        cx.add_window(|window, cx| Editor::new(EditorMode::Full, multi_buffer, None, window, cx));
+    let editor = cx.add_window(|window, cx| {
+        Editor::new(EditorMode::Full, multi_buffer, None, true, window, cx)
+    });
     editor
         .update(cx, |editor, _window, cx| {
             let diff = cx.new(|cx| BufferDiff::new_with_base_text(base, &buffer, cx));
@@ -15648,7 +15468,7 @@ async fn test_display_diff_hunks(cx: &mut TestAppContext) {
         for buffer in &buffers {
             let snapshot = buffer.read(cx).snapshot();
             multibuffer.set_excerpts_for_path(
-                PathKey::namespaced(0, buffer.read(cx).file().unwrap().path().clone()),
+                PathKey::namespaced("", buffer.read(cx).file().unwrap().path().clone()),
                 buffer.clone(),
                 vec![text::Anchor::MIN.to_point(&snapshot)..text::Anchor::MAX.to_point(&snapshot)],
                 DEFAULT_MULTIBUFFER_CONTEXT,
@@ -15659,7 +15479,14 @@ async fn test_display_diff_hunks(cx: &mut TestAppContext) {
     });
 
     let editor = cx.add_window(|window, cx| {
-        Editor::new(EditorMode::Full, multibuffer, Some(project), window, cx)
+        Editor::new(
+            EditorMode::Full,
+            multibuffer,
+            Some(project),
+            true,
+            window,
+            cx,
+        )
     });
     cx.run_until_parked();
 
@@ -15678,9 +15505,9 @@ async fn test_display_diff_hunks(cx: &mut TestAppContext) {
     assert_eq!(
         hunks,
         [
-            DisplayRow(2)..DisplayRow(4),
-            DisplayRow(7)..DisplayRow(9),
-            DisplayRow(12)..DisplayRow(14),
+            DisplayRow(3)..DisplayRow(5),
+            DisplayRow(10)..DisplayRow(12),
+            DisplayRow(17)..DisplayRow(19),
         ]
     );
 }
@@ -16111,6 +15938,7 @@ async fn test_find_enclosing_node_with_task(cx: &mut TestAppContext) {
             EditorMode::Full,
             multi_buffer,
             Some(project.clone()),
+            true,
             window,
             cx,
         )
@@ -16265,6 +16093,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
             EditorMode::Full,
             multi_buffer.clone(),
             Some(project.clone()),
+            true,
             window,
             cx,
         )
@@ -16272,7 +16101,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
 
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\naaaa\nbbbb\ncccc\n\n\nffff\ngggg\n\n\njjjj\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
+        "\n\n\naaaa\nbbbb\ncccc\n\n\n\nffff\ngggg\n\n\n\njjjj\n\n\n\n\nllll\nmmmm\nnnnn\n\n\n\nqqqq\nrrrr\n\n\n\nuuuu\n\n\n\n\nvvvv\nwwww\nxxxx\n\n\n\n1111\n2222\n\n\n\n5555\n",
     );
 
     multi_buffer_editor.update(cx, |editor, cx| {
@@ -16280,7 +16109,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
+        "\n\n\n\n\nllll\nmmmm\nnnnn\n\n\n\nqqqq\nrrrr\n\n\n\nuuuu\n\n\n\n\nvvvv\nwwww\nxxxx\n\n\n\n1111\n2222\n\n\n\n5555\n",
         "After folding the first buffer, its text should not be displayed"
     );
 
@@ -16289,7 +16118,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
+        "\n\n\n\n\n\n\nvvvv\nwwww\nxxxx\n\n\n\n1111\n2222\n\n\n\n5555\n",
         "After folding the second buffer, its text should not be displayed"
     );
 
@@ -16314,7 +16143,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n",
+        "\n\n\n\n\nllll\nmmmm\nnnnn\n\n\n\nqqqq\nrrrr\n\n\n\nuuuu\n\n\n",
         "After unfolding the second buffer, its text should be displayed"
     );
 
@@ -16336,7 +16165,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
 
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\nB\n\n\n\n\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n",
+        "\n\n\nB\n\n\n\n\n\n\n\n\n\n\nllll\nmmmm\nnnnn\n\n\n\nqqqq\nrrrr\n\n\n\nuuuu\n\n\n",
         "After unfolding the first buffer, its and 2nd buffer's text should be displayed"
     );
 
@@ -16345,7 +16174,7 @@ async fn test_folding_buffers(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\nB\n\n\n\n\n\n\nllll\nmmmm\nnnnn\n\n\nqqqq\nrrrr\n\n\nuuuu\n\n\nvvvv\nwwww\nxxxx\n\n\n1111\n2222\n\n\n5555",
+        "\n\n\nB\n\n\n\n\n\n\n\n\n\n\nllll\nmmmm\nnnnn\n\n\n\nqqqq\nrrrr\n\n\n\nuuuu\n\n\n\n\nvvvv\nwwww\nxxxx\n\n\n\n1111\n2222\n\n\n\n5555\n",
         "After unfolding the all buffers, all original text should be displayed"
     );
 }
@@ -16431,12 +16260,13 @@ async fn test_folding_buffers_with_one_excerpt(cx: &mut TestAppContext) {
             EditorMode::Full,
             multi_buffer,
             Some(project.clone()),
+            true,
             window,
             cx,
         )
     });
 
-    let full_text = "\n\n1111\n2222\n3333\n\n\n4444\n5555\n6666\n\n\n7777\n8888\n9999";
+    let full_text = "\n\n\n1111\n2222\n3333\n\n\n\n\n4444\n5555\n6666\n\n\n\n\n7777\n8888\n9999\n";
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
         full_text,
@@ -16447,7 +16277,7 @@ async fn test_folding_buffers_with_one_excerpt(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n4444\n5555\n6666\n\n\n7777\n8888\n9999",
+        "\n\n\n\n\n4444\n5555\n6666\n\n\n\n\n7777\n8888\n9999\n",
         "After folding the first buffer, its text should not be displayed"
     );
 
@@ -16457,7 +16287,7 @@ async fn test_folding_buffers_with_one_excerpt(cx: &mut TestAppContext) {
 
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n\n\n7777\n8888\n9999",
+        "\n\n\n\n\n\n\n7777\n8888\n9999\n",
         "After folding the second buffer, its text should not be displayed"
     );
 
@@ -16475,7 +16305,7 @@ async fn test_folding_buffers_with_one_excerpt(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n\n\n4444\n5555\n6666\n\n",
+        "\n\n\n\n\n4444\n5555\n6666\n\n\n",
         "After unfolding the second buffer, its text should be displayed"
     );
 
@@ -16484,7 +16314,7 @@ async fn test_folding_buffers_with_one_excerpt(cx: &mut TestAppContext) {
     });
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
-        "\n\n1111\n2222\n3333\n\n\n4444\n5555\n6666\n\n",
+        "\n\n\n1111\n2222\n3333\n\n\n\n\n4444\n5555\n6666\n\n\n",
         "After unfolding the first buffer, its text should be displayed"
     );
 
@@ -16550,6 +16380,7 @@ async fn test_folding_buffer_when_multibuffer_has_only_one_excerpt(cx: &mut Test
             EditorMode::Full,
             multi_buffer,
             Some(project.clone()),
+            true,
             window,
             cx,
         )
@@ -16568,7 +16399,7 @@ async fn test_folding_buffer_when_multibuffer_has_only_one_excerpt(cx: &mut Test
         editor.change_selections(None, window, cx, |s| s.select_ranges(Some(highlight_range)));
     });
 
-    let full_text = format!("\n\n{sample_text}");
+    let full_text = format!("\n\n\n{sample_text}\n");
     assert_eq!(
         multi_buffer_editor.update(cx, |editor, cx| editor.display_text(cx)),
         full_text,
@@ -16597,7 +16428,14 @@ async fn test_multi_buffer_navigation_with_folded_buffers(cx: &mut TestAppContex
             ],
             cx,
         );
-        let mut editor = Editor::new(EditorMode::Full, multi_buffer.clone(), None, window, cx);
+        let mut editor = Editor::new(
+            EditorMode::Full,
+            multi_buffer.clone(),
+            None,
+            true,
+            window,
+            cx,
+        );
 
         let buffer_ids = multi_buffer.read(cx).excerpt_buffer_ids();
         // fold all but the second buffer, so that we test navigating between two
@@ -16909,7 +16747,7 @@ async fn assert_highlighted_edits(
 ) {
     let window = cx.add_window(|window, cx| {
         let buffer = MultiBuffer::build_simple(text, cx);
-        Editor::new(EditorMode::Full, buffer, None, window, cx)
+        Editor::new(EditorMode::Full, buffer, None, true, window, cx)
     });
     let cx = &mut VisualTestContext::from_window(*window, cx);
 

crates/editor/src/element.rs

@@ -18,12 +18,12 @@ use crate::{
     scroll::{axis_pair, scroll_amount::ScrollAmount, AxisPair},
     BlockId, ChunkReplacement, CursorShape, CustomBlockId, DisplayDiffHunk, DisplayPoint,
     DisplayRow, DocumentHighlightRead, DocumentHighlightWrite, EditDisplayMode, Editor, EditorMode,
-    EditorSettings, EditorSnapshot, EditorStyle, FocusedBlock, GoToHunk, GoToPreviousHunk,
-    GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor, InlayHintRefreshReason,
-    InlineCompletion, JumpData, LineDown, LineHighlight, LineUp, OpenExcerpts, PageDown, PageUp,
-    Point, RowExt, RowRangeExt, SelectPhase, SelectedTextHighlight, Selection, SoftWrap,
-    StickyHeaderExcerpt, ToPoint, ToggleFold, COLUMNAR_SELECTION_MODIFIERS, CURSORS_VISIBLE_FOR,
-    FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
+    EditorSettings, EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GoToHunk,
+    GoToPreviousHunk, GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor,
+    InlayHintRefreshReason, InlineCompletion, JumpData, LineDown, LineHighlight, LineUp,
+    OpenExcerpts, PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, SelectedTextHighlight,
+    Selection, SoftWrap, StickyHeaderExcerpt, ToPoint, ToggleFold, COLUMNAR_SELECTION_MODIFIERS,
+    CURSORS_VISIBLE_FOR, FILE_HEADER_HEIGHT, GIT_BLAME_MAX_AUTHOR_CHARS_DISPLAYED, MAX_LINE_LEN,
     MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
 };
 use buffer_diff::{DiffHunkStatus, DiffHunkStatusKind};
@@ -32,14 +32,15 @@ use collections::{BTreeMap, HashMap, HashSet};
 use file_icons::FileIcons;
 use git::{blame::BlameEntry, status::FileStatus, Oid};
 use gpui::{
-    anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline, point, px, quad,
-    relative, size, solid_background, transparent_black, Action, AnyElement, App, AvailableSpace,
-    Axis, Bounds, ClickEvent, ClipboardItem, ContentMask, Context, Corner, Corners, CursorStyle,
-    DispatchPhase, Edges, Element, ElementInputHandler, Entity, Focusable as _, FontId,
-    GlobalElementId, Hitbox, Hsla, InteractiveElement, IntoElement, Keystroke, Length,
-    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad,
-    ParentElement, Pixels, ScrollDelta, ScrollWheelEvent, ShapedLine, SharedString, Size,
-    StatefulInteractiveElement, Style, Styled, Subscription, TextRun, TextStyleRefinement, Window,
+    anchored, deferred, div, fill, linear_color_stop, linear_gradient, outline, pattern_slash,
+    point, px, quad, relative, size, solid_background, svg, transparent_black, Action, AnyElement,
+    App, AvailableSpace, Axis, Bounds, ClickEvent, ClipboardItem, ContentMask, Context, Corner,
+    Corners, CursorStyle, DispatchPhase, Edges, Element, ElementInputHandler, Entity,
+    Focusable as _, FontId, GlobalElementId, Hitbox, Hsla, InteractiveElement, IntoElement,
+    Keystroke, Length, ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent,
+    MouseUpEvent, PaintQuad, ParentElement, Pixels, ScrollDelta, ScrollWheelEvent, ShapedLine,
+    SharedString, Size, StatefulInteractiveElement, Style, Styled, Subscription, TextRun,
+    TextStyleRefinement, Window,
 };
 use inline_completion::Direction;
 use itertools::Itertools;
@@ -52,10 +53,10 @@ use language::{
 };
 use lsp::DiagnosticSeverity;
 use multi_buffer::{
-    Anchor, ExcerptId, ExcerptInfo, ExpandExcerptDirection, ExpandInfo, MultiBufferPoint,
-    MultiBufferRow, RowInfo,
+    Anchor, ExcerptId, ExcerptInfo, ExpandExcerptDirection, MultiBufferPoint, MultiBufferRow,
+    RowInfo,
 };
-use project::project_settings::{self, GitGutterSetting, ProjectSettings};
+use project::project_settings::{self, GitGutterSetting, GitHunkStyleSetting, ProjectSettings};
 use settings::Settings;
 use smallvec::{smallvec, SmallVec};
 use std::{
@@ -72,7 +73,7 @@ use sum_tree::Bias;
 use text::BufferId;
 use theme::{ActiveTheme, Appearance, BufferLineHeight, PlayerColor};
 use ui::{
-    h_flex, prelude::*, ButtonLike, ContextMenu, IconButtonShape, KeyBinding, Tooltip,
+    h_flex, prelude::*, ButtonLike, ButtonStyle, ContextMenu, IconButtonShape, KeyBinding, Tooltip,
     POPOVER_Y_PADDING,
 };
 use unicode_segmentation::UnicodeSegmentation;
@@ -1515,19 +1516,6 @@ impl EditorElement {
         }
     }
 
-    fn prepaint_expand_toggles(
-        &self,
-        expand_toggles: &mut [Option<(AnyElement, gpui::Point<Pixels>)>],
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for (expand_toggle, origin) in expand_toggles.iter_mut().flatten() {
-            let available_space = size(AvailableSpace::MinContent, AvailableSpace::MinContent);
-            expand_toggle.layout_as_root(available_space, window, cx);
-            expand_toggle.prepaint_as_root(*origin, available_space, window, cx);
-        }
-    }
-
     fn prepaint_crease_trailers(
         &self,
         trailers: Vec<Option<AnyElement>>,
@@ -2022,7 +2010,6 @@ impl EditorElement {
         &self,
         line_height: Pixels,
         range: Range<DisplayRow>,
-        row_infos: &[RowInfo],
         scroll_pixel_position: gpui::Point<Pixels>,
         gutter_dimensions: &GutterDimensions,
         gutter_hitbox: &Hitbox,
@@ -2088,12 +2075,6 @@ impl EditorElement {
                         }
                     }
                     let display_row = multibuffer_point.to_display_point(snapshot).row();
-                    if row_infos
-                        .get((display_row - range.start).0 as usize)
-                        .is_some_and(|row_info| row_info.expand_info.is_some())
-                    {
-                        return None;
-                    }
                     let button = editor.render_run_indicator(
                         &self.style,
                         Some(display_row) == active_task_indicator_row,
@@ -2118,82 +2099,6 @@ impl EditorElement {
         })
     }
 
-    fn layout_excerpt_gutter(
-        &self,
-        gutter_hitbox: &Hitbox,
-        line_height: Pixels,
-        scroll_position: gpui::Point<f32>,
-        buffer_rows: &[RowInfo],
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Vec<Option<(AnyElement, gpui::Point<Pixels>)>> {
-        let editor_font_size = self.style.text.font_size.to_pixels(window.rem_size()) * 1.2;
-
-        let icon_size = editor_font_size.round();
-        let button_h_padding = ((icon_size - px(1.0)) / 2.0).round() - px(2.0);
-
-        let scroll_top = scroll_position.y * line_height;
-
-        let elements = buffer_rows
-            .into_iter()
-            .enumerate()
-            .map(|(ix, row_info)| {
-                let ExpandInfo {
-                    excerpt_id,
-                    direction,
-                } = row_info.expand_info?;
-
-                let icon_name = match direction {
-                    ExpandExcerptDirection::Up => IconName::ExpandUp,
-                    ExpandExcerptDirection::Down => IconName::ExpandDown,
-                    ExpandExcerptDirection::UpAndDown => IconName::ExpandVertical,
-                };
-
-                let editor = self.editor.clone();
-                let max_row = self
-                    .editor
-                    .read(cx)
-                    .buffer()
-                    .read(cx)
-                    .snapshot(cx)
-                    .widest_line_number();
-                let is_wide = max_row > 999
-                    && row_info
-                        .buffer_row
-                        .is_some_and(|row| row.ilog10() == max_row.ilog10());
-
-                let toggle = IconButton::new(("expand", ix), icon_name)
-                    .icon_color(Color::Custom(cx.theme().colors().editor_line_number))
-                    .selected_icon_color(Color::Custom(cx.theme().colors().editor_foreground))
-                    .icon_size(IconSize::Custom(rems(editor_font_size / window.rem_size())))
-                    .width((icon_size + button_h_padding * 2).into())
-                    .when(is_wide, |el| {
-                        el.width((icon_size + button_h_padding).into())
-                    })
-                    .on_click(move |_, _, cx| {
-                        editor.update(cx, |editor, cx| {
-                            editor.expand_excerpt(excerpt_id, direction, cx);
-                        });
-                    })
-                    .tooltip(Tooltip::for_action_title(
-                        "Expand excerpt",
-                        &crate::actions::ExpandExcerpts::default(),
-                    ))
-                    .into_any_element();
-
-                let position = point(
-                    px(1.),
-                    ix as f32 * line_height - (scroll_top % line_height) + px(1.),
-                );
-                let origin = gutter_hitbox.origin + position;
-
-                Some((toggle, origin))
-            })
-            .collect();
-
-        elements
-    }
-
     fn layout_code_actions_indicator(
         &self,
         line_height: Pixels,
@@ -2411,9 +2316,6 @@ impl EditorElement {
                 .into_iter()
                 .enumerate()
                 .map(|(ix, info)| {
-                    if info.expand_info.is_some() {
-                        return None;
-                    }
                     let row = info.multibuffer_row?;
                     let display_row = DisplayRow(rows.start.0 + ix as u32);
                     let active = active_rows.contains_key(&display_row);
@@ -2436,9 +2338,6 @@ impl EditorElement {
         buffer_rows
             .into_iter()
             .map(|row_info| {
-                if row_info.expand_info.is_some() {
-                    return None;
-                }
                 if let Some(row) = row_info.multibuffer_row {
                     snapshot.render_crease_trailer(row, window, cx)
                 } else {
@@ -2616,11 +2515,25 @@ impl EditorElement {
 
             Block::FoldedBuffer {
                 first_excerpt,
+                prev_excerpt,
+                show_excerpt_controls,
                 height,
-                ..
             } => {
                 let selected = selected_buffer_ids.contains(&first_excerpt.buffer_id);
-                let result = v_flex().id(block_id).w_full();
+                let mut result = v_flex().id(block_id).w_full();
+
+                if let Some(prev_excerpt) = prev_excerpt {
+                    if *show_excerpt_controls {
+                        result = result.child(self.render_expand_excerpt_control(
+                            block_id,
+                            ExpandExcerptDirection::Down,
+                            prev_excerpt.id,
+                            gutter_dimensions,
+                            window,
+                            cx,
+                        ));
+                    }
+                }
 
                 let jump_data = header_jump_data(snapshot, block_row_start, *height, first_excerpt);
                 result
@@ -2628,7 +2541,6 @@ impl EditorElement {
                         first_excerpt,
                         true,
                         selected,
-                        false,
                         jump_data,
                         window,
                         cx,
@@ -2637,14 +2549,28 @@ impl EditorElement {
             }
 
             Block::ExcerptBoundary {
+                prev_excerpt,
                 next_excerpt,
+                show_excerpt_controls,
                 height,
                 starts_new_buffer,
-                ..
             } => {
                 let color = cx.theme().colors().clone();
                 let mut result = v_flex().id(block_id).w_full();
 
+                if let Some(prev_excerpt) = prev_excerpt {
+                    if *show_excerpt_controls {
+                        result = result.child(self.render_expand_excerpt_control(
+                            block_id,
+                            ExpandExcerptDirection::Down,
+                            prev_excerpt.id,
+                            gutter_dimensions,
+                            window,
+                            cx,
+                        ));
+                    }
+                }
+
                 if let Some(next_excerpt) = next_excerpt {
                     let jump_data =
                         header_jump_data(snapshot, block_row_start, *height, next_excerpt);
@@ -2657,7 +2583,6 @@ impl EditorElement {
                                 next_excerpt,
                                 false,
                                 selected,
-                                false,
                                 jump_data,
                                 window,
                                 cx,
@@ -2666,17 +2591,40 @@ impl EditorElement {
                             result = result
                                 .child(div().h(FILE_HEADER_HEIGHT as f32 * window.line_height()));
                         }
+
+                        if *show_excerpt_controls {
+                            result = result.child(self.render_expand_excerpt_control(
+                                block_id,
+                                ExpandExcerptDirection::Up,
+                                next_excerpt.id,
+                                gutter_dimensions,
+                                window,
+                                cx,
+                            ));
+                        }
                     } else {
-                        result = result.child(
-                            h_flex().relative().child(
-                                div()
-                                    .top(line_height / 2.)
-                                    .absolute()
-                                    .w_full()
-                                    .h_px()
-                                    .bg(color.border_variant),
-                            ),
-                        );
+                        if *show_excerpt_controls {
+                            result = result.child(
+                                h_flex()
+                                    .relative()
+                                    .child(
+                                        div()
+                                            .top(px(0.))
+                                            .absolute()
+                                            .w_full()
+                                            .h_px()
+                                            .bg(color.border_variant),
+                                    )
+                                    .child(self.render_expand_excerpt_control(
+                                        block_id,
+                                        ExpandExcerptDirection::Up,
+                                        next_excerpt.id,
+                                        gutter_dimensions,
+                                        window,
+                                        cx,
+                                    )),
+                            );
+                        }
                     };
                 }
 
@@ -2715,7 +2663,6 @@ impl EditorElement {
         for_excerpt: &ExcerptInfo,
         is_folded: bool,
         is_selected: bool,
-        _is_sticky: bool,
         jump_data: JumpData,
         window: &mut Window,
         cx: &mut App,
@@ -2762,7 +2709,7 @@ impl EditorElement {
                     .pl_0p5()
                     .pr_5()
                     .rounded_sm()
-                    // .when(is_sticky, |el| el.shadow_md())
+                    .shadow_md()
                     .border_1()
                     .map(|div| {
                         let border_color = if is_selected
@@ -2901,6 +2848,95 @@ impl EditorElement {
             )
     }
 
+    fn render_expand_excerpt_control(
+        &self,
+        block_id: BlockId,
+        direction: ExpandExcerptDirection,
+        excerpt_id: ExcerptId,
+        gutter_dimensions: &GutterDimensions,
+        window: &Window,
+        cx: &mut App,
+    ) -> impl IntoElement {
+        let color = cx.theme().colors().clone();
+        let hover_color = color.border_variant.opacity(0.5);
+        let focus_handle = self.editor.focus_handle(cx).clone();
+
+        let icon_offset =
+            gutter_dimensions.width - (gutter_dimensions.left_padding + gutter_dimensions.margin);
+        let header_height = MULTI_BUFFER_EXCERPT_HEADER_HEIGHT as f32 * window.line_height();
+        let group_name = if direction == ExpandExcerptDirection::Down {
+            "expand-down"
+        } else {
+            "expand-up"
+        };
+
+        let expand_area = |id: SharedString| {
+            h_flex()
+                .id(id)
+                .w_full()
+                .cursor_pointer()
+                .block_mouse_down()
+                .on_mouse_move(|_, _, cx| cx.stop_propagation())
+                .hover(|style| style.bg(hover_color))
+                .tooltip({
+                    let focus_handle = focus_handle.clone();
+                    move |window, cx| {
+                        Tooltip::for_action_in(
+                            "Expand Excerpt",
+                            &ExpandExcerpts { lines: 0 },
+                            &focus_handle,
+                            window,
+                            cx,
+                        )
+                    }
+                })
+        };
+
+        expand_area(
+            format!(
+                "block-{}-{}",
+                block_id,
+                if direction == ExpandExcerptDirection::Down {
+                    "down"
+                } else {
+                    "up"
+                }
+            )
+            .into(),
+        )
+        .group(group_name)
+        .child(
+            h_flex()
+                .w(icon_offset)
+                .h(header_height)
+                .flex_none()
+                .justify_end()
+                .child(
+                    ButtonLike::new("expand-icon")
+                        .style(ButtonStyle::Transparent)
+                        .child(
+                            svg()
+                                .path(if direction == ExpandExcerptDirection::Down {
+                                    IconName::ArrowDownFromLine.path()
+                                } else {
+                                    IconName::ArrowUpFromLine.path()
+                                })
+                                .size(IconSize::XSmall.rems())
+                                .text_color(cx.theme().colors().editor_line_number)
+                                .group_hover(group_name, |style| {
+                                    style.text_color(cx.theme().colors().editor_active_line_number)
+                                }),
+                        ),
+                ),
+        )
+        .on_click(window.listener_for(&self.editor, {
+            move |editor, _, _, cx| {
+                editor.expand_excerpt(excerpt_id, direction, cx);
+                cx.stop_propagation();
+            }
+        }))
+    }
+
     fn render_blocks(
         &self,
         rows: Range<DisplayRow>,
@@ -3132,6 +3168,7 @@ impl EditorElement {
         &self,
         StickyHeaderExcerpt {
             excerpt,
+            next_excerpt_controls_present,
             next_buffer_row,
         }: StickyHeaderExcerpt<'_>,
         scroll_position: f32,
@@ -3168,7 +3205,7 @@ impl EditorElement {
                     .top_0(),
             )
             .child(
-                self.render_buffer_header(excerpt, false, selected, true, jump_data, window, cx)
+                self.render_buffer_header(excerpt, false, selected, jump_data, window, cx)
                     .into_any_element(),
             )
             .into_any_element();
@@ -3178,7 +3215,11 @@ impl EditorElement {
         if let Some(next_buffer_row) = next_buffer_row {
             // Push up the sticky header when the excerpt is getting close to the top of the viewport
 
-            let max_row = next_buffer_row - FILE_HEADER_HEIGHT * 2;
+            let mut max_row = next_buffer_row - FILE_HEADER_HEIGHT * 2;
+
+            if next_excerpt_controls_present {
+                max_row -= MULTI_BUFFER_EXCERPT_HEADER_HEIGHT;
+            }
 
             let offset = scroll_position - max_row as f32;
 
@@ -4315,6 +4356,13 @@ impl EditorElement {
     }
 
     fn paint_gutter_diff_hunks(layout: &mut EditorLayout, window: &mut Window, cx: &mut App) {
+        let is_light = cx.theme().appearance().is_light();
+
+        let hunk_style = ProjectSettings::get_global(cx)
+            .git
+            .hunk_style
+            .unwrap_or_default();
+
         if layout.display_hunks.is_empty() {
             return;
         }
@@ -4375,7 +4423,28 @@ impl EditorElement {
                     }),
                 };
 
-                if let Some((hunk_bounds, background_color, corner_radii, _)) = hunk_to_paint {
+                if let Some((hunk_bounds, mut background_color, corner_radii, secondary_status)) =
+                    hunk_to_paint
+                {
+                    match hunk_style {
+                        GitHunkStyleSetting::Transparent | GitHunkStyleSetting::Pattern => {
+                            if secondary_status.has_secondary_hunk() {
+                                background_color =
+                                    background_color.opacity(if is_light { 0.2 } else { 0.32 });
+                            }
+                        }
+                        GitHunkStyleSetting::StagedPattern
+                        | GitHunkStyleSetting::StagedTransparent => {
+                            if !secondary_status.has_secondary_hunk() {
+                                background_color =
+                                    background_color.opacity(if is_light { 0.2 } else { 0.32 });
+                            }
+                        }
+                        GitHunkStyleSetting::StagedBorder | GitHunkStyleSetting::Border => {
+                            // Don't change the background color
+                        }
+                    }
+
                     // Flatten the background color with the editor color to prevent
                     // elements below transparent hunks from showing through
                     let flattened_background_color = cx
@@ -4474,12 +4543,6 @@ impl EditorElement {
                 }
             });
 
-            window.with_element_namespace("expand_toggles", |window| {
-                for (expand_toggle, _) in layout.expand_toggles.iter_mut().flatten() {
-                    expand_toggle.paint(window, cx);
-                }
-            });
-
             for test_indicator in layout.test_indicators.iter_mut() {
                 test_indicator.paint(window, cx);
             }
@@ -6735,6 +6798,10 @@ impl Element for EditorElement {
                         .update(cx, |editor, cx| editor.highlighted_display_rows(window, cx));
 
                     let is_light = cx.theme().appearance().is_light();
+                    let hunk_style = ProjectSettings::get_global(cx)
+                        .git
+                        .hunk_style
+                        .unwrap_or_default();
 
                     for (ix, row_info) in row_infos.iter().enumerate() {
                         let Some(diff_status) = row_info.diff_status else {
@@ -6754,23 +6821,69 @@ impl Element for EditorElement {
 
                         let unstaged = diff_status.has_secondary_hunk();
                         let hunk_opacity = if is_light { 0.16 } else { 0.12 };
+                        let slash_width = line_height.0 / 1.5; // ~16 by default
 
-                        let staged_highlight = LineHighlight {
-                            background: (background_color.opacity(if is_light {
-                                0.08
-                            } else {
-                                0.06
-                            }))
-                            .into(),
-                            border: Some(if is_light {
-                                background_color.opacity(0.48)
-                            } else {
-                                background_color.opacity(0.36)
-                            }),
+                        let staged_highlight: LineHighlight = match hunk_style {
+                            GitHunkStyleSetting::Transparent
+                            | GitHunkStyleSetting::Pattern
+                            | GitHunkStyleSetting::Border => {
+                                solid_background(background_color.opacity(hunk_opacity)).into()
+                            }
+                            GitHunkStyleSetting::StagedPattern => {
+                                pattern_slash(background_color.opacity(hunk_opacity), slash_width)
+                                    .into()
+                            }
+                            GitHunkStyleSetting::StagedTransparent => {
+                                solid_background(background_color.opacity(if is_light {
+                                    0.08
+                                } else {
+                                    0.04
+                                }))
+                                .into()
+                            }
+                            GitHunkStyleSetting::StagedBorder => LineHighlight {
+                                background: (background_color.opacity(if is_light {
+                                    0.08
+                                } else {
+                                    0.06
+                                }))
+                                .into(),
+                                border: Some(if is_light {
+                                    background_color.opacity(0.48)
+                                } else {
+                                    background_color.opacity(0.36)
+                                }),
+                            },
                         };
 
-                        let unstaged_highlight =
-                            solid_background(background_color.opacity(hunk_opacity)).into();
+                        let unstaged_highlight = match hunk_style {
+                            GitHunkStyleSetting::Transparent => {
+                                solid_background(background_color.opacity(if is_light {
+                                    0.08
+                                } else {
+                                    0.04
+                                }))
+                                .into()
+                            }
+                            GitHunkStyleSetting::Pattern => {
+                                pattern_slash(background_color.opacity(hunk_opacity), slash_width)
+                                    .into()
+                            }
+                            GitHunkStyleSetting::Border => LineHighlight {
+                                background: (background_color.opacity(if is_light {
+                                    0.08
+                                } else {
+                                    0.02
+                                }))
+                                .into(),
+                                border: Some(background_color.opacity(0.5)),
+                            },
+                            GitHunkStyleSetting::StagedPattern
+                            | GitHunkStyleSetting::StagedTransparent
+                            | GitHunkStyleSetting::StagedBorder => {
+                                solid_background(background_color.opacity(hunk_opacity)).into()
+                            }
+                        };
 
                         let background = if unstaged {
                             unstaged_highlight
@@ -6857,18 +6970,6 @@ impl Element for EditorElement {
                         cx,
                     );
 
-                    let mut expand_toggles =
-                        window.with_element_namespace("expand_toggles", |window| {
-                            self.layout_excerpt_gutter(
-                                &gutter_hitbox,
-                                line_height,
-                                scroll_position,
-                                &row_infos,
-                                window,
-                                cx,
-                            )
-                        });
-
                     let mut crease_toggles =
                         window.with_element_namespace("crease_toggles", |window| {
                             self.layout_crease_toggles(
@@ -6966,7 +7067,7 @@ impl Element for EditorElement {
                     let mut scroll_width = scroll_range_bounds.size.width;
 
                     let sticky_header_excerpt = if snapshot.buffer_snapshot.show_headers() {
-                        snapshot.sticky_header_excerpt(scroll_position.y)
+                        snapshot.sticky_header_excerpt(start_row)
                     } else {
                         None
                     };
@@ -7283,14 +7384,7 @@ impl Element for EditorElement {
                                             .tasks
                                             .contains_key(&(buffer_id, row));
 
-                                        let has_expand_indicator = row_infos
-                                            .get(
-                                                (newest_selection_head.row() - start_row).0
-                                                    as usize,
-                                            )
-                                            .is_some_and(|row_info| row_info.expand_info.is_some());
-
-                                        if !has_test_indicator && !has_expand_indicator {
+                                        if !has_test_indicator {
                                             code_actions_indicator = self
                                                 .layout_code_actions_indicator(
                                                     line_height,
@@ -7323,7 +7417,6 @@ impl Element for EditorElement {
                         self.layout_run_indicators(
                             line_height,
                             start_row..end_row,
-                            &row_infos,
                             scroll_pixel_position,
                             &gutter_dimensions,
                             &gutter_hitbox,
@@ -7386,10 +7479,6 @@ impl Element for EditorElement {
                         )
                     });
 
-                    window.with_element_namespace("expand_toggles", |window| {
-                        self.prepaint_expand_toggles(&mut expand_toggles, window, cx)
-                    });
-
                     let invisible_symbol_font_size = font_size / 2.;
                     let tab_invisible = window
                         .text_system()
@@ -7491,7 +7580,6 @@ impl Element for EditorElement {
                         tab_invisible,
                         space_invisible,
                         sticky_buffer_header,
-                        expand_toggles,
                     }
                 })
             })
@@ -7665,7 +7753,6 @@ pub struct EditorLayout {
     code_actions_indicator: Option<AnyElement>,
     test_indicators: Vec<AnyElement>,
     crease_toggles: Vec<Option<AnyElement>>,
-    expand_toggles: Vec<Option<(AnyElement, gpui::Point<Pixels>)>>,
     diff_hunk_controls: Vec<AnyElement>,
     crease_trailers: Vec<Option<CreaseTrailerLayout>>,
     inline_completion_popover: Option<AnyElement>,
@@ -8299,7 +8386,7 @@ mod tests {
         init_test(cx, |_| {});
         let window = cx.add_window(|window, cx| {
             let buffer = MultiBuffer::build_simple(&sample_text(6, 6, 'a'), cx);
-            Editor::new(EditorMode::Full, buffer, None, window, cx)
+            Editor::new(EditorMode::Full, buffer, None, true, window, cx)
         });
 
         let editor = window.root(cx).unwrap();
@@ -8399,7 +8486,7 @@ mod tests {
 
         let window = cx.add_window(|window, cx| {
             let buffer = MultiBuffer::build_simple(&(sample_text(6, 6, 'a') + "\n"), cx);
-            Editor::new(EditorMode::Full, buffer, None, window, cx)
+            Editor::new(EditorMode::Full, buffer, None, true, window, cx)
         });
         let cx = &mut VisualTestContext::from_window(*window, cx);
         let editor = window.root(cx).unwrap();
@@ -8462,6 +8549,90 @@ mod tests {
             state.active_rows.keys().cloned().collect::<Vec<_>>(),
             vec![DisplayRow(0), DisplayRow(3), DisplayRow(5), DisplayRow(6)]
         );
+
+        // multi-buffer support
+        // in DisplayPoint coordinates, this is what we're dealing with:
+        //  0: [[file
+        //  1:   header
+        //  2:   section]]
+        //  3: aaaaaa
+        //  4: bbbbbb
+        //  5: cccccc
+        //  6:
+        //  7: [[footer]]
+        //  8: [[header]]
+        //  9: ffffff
+        // 10: gggggg
+        // 11: hhhhhh
+        // 12:
+        // 13: [[footer]]
+        // 14: [[file
+        // 15:   header
+        // 16:   section]]
+        // 17: bbbbbb
+        // 18: cccccc
+        // 19: dddddd
+        // 20: [[footer]]
+        let window = cx.add_window(|window, cx| {
+            let buffer = MultiBuffer::build_multi(
+                [
+                    (
+                        &(sample_text(8, 6, 'a') + "\n"),
+                        vec![
+                            Point::new(0, 0)..Point::new(3, 0),
+                            Point::new(4, 0)..Point::new(7, 0),
+                        ],
+                    ),
+                    (
+                        &(sample_text(8, 6, 'a') + "\n"),
+                        vec![Point::new(1, 0)..Point::new(3, 0)],
+                    ),
+                ],
+                cx,
+            );
+            Editor::new(EditorMode::Full, buffer, None, true, window, cx)
+        });
+        let editor = window.root(cx).unwrap();
+        let style = cx.update(|_, cx| editor.read(cx).style().unwrap().clone());
+        let _state = window.update(cx, |editor, window, cx| {
+            editor.cursor_shape = CursorShape::Block;
+            editor.change_selections(None, window, cx, |s| {
+                s.select_display_ranges([
+                    DisplayPoint::new(DisplayRow(4), 0)..DisplayPoint::new(DisplayRow(7), 0),
+                    DisplayPoint::new(DisplayRow(10), 0)..DisplayPoint::new(DisplayRow(13), 0),
+                ]);
+            });
+        });
+
+        let (_, state) = cx.draw(
+            point(px(500.), px(500.)),
+            size(px(500.), px(500.)),
+            |_, _| EditorElement::new(&editor, style),
+        );
+        assert_eq!(state.selections.len(), 1);
+        let local_selections = &state.selections[0].1;
+        assert_eq!(local_selections.len(), 2);
+
+        // moves cursor on excerpt boundary back a line
+        // and doesn't allow selection to bleed through
+        assert_eq!(
+            local_selections[0].range,
+            DisplayPoint::new(DisplayRow(4), 0)..DisplayPoint::new(DisplayRow(7), 0)
+        );
+        assert_eq!(
+            local_selections[0].head,
+            DisplayPoint::new(DisplayRow(6), 0)
+        );
+        // moves cursor on buffer boundary back two lines
+        // and doesn't allow selection to bleed through
+        assert_eq!(
+            local_selections[1].range,
+            DisplayPoint::new(DisplayRow(10), 0)..DisplayPoint::new(DisplayRow(13), 0)
+        );
+        assert_eq!(
+            local_selections[1].head,
+            DisplayPoint::new(DisplayRow(12), 0)
+        );
     }
 
     #[gpui::test]
@@ -8470,7 +8641,7 @@ mod tests {
 
         let window = cx.add_window(|window, cx| {
             let buffer = MultiBuffer::build_simple("", cx);
-            Editor::new(EditorMode::Full, buffer, None, window, cx)
+            Editor::new(EditorMode::Full, buffer, None, true, window, cx)
         });
         let cx = &mut VisualTestContext::from_window(*window, cx);
         let editor = window.root(cx).unwrap();
@@ -8696,7 +8867,7 @@ mod tests {
         );
         let window = cx.add_window(|window, cx| {
             let buffer = MultiBuffer::build_simple(input_text, cx);
-            Editor::new(editor_mode, buffer, None, window, cx)
+            Editor::new(editor_mode, buffer, None, true, window, cx)
         });
         let cx = &mut VisualTestContext::from_window(*window, cx);
         let editor = window.root(cx).unwrap();

crates/editor/src/git/blame.rs

@@ -488,7 +488,7 @@ async fn parse_commit_messages(
                 },
             ))
         } else {
-            None
+            continue;
         };
 
         let remote = parsed_remote_url

crates/editor/src/inlay_hint_cache.rs

@@ -2618,7 +2618,7 @@ pub mod tests {
 
         cx.executor().run_until_parked();
         let editor = cx.add_window(|window, cx| {
-            Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx)
+            Editor::for_multibuffer(multibuffer, Some(project.clone()), true, window, cx)
         });
 
         let editor_edited = Arc::new(AtomicBool::new(false));
@@ -2830,6 +2830,7 @@ pub mod tests {
                     "main hint #5".to_string(),
                     "other hint(edited) #0".to_string(),
                     "other hint(edited) #1".to_string(),
+                    "other hint(edited) #2".to_string(),
                 ];
                 assert_eq!(
                     expected_hints,
@@ -2920,7 +2921,7 @@ pub mod tests {
 
         cx.executor().run_until_parked();
         let editor = cx.add_window(|window, cx| {
-            Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx)
+            Editor::for_multibuffer(multibuffer, Some(project.clone()), true, window, cx)
         });
         let editor_edited = Arc::new(AtomicBool::new(false));
         let fake_server = fake_servers.next().await.unwrap();

crates/editor/src/items.rs

@@ -129,8 +129,13 @@ impl FollowableItem for Editor {
                 });
 
                 cx.new(|cx| {
-                    let mut editor =
-                        Editor::for_multibuffer(multibuffer, Some(project.clone()), window, cx);
+                    let mut editor = Editor::for_multibuffer(
+                        multibuffer,
+                        Some(project.clone()),
+                        true,
+                        window,
+                        cx,
+                    );
                     editor.remote_id = Some(remote_id);
                     editor
                 })

crates/editor/src/movement.rs

@@ -893,6 +893,8 @@ mod tests {
                 font,
                 font_size,
                 None,
+                true,
+                1,
                 1,
                 1,
                 FoldPlaceholder::test(),
@@ -1108,136 +1110,138 @@ mod tests {
                     font,
                     px(14.0),
                     None,
+                    true,
                     0,
                     2,
+                    0,
                     FoldPlaceholder::test(),
                     cx,
                 )
             });
             let snapshot = display_map.update(cx, |map, cx| map.snapshot(cx));
 
-            assert_eq!(snapshot.text(), "abc\ndefg\nhijkl\nmn");
+            assert_eq!(snapshot.text(), "\n\nabc\ndefg\n\n\nhijkl\nmn");
 
             let col_2_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(0), 2), &text_layout_details);
+                .x_for_display_point(DisplayPoint::new(DisplayRow(2), 2), &text_layout_details);
 
             // Can't move up into the first excerpt's header
             assert_eq!(
                 up(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 2),
+                    DisplayPoint::new(DisplayRow(2), 2),
                     SelectionGoal::HorizontalPosition(col_2_x.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(0), 0),
+                    DisplayPoint::new(DisplayRow(2), 0),
                     SelectionGoal::HorizontalPosition(col_2_x.0),
                 ),
             );
             assert_eq!(
                 up(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 0),
+                    DisplayPoint::new(DisplayRow(2), 0),
                     SelectionGoal::None,
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(0), 0),
+                    DisplayPoint::new(DisplayRow(2), 0),
                     SelectionGoal::HorizontalPosition(0.0),
                 ),
             );
 
             let col_4_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(1), 4), &text_layout_details);
+                .x_for_display_point(DisplayPoint::new(DisplayRow(3), 4), &text_layout_details);
 
             // Move up and down within first excerpt
             assert_eq!(
                 up(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(1), 4),
+                    DisplayPoint::new(DisplayRow(3), 4),
                     SelectionGoal::HorizontalPosition(col_4_x.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(0), 3),
+                    DisplayPoint::new(DisplayRow(2), 3),
                     SelectionGoal::HorizontalPosition(col_4_x.0)
                 ),
             );
             assert_eq!(
                 down(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(0), 3),
+                    DisplayPoint::new(DisplayRow(2), 3),
                     SelectionGoal::HorizontalPosition(col_4_x.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(1), 4),
+                    DisplayPoint::new(DisplayRow(3), 4),
                     SelectionGoal::HorizontalPosition(col_4_x.0)
                 ),
             );
 
             let col_5_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(2), 5), &text_layout_details);
+                .x_for_display_point(DisplayPoint::new(DisplayRow(6), 5), &text_layout_details);
 
             // Move up and down across second excerpt's header
             assert_eq!(
                 up(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(2), 5),
+                    DisplayPoint::new(DisplayRow(6), 5),
                     SelectionGoal::HorizontalPosition(col_5_x.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(1), 4),
+                    DisplayPoint::new(DisplayRow(3), 4),
                     SelectionGoal::HorizontalPosition(col_5_x.0)
                 ),
             );
             assert_eq!(
                 down(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(1), 4),
+                    DisplayPoint::new(DisplayRow(3), 4),
                     SelectionGoal::HorizontalPosition(col_5_x.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(2), 5),
+                    DisplayPoint::new(DisplayRow(6), 5),
                     SelectionGoal::HorizontalPosition(col_5_x.0)
                 ),
             );
 
             let max_point_x = snapshot
-                .x_for_display_point(DisplayPoint::new(DisplayRow(3), 2), &text_layout_details);
+                .x_for_display_point(DisplayPoint::new(DisplayRow(7), 2), &text_layout_details);
 
             // Can't move down off the end, and attempting to do so leaves the selection goal unchanged
             assert_eq!(
                 down(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(3), 0),
+                    DisplayPoint::new(DisplayRow(7), 0),
                     SelectionGoal::HorizontalPosition(0.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(3), 2),
+                    DisplayPoint::new(DisplayRow(7), 2),
                     SelectionGoal::HorizontalPosition(0.0)
                 ),
             );
             assert_eq!(
                 down(
                     &snapshot,
-                    DisplayPoint::new(DisplayRow(3), 2),
+                    DisplayPoint::new(DisplayRow(7), 2),
                     SelectionGoal::HorizontalPosition(max_point_x.0),
                     false,
                     &text_layout_details
                 ),
                 (
-                    DisplayPoint::new(DisplayRow(3), 2),
+                    DisplayPoint::new(DisplayRow(7), 2),
                     SelectionGoal::HorizontalPosition(max_point_x.0)
                 ),
             );

crates/editor/src/proposed_changes_editor.rs

@@ -62,7 +62,8 @@ impl ProposedChangesEditor {
         let (recalculate_diffs_tx, mut recalculate_diffs_rx) = mpsc::unbounded();
         let mut this = Self {
             editor: cx.new(|cx| {
-                let mut editor = Editor::for_multibuffer(multibuffer.clone(), project, window, cx);
+                let mut editor =
+                    Editor::for_multibuffer(multibuffer.clone(), project, true, window, cx);
                 editor.set_expand_all_diff_hunks(cx);
                 editor.set_completion_provider(None);
                 editor.clear_code_action_providers();

crates/editor/src/rust_analyzer_ext.rs

@@ -86,7 +86,7 @@ pub fn expand_macro_recursively(
                 cx.new(|cx| MultiBuffer::singleton(buffer, cx).with_title(macro_expansion.name));
             workspace.add_item_to_active_pane(
                 Box::new(cx.new(|cx| {
-                    let mut editor = Editor::for_multibuffer(multibuffer, None, window, cx);
+                    let mut editor = Editor::for_multibuffer(multibuffer, None, false, window, cx);
                     editor.set_read_only(true);
                     editor
                 })),

crates/editor/src/test.rs

@@ -61,6 +61,8 @@ pub fn marked_display_snapshot(
             font,
             font_size,
             None,
+            true,
+            1,
             1,
             1,
             FoldPlaceholder::test(),
@@ -106,7 +108,7 @@ pub(crate) fn build_editor(
     window: &mut Window,
     cx: &mut Context<Editor>,
 ) -> Editor {
-    Editor::new(EditorMode::Full, buffer, None, window, cx)
+    Editor::new(EditorMode::Full, buffer, None, true, window, cx)
 }
 
 pub(crate) fn build_editor_with_project(
@@ -115,5 +117,5 @@ pub(crate) fn build_editor_with_project(
     window: &mut Window,
     cx: &mut Context<Editor>,
 ) -> Editor {
-    Editor::new(EditorMode::Full, buffer, Some(project), window, cx)
+    Editor::new(EditorMode::Full, buffer, Some(project), true, window, cx)
 }

crates/extension/src/extension.rs

@@ -1,5 +1,4 @@
 pub mod extension_builder;
-mod extension_events;
 mod extension_host_proxy;
 mod extension_manifest;
 mod types;
@@ -15,14 +14,12 @@ use gpui::{App, Task};
 use language::LanguageName;
 use semantic_version::SemanticVersion;
 
-pub use crate::extension_events::*;
 pub use crate::extension_host_proxy::*;
 pub use crate::extension_manifest::*;
 pub use crate::types::*;
 
 /// Initializes the `extension` crate.
 pub fn init(cx: &mut App) {
-    extension_events::init(cx);
     ExtensionHostProxy::default_global(cx);
 }
 

crates/extension/src/extension_events.rs

@@ -1,37 +0,0 @@
-use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Global};
-
-pub fn init(cx: &mut App) {
-    let extension_events = cx.new(ExtensionEvents::new);
-    cx.set_global(GlobalExtensionEvents(extension_events));
-}
-
-struct GlobalExtensionEvents(Entity<ExtensionEvents>);
-
-impl Global for GlobalExtensionEvents {}
-
-/// An event bus for broadcasting extension-related events throughout the app.
-pub struct ExtensionEvents;
-
-impl ExtensionEvents {
-    /// Returns the global [`ExtensionEvents`].
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        return cx
-            .try_global::<GlobalExtensionEvents>()
-            .map(|g| g.0.clone());
-    }
-
-    fn new(_cx: &mut Context<Self>) -> Self {
-        Self
-    }
-
-    pub fn emit(&mut self, event: Event, cx: &mut Context<Self>) {
-        cx.emit(event)
-    }
-}
-
-#[derive(Clone)]
-pub enum Event {
-    ExtensionsInstalledChanged,
-}
-
-impl EventEmitter<Event> for ExtensionEvents {}

crates/extension_api/Cargo.toml

@@ -6,7 +6,8 @@ repository = "https://github.com/zed-industries/zed"
 documentation = "https://docs.rs/zed_extension_api"
 keywords = ["zed", "extension"]
 edition.workspace = true
-publish = true
+# Change back to `true` when we're ready to publish v0.3.0.
+publish = false
 license = "Apache-2.0"
 
 [lints]

crates/extension_api/README.md

@@ -23,7 +23,7 @@ need to set your `crate-type` accordingly:
 
 ```toml
 [dependencies]
-zed_extension_api = "0.3.0"
+zed_extension_api = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]
@@ -63,7 +63,6 @@ Here is the compatibility of the `zed_extension_api` with versions of Zed:
 
 | Zed version | `zed_extension_api` version |
 | ----------- | --------------------------- |
-| `0.178.x`   | `0.0.1` - `0.3.0`           |
 | `0.162.x`   | `0.0.1` - `0.2.0`           |
 | `0.149.x`   | `0.0.1` - `0.1.0`           |
 | `0.131.x`   | `0.0.1` - `0.0.6`           |

crates/extension_host/src/extension_host.rs

@@ -14,7 +14,7 @@ use collections::{btree_map, BTreeMap, BTreeSet, HashMap, HashSet};
 use extension::extension_builder::{CompileExtensionOptions, ExtensionBuilder};
 pub use extension::ExtensionManifest;
 use extension::{
-    ExtensionContextServerProxy, ExtensionEvents, ExtensionGrammarProxy, ExtensionHostProxy,
+    ExtensionContextServerProxy, ExtensionGrammarProxy, ExtensionHostProxy,
     ExtensionIndexedDocsProviderProxy, ExtensionLanguageProxy, ExtensionLanguageServerProxy,
     ExtensionSlashCommandProxy, ExtensionSnippetProxy, ExtensionThemeProxy,
 };
@@ -1316,12 +1316,6 @@ impl ExtensionStore {
                 this.proxy.set_extensions_loaded();
                 this.proxy.reload_current_theme(cx);
                 this.proxy.reload_current_icon_theme(cx);
-
-                if let Some(events) = ExtensionEvents::try_global(cx) {
-                    events.update(cx, |this, cx| {
-                        this.emit(extension::Event::ExtensionsInstalledChanged, cx)
-                    });
-                }
             })
             .ok();
         })

crates/extension_host/src/extension_store_test.rs

@@ -780,7 +780,6 @@ fn init_test(cx: &mut TestAppContext) {
         let store = SettingsStore::test(cx);
         cx.set_global(store);
         release_channel::init(SemanticVersion::default(), cx);
-        extension::init(cx);
         theme::init(theme::LoadThemes::JustBase, cx);
         Project::init_settings(cx);
         ExtensionSettings::register(cx);

crates/extension_host/src/wasm_host/wit.rs

@@ -59,7 +59,7 @@ pub fn wasm_api_version_range(release_channel: ReleaseChannel) -> RangeInclusive
 
     let max_version = match release_channel {
         ReleaseChannel::Dev | ReleaseChannel::Nightly => latest::MAX_VERSION,
-        ReleaseChannel::Stable | ReleaseChannel::Preview => latest::MAX_VERSION,
+        ReleaseChannel::Stable | ReleaseChannel::Preview => since_v0_2_0::MAX_VERSION,
     };
 
     since_v0_0_1::MIN_VERSION..=max_version
@@ -108,6 +108,8 @@ impl Extension {
         let _ = release_channel;
 
         if version >= latest::MIN_VERSION {
+            authorize_access_to_unreleased_wasm_api_version(release_channel)?;
+
             let extension =
                 latest::Extension::instantiate_async(store, component, latest::linker())
                     .await

crates/extension_host/src/wasm_host/wit/since_v0_2_0.rs

@@ -8,6 +8,7 @@ use wasmtime::component::{Linker, Resource};
 use super::latest;
 
 pub const MIN_VERSION: SemanticVersion = SemanticVersion::new(0, 2, 0);
+pub const MAX_VERSION: SemanticVersion = SemanticVersion::new(0, 2, 0);
 
 wasmtime::component::bindgen!({
     async: true,

crates/file_finder/src/open_path_prompt.rs

@@ -1,5 +1,5 @@
 use futures::channel::oneshot;
-use fuzzy::{StringMatch, StringMatchCandidate};
+use fuzzy::StringMatchCandidate;
 use picker::{Picker, PickerDelegate};
 use project::DirectoryLister;
 use std::{
@@ -9,7 +9,7 @@ use std::{
         Arc,
     },
 };
-use ui::{prelude::*, HighlightedLabel, ListItemSpacing};
+use ui::{prelude::*, LabelLike, ListItemSpacing};
 use ui::{Context, ListItem, Window};
 use util::{maybe, paths::compare_paths};
 use workspace::Workspace;
@@ -22,7 +22,6 @@ pub struct OpenPathDelegate {
     selected_index: usize,
     directory_state: Option<DirectoryState>,
     matches: Vec<usize>,
-    string_matches: Vec<StringMatch>,
     cancel_flag: Arc<AtomicBool>,
     should_dismiss: bool,
 }
@@ -35,7 +34,6 @@ impl OpenPathDelegate {
             selected_index: 0,
             directory_state: None,
             matches: Vec::new(),
-            string_matches: Vec::new(),
             cancel_flag: Arc::new(AtomicBool::new(false)),
             should_dismiss: true,
         }
@@ -225,7 +223,6 @@ impl PickerDelegate for OpenPathDelegate {
             if suffix == "" {
                 this.update(&mut cx, |this, cx| {
                     this.delegate.matches.clear();
-                    this.delegate.string_matches.clear();
                     this.delegate
                         .matches
                         .extend(match_candidates.iter().map(|m| m.path.id));
@@ -252,7 +249,6 @@ impl PickerDelegate for OpenPathDelegate {
 
             this.update(&mut cx, |this, cx| {
                 this.delegate.matches.clear();
-                this.delegate.string_matches = matches.clone();
                 this.delegate
                     .matches
                     .extend(matches.into_iter().map(|m| m.candidate_id));
@@ -341,22 +337,13 @@ impl PickerDelegate for OpenPathDelegate {
         let m = self.matches.get(ix)?;
         let directory_state = self.directory_state.as_ref()?;
         let candidate = directory_state.match_candidates.get(*m)?;
-        let highlight_positions = self
-            .string_matches
-            .iter()
-            .find(|string_match| string_match.candidate_id == *m)
-            .map(|string_match| string_match.positions.clone())
-            .unwrap_or_default();
 
         Some(
             ListItem::new(ix)
                 .spacing(ListItemSpacing::Sparse)
                 .inset(true)
                 .toggle_state(selected)
-                .child(HighlightedLabel::new(
-                    candidate.path.string.clone(),
-                    highlight_positions,
-                )),
+                .child(LabelLike::new().child(candidate.path.string.clone())),
         )
     }
 

crates/fs/src/fs.rs

@@ -16,14 +16,12 @@ use git::{repository::RepoPath, status::FileStatus};
 
 #[cfg(any(target_os = "linux", target_os = "freebsd"))]
 use ashpd::desktop::trash;
-use std::borrow::Cow;
 #[cfg(any(test, feature = "test-support"))]
 use std::collections::HashSet;
 #[cfg(unix)]
 use std::os::fd::AsFd;
 #[cfg(unix)]
 use std::os::fd::AsRawFd;
-use util::command::new_std_command;
 
 #[cfg(unix)]
 use std::os::unix::fs::MetadataExt;
@@ -138,7 +136,6 @@ pub trait Fs: Send + Sync {
 
     fn home_dir(&self) -> Option<PathBuf>;
     fn open_repo(&self, abs_dot_git: &Path) -> Option<Arc<dyn GitRepository>>;
-    fn git_init(&self, abs_work_directory: &Path, fallback_branch_name: String) -> Result<()>;
     fn is_fake(&self) -> bool;
     async fn is_case_sensitive(&self) -> Result<bool>;
 
@@ -768,29 +765,6 @@ impl Fs for RealFs {
         )))
     }
 
-    fn git_init(&self, abs_work_directory_path: &Path, fallback_branch_name: String) -> Result<()> {
-        let config = new_std_command("git")
-            .current_dir(abs_work_directory_path)
-            .args(&["config", "--global", "--get", "init.defaultBranch"])
-            .output()?;
-
-        let branch_name;
-
-        if config.status.success() && !config.stdout.is_empty() {
-            branch_name = String::from_utf8_lossy(&config.stdout);
-        } else {
-            branch_name = Cow::Borrowed(fallback_branch_name.as_str());
-        }
-
-        new_std_command("git")
-            .current_dir(abs_work_directory_path)
-            .args(&["init", "-b"])
-            .arg(branch_name.trim())
-            .output()?;
-
-        Ok(())
-    }
-
     fn is_fake(&self) -> bool {
         false
     }
@@ -2101,14 +2075,6 @@ impl Fs for FakeFs {
         }
     }
 
-    fn git_init(
-        &self,
-        abs_work_directory_path: &Path,
-        _fallback_branch_name: String,
-    ) -> Result<()> {
-        smol::block_on(self.create_dir(&abs_work_directory_path.join(".git")))
-    }
-
     fn is_fake(&self) -> bool {
         true
     }

crates/git/src/blame.rs

@@ -2,8 +2,8 @@ use crate::commit::get_messages;
 use crate::Oid;
 use anyhow::{anyhow, Context as _, Result};
 use collections::{HashMap, HashSet};
-use futures::AsyncWriteExt;
 use serde::{Deserialize, Serialize};
+use std::io::Write;
 use std::process::Stdio;
 use std::{ops::Range, path::Path};
 use text::Rope;
@@ -21,14 +21,14 @@ pub struct Blame {
 }
 
 impl Blame {
-    pub async fn for_path(
+    pub fn for_path(
         git_binary: &Path,
         working_directory: &Path,
         path: &Path,
         content: &Rope,
         remote_url: Option<String>,
     ) -> Result<Self> {
-        let output = run_git_blame(git_binary, working_directory, path, content).await?;
+        let output = run_git_blame(git_binary, working_directory, path, content)?;
         let mut entries = parse_git_blame(&output)?;
         entries.sort_unstable_by(|a, b| a.range.start.cmp(&b.range.start));
 
@@ -39,9 +39,8 @@ impl Blame {
         }
 
         let shas = unique_shas.into_iter().collect::<Vec<_>>();
-        let messages = get_messages(working_directory, &shas)
-            .await
-            .context("failed to get commit messages")?;
+        let messages =
+            get_messages(working_directory, &shas).context("failed to get commit messages")?;
 
         Ok(Self {
             entries,
@@ -54,13 +53,13 @@ impl Blame {
 const GIT_BLAME_NO_COMMIT_ERROR: &str = "fatal: no such ref: HEAD";
 const GIT_BLAME_NO_PATH: &str = "fatal: no such path";
 
-async fn run_git_blame(
+fn run_git_blame(
     git_binary: &Path,
     working_directory: &Path,
     path: &Path,
     contents: &Rope,
 ) -> Result<String> {
-    let mut child = util::command::new_smol_command(git_binary)
+    let child = util::command::new_std_command(git_binary)
         .current_dir(working_directory)
         .arg("blame")
         .arg("--incremental")
@@ -73,19 +72,18 @@ async fn run_git_blame(
         .spawn()
         .map_err(|e| anyhow!("Failed to start git blame process: {}", e))?;
 
-    let stdin = child
+    let mut stdin = child
         .stdin
-        .as_mut()
+        .as_ref()
         .context("failed to get pipe to stdin of git blame command")?;
 
     for chunk in contents.chunks() {
-        stdin.write_all(chunk.as_bytes()).await?;
+        stdin.write_all(chunk.as_bytes())?;
     }
-    stdin.flush().await?;
+    stdin.flush()?;
 
     let output = child
-        .output()
-        .await
+        .wait_with_output()
         .map_err(|e| anyhow!("Failed to read git blame output: {}", e))?;
 
     if !output.status.success() {

crates/git/src/commit.rs

@@ -3,21 +3,20 @@ use anyhow::{anyhow, Result};
 use collections::HashMap;
 use std::path::Path;
 
-pub async fn get_messages(working_directory: &Path, shas: &[Oid]) -> Result<HashMap<Oid, String>> {
+pub fn get_messages(working_directory: &Path, shas: &[Oid]) -> Result<HashMap<Oid, String>> {
     if shas.is_empty() {
         return Ok(HashMap::default());
     }
 
     const MARKER: &str = "<MARKER>";
 
-    let output = util::command::new_smol_command("git")
+    let output = util::command::new_std_command("git")
         .current_dir(working_directory)
         .arg("show")
         .arg("-s")
         .arg(format!("--format=%B{}", MARKER))
         .args(shas.iter().map(ToString::to_string))
         .output()
-        .await
         .map_err(|e| anyhow!("Failed to start git blame process: {}", e))?;
 
     anyhow::ensure!(

crates/git/src/git.rs

@@ -50,14 +50,11 @@ actions!(
         Fetch,
         Commit,
         ExpandCommitEditor,
-        GenerateCommitMessage,
-        Init,
+        GenerateCommitMessage
     ]
 );
-
 action_with_deprecated_aliases!(git, RestoreFile, ["editor::RevertFile"]);
 action_with_deprecated_aliases!(git, Restore, ["editor::RevertSelectedHunks"]);
-action_with_deprecated_aliases!(git, Blame, ["editor::ToggleGitBlame"]);
 
 /// The length of a Git short SHA.
 pub const SHORT_SHA_LENGTH: usize = 7;