Use Pratt Parsing for shell commands

wip
Make tests avoid the non-space options
2025-03-08 00:42:59 -05:00 · 2025-03-08 00:41:17 -05:00 · 2025-03-08 00:41:17 -05:00 · 2025-03-08 00:41:17 -05:00 · 2025-03-08 00:41:17 -05:00 · 2025-03-08 00:41:17 -05:00
356 changed files with 15051 additions and 7558 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -26,3 +26,6 @@ rustflags = [
    "-C",
    "target-feature=+crt-static", # This fixes the linking issue when compiling livekit on Windows
 ]
+
+[env]
+MACOSX_DEPLOYMENT_TARGET = "10.15.7"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -236,12 +236,24 @@ jobs:
        if: always()
        run: rm -rf ./../.cargo

-  windows_tests:
+  windows_clippy:
    timeout-minutes: 60
-    name: (Windows) Run Clippy and tests
+    name: (Windows) Run Clippy
    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
@@ -275,6 +287,69 @@ jobs:
        working-directory: ${{ env.ZED_WORKSPACE }}
        run: ./script/clippy.ps1

+      - name: Check dev drive space
+        working-directory: ${{ env.ZED_WORKSPACE }}
+        # `setup-dev-driver.ps1` creates a 100GB drive, with CI taking up ~45GB of the drive.
+        run: ./script/exit-ci-if-dev-drive-is-full.ps1 95
+
+      # Since the Windows runners are stateful, so we need to remove the config file to prevent potential bug.
+      - name: Clean CI config file
+        if: always()
+        run: |
+          if (Test-Path "${{ env.CARGO_HOME }}/config.toml") {
+            Remove-Item -Path "${{ env.CARGO_HOME }}/config.toml"  -Force
+          }
+
+  # Windows CI takes twice as long as our other platforms and fast github hosted runners are expensive.
+  # But we still want to do CI, so let's only run tests on main and come back to this when we're
+  # ready to self host our Windows CI (e.g. during the push for full Windows support)
+  windows_tests:
+    timeout-minutes: 60
+    name: (Windows) Run Tests
+    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
+
+      - name: Checkout repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          clean: false
+
+      - name: Create Dev Drive using ReFS
+        run: ./script/setup-dev-driver.ps1
+
+      # actions/checkout does not let us clone into anywhere outside ${{ github.workspace }}, so we have to copy the clone...
+      - name: Copy Git Repo to Dev Drive
+        run: |
+          Copy-Item -Path "${{ github.workspace }}" -Destination "${{ env.ZED_WORKSPACE }}" -Recurse
+
+      - name: Cache dependencies
+        uses: swatinem/rust-cache@f0deed1e0edfc6a9be95417288c0e1099b1eeec3 # v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+          workspaces: ${{ env.ZED_WORKSPACE }}
+          cache-provider: "github"
+
+      - name: Configure CI
+        run: |
+          mkdir -p ${{ env.CARGO_HOME }} -ErrorAction Ignore
+          cp ./.cargo/ci-config.toml ${{ env.CARGO_HOME }}/config.toml
+
      - name: Run tests
        uses: ./.github/actions/run_tests_windows
        with:
@@ -292,7 +367,10 @@ jobs:
      # Since the Windows runners are stateful, so we need to remove the config file to prevent potential bug.
      - name: Clean CI config file
        if: always()
-        run: Remove-Item -Path "${{ env.CARGO_HOME }}/config.toml"  -Force
+        run: |
+          if (Test-Path "${{ env.CARGO_HOME }}/config.toml") {
+            Remove-Item -Path "${{ env.CARGO_HOME }}/config.toml"  -Force
+          }

  bundle-mac:
    timeout-minutes: 120
@@ -422,6 +500,13 @@ jobs:
          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') }}
+        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
+
      - name: Upload app bundle to release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
        with:
@@ -470,6 +555,13 @@ jobs:
          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') }}
+        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
+
      - name: Upload app bundle to release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
        with:
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ resolver = "2"
 members = [
    "crates/activity_indicator",
    "crates/anthropic",
+    "crates/askpass",
    "crates/assets",
    "crates/assistant",
    "crates/assistant2",
@@ -117,6 +118,7 @@ members = [
    "crates/rope",
    "crates/rpc",
    "crates/schema_generator",
+    "crates/scripting_tool",
    "crates/search",
    "crates/semantic_index",
    "crates/semantic_version",
@@ -167,15 +169,9 @@ members = [
    # Extensions
    #

-    "extensions/csharp",
-    "extensions/deno",
-    "extensions/elixir",
    "extensions/emmet",
-    "extensions/erlang",
    "extensions/glsl",
-    "extensions/haskell",
    "extensions/html",
-    "extensions/lua",
    "extensions/perplexity",
    "extensions/proto",
    "extensions/purescript",
@@ -209,6 +205,7 @@ edition = "2021"
 activity_indicator = { path = "crates/activity_indicator" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
+askpass = { path = "crates/askpass" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
 assistant2 = { path = "crates/assistant2" }
@@ -321,6 +318,7 @@ reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
+scripting_tool = { path = "crates/scripting_tool" }
 search = { path = "crates/search" }
 semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
@@ -453,6 +451,7 @@ livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "
 ], default-features = false }
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 markup5ever_rcdom = "0.3.0"
+mlua = { version = "0.10", features = ["lua54", "vendored", "async", "send"] }
 nanoid = "0.4"
 nbformat = { version = "0.10.0" }
 nix = "0.29"
@@ -601,9 +600,11 @@ features = [
 version = "0.58"
 features = [
    "implement",
+    "Foundation_Collections",
    "Foundation_Numerics",
    "Storage",
    "System_Threading",
+    "UI_StartScreen",
    "UI_ViewManagement",
    "Wdk_System_SystemServices",
    "Win32_Globalization",
--- a/assets/icons/ai_edit.svg
+++ b/assets/icons/ai_edit.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5871 5.40624C12.8514 5.14195 13 4.78346 13 4.40965C13 4.03583 12.8516 3.67731 12.5873 3.41295C12.323 3.14859 11.9645 3.00005 11.5907 3C11.2169 2.99995 10.8584 3.14841 10.594 3.4127L3.92098 10.0874C3.80488 10.2031 3.71903 10.3456 3.67097 10.5024L3.01047 12.6784C2.99754 12.7217 2.99657 12.7676 3.00764 12.8113C3.01872 12.8551 3.04143 12.895 3.07337 12.9269C3.1053 12.9588 3.14528 12.9815 3.18905 12.9925C3.23282 13.0035 3.27875 13.0024 3.32197 12.9894L5.49849 12.3294C5.65508 12.2818 5.79758 12.1964 5.91349 12.0809L12.5871 5.40624Z" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 4L12 6" stroke="black" stroke-width="1.33" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.38818 3.53598V2.53598" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.56982 12.6995L9.56982 13.6995" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.38818 6.53598H3.38818" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M13.5698 9.69949L12.5698 9.69949" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.38818 4.53598L3.38818 3.53598" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5698 11.6995L12.5698 12.6995" stroke="black" stroke-width="1.2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/file_icons/luau.svg
+++ b/assets/icons/file_icons/luau.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.36197 1.67985C5.3748 1.41534 4.36011 2.00117 4.0956 2.98834L2.17985 10.138C1.91534 11.1252 2.50117 12.1399 3.48833 12.4044L10.638 14.3202C11.6252 14.5847 12.6399 13.9988 12.9044 13.0117L14.8202 5.86197C15.0847 4.8748 14.4988 3.86012 13.5117 3.59561L6.36197 1.67985ZM10.0457 4.58266C9.77896 4.51119 9.50479 4.66948 9.43332 4.93621L8.76235 7.44028C8.69088 7.70701 8.84917 7.98118 9.11591 8.05265L11.62 8.72362C11.8867 8.79509 12.1609 8.6368 12.2324 8.37006L12.9033 5.86599C12.9748 5.59926 12.8165 5.32509 12.5498 5.25362L10.0457 4.58266Z" fill="black"/>
+</svg>
--- a/assets/icons/info.svg
+++ b/assets/icons/info.svg
@@ -1,12 +1,5 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2131_1193)">
-<circle cx="7" cy="7" r="6" stroke="black" stroke-width="1.5"/>
-<path d="M6 10H7M8 10H7M7 10V7.1C7 7.04477 6.95523 7 6.9 7H6" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
-<circle cx="7" cy="4.5" r="1" fill="black"/>
-</g>
-<defs>
-<clipPath id="clip0_2131_1193">
-<rect width="14" height="14" fill="white"/>
-</clipPath>
-</defs>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14Z" stroke="black" stroke-width="1.5"/>
+<path d="M7 11H8M8 11H9M8 11V8.1C8 8.04477 7.95523 8 7.9 8H7" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M8 6.5C8.55228 6.5 9 6.05228 9 5.5C9 4.94772 8.55228 4.5 8 4.5C7.44772 4.5 7 4.94772 7 5.5C7 6.05228 7.44772 6.5 8 6.5Z" fill="black"/>
 </svg>
--- a/assets/icons/zed_predict_error.svg
+++ b/assets/icons/zed_predict_error.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.6" d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
+<path d="M14 8L10 12M14 12L10 8" stroke="black" stroke-width="1.5"/>
+</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -475,9 +475,7 @@
      "ctrl-alt-delete": "editor::DeleteToNextSubwordEnd",
      "ctrl-alt-d": "editor::DeleteToNextSubwordEnd",
      "ctrl-alt-left": "editor::MoveToPreviousSubwordStart",
-      // "ctrl-alt-b": "editor::MoveToPreviousSubwordStart",
      "ctrl-alt-right": "editor::MoveToNextSubwordEnd",
-      "ctrl-alt-f": "editor::MoveToNextSubwordEnd",
      "ctrl-alt-shift-left": "editor::SelectToPreviousSubwordStart",
      "ctrl-alt-shift-b": "editor::SelectToPreviousSubwordStart",
      "ctrl-alt-shift-right": "editor::SelectToNextSubwordEnd",
@@ -612,12 +610,29 @@
      "ctrl-alt-e": "assistant2::RemoveAllContext"
    }
  },
+  {
+    "context": "AssistantPanel2 && prompt_editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-n": "assistant2::NewPromptEditor",
+      "cmd-alt-t": "assistant2::NewThread"
+    }
+  },
  {
    "context": "MessageEditor > Editor",
    "bindings": {
      "enter": "assistant2::Chat"
    }
  },
+  {
+    "context": "EditMessageEditor > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "menu::Confirm",
+      "alt-enter": "editor::Newline"
+    }
+  },
  {
    "context": "ContextStrip",
    "bindings": {
@@ -722,7 +737,7 @@
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
-      "ctrl-enter": "git::ShowCommitEditor",
+      "ctrl-enter": "git::Commit",
      "alt-enter": "menu::SecondaryConfirm"
    }
  },
@@ -730,13 +745,20 @@
    "context": "GitCommit > Editor",
    "bindings": {
      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit"
+      "ctrl-enter": "git::Commit",
+      "alt-l": "git::GenerateCommitMessage"
    }
  },
  {
    "context": "GitDiff > Editor",
    "bindings": {
-      "ctrl-enter": "git::ShowCommitEditor"
+      "ctrl-enter": "git::Commit"
+    }
+  },
+  {
+    "context": "AskPass > Editor",
+    "bindings": {
+      "enter": "menu::Confirm"
    }
  },
  {
@@ -746,7 +768,8 @@
      "tab": "git_panel::FocusChanges",
      "shift-tab": "git_panel::FocusChanges",
      "ctrl-enter": "git::Commit",
-      "alt-up": "git_panel::FocusChanges"
+      "alt-up": "git_panel::FocusChanges",
+      "alt-l": "git::GenerateCommitMessage"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -108,8 +108,8 @@
      "cmd-right": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "cmd-up": "editor::MoveToStartOfExcerpt",
-      "cmd-down": "editor::MoveToEndOfExcerpt",
+      "cmd-up": "editor::MoveToBeginning",
+      "cmd-down": "editor::MoveToEnd",
      "cmd-home": "editor::MoveToBeginning", // Typed via `cmd-fn-left`
      "cmd-end": "editor::MoveToEnd", // Typed via `cmd-fn-right`
      "shift-up": "editor::SelectUp",
@@ -124,8 +124,8 @@
      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
-      "cmd-shift-down": "editor::SelectToEndOfExcerpt",
+      "cmd-shift-up": "editor::SelectToBeginning",
+      "cmd-shift-down": "editor::SelectToEnd",
      "cmd-a": "editor::SelectAll",
      "cmd-l": "editor::SelectLine",
      "cmd-shift-i": "editor::Format",
@@ -172,6 +172,16 @@
      "alt-enter": "editor::OpenSelectionsInMultibuffer"
    }
  },
+  {
+    "context": "Editor && multibuffer",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-up": "editor::MoveToStartOfExcerpt",
+      "cmd-down": "editor::MoveToStartOfNextExcerpt",
+      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
+      "cmd-shift-down": "editor::SelectToStartOfNextExcerpt"
+    }
+  },
  {
    "context": "Editor && mode == full && edit_prediction",
    "use_key_equivalents": true,
@@ -256,6 +266,14 @@
      "cmd-alt-e": "assistant2::RemoveAllContext"
    }
  },
+  {
+    "context": "AssistantPanel2 && prompt_editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-n": "assistant2::NewPromptEditor",
+      "cmd-alt-t": "assistant2::NewThread"
+    }
+  },
  {
    "context": "MessageEditor > Editor",
    "use_key_equivalents": true,
@@ -263,6 +281,15 @@
      "enter": "assistant2::Chat"
    }
  },
+  {
+    "context": "EditMessageEditor > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel",
+      "enter": "menu::Confirm",
+      "alt-enter": "editor::Newline"
+    }
+  },
  {
    "context": "ContextStrip",
    "use_key_equivalents": true,
@@ -743,14 +770,21 @@
      "tab": "git_panel::FocusEditor",
      "shift-tab": "git_panel::FocusEditor",
      "escape": "git_panel::ToggleFocus",
-      "cmd-enter": "git::ShowCommitEditor"
+      "cmd-enter": "git::Commit"
    }
  },
  {
    "context": "GitDiff > Editor",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-enter": "git::ShowCommitEditor"
+      "cmd-enter": "git::Commit"
+    }
+  },
+  {
+    "context": "AskPass > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "menu::Confirm"
    }
  },
  {
@@ -761,7 +795,9 @@
      "cmd-enter": "git::Commit",
      "tab": "git_panel::FocusChanges",
      "shift-tab": "git_panel::FocusChanges",
-      "alt-up": "git_panel::FocusChanges"
+      "alt-up": "git_panel::FocusChanges",
+      "shift-escape": "git::ExpandCommitEditor",
+      "alt-tab": "git::GenerateCommitMessage"
    }
  },
  {
@@ -769,7 +805,8 @@
    "use_key_equivalents": true,
    "bindings": {
      "enter": "editor::Newline",
-      "cmd-enter": "git::Commit"
+      "cmd-enter": "git::Commit",
+      "alt-tab": "git::GenerateCommitMessage"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -6,7 +6,7 @@
      "a": ["vim::PushObject", { "around": true }],
      "left": "vim::Left",
      "h": "vim::Left",
-      "backspace": "vim::Backspace",
+      "backspace": "vim::WrappingLeft",
      "down": "vim::Down",
      "ctrl-j": "vim::Down",
      "j": "vim::Down",
@@ -20,7 +20,7 @@
      "k": "vim::Up",
      "right": "vim::Right",
      "l": "vim::Right",
-      "space": "vim::Space",
+      "space": "vim::WrappingRight",
      "end": "vim::EndOfLine",
      "$": "vim::EndOfLine",
      "^": "vim::FirstNonWhitespace",
@@ -247,7 +247,8 @@
    "context": "VimControl && VimCount",
    "bindings": {
      "0": ["vim::Number", 0],
-      ":": "vim::CountCommand"
+      ":": "vim::CountCommand",
+      "%": "vim::GoToPercentage"
    }
  },
  {
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -720,8 +720,8 @@
  "remove_trailing_whitespace_on_save": true,
  // Whether to start a new line with a comment when a previous line is a comment as well.
  "extend_comment_on_newline": true,
-  // Whether or not to ensure there's a single newline at the end of a buffer
-  // when saving it.
+  // Removes any lines containing only whitespace at the end of the file and
+  // ensures just one newline at the end.
  "ensure_final_newline_on_save": true,
  // Whether or not to perform a buffer format before saving
  //
@@ -845,7 +845,7 @@
    //    "hunk_style": "transparent"
    // 2. Show unstaged hunks with a pattern background:
    //    "hunk_style": "pattern"
-    "hunk_style": "transparent"
+    "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.
@@ -1055,7 +1055,6 @@
  // }
  //
  "file_types": {
-    "Plain Text": ["txt"],
    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
    "Shell Script": [".env.*"]
  },
@@ -1175,6 +1174,7 @@
      "format_on_save": "off",
      "use_on_type_format": false,
      "allow_rewrap": "anywhere",
+      "soft_wrap": "bounded",
      "prettier": {
        "allowed": true
      }
@@ -1298,6 +1298,11 @@
    // "semi": false,
    // "singleQuote": true
  },
+  // Settings for auto-closing of JSX tags.
+  "jsx_tag_auto_close": {
+    // // Whether to auto-close JSX tags.
+    // "enabled": true
+  },
  // LSP Specific settings.
  "lsp": {
    // Specify the LSP name as a key here.
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -9,7 +9,10 @@ use gpui::{
 };
 use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
 use lsp::LanguageServerName;
-use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
+use project::{
+    EnvironmentErrorMessage, LanguageServerProgress, LspStoreEvent, Project,
+    ProjectEnvironmentEvent, WorktreeId,
+};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
 use ui::{prelude::*, ButtonLike, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
@@ -73,7 +76,22 @@ impl ActivityIndicator {
            })
            .detach();

-            cx.observe(&project, |_, _, cx| cx.notify()).detach();
+            cx.subscribe(
+                &project.read(cx).lsp_store(),
+                |_, _, event, cx| match event {
+                    LspStoreEvent::LanguageServerUpdate { .. } => cx.notify(),
+                    _ => {}
+                },
+            )
+            .detach();
+
+            cx.subscribe(
+                &project.read(cx).environment().clone(),
+                |_, _, event, cx| match event {
+                    ProjectEnvironmentEvent::ErrorsUpdated => cx.notify(),
+                },
+            )
+            .detach();

            if let Some(auto_updater) = auto_updater.as_ref() {
                cx.observe(auto_updater, |_, _, cx| cx.notify()).detach();
@@ -204,7 +222,7 @@ impl ActivityIndicator {
                message: error.0.clone(),
                on_click: Some(Arc::new(move |this, window, cx| {
                    this.project.update(cx, |project, cx| {
-                        project.remove_environment_error(cx, worktree_id);
+                        project.remove_environment_error(worktree_id, cx);
                    });
                    window.dispatch_action(Box::new(workspace::OpenLog), cx);
                })),
--- a/crates/askpass/Cargo.toml
+++ b/crates/askpass/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "askpass"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/askpass.rs"
+
+[dependencies]
+anyhow.workspace = true
+futures.workspace = true
+gpui.workspace = true
+smol.workspace = true
+tempfile.workspace = true
+util.workspace = true
+which.workspace = true
--- a/extensions/csharp/LICENSE-APACHE
+++ b/extensions/csharp/LICENSE-APACHE
--- a/crates/askpass/src/askpass.rs
+++ b/crates/askpass/src/askpass.rs
@@ -0,0 +1,194 @@
+use std::path::{Path, PathBuf};
+use std::time::Duration;
+
+#[cfg(unix)]
+use anyhow::Context as _;
+use futures::channel::{mpsc, oneshot};
+#[cfg(unix)]
+use futures::{io::BufReader, AsyncBufReadExt as _};
+#[cfg(unix)]
+use futures::{select_biased, AsyncWriteExt as _, FutureExt as _};
+use futures::{SinkExt, StreamExt};
+use gpui::{AsyncApp, BackgroundExecutor, Task};
+#[cfg(unix)]
+use smol::fs;
+#[cfg(unix)]
+use smol::{fs::unix::PermissionsExt as _, net::unix::UnixListener};
+#[cfg(unix)]
+use util::ResultExt as _;
+
+#[derive(PartialEq, Eq)]
+pub enum AskPassResult {
+    CancelledByUser,
+    Timedout,
+}
+
+pub struct AskPassDelegate {
+    tx: mpsc::UnboundedSender<(String, oneshot::Sender<String>)>,
+    _task: Task<()>,
+}
+
+impl AskPassDelegate {
+    pub fn new(
+        cx: &mut AsyncApp,
+        password_prompt: impl Fn(String, oneshot::Sender<String>, &mut AsyncApp) + Send + Sync + 'static,
+    ) -> Self {
+        let (tx, mut rx) = mpsc::unbounded::<(String, oneshot::Sender<String>)>();
+        let task = cx.spawn(|mut cx| async move {
+            while let Some((prompt, channel)) = rx.next().await {
+                password_prompt(prompt, channel, &mut cx);
+            }
+        });
+        Self { tx, _task: task }
+    }
+
+    pub async fn ask_password(&mut self, prompt: String) -> anyhow::Result<String> {
+        let (tx, rx) = oneshot::channel();
+        self.tx.send((prompt, tx)).await?;
+        Ok(rx.await?)
+    }
+}
+
+#[cfg(unix)]
+pub struct AskPassSession {
+    script_path: PathBuf,
+    _askpass_task: Task<()>,
+    askpass_opened_rx: Option<oneshot::Receiver<()>>,
+    askpass_kill_master_rx: Option<oneshot::Receiver<()>>,
+}
+
+#[cfg(unix)]
+impl AskPassSession {
+    /// This will create a new AskPassSession.
+    /// You must retain this session until the master process exits.
+    #[must_use]
+    pub async fn new(
+        executor: &BackgroundExecutor,
+        mut delegate: AskPassDelegate,
+    ) -> anyhow::Result<Self> {
+        let temp_dir = tempfile::Builder::new().prefix("zed-askpass").tempdir()?;
+        let askpass_socket = temp_dir.path().join("askpass.sock");
+        let askpass_script_path = temp_dir.path().join("askpass.sh");
+        let (askpass_opened_tx, askpass_opened_rx) = oneshot::channel::<()>();
+        let listener =
+            UnixListener::bind(&askpass_socket).context("failed to create askpass socket")?;
+
+        let (askpass_kill_master_tx, askpass_kill_master_rx) = oneshot::channel::<()>();
+        let mut kill_tx = Some(askpass_kill_master_tx);
+
+        let askpass_task = executor.spawn(async move {
+            let mut askpass_opened_tx = Some(askpass_opened_tx);
+
+            while let Ok((mut stream, _)) = listener.accept().await {
+                if let Some(askpass_opened_tx) = askpass_opened_tx.take() {
+                    askpass_opened_tx.send(()).ok();
+                }
+                let mut buffer = Vec::new();
+                let mut reader = BufReader::new(&mut stream);
+                if reader.read_until(b'\0', &mut buffer).await.is_err() {
+                    buffer.clear();
+                }
+                let prompt = String::from_utf8_lossy(&buffer);
+                if let Some(password) = delegate
+                    .ask_password(prompt.to_string())
+                    .await
+                    .context("failed to get askpass password")
+                    .log_err()
+                {
+                    stream.write_all(password.as_bytes()).await.log_err();
+                } else {
+                    if let Some(kill_tx) = kill_tx.take() {
+                        kill_tx.send(()).log_err();
+                    }
+                    // note: we expect the caller to drop this task when it's done.
+                    // We need to keep the stream open until the caller is done to avoid
+                    // spurious errors from ssh.
+                    std::future::pending::<()>().await;
+                    drop(stream);
+                }
+            }
+            drop(temp_dir)
+        });
+
+        anyhow::ensure!(
+            which::which("nc").is_ok(),
+            "Cannot find `nc` command (netcat), which is required to connect over SSH."
+        );
+
+        // Create an askpass script that communicates back to this process.
+        let askpass_script = format!(
+            "{shebang}\n{print_args} | {nc} -U {askpass_socket} 2> /dev/null \n",
+            // on macOS `brew install netcat` provides the GNU netcat implementation
+            // which does not support -U.
+            nc = if cfg!(target_os = "macos") {
+                "/usr/bin/nc"
+            } else {
+                "nc"
+            },
+            askpass_socket = askpass_socket.display(),
+            print_args = "printf '%s\\0' \"$@\"",
+            shebang = "#!/bin/sh",
+        );
+        fs::write(&askpass_script_path, askpass_script).await?;
+        fs::set_permissions(&askpass_script_path, std::fs::Permissions::from_mode(0o755)).await?;
+
+        Ok(Self {
+            script_path: askpass_script_path,
+            _askpass_task: askpass_task,
+            askpass_kill_master_rx: Some(askpass_kill_master_rx),
+            askpass_opened_rx: Some(askpass_opened_rx),
+        })
+    }
+
+    pub fn script_path(&self) -> &Path {
+        &self.script_path
+    }
+
+    // This will run the askpass task forever, resolving as many authentication requests as needed.
+    // The caller is responsible for examining the result of their own commands and cancelling this
+    // future when this is no longer needed. Note that this can only be called once, but due to the
+    // drop order this takes an &mut, so you can `drop()` it after you're done with the master process.
+    pub async fn run(&mut self) -> AskPassResult {
+        let connection_timeout = Duration::from_secs(10);
+        let askpass_opened_rx = self.askpass_opened_rx.take().expect("Only call run once");
+        let askpass_kill_master_rx = self
+            .askpass_kill_master_rx
+            .take()
+            .expect("Only call run once");
+
+        select_biased! {
+            _ = askpass_opened_rx.fuse() => {
+                // Note: this await can only resolve after we are dropped.
+                askpass_kill_master_rx.await.ok();
+                return AskPassResult::CancelledByUser
+            }
+
+            _ = futures::FutureExt::fuse(smol::Timer::after(connection_timeout)) => {
+                return AskPassResult::Timedout
+            }
+        }
+    }
+}
+
+#[cfg(not(unix))]
+pub struct AskPassSession {
+    path: PathBuf,
+}
+
+#[cfg(not(unix))]
+impl AskPassSession {
+    pub async fn new(_: &BackgroundExecutor, _: AskPassDelegate) -> anyhow::Result<Self> {
+        Ok(Self {
+            path: PathBuf::new(),
+        })
+    }
+
+    pub fn script_path(&self) -> &Path {
+        &self.path
+    }
+
+    pub async fn run(&mut self) -> AskPassResult {
+        futures::FutureExt::fuse(smol::Timer::after(Duration::from_secs(10))).await;
+        AskPassResult::Timedout
+    }
+}
--- a/crates/assistant/src/assistant_configuration.rs
+++ b/crates/assistant/src/assistant_configuration.rs
@@ -110,7 +110,7 @@ impl ConfigurationView {
                    .bg(cx.theme().colors().surface_background)
                    .border_1()
                    .border_color(cx.theme().colors().border_variant)
-                    .rounded_md()
+                    .rounded_sm()
                    .when(configuration_view.is_none(), |this| {
                        this.child(div().child(Label::new(format!(
                            "No configuration view for {}",
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -38,7 +38,7 @@ use language_model::{
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::{CodeAction, ProjectTransaction};
+use project::{CodeAction, LspAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use rope::Rope;
 use settings::{update_settings_file, Settings, SettingsStore};
@@ -3569,10 +3569,10 @@ impl CodeActionProvider for AssistantCodeActionProvider {
            Task::ready(Ok(vec![CodeAction {
                server_id: language::LanguageServerId(0),
                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: lsp::CodeAction {
+                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
                    title: "Fix with Assistant".into(),
                    ..Default::default()
-                },
+                })),
            }]))
        } else {
            Task::ready(Ok(Vec::new()))
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -1,19 +1,19 @@
 use std::sync::Arc;

-use assistant_tool::ToolWorkingSet;
 use collections::HashMap;
+use editor::{Editor, MultiBuffer};
 use gpui::{
-    list, AbsoluteLength, AnyElement, App, DefiniteLength, EdgesRefinement, Empty, Entity, Length,
-    ListAlignment, ListOffset, ListState, StyleRefinement, Subscription, TextStyleRefinement,
-    UnderlineStyle, WeakEntity,
+    list, AbsoluteLength, AnyElement, App, ClickEvent, DefiniteLength, EdgesRefinement, Empty,
+    Entity, Focusable, Length, ListAlignment, ListOffset, ListState, StyleRefinement, Subscription,
+    Task, TextStyleRefinement, UnderlineStyle,
 };
-use language::LanguageRegistry;
+use language::{Buffer, LanguageRegistry};
 use language_model::{LanguageModelRegistry, LanguageModelToolUseId, Role};
 use markdown::{Markdown, MarkdownStyle};
 use settings::Settings as _;
 use theme::ThemeSettings;
-use ui::{prelude::*, Disclosure};
-use workspace::Workspace;
+use ui::{prelude::*, Disclosure, KeyBinding};
+use util::ResultExt as _;

 use crate::thread::{MessageId, RequestKind, Thread, ThreadError, ThreadEvent};
 use crate::thread_store::ThreadStore;
@@ -21,26 +21,28 @@ use crate::tool_use::{ToolUse, ToolUseStatus};
 use crate::ui::ContextPill;

 pub struct ActiveThread {
-    workspace: WeakEntity<Workspace>,
    language_registry: Arc<LanguageRegistry>,
-    tools: Arc<ToolWorkingSet>,
    thread_store: Entity<ThreadStore>,
    thread: Entity<Thread>,
+    save_thread_task: Option<Task<()>>,
    messages: Vec<MessageId>,
    list_state: ListState,
    rendered_messages_by_id: HashMap<MessageId, Entity<Markdown>>,
+    editing_message: Option<(MessageId, EditMessageState)>,
    expanded_tool_uses: HashMap<LanguageModelToolUseId, bool>,
    last_error: Option<ThreadError>,
    _subscriptions: Vec<Subscription>,
 }

+struct EditMessageState {
+    editor: Entity<Editor>,
+}
+
 impl ActiveThread {
    pub fn new(
        thread: Entity<Thread>,
        thread_store: Entity<ThreadStore>,
-        workspace: WeakEntity<Workspace>,
        language_registry: Arc<LanguageRegistry>,
-        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -50,21 +52,21 @@ impl ActiveThread {
        ];

        let mut this = Self {
-            workspace,
            language_registry,
-            tools,
            thread_store,
            thread: thread.clone(),
+            save_thread_task: None,
            messages: Vec::new(),
            rendered_messages_by_id: HashMap::default(),
            expanded_tool_uses: HashMap::default(),
            list_state: ListState::new(0, ListAlignment::Bottom, px(1024.), {
                let this = cx.entity().downgrade();
-                move |ix, _: &mut Window, cx: &mut App| {
-                    this.update(cx, |this, cx| this.render_message(ix, cx))
+                move |ix, window: &mut Window, cx: &mut App| {
+                    this.update(cx, |this, cx| this.render_message(ix, window, cx))
                        .unwrap()
                }
            }),
+            editing_message: None,
            last_error: None,
            _subscriptions: subscriptions,
        };
@@ -117,6 +119,44 @@ impl ActiveThread {
        self.messages.push(*id);
        self.list_state.splice(old_len..old_len, 1);

+        let markdown = self.render_markdown(text.into(), window, cx);
+        self.rendered_messages_by_id.insert(*id, markdown);
+        self.list_state.scroll_to(ListOffset {
+            item_ix: old_len,
+            offset_in_item: Pixels(0.0),
+        });
+    }
+
+    fn edited_message(
+        &mut self,
+        id: &MessageId,
+        text: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(index) = self.messages.iter().position(|message_id| message_id == id) else {
+            return;
+        };
+        self.list_state.splice(index..index + 1, 1);
+        let markdown = self.render_markdown(text.into(), window, cx);
+        self.rendered_messages_by_id.insert(*id, markdown);
+    }
+
+    fn deleted_message(&mut self, id: &MessageId) {
+        let Some(index) = self.messages.iter().position(|message_id| message_id == id) else {
+            return;
+        };
+        self.messages.remove(index);
+        self.list_state.splice(index..index + 1, 0);
+        self.rendered_messages_by_id.remove(id);
+    }
+
+    fn render_markdown(
+        &self,
+        text: SharedString,
+        window: &Window,
+        cx: &mut Context<Self>,
+    ) -> Entity<Markdown> {
        let theme_settings = ThemeSettings::get_global(cx);
        let colors = cx.theme().colors();
        let ui_font_size = TextSize::Default.rems(cx);
@@ -125,6 +165,8 @@ impl ActiveThread {

        text_style.refine(&TextStyleRefinement {
            font_family: Some(theme_settings.ui_font.family.clone()),
+            font_fallbacks: theme_settings.ui_font.fallbacks.clone(),
+            font_features: Some(theme_settings.ui_font.features.clone()),
            font_size: Some(ui_font_size.into()),
            color: Some(cx.theme().colors().text),
            ..Default::default()
@@ -134,6 +176,8 @@ impl ActiveThread {
            base_text_style: text_style,
            syntax: cx.theme().syntax().clone(),
            selection_background_color: cx.theme().players().local().selection,
+            code_block_overflow_x_scroll: true,
+            table_overflow_x_scroll: true,
            code_block: StyleRefinement {
                margin: EdgesRefinement {
                    top: Some(Length::Definite(rems(0.).into())),
@@ -157,6 +201,8 @@ impl ActiveThread {
                },
                text: Some(TextStyleRefinement {
                    font_family: Some(theme_settings.buffer_font.family.clone()),
+                    font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
+                    font_features: Some(theme_settings.buffer_font.features.clone()),
                    font_size: Some(buffer_font_size.into()),
                    ..Default::default()
                }),
@@ -164,6 +210,8 @@ impl ActiveThread {
            },
            inline_code: TextStyleRefinement {
                font_family: Some(theme_settings.buffer_font.family.clone()),
+                font_fallbacks: theme_settings.buffer_font.fallbacks.clone(),
+                font_features: Some(theme_settings.buffer_font.features.clone()),
                font_size: Some(buffer_font_size.into()),
                background_color: Some(colors.editor_foreground.opacity(0.1)),
                ..Default::default()
@@ -180,20 +228,15 @@ impl ActiveThread {
            ..Default::default()
        };

-        let markdown = cx.new(|cx| {
+        cx.new(|cx| {
            Markdown::new(
-                text.into(),
+                text,
                markdown_style,
                Some(self.language_registry.clone()),
                None,
                cx,
            )
-        });
-        self.rendered_messages_by_id.insert(*id, markdown);
-        self.list_state.scroll_to(ListOffset {
-            item_ix: old_len,
-            offset_in_item: Pixels(0.0),
-        });
+        })
    }

    fn handle_thread_event(
@@ -208,11 +251,7 @@ impl ActiveThread {
                self.last_error = Some(error.clone());
            }
            ThreadEvent::StreamedCompletion | ThreadEvent::SummaryChanged => {
-                self.thread_store
-                    .update(cx, |thread_store, cx| {
-                        thread_store.save_thread(&self.thread, cx)
-                    })
-                    .detach_and_log_err(cx);
+                self.save_thread(cx);
            }
            ThreadEvent::StreamedAssistantText(message_id, text) => {
                if let Some(markdown) = self.rendered_messages_by_id.get_mut(&message_id) {
@@ -231,55 +270,38 @@ impl ActiveThread {
                    self.push_message(message_id, message_text, window, cx);
                }

-                self.thread_store
-                    .update(cx, |thread_store, cx| {
-                        thread_store.save_thread(&self.thread, cx)
-                    })
-                    .detach_and_log_err(cx);
+                self.save_thread(cx);
+                cx.notify();
+            }
+            ThreadEvent::MessageEdited(message_id) => {
+                if let Some(message_text) = self
+                    .thread
+                    .read(cx)
+                    .message(*message_id)
+                    .map(|message| message.text.clone())
+                {
+                    self.edited_message(message_id, message_text, window, cx);
+                }

+                self.save_thread(cx);
+                cx.notify();
+            }
+            ThreadEvent::MessageDeleted(message_id) => {
+                self.deleted_message(message_id);
+                self.save_thread(cx);
                cx.notify();
            }
            ThreadEvent::UsePendingTools => {
-                let pending_tool_uses = self
-                    .thread
-                    .read(cx)
-                    .pending_tool_uses()
-                    .into_iter()
-                    .filter(|tool_use| tool_use.status.is_idle())
-                    .cloned()
-                    .collect::<Vec<_>>();
-
-                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, self.workspace.clone(), window, cx);
-
-                        self.thread.update(cx, |thread, cx| {
-                            thread.insert_tool_output(tool_use.id.clone(), task, cx);
-                        });
-                    }
-                }
+                self.thread.update(cx, |thread, cx| {
+                    thread.use_pending_tools(cx);
+                });
            }
            ThreadEvent::ToolFinished { .. } => {
-                let all_tools_finished = self
-                    .thread
-                    .read(cx)
-                    .pending_tool_uses()
-                    .into_iter()
-                    .all(|tool_use| tool_use.status.is_error());
-                if all_tools_finished {
+                if self.thread.read(cx).all_tools_finished() {
                    let model_registry = LanguageModelRegistry::read_global(cx);
                    if let Some(model) = model_registry.active_model() {
                        self.thread.update(cx, |thread, cx| {
-                            // Insert a user message to contain the tool results.
-                            thread.insert_user_message(
-                                // TODO: Sending up a user message without any content results in the model sending back
-                                // responses that also don't have any content. We currently don't handle this case well,
-                                // so for now we provide some text to keep the model on track.
-                                "Here are the tool results.",
-                                Vec::new(),
-                                cx,
-                            );
-                            thread.send_to_model(model, RequestKind::Chat, true, cx);
+                            thread.send_tool_results_to_model(model, cx);
                        });
                    }
                }
@@ -287,7 +309,133 @@ impl ActiveThread {
        }
    }

-    fn render_message(&self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
+    /// Spawns a task to save the active thread.
+    ///
+    /// Only one task to save the thread will be in flight at a time.
+    fn save_thread(&mut self, cx: &mut Context<Self>) {
+        let thread = self.thread.clone();
+        self.save_thread_task = Some(cx.spawn(|this, mut cx| async move {
+            let task = this
+                .update(&mut cx, |this, cx| {
+                    this.thread_store
+                        .update(cx, |thread_store, cx| thread_store.save_thread(&thread, cx))
+                })
+                .ok();
+
+            if let Some(task) = task {
+                task.await.log_err();
+            }
+        }));
+    }
+
+    fn start_editing_message(
+        &mut self,
+        message_id: MessageId,
+        message_text: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let buffer = cx.new(|cx| {
+            MultiBuffer::singleton(cx.new(|cx| Buffer::local(message_text.clone(), cx)), cx)
+        });
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::new(
+                editor::EditorMode::AutoHeight { max_lines: 8 },
+                buffer,
+                None,
+                false,
+                window,
+                cx,
+            );
+            editor.focus_handle(cx).focus(window);
+            editor.move_to_end(&editor::actions::MoveToEnd, window, cx);
+            editor
+        });
+        self.editing_message = Some((
+            message_id,
+            EditMessageState {
+                editor: editor.clone(),
+            },
+        ));
+        cx.notify();
+    }
+
+    fn cancel_editing_message(&mut self, _: &menu::Cancel, _: &mut Window, cx: &mut Context<Self>) {
+        self.editing_message.take();
+        cx.notify();
+    }
+
+    fn confirm_editing_message(
+        &mut self,
+        _: &menu::Confirm,
+        _: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some((message_id, state)) = self.editing_message.take() else {
+            return;
+        };
+        let edited_text = state.editor.read(cx).text(cx);
+        self.thread.update(cx, |thread, cx| {
+            thread.edit_message(message_id, Role::User, edited_text, cx);
+            for message_id in self.messages_after(message_id) {
+                thread.delete_message(*message_id, cx);
+            }
+        });
+
+        let provider = LanguageModelRegistry::read_global(cx).active_provider();
+        if provider
+            .as_ref()
+            .map_or(false, |provider| provider.must_accept_terms(cx))
+        {
+            cx.notify();
+            return;
+        }
+        let model_registry = LanguageModelRegistry::read_global(cx);
+        let Some(model) = model_registry.active_model() else {
+            return;
+        };
+
+        self.thread.update(cx, |thread, cx| {
+            thread.send_to_model(model, RequestKind::Chat, false, cx)
+        });
+        cx.notify();
+    }
+
+    fn last_user_message(&self, cx: &Context<Self>) -> Option<MessageId> {
+        self.messages
+            .iter()
+            .rev()
+            .find(|message_id| {
+                self.thread
+                    .read(cx)
+                    .message(**message_id)
+                    .map_or(false, |message| message.role == Role::User)
+            })
+            .cloned()
+    }
+
+    fn messages_after(&self, message_id: MessageId) -> &[MessageId] {
+        self.messages
+            .iter()
+            .position(|id| *id == message_id)
+            .map(|index| &self.messages[index + 1..])
+            .unwrap_or(&[])
+    }
+
+    fn handle_cancel_click(&mut self, _: &ClickEvent, window: &mut Window, cx: &mut Context<Self>) {
+        self.cancel_editing_message(&menu::Cancel, window, cx);
+    }
+
+    fn handle_regenerate_click(
+        &mut self,
+        _: &ClickEvent,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.confirm_editing_message(&menu::Confirm, window, cx);
+    }
+
+    fn render_message(&self, ix: usize, window: &mut Window, cx: &mut Context<Self>) -> AnyElement {
        let message_id = self.messages[ix];
        let Some(message) = self.thread.read(cx).message(message_id) else {
            return Empty.into_any();
@@ -306,8 +454,28 @@ impl ActiveThread {
            return Empty.into_any();
        }

+        let allow_editing_message =
+            message.role == Role::User && self.last_user_message(cx) == Some(message_id);
+
+        let edit_message_editor = self
+            .editing_message
+            .as_ref()
+            .filter(|(id, _)| *id == message_id)
+            .map(|(_, state)| state.editor.clone());
+
        let message_content = v_flex()
-            .child(div().p_2p5().text_ui(cx).child(markdown.clone()))
+            .child(
+                if let Some(edit_message_editor) = edit_message_editor.clone() {
+                    div()
+                        .key_context("EditMessageEditor")
+                        .on_action(cx.listener(Self::cancel_editing_message))
+                        .on_action(cx.listener(Self::confirm_editing_message))
+                        .p_2p5()
+                        .child(edit_message_editor)
+                } else {
+                    div().p_2p5().text_ui(cx).child(markdown.clone())
+                },
+            )
            .when_some(context, |parent, context| {
                if !context.is_empty() {
                    parent.child(
@@ -337,7 +505,8 @@ impl ActiveThread {
                        .child(
                            h_flex()
                                .py_1()
-                                .px_2()
+                                .pl_2()
+                                .pr_1()
                                .bg(colors.editor_foreground.opacity(0.05))
                                .border_b_1()
                                .border_color(colors.border)
@@ -356,6 +525,71 @@ impl ActiveThread {
                                                .size(LabelSize::Small)
                                                .color(Color::Muted),
                                        ),
+                                )
+                                .when_some(
+                                    edit_message_editor.clone(),
+                                    |this, edit_message_editor| {
+                                        let focus_handle = edit_message_editor.focus_handle(cx);
+                                        this.child(
+                                            h_flex()
+                                                .gap_1()
+                                                .child(
+                                                    Button::new("cancel-edit-message", "Cancel")
+                                                        .label_size(LabelSize::Small)
+                                                        .key_binding(
+                                                            KeyBinding::for_action_in(
+                                                                &menu::Cancel,
+                                                                &focus_handle,
+                                                                window,
+                                                                cx,
+                                                            )
+                                                            .map(|kb| kb.size(rems_from_px(12.))),
+                                                        )
+                                                        .on_click(
+                                                            cx.listener(Self::handle_cancel_click),
+                                                        ),
+                                                )
+                                                .child(
+                                                    Button::new(
+                                                        "confirm-edit-message",
+                                                        "Regenerate",
+                                                    )
+                                                    .label_size(LabelSize::Small)
+                                                    .key_binding(
+                                                        KeyBinding::for_action_in(
+                                                            &menu::Confirm,
+                                                            &focus_handle,
+                                                            window,
+                                                            cx,
+                                                        )
+                                                        .map(|kb| kb.size(rems_from_px(12.))),
+                                                    )
+                                                    .on_click(
+                                                        cx.listener(Self::handle_regenerate_click),
+                                                    ),
+                                                ),
+                                        )
+                                    },
+                                )
+                                .when(
+                                    edit_message_editor.is_none() && allow_editing_message,
+                                    |this| {
+                                        this.child(
+                                            Button::new("edit-message", "Edit")
+                                                .label_size(LabelSize::Small)
+                                                .on_click(cx.listener({
+                                                    let message_text = message.text.clone();
+                                                    move |this, _, window, cx| {
+                                                        this.start_editing_message(
+                                                            message_id,
+                                                            message_text.clone(),
+                                                            window,
+                                                            cx,
+                                                        );
+                                                    }
+                                                })),
+                                        )
+                                    },
                                ),
                        )
                        .child(message_content),
@@ -379,7 +613,7 @@ impl ActiveThread {
            Role::System => div().id(("message-container", ix)).py_1().px_2().child(
                v_flex()
                    .bg(colors.editor_background)
-                    .rounded_md()
+                    .rounded_sm()
                    .child(message_content),
            ),
        };
@@ -408,7 +642,7 @@ impl ActiveThread {
                        .pr_2()
                        .bg(cx.theme().colors().editor_foreground.opacity(0.02))
                        .when(is_open, |element| element.border_b_1().rounded_t(px(6.)))
-                        .when(!is_open, |element| element.rounded(px(6.)))
+                        .when(!is_open, |element| element.rounded_md())
                        .border_color(cx.theme().colors().border)
                        .child(
                            h_flex()
--- a/crates/assistant2/src/assistant_configuration.rs
+++ b/crates/assistant2/src/assistant_configuration.rs
@@ -134,7 +134,7 @@ impl AssistantConfiguration {
                    .bg(cx.theme().colors().editor_background)
                    .border_1()
                    .border_color(cx.theme().colors().border_variant)
-                    .rounded_md()
+                    .rounded_sm()
                    .map(|parent| match configuration_view {
                        Some(configuration_view) => parent.child(configuration_view),
                        None => parent.child(div().child(Label::new(format!(
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -15,7 +15,8 @@ use editor::Editor;
 use fs::Fs;
 use gpui::{
    prelude::*, Action, AnyElement, App, AsyncWindowContext, Corner, Entity, EventEmitter,
-    FocusHandle, Focusable, FontWeight, Pixels, Subscription, Task, UpdateGlobal, WeakEntity,
+    FocusHandle, Focusable, FontWeight, KeyContext, Pixels, Subscription, Task, UpdateGlobal,
+    WeakEntity,
 };
 use language::LanguageRegistry;
 use language_model::{LanguageModelProviderTosView, LanguageModelRegistry};
@@ -91,7 +92,6 @@ pub struct AssistantPanel {
    context_editor: Option<Entity<ContextEditor>>,
    configuration: Option<Entity<AssistantConfiguration>>,
    configuration_subscription: Option<Subscription>,
-    tools: Arc<ToolWorkingSet>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
    history_store: Entity<HistoryStore>,
@@ -132,7 +132,7 @@ impl AssistantPanel {
            log::info!("[assistant2-debug] finished initializing ContextStore");

            workspace.update_in(&mut cx, |workspace, window, cx| {
-                cx.new(|cx| Self::new(workspace, thread_store, context_store, tools, window, cx))
+                cx.new(|cx| Self::new(workspace, thread_store, context_store, window, cx))
            })
        })
    }
@@ -141,7 +141,6 @@ impl AssistantPanel {
        workspace: &Workspace,
        thread_store: Entity<ThreadStore>,
        context_store: Entity<assistant_context_editor::ContextStore>,
-        tools: Arc<ToolWorkingSet>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
@@ -169,8 +168,8 @@ impl AssistantPanel {

        Self {
            active_view: ActiveView::Thread,
-            workspace: workspace.clone(),
-            project,
+            workspace,
+            project: project.clone(),
            fs: fs.clone(),
            language_registry: language_registry.clone(),
            thread_store: thread_store.clone(),
@@ -178,9 +177,7 @@ impl AssistantPanel {
                ActiveThread::new(
                    thread.clone(),
                    thread_store.clone(),
-                    workspace,
                    language_registry,
-                    tools.clone(),
                    window,
                    cx,
                )
@@ -190,7 +187,6 @@ impl AssistantPanel {
            context_editor: None,
            configuration: None,
            configuration_subscription: None,
-            tools,
            local_timezone: UtcOffset::from_whole_seconds(
                chrono::Local::now().offset().local_minus_utc(),
            )
@@ -245,9 +241,7 @@ impl AssistantPanel {
            ActiveThread::new(
                thread.clone(),
                self.thread_store.clone(),
-                self.workspace.clone(),
                self.language_registry.clone(),
-                self.tools.clone(),
                window,
                cx,
            )
@@ -380,9 +374,7 @@ impl AssistantPanel {
                    ActiveThread::new(
                        thread.clone(),
                        this.thread_store.clone(),
-                        this.workspace.clone(),
                        this.language_registry.clone(),
-                        this.tools.clone(),
                        window,
                        cx,
                    )
@@ -993,12 +985,21 @@ impl AssistantPanel {
            )
            .into_any()
    }
+
+    fn key_context(&self) -> KeyContext {
+        let mut key_context = KeyContext::new_with_defaults();
+        key_context.add("AssistantPanel2");
+        if matches!(self.active_view, ActiveView::PromptEditor) {
+            key_context.add("prompt_editor");
+        }
+        key_context
+    }
 }

 impl Render for AssistantPanel {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        v_flex()
-            .key_context("AssistantPanel2")
+            .key_context(self.key_context())
            .justify_between()
            .size_full()
            .on_action(cx.listener(Self::cancel))
@@ -1013,12 +1014,7 @@ impl Render for AssistantPanel {
            .map(|parent| match self.active_view {
                ActiveView::Thread => parent
                    .child(self.render_active_thread_or_empty_state(window, cx))
-                    .child(
-                        h_flex()
-                            .border_t_1()
-                            .border_color(cx.theme().colors().border)
-                            .child(self.message_editor.clone()),
-                    )
+                    .child(h_flex().child(self.message_editor.clone()))
                    .children(self.render_last_error(cx)),
                ActiveView::History => parent.child(self.history.clone()),
                ActiveView::PromptEditor => parent.children(self.context_editor.clone()),
--- a/crates/assistant2/src/context_store.rs
+++ b/crates/assistant2/src/context_store.rs
@@ -208,12 +208,18 @@ impl ContextStore {
            let mut text_tasks = Vec::new();
            this.update(&mut cx, |_, cx| {
                for (path, buffer_entity) in files.into_iter().zip(buffers) {
-                    let buffer_entity = buffer_entity?;
-                    let buffer = buffer_entity.read(cx);
-                    let (buffer_info, text_task) =
-                        collect_buffer_info_and_text(path, buffer_entity, buffer, cx.to_async());
-                    buffer_infos.push(buffer_info);
-                    text_tasks.push(text_task);
+                    // Skip all binary files and other non-UTF8 files
+                    if let Ok(buffer_entity) = buffer_entity {
+                        let buffer = buffer_entity.read(cx);
+                        let (buffer_info, text_task) = collect_buffer_info_and_text(
+                            path,
+                            buffer_entity,
+                            buffer,
+                            cx.to_async(),
+                        );
+                        buffer_infos.push(buffer_info);
+                        text_tasks.push(text_task);
+                    }
                }
                anyhow::Ok(())
            })??;
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -27,6 +27,7 @@ use language::{Buffer, Point, Selection, TransactionId};
 use language_model::{report_assistant_event, LanguageModelRegistry};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
+use project::LspAction;
 use project::{CodeAction, ProjectTransaction};
 use prompt_store::PromptBuilder;
 use settings::{Settings, SettingsStore};
@@ -1727,10 +1728,10 @@ impl CodeActionProvider for AssistantCodeActionProvider {
            Task::ready(Ok(vec![CodeAction {
                server_id: language::LanguageServerId(0),
                range: snapshot.anchor_before(range.start)..snapshot.anchor_after(range.end),
-                lsp_action: lsp::CodeAction {
+                lsp_action: LspAction::Action(Box::new(lsp::CodeAction {
                    title: "Fix with Assistant".into(),
                    ..Default::default()
-                },
+                })),
            }]))
        } else {
            Task::ready(Ok(Vec::new()))
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -4,8 +4,8 @@ use editor::actions::MoveUp;
 use editor::{Editor, EditorElement, EditorEvent, EditorStyle};
 use fs::Fs;
 use gpui::{
-    pulsating_between, Animation, AnimationExt, App, DismissEvent, Entity, Focusable, Subscription,
-    TextStyle, WeakEntity,
+    Animation, AnimationExt, App, DismissEvent, Entity, Focusable, Subscription, TextStyle,
+    WeakEntity,
 };
 use language_model::LanguageModelRegistry;
 use language_model_selector::ToggleModelSelector;
@@ -16,7 +16,7 @@ use text::Bias;
 use theme::ThemeSettings;
 use ui::{
    prelude::*, ButtonLike, KeyBinding, PlatformStyle, PopoverMenu, PopoverMenuHandle, Switch,
-    TintColor, Tooltip,
+    Tooltip,
 };
 use vim_mode_setting::VimModeSetting;
 use workspace::Workspace;
@@ -298,166 +298,211 @@ impl Render for MessageEditor {
        let linux = platform == PlatformStyle::Linux;
        let windows = platform == PlatformStyle::Windows;
        let button_width = if linux || windows || vim_mode_enabled {
-            px(92.)
+            px(82.)
        } else {
            px(64.)
        };

        v_flex()
-            .key_context("MessageEditor")
-            .on_action(cx.listener(Self::chat))
-            .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
-                this.model_selector
-                    .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
-            }))
-            .on_action(cx.listener(Self::toggle_context_picker))
-            .on_action(cx.listener(Self::remove_all_context))
-            .on_action(cx.listener(Self::move_up))
-            .on_action(cx.listener(Self::toggle_chat_mode))
            .size_full()
-            .gap_2()
-            .p_2()
-            .bg(bg_color)
-            .child(self.context_strip.clone())
+            .when(is_streaming_completion, |parent| {
+                let focus_handle = self.editor.focus_handle(cx).clone();
+                parent.child(
+                    h_flex().py_3().w_full().justify_center().child(
+                        h_flex()
+                            .flex_none()
+                            .pl_2()
+                            .pr_1()
+                            .py_1()
+                            .bg(cx.theme().colors().editor_background)
+                            .border_1()
+                            .border_color(cx.theme().colors().border_variant)
+                            .rounded_lg()
+                            .shadow_md()
+                            .gap_1()
+                            .child(
+                                Icon::new(IconName::ArrowCircle)
+                                    .size(IconSize::XSmall)
+                                    .color(Color::Muted)
+                                    .with_animation(
+                                        "arrow-circle",
+                                        Animation::new(Duration::from_secs(2)).repeat(),
+                                        |icon, delta| {
+                                            icon.transform(gpui::Transformation::rotate(
+                                                gpui::percentage(delta),
+                                            ))
+                                        },
+                                    ),
+                            )
+                            .child(
+                                Label::new("Generating…")
+                                    .size(LabelSize::XSmall)
+                                    .color(Color::Muted),
+                            )
+                            .child(ui::Divider::vertical())
+                            .child(
+                                Button::new("cancel-generation", "Cancel")
+                                    .label_size(LabelSize::XSmall)
+                                    .key_binding(
+                                        KeyBinding::for_action_in(
+                                            &editor::actions::Cancel,
+                                            &focus_handle,
+                                            window,
+                                            cx,
+                                        )
+                                        .map(|kb| kb.size(rems_from_px(10.))),
+                                    )
+                                    .on_click(move |_event, window, cx| {
+                                        focus_handle.dispatch_action(
+                                            &editor::actions::Cancel,
+                                            window,
+                                            cx,
+                                        );
+                                    }),
+                            ),
+                    ),
+                )
+            })
            .child(
                v_flex()
-                    .gap_5()
-                    .child({
-                        let settings = ThemeSettings::get_global(cx);
-                        let text_style = TextStyle {
-                            color: cx.theme().colors().text,
-                            font_family: settings.ui_font.family.clone(),
-                            font_features: settings.ui_font.features.clone(),
-                            font_size: font_size.into(),
-                            font_weight: settings.ui_font.weight,
-                            line_height: line_height.into(),
-                            ..Default::default()
-                        };
-
-                        EditorElement::new(
-                            &self.editor,
-                            EditorStyle {
-                                background: bg_color,
-                                local_player: cx.theme().players().local(),
-                                text: text_style,
-                                ..Default::default()
-                            },
-                        )
-                    })
+                    .key_context("MessageEditor")
+                    .on_action(cx.listener(Self::chat))
+                    .on_action(cx.listener(|this, _: &ToggleModelSelector, window, cx| {
+                        this.model_selector
+                            .update(cx, |model_selector, cx| model_selector.toggle(window, cx));
+                    }))
+                    .on_action(cx.listener(Self::toggle_context_picker))
+                    .on_action(cx.listener(Self::remove_all_context))
+                    .on_action(cx.listener(Self::move_up))
+                    .on_action(cx.listener(Self::toggle_chat_mode))
+                    .gap_2()
+                    .p_2()
+                    .bg(bg_color)
+                    .border_t_1()
+                    .border_color(cx.theme().colors().border)
+                    .child(self.context_strip.clone())
                    .child(
-                        PopoverMenu::new("inline-context-picker")
-                            .menu(move |window, cx| {
-                                inline_context_picker.update(cx, |this, cx| {
-                                    this.init(window, cx);
-                                });
+                        v_flex()
+                            .gap_5()
+                            .child({
+                                let settings = ThemeSettings::get_global(cx);
+                                let text_style = TextStyle {
+                                    color: cx.theme().colors().text,
+                                    font_family: settings.ui_font.family.clone(),
+                                    font_fallbacks: settings.ui_font.fallbacks.clone(),
+                                    font_features: settings.ui_font.features.clone(),
+                                    font_size: font_size.into(),
+                                    font_weight: settings.ui_font.weight,
+                                    line_height: line_height.into(),
+                                    ..Default::default()
+                                };

-                                Some(inline_context_picker.clone())
+                                EditorElement::new(
+                                    &self.editor,
+                                    EditorStyle {
+                                        background: bg_color,
+                                        local_player: cx.theme().players().local(),
+                                        text: text_style,
+                                        ..Default::default()
+                                    },
+                                )
                            })
-                            .attach(gpui::Corner::TopLeft)
-                            .anchor(gpui::Corner::BottomLeft)
-                            .offset(gpui::Point {
-                                x: px(0.0),
-                                y: (-ThemeSettings::get_global(cx).ui_font_size(cx) * 2) - px(4.0),
-                            })
-                            .with_handle(self.inline_context_picker_menu_handle.clone()),
-                    )
-                    .child(
-                        h_flex()
-                            .justify_between()
                            .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,
-                                    )),
+                                PopoverMenu::new("inline-context-picker")
+                                    .menu(move |window, cx| {
+                                        inline_context_picker.update(cx, |this, cx| {
+                                            this.init(window, cx);
+                                        });
+
+                                        Some(inline_context_picker.clone())
+                                    })
+                                    .attach(gpui::Corner::TopLeft)
+                                    .anchor(gpui::Corner::BottomLeft)
+                                    .offset(gpui::Point {
+                                        x: px(0.0),
+                                        y: (-ThemeSettings::get_global(cx).ui_font_size(cx) * 2)
+                                            - px(4.0),
+                                    })
+                                    .with_handle(self.inline_context_picker_menu_handle.clone()),
                            )
-                            .child(h_flex().gap_1().child(self.model_selector.clone()).child(
-                                if is_streaming_completion {
-                                    ButtonLike::new("cancel-generation")
-                                        .width(button_width.into())
-                                        .style(ButtonStyle::Tinted(TintColor::Accent))
-                                        .child(
-                                            h_flex()
-                                                .w_full()
-                                                .justify_between()
-                                                .child(
-                                                    Label::new("Cancel")
-                                                        .size(LabelSize::Small)
-                                                        .with_animation(
-                                                            "pulsating-label",
-                                                            Animation::new(Duration::from_secs(2))
-                                                                .repeat()
-                                                                .with_easing(pulsating_between(
-                                                                    0.4, 0.8,
-                                                                )),
-                                                            |label, delta| label.alpha(delta),
-                                                        ),
-                                                )
-                                                .children(
-                                                    KeyBinding::for_action_in(
-                                                        &editor::actions::Cancel,
-                                                        &focus_handle,
-                                                        window,
-                                                        cx,
-                                                    )
-                                                    .map(|binding| binding.into_any_element()),
-                                                ),
-                                        )
-                                        .on_click(move |_event, window, cx| {
-                                            focus_handle.dispatch_action(
-                                                &editor::actions::Cancel,
+                            .child(
+                                h_flex()
+                                    .justify_between()
+                                    .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,
-                                            );
-                                        })
-                                } else {
-                                    ButtonLike::new("submit-message")
-                                        .width(button_width.into())
-                                        .style(ButtonStyle::Filled)
-                                        .disabled(is_editor_empty || !is_model_selected)
-                                        .child(
-                                            h_flex()
-                                                .w_full()
-                                                .justify_between()
-                                                .child(
-                                                    Label::new("Submit")
-                                                        .size(LabelSize::Small)
-                                                        .color(submit_label_color),
+                                            )),
+                                    )
+                                    .child(
+                                        h_flex().gap_1().child(self.model_selector.clone()).child(
+                                            ButtonLike::new("submit-message")
+                                                .width(button_width.into())
+                                                .style(ButtonStyle::Filled)
+                                                .disabled(
+                                                    is_editor_empty
+                                                        || !is_model_selected
+                                                        || is_streaming_completion,
                                                )
-                                                .children(
-                                                    KeyBinding::for_action_in(
-                                                        &Chat,
-                                                        &focus_handle,
-                                                        window,
-                                                        cx,
-                                                    )
-                                                    .map(|binding| binding.into_any_element()),
-                                                ),
-                                        )
-                                        .on_click(move |_event, window, cx| {
-                                            focus_handle.dispatch_action(&Chat, window, cx);
-                                        })
-                                        .when(is_editor_empty, |button| {
-                                            button
-                                                .tooltip(Tooltip::text("Type a message to submit"))
-                                        })
-                                        .when(!is_model_selected, |button| {
-                                            button.tooltip(Tooltip::text(
-                                                "Select a model to continue",
-                                            ))
-                                        })
-                                },
-                            )),
+                                                .child(
+                                                    h_flex()
+                                                        .w_full()
+                                                        .justify_between()
+                                                        .child(
+                                                            Label::new("Submit")
+                                                                .size(LabelSize::Small)
+                                                                .color(submit_label_color),
+                                                        )
+                                                        .children(
+                                                            KeyBinding::for_action_in(
+                                                                &Chat,
+                                                                &focus_handle,
+                                                                window,
+                                                                cx,
+                                                            )
+                                                            .map(|binding| {
+                                                                binding
+                                                                    .when(vim_mode_enabled, |kb| {
+                                                                        kb.size(rems_from_px(12.))
+                                                                    })
+                                                                    .into_any_element()
+                                                            }),
+                                                        ),
+                                                )
+                                                .on_click(move |_event, window, cx| {
+                                                    focus_handle.dispatch_action(&Chat, window, cx);
+                                                })
+                                                .when(is_editor_empty, |button| {
+                                                    button.tooltip(Tooltip::text(
+                                                        "Type a message to submit",
+                                                    ))
+                                                })
+                                                .when(is_streaming_completion, |button| {
+                                                    button.tooltip(Tooltip::text(
+                                                        "Cancel to submit a new message",
+                                                    ))
+                                                })
+                                                .when(!is_model_selected, |button| {
+                                                    button.tooltip(Tooltip::text(
+                                                        "Select a model to continue",
+                                                    ))
+                                                }),
+                                        ),
+                                    ),
+                            ),
                    ),
            )
    }
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -5,12 +5,14 @@ use assistant_tool::ToolWorkingSet;
 use chrono::{DateTime, Utc};
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::StreamExt as _;
-use gpui::{App, Context, EventEmitter, SharedString, Task};
+use gpui::{App, Context, Entity, EventEmitter, SharedString, Task};
 use language_model::{
    LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolUseId,
-    MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError, Role, StopReason,
+    LanguageModelRequestMessage, LanguageModelRequestTool, LanguageModelToolResult,
+    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
+    Role, StopReason,
 };
+use project::Project;
 use serde::{Deserialize, Serialize};
 use util::{post_inc, TryFutureExt as _};
 use uuid::Uuid;
@@ -70,12 +72,17 @@ pub struct Thread {
    context_by_message: HashMap<MessageId, Vec<ContextId>>,
    completion_count: usize,
    pending_completions: Vec<PendingCompletion>,
+    project: Entity<Project>,
    tools: Arc<ToolWorkingSet>,
    tool_use: ToolUseState,
 }

 impl Thread {
-    pub fn new(tools: Arc<ToolWorkingSet>, _cx: &mut Context<Self>) -> Self {
+    pub fn new(
+        project: Entity<Project>,
+        tools: Arc<ToolWorkingSet>,
+        _cx: &mut Context<Self>,
+    ) -> Self {
        Self {
            id: ThreadId::new(),
            updated_at: Utc::now(),
@@ -87,18 +94,27 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
+            project,
            tools,
-            tool_use: ToolUseState::default(),
+            tool_use: ToolUseState::new(),
        }
    }

    pub fn from_saved(
        id: ThreadId,
        saved: SavedThread,
+        project: Entity<Project>,
        tools: Arc<ToolWorkingSet>,
        _cx: &mut Context<Self>,
    ) -> Self {
-        let next_message_id = MessageId(saved.messages.len());
+        let next_message_id = MessageId(
+            saved
+                .messages
+                .last()
+                .map(|message| message.id.0 + 1)
+                .unwrap_or(0),
+        );
+        let tool_use = ToolUseState::from_saved_messages(&saved.messages);

        Self {
            id,
@@ -119,8 +135,9 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
+            project,
            tools,
-            tool_use: ToolUseState::default(),
+            tool_use,
        }
    }

@@ -185,10 +202,23 @@ impl Thread {
        self.tool_use.pending_tool_uses()
    }

+    /// Returns whether all of the tool uses have finished running.
+    pub fn all_tools_finished(&self) -> bool {
+        // If the only pending tool uses left are the ones with errors, then that means that we've finished running all
+        // of the pending tools.
+        self.pending_tool_uses()
+            .into_iter()
+            .all(|tool_use| tool_use.status.is_error())
+    }
+
    pub fn tool_uses_for_message(&self, id: MessageId) -> Vec<ToolUse> {
        self.tool_use.tool_uses_for_message(id)
    }

+    pub fn tool_results_for_message(&self, id: MessageId) -> Vec<&LanguageModelToolResult> {
+        self.tool_use.tool_results_for_message(id)
+    }
+
    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
        self.tool_use.message_has_tool_results(message_id)
    }
@@ -223,6 +253,34 @@ impl Thread {
        id
    }

+    pub fn edit_message(
+        &mut self,
+        id: MessageId,
+        new_role: Role,
+        new_text: String,
+        cx: &mut Context<Self>,
+    ) -> bool {
+        let Some(message) = self.messages.iter_mut().find(|message| message.id == id) else {
+            return false;
+        };
+        message.role = new_role;
+        message.text = new_text;
+        self.touch_updated_at();
+        cx.emit(ThreadEvent::MessageEdited(id));
+        true
+    }
+
+    pub fn delete_message(&mut self, id: MessageId, cx: &mut Context<Self>) -> bool {
+        let Some(index) = self.messages.iter().position(|message| message.id == id) else {
+            return false;
+        };
+        self.messages.remove(index);
+        self.context_by_message.remove(&id);
+        self.touch_updated_at();
+        cx.emit(ThreadEvent::MessageDeleted(id));
+        true
+    }
+
    /// Returns the representation of this [`Thread`] in a textual form.
    ///
    /// This is the representation we use when attaching a thread as context to another thread.
@@ -510,6 +568,23 @@ impl Thread {
        });
    }

+    pub fn use_pending_tools(&mut self, cx: &mut Context<Self>) {
+        let pending_tool_uses = self
+            .pending_tool_uses()
+            .into_iter()
+            .filter(|tool_use| tool_use.status.is_idle())
+            .cloned()
+            .collect::<Vec<_>>();
+
+        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, self.project.clone(), cx);
+
+                self.insert_tool_output(tool_use.id.clone(), task, cx);
+            }
+        }
+    }
+
    pub fn insert_tool_output(
        &mut self,
        tool_use_id: LanguageModelToolUseId,
@@ -536,6 +611,23 @@ impl Thread {
            .run_pending_tool(tool_use_id, insert_output_task);
    }

+    pub fn send_tool_results_to_model(
+        &mut self,
+        model: Arc<dyn LanguageModel>,
+        cx: &mut Context<Self>,
+    ) {
+        // Insert a user message to contain the tool results.
+        self.insert_user_message(
+            // TODO: Sending up a user message without any content results in the model sending back
+            // responses that also don't have any content. We currently don't handle this case well,
+            // so for now we provide some text to keep the model on track.
+            "Here are the tool results.",
+            Vec::new(),
+            cx,
+        );
+        self.send_to_model(model, RequestKind::Chat, true, cx);
+    }
+
    /// Cancels the last pending completion, if there are any pending.
    ///
    /// Returns whether a completion was canceled.
@@ -561,6 +653,8 @@ pub enum ThreadEvent {
    StreamedCompletion,
    StreamedAssistantText(MessageId, String),
    MessageAdded(MessageId),
+    MessageEdited(MessageId),
+    MessageDeleted(MessageId),
    SummaryChanged,
    UsePendingTools,
    ToolFinished {
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -12,9 +12,9 @@ use futures::FutureExt as _;
 use gpui::{
    prelude::*, App, BackgroundExecutor, Context, Entity, Global, ReadGlobal, SharedString, Task,
 };
-use heed::types::SerdeBincode;
+use heed::types::{SerdeBincode, SerdeJson};
 use heed::Database;
-use language_model::Role;
+use language_model::{LanguageModelToolUseId, Role};
 use project::Project;
 use serde::{Deserialize, Serialize};
 use util::ResultExt as _;
@@ -26,7 +26,6 @@ pub fn init(cx: &mut App) {
 }

 pub struct ThreadStore {
-    #[allow(unused)]
    project: Entity<Project>,
    tools: Arc<ToolWorkingSet>,
    context_server_manager: Entity<ContextServerManager>,
@@ -78,7 +77,7 @@ impl ThreadStore {
    }

    pub fn create_thread(&mut self, cx: &mut Context<Self>) -> Entity<Thread> {
-        cx.new(|cx| Thread::new(self.tools.clone(), cx))
+        cx.new(|cx| Thread::new(self.project.clone(), self.tools.clone(), cx))
    }

    pub fn open_thread(
@@ -96,7 +95,15 @@ impl ThreadStore {
                .ok_or_else(|| anyhow!("no thread found with ID: {id:?}"))?;

            this.update(&mut cx, |this, cx| {
-                cx.new(|cx| Thread::from_saved(id.clone(), thread, this.tools.clone(), cx))
+                cx.new(|cx| {
+                    Thread::from_saved(
+                        id.clone(),
+                        thread,
+                        this.project.clone(),
+                        this.tools.clone(),
+                        cx,
+                    )
+                })
            })
        })
    }
@@ -113,6 +120,24 @@ impl ThreadStore {
                        id: message.id,
                        role: message.role,
                        text: message.text.clone(),
+                        tool_uses: thread
+                            .tool_uses_for_message(message.id)
+                            .into_iter()
+                            .map(|tool_use| SavedToolUse {
+                                id: tool_use.id,
+                                name: tool_use.name,
+                                input: tool_use.input,
+                            })
+                            .collect(),
+                        tool_results: thread
+                            .tool_results_for_message(message.id)
+                            .into_iter()
+                            .map(|tool_result| SavedToolResult {
+                                tool_use_id: tool_result.tool_use_id.clone(),
+                                is_error: tool_result.is_error,
+                                content: tool_result.content.clone(),
+                            })
+                            .collect(),
                    })
                    .collect(),
            };
@@ -239,11 +264,29 @@ pub struct SavedThread {
    pub messages: Vec<SavedMessage>,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct SavedMessage {
    pub id: MessageId,
    pub role: Role,
    pub text: String,
+    #[serde(default)]
+    pub tool_uses: Vec<SavedToolUse>,
+    #[serde(default)]
+    pub tool_results: Vec<SavedToolResult>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SavedToolUse {
+    pub id: LanguageModelToolUseId,
+    pub name: SharedString,
+    pub input: serde_json::Value,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct SavedToolResult {
+    pub tool_use_id: LanguageModelToolUseId,
+    pub is_error: bool,
+    pub content: Arc<str>,
 }

 struct GlobalThreadsDatabase(
@@ -255,7 +298,7 @@ impl Global for GlobalThreadsDatabase {}
 pub(crate) struct ThreadsDatabase {
    executor: BackgroundExecutor,
    env: heed::Env,
-    threads: Database<SerdeBincode<ThreadId>, SerdeBincode<SavedThread>>,
+    threads: Database<SerdeBincode<ThreadId>, SerdeJson<SavedThread>>,
 }

 impl ThreadsDatabase {
@@ -270,7 +313,7 @@ impl ThreadsDatabase {
        let database_future = executor
            .spawn({
                let executor = executor.clone();
-                let database_path = paths::support_dir().join("threads/threads-db.0.mdb");
+                let database_path = paths::support_dir().join("threads/threads-db.1.mdb");
                async move { ThreadsDatabase::new(database_path, executor) }
            })
            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
--- a/crates/assistant2/src/tool_use.rs
+++ b/crates/assistant2/src/tool_use.rs
@@ -7,10 +7,11 @@ use futures::FutureExt as _;
 use gpui::{SharedString, Task};
 use language_model::{
    LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
-    LanguageModelToolUseId, MessageContent,
+    LanguageModelToolUseId, MessageContent, Role,
 };

 use crate::thread::MessageId;
+use crate::thread_store::SavedMessage;

 #[derive(Debug)]
 pub struct ToolUse {
@@ -28,7 +29,6 @@ pub enum ToolUseStatus {
    Error(SharedString),
 }

-#[derive(Default)]
 pub struct ToolUseState {
    tool_uses_by_assistant_message: HashMap<MessageId, Vec<LanguageModelToolUse>>,
    tool_uses_by_user_message: HashMap<MessageId, Vec<LanguageModelToolUseId>>,
@@ -37,6 +37,65 @@ pub struct ToolUseState {
 }

 impl ToolUseState {
+    pub fn new() -> Self {
+        Self {
+            tool_uses_by_assistant_message: HashMap::default(),
+            tool_uses_by_user_message: HashMap::default(),
+            tool_results: HashMap::default(),
+            pending_tool_uses_by_id: HashMap::default(),
+        }
+    }
+
+    pub fn from_saved_messages(messages: &[SavedMessage]) -> Self {
+        let mut this = Self::new();
+
+        for message in messages {
+            match message.role {
+                Role::Assistant => {
+                    if !message.tool_uses.is_empty() {
+                        this.tool_uses_by_assistant_message.insert(
+                            message.id,
+                            message
+                                .tool_uses
+                                .iter()
+                                .map(|tool_use| LanguageModelToolUse {
+                                    id: tool_use.id.clone(),
+                                    name: tool_use.name.clone().into(),
+                                    input: tool_use.input.clone(),
+                                })
+                                .collect(),
+                        );
+                    }
+                }
+                Role::User => {
+                    if !message.tool_results.is_empty() {
+                        let tool_uses_by_user_message = this
+                            .tool_uses_by_user_message
+                            .entry(message.id)
+                            .or_default();
+
+                        for tool_result in &message.tool_results {
+                            let tool_use_id = tool_result.tool_use_id.clone();
+
+                            tool_uses_by_user_message.push(tool_use_id.clone());
+                            this.tool_results.insert(
+                                tool_use_id.clone(),
+                                LanguageModelToolResult {
+                                    tool_use_id,
+                                    is_error: tool_result.is_error,
+                                    content: tool_result.content.clone(),
+                                },
+                            );
+                        }
+                    }
+                }
+                Role::System => {}
+            }
+        }
+
+        this
+    }
+
    pub fn pending_tool_uses(&self) -> Vec<&PendingToolUse> {
        self.pending_tool_uses_by_id.values().collect()
    }
@@ -84,6 +143,17 @@ impl ToolUseState {
        tool_uses
    }

+    pub fn tool_results_for_message(&self, message_id: MessageId) -> Vec<&LanguageModelToolResult> {
+        let empty = Vec::new();
+
+        self.tool_uses_by_user_message
+            .get(&message_id)
+            .unwrap_or(&empty)
+            .iter()
+            .filter_map(|tool_use_id| self.tool_results.get(&tool_use_id))
+            .collect()
+    }
+
    pub fn message_has_tool_results(&self, message_id: MessageId) -> bool {
        self.tool_uses_by_user_message
            .get(&message_id)
--- a/crates/assistant2/src/ui/context_pill.rs
+++ b/crates/assistant2/src/ui/context_pill.rs
@@ -103,7 +103,7 @@ impl RenderOnce for ContextPill {
            .pl_1()
            .pb(px(1.))
            .border_1()
-            .rounded_md()
+            .rounded_sm()
            .gap_1()
            .child(self.icon().size(IconSize::XSmall).color(Color::Muted));

--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -54,7 +54,7 @@ use ui::{
    Tooltip,
 };
 use util::{maybe, ResultExt};
-use workspace::searchable::SearchableItemHandle;
+use workspace::searchable::{Direction, SearchableItemHandle};
 use workspace::{
    item::{self, FollowableItem, Item, ItemHandle},
    notifications::NotificationId,
@@ -1241,7 +1241,7 @@ impl ContextEditor {
            .child("Press")
            .child(
                h_flex()
-                    .rounded_md()
+                    .rounded_sm()
                    .px_1()
                    .mr_0p5()
                    .border_1()
@@ -2092,7 +2092,7 @@ impl ContextEditor {
                .ml(gutter_width)
                .pb_1()
                .w(max_width - gutter_width)
-                .rounded_md()
+                .rounded_sm()
                .border_1()
                .border_color(theme.colors().border_variant)
                .overflow_hidden()
@@ -3106,12 +3106,13 @@ impl SearchableItem for ContextEditor {

    fn active_match_index(
        &mut self,
+        direction: Direction,
        matches: &[Self::Match],
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Option<usize> {
        self.editor.update(cx, |editor, cx| {
-            editor.active_match_index(matches, window, cx)
+            editor.active_match_index(direction, matches, window, cx)
        })
    }
 }
@@ -3421,7 +3422,7 @@ fn invoked_slash_command_fold_placeholder(
                .ml_6()
                .gap_2()
                .bg(cx.theme().colors().surface_background)
-                .rounded_md()
+                .rounded_sm()
                .child(Label::new(format!("/{}", command.name.clone())))
                .map(|parent| match &command.status {
                    InvokedSlashCommandStatus::Running(_) => {
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -104,49 +104,53 @@ impl ContextStore {
            const CONTEXT_WATCH_DURATION: Duration = Duration::from_millis(100);
            let (mut events, _) = fs.watch(contexts_dir(), CONTEXT_WATCH_DURATION).await;

-            let this = cx.new(|cx: &mut Context<Self>| {
-                let context_server_factory_registry =
-                    ContextServerFactoryRegistry::default_global(cx);
-                let context_server_manager = cx.new(|cx| {
-                    ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
-                });
-                let mut this = Self {
-                    contexts: Vec::new(),
-                    contexts_metadata: Vec::new(),
-                    context_server_manager,
-                    context_server_slash_command_ids: HashMap::default(),
-                    host_contexts: Vec::new(),
-                    fs,
-                    languages,
-                    slash_commands,
-                    telemetry,
-                    _watch_updates: cx.spawn(|this, mut cx| {
-                        async move {
-                            while events.next().await.is_some() {
-                                this.update(&mut cx, |this, cx| this.reload(cx))?
-                                    .await
-                                    .log_err();
+            let this =
+                cx.new(|cx: &mut Context<Self>| {
+                    let context_server_factory_registry =
+                        ContextServerFactoryRegistry::default_global(cx);
+                    let context_server_manager = cx.new(|cx| {
+                        ContextServerManager::new(
+                            context_server_factory_registry,
+                            project.clone(),
+                            cx,
+                        )
+                    });
+                    let mut this = Self {
+                        contexts: Vec::new(),
+                        contexts_metadata: Vec::new(),
+                        context_server_manager,
+                        context_server_slash_command_ids: HashMap::default(),
+                        host_contexts: Vec::new(),
+                        fs,
+                        languages,
+                        slash_commands,
+                        telemetry,
+                        _watch_updates: cx.spawn(|this, mut cx| {
+                            async move {
+                                while events.next().await.is_some() {
+                                    this.update(&mut cx, |this, cx| this.reload(cx))?
+                                        .await
+                                        .log_err();
+                                }
+                                anyhow::Ok(())
                            }
-                            anyhow::Ok(())
-                        }
-                        .log_err()
-                    }),
-                    client_subscription: None,
-                    _project_subscriptions: vec![
-                        cx.observe(&project, Self::handle_project_changed),
-                        cx.subscribe(&project, Self::handle_project_event),
-                    ],
-                    project_is_shared: false,
-                    client: project.read(cx).client(),
-                    project: project.clone(),
-                    prompt_builder,
-                };
-                this.handle_project_changed(project.clone(), cx);
-                this.synchronize_contexts(cx);
-                this.register_context_server_handlers(cx);
-                this.reload(cx).detach_and_log_err(cx);
-                this
-            })?;
+                            .log_err()
+                        }),
+                        client_subscription: None,
+                        _project_subscriptions: vec![
+                            cx.subscribe(&project, Self::handle_project_event)
+                        ],
+                        project_is_shared: false,
+                        client: project.read(cx).client(),
+                        project: project.clone(),
+                        prompt_builder,
+                    };
+                    this.handle_project_shared(project.clone(), cx);
+                    this.synchronize_contexts(cx);
+                    this.register_context_server_handlers(cx);
+                    this.reload(cx).detach_and_log_err(cx);
+                    this
+                })?;

            Ok(this)
        })
@@ -288,7 +292,7 @@ impl ContextStore {
        })?
    }

-    fn handle_project_changed(&mut self, _: Entity<Project>, cx: &mut Context<Self>) {
+    fn handle_project_shared(&mut self, _: Entity<Project>, cx: &mut Context<Self>) {
        let is_shared = self.project.read(cx).is_shared();
        let was_shared = mem::replace(&mut self.project_is_shared, is_shared);
        if is_shared == was_shared {
@@ -318,11 +322,14 @@ impl ContextStore {

    fn handle_project_event(
        &mut self,
-        _: Entity<Project>,
+        project: Entity<Project>,
        event: &project::Event,
        cx: &mut Context<Self>,
    ) {
        match event {
+            project::Event::RemoteIdChanged(_) => {
+                self.handle_project_shared(project, cx);
+            }
            project::Event::Reshared => {
                self.advertise_contexts(cx);
            }
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -140,7 +140,7 @@ impl ResolvedPatch {
            buffer.edit(
                edits,
                Some(AutoindentMode::Block {
-                    original_start_columns: Vec::new(),
+                    original_indent_columns: Vec::new(),
                }),
                cx,
            );
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -5,9 +5,9 @@ use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWor
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
 use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
-use language::{Anchor, Buffer, LanguageServerId, ToPoint};
+use language::{Anchor, Buffer, ToPoint};
 use parking_lot::Mutex;
-use project::{lsp_store::CompletionDocumentation, CompletionIntent};
+use project::{lsp_store::CompletionDocumentation, CompletionIntent, CompletionSource};
 use rope::Point;
 use std::{
    cell::RefCell,
@@ -125,10 +125,8 @@ impl SlashCommandCompletionProvider {
                            )),
                            new_text,
                            label: command.label(cx),
-                            server_id: LanguageServerId(0),
-                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
+                            source: CompletionSource::Custom,
                        })
                    })
                    .collect()
@@ -225,10 +223,8 @@ impl SlashCommandCompletionProvider {
                            label: new_argument.label,
                            new_text,
                            documentation: None,
-                            server_id: LanguageServerId(0),
-                            lsp_completion: Default::default(),
                            confirm,
-                            resolved: true,
+                            source: CompletionSource::Custom,
                        }
                    })
                    .collect())
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -17,6 +17,6 @@ collections.workspace = true
 derive_more.workspace = true
 gpui.workspace = true
 parking_lot.workspace = true
+project.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-workspace.workspace = true
--- a/crates/assistant_tool/src/assistant_tool.rs
+++ b/crates/assistant_tool/src/assistant_tool.rs
@@ -4,8 +4,8 @@ mod tool_working_set;
 use std::sync::Arc;

 use anyhow::Result;
-use gpui::{App, Task, WeakEntity, Window};
-use workspace::Workspace;
+use gpui::{App, Entity, Task};
+use project::Project;

 pub use crate::tool_registry::*;
 pub use crate::tool_working_set::*;
@@ -31,8 +31,7 @@ pub trait Tool: 'static + Send + Sync {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        workspace: WeakEntity<Workspace>,
-        window: &mut Window,
+        project: Entity<Project>,
        cx: &mut App,
    ) -> Task<Result<String>>;
 }
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -16,7 +16,7 @@ anyhow.workspace = true
 assistant_tool.workspace = true
 chrono.workspace = true
 gpui.workspace = true
+project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-workspace.workspace = true
--- a/crates/assistant_tools/src/assistant_tools.rs
+++ b/crates/assistant_tools/src/assistant_tools.rs
@@ -1,13 +1,19 @@
+mod list_worktrees_tool;
 mod now_tool;
+mod read_file_tool;

 use assistant_tool::ToolRegistry;
 use gpui::App;

+use crate::list_worktrees_tool::ListWorktreesTool;
 use crate::now_tool::NowTool;
+use crate::read_file_tool::ReadFileTool;

 pub fn init(cx: &mut App) {
    assistant_tool::init(cx);

    let registry = ToolRegistry::global(cx);
    registry.register_tool(NowTool);
+    registry.register_tool(ListWorktreesTool);
+    registry.register_tool(ReadFileTool);
 }
--- a/crates/assistant_tools/src/list_worktrees_tool.rs
+++ b/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)
+            })?
+        })
+    }
+}
--- a/crates/assistant_tools/src/now_tool.rs
+++ b/crates/assistant_tools/src/now_tool.rs
@@ -3,7 +3,8 @@ use std::sync::Arc;
 use anyhow::{anyhow, Result};
 use assistant_tool::Tool;
 use chrono::{Local, Utc};
-use gpui::{App, Task, WeakEntity, Window};
+use gpui::{App, Entity, Task};
+use project::Project;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};

@@ -41,8 +42,7 @@ impl Tool for NowTool {
    fn run(
        self: Arc<Self>,
        input: serde_json::Value,
-        _workspace: WeakEntity<workspace::Workspace>,
-        _window: &mut Window,
+        _project: Entity<Project>,
        _cx: &mut App,
    ) -> Task<Result<String>> {
        let input: NowToolInput = match serde_json::from_value(input) {
--- a/crates/assistant_tools/src/read_file_tool.rs
+++ b/crates/assistant_tools/src/read_file_tool.rs
@@ -0,0 +1,62 @@
+use std::path::Path;
+use std::sync::Arc;
+
+use anyhow::{anyhow, Result};
+use assistant_tool::Tool;
+use gpui::{App, Entity, Task};
+use project::{Project, ProjectPath, WorktreeId};
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, JsonSchema)]
+pub struct ReadFileToolInput {
+    /// The ID of the worktree in which the file resides.
+    pub worktree_id: usize,
+    /// The path to the file to read.
+    ///
+    /// This path is relative to the worktree root, it must not be an absolute path.
+    pub path: Arc<Path>,
+}
+
+pub struct ReadFileTool;
+
+impl Tool for ReadFileTool {
+    fn name(&self) -> String {
+        "read-file".into()
+    }
+
+    fn description(&self) -> String {
+        "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 {
+        let schema = schemars::schema_for!(ReadFileToolInput);
+        serde_json::to_value(&schema).unwrap()
+    }
+
+    fn run(
+        self: Arc<Self>,
+        input: serde_json::Value,
+        project: Entity<Project>,
+        cx: &mut App,
+    ) -> Task<Result<String>> {
+        let input = match serde_json::from_value::<ReadFileToolInput>(input) {
+            Ok(input) => input,
+            Err(err) => return Task::ready(Err(anyhow!(err))),
+        };
+
+        let project_path = ProjectPath {
+            worktree_id: WorktreeId::from_usize(input.worktree_id),
+            path: input.path,
+        };
+        cx.spawn(|cx| async move {
+            let buffer = cx
+                .update(|cx| {
+                    project.update(cx, |project, cx| project.open_buffer(project_path, cx))
+                })?
+                .await?;
+
+            cx.update(|cx| buffer.read(cx).text())
+        })
+    }
+}
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -663,11 +663,13 @@ impl std::fmt::Debug for BufferDiff {
    }
 }

+#[derive(Clone, Debug)]
 pub enum BufferDiffEvent {
    DiffChanged {
        changed_range: Option<Range<text::Anchor>>,
    },
    LanguageChanged,
+    HunksStagedOrUnstaged(Option<Rope>),
 }

 impl EventEmitter<BufferDiffEvent> for BufferDiff {}
@@ -762,6 +764,17 @@ impl BufferDiff {
        self.secondary_diff.clone()
    }

+    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.clear();
+            });
+            cx.emit(BufferDiffEvent::DiffChanged {
+                changed_range: Some(Anchor::MIN..Anchor::MAX),
+            });
+        }
+    }
+
    pub fn stage_or_unstage_hunks(
        &mut self,
        stage: bool,
@@ -784,6 +797,9 @@ impl BufferDiff {
                }
            });
        }
+        cx.emit(BufferDiffEvent::HunksStagedOrUnstaged(
+            new_index_text.clone(),
+        ));
        if let Some((first, last)) = hunks.first().zip(hunks.last()) {
            let changed_range = first.buffer_range.start..last.buffer_range.end;
            cx.emit(BufferDiffEvent::DiffChanged {
@@ -900,6 +916,14 @@ impl BufferDiff {
        }
    }

+    pub fn hunks<'a>(
+        &'a self,
+        buffer_snapshot: &'a text::BufferSnapshot,
+        cx: &'a App,
+    ) -> impl 'a + Iterator<Item = DiffHunk> {
+        self.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, buffer_snapshot, cx)
+    }
+
    pub fn hunks_intersecting_range<'a>(
        &'a self,
        range: Range<text::Anchor>,
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -418,6 +418,8 @@ impl Telemetry {

    fn report_event(self: &Arc<Self>, event: Event) {
        let mut state = self.state.lock();
+        // RUST_LOG=telemetry=trace to debug telemetry events
+        log::trace!(target: "telemetry", "{:?}", event);

        if !state.settings.metrics {
            return;
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -308,7 +308,7 @@ impl Server {
            .add_request_handler(forward_read_only_project_request::<proto::InlayHints>)
            .add_request_handler(forward_read_only_project_request::<proto::ResolveInlayHint>)
            .add_request_handler(forward_read_only_project_request::<proto::OpenBufferByPath>)
-            .add_request_handler(forward_read_only_project_request::<proto::GitBranches>)
+            .add_request_handler(forward_read_only_project_request::<proto::GitGetBranches>)
            .add_request_handler(forward_read_only_project_request::<proto::OpenUnstagedDiff>)
            .add_request_handler(forward_read_only_project_request::<proto::OpenUncommittedDiff>)
            .add_request_handler(
@@ -393,9 +393,6 @@ impl Server {
            .add_request_handler(forward_mutating_project_request::<proto::OpenContext>)
            .add_request_handler(forward_mutating_project_request::<proto::CreateContext>)
            .add_request_handler(forward_mutating_project_request::<proto::SynchronizeContexts>)
-            .add_request_handler(forward_mutating_project_request::<proto::Push>)
-            .add_request_handler(forward_mutating_project_request::<proto::Pull>)
-            .add_request_handler(forward_mutating_project_request::<proto::Fetch>)
            .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>)
@@ -405,6 +402,10 @@ impl Server {
            .add_request_handler(forward_read_only_project_request::<proto::GitCheckoutFiles>)
            .add_request_handler(forward_mutating_project_request::<proto::SetIndexText>)
            .add_request_handler(forward_mutating_project_request::<proto::OpenCommitMessageBuffer>)
+            .add_request_handler(forward_mutating_project_request::<proto::GitDiff>)
+            .add_request_handler(forward_mutating_project_request::<proto::GitCreateBranch>)
+            .add_request_handler(forward_mutating_project_request::<proto::GitChangeBranch>)
+            .add_request_handler(forward_mutating_project_request::<proto::CheckForPushedCommits>)
            .add_message_handler(broadcast_project_message_from_host::<proto::AdvertiseContexts>)
            .add_message_handler(update_context)
            .add_request_handler({
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -6741,19 +6741,24 @@ async fn test_remote_git_branches(
        .collect::<HashSet<_>>();

    let (project_a, worktree_id) = client_a.build_local_project("/project", cx_a).await;
+
    let project_id = active_call_a
        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
        .await
        .unwrap();
    let project_b = client_b.join_remote_project(project_id, cx_b).await;

-    let root_path = ProjectPath::root_path(worktree_id);
-    // Client A sees that a guest has joined.
+    // Client A sees that a guest has joined and the repo has been populated
    executor.run_until_parked();

+    let repo_b = cx_b.update(|cx| project_b.read(cx).active_repository(cx).unwrap());
+
+    let root_path = ProjectPath::root_path(worktree_id);
+
    let branches_b = cx_b
-        .update(|cx| project_b.update(cx, |project, cx| project.branches(root_path.clone(), cx)))
+        .update(|cx| repo_b.update(cx, |repository, _| repository.branches()))
        .await
+        .unwrap()
        .unwrap();

    let new_branch = branches[2];
@@ -6765,13 +6770,10 @@ async fn test_remote_git_branches(

    assert_eq!(branches_b, branches_set);

-    cx_b.update(|cx| {
-        project_b.update(cx, |project, cx| {
-            project.update_or_create_branch(root_path.clone(), new_branch.to_string(), cx)
-        })
-    })
-    .await
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+        .await
+        .unwrap()
+        .unwrap();

    executor.run_until_parked();

@@ -6789,11 +6791,21 @@ async fn test_remote_git_branches(

    // Also try creating a new branch
    cx_b.update(|cx| {
-        project_b.update(cx, |project, cx| {
-            project.update_or_create_branch(root_path.clone(), "totally-new-branch".to_string(), cx)
-        })
+        repo_b
+            .read(cx)
+            .create_branch("totally-new-branch".to_string())
    })
    .await
+    .unwrap()
+    .unwrap();
+
+    cx_b.update(|cx| {
+        repo_b
+            .read(cx)
+            .change_branch("totally-new-branch".to_string())
+    })
+    .await
+    .unwrap()
    .unwrap();

    executor.run_until_parked();
--- a/crates/collab/src/tests/remote_editing_collaboration_tests.rs
+++ b/crates/collab/src/tests/remote_editing_collaboration_tests.rs
@@ -276,11 +276,13 @@ async fn test_ssh_collaboration_git_branches(
    // has some git repositories
    executor.run_until_parked();

+    let repo_b = cx_b.update(|cx| project_b.read(cx).active_repository(cx).unwrap());
    let root_path = ProjectPath::root_path(worktree_id);

    let branches_b = cx_b
-        .update(|cx| project_b.update(cx, |project, cx| project.branches(root_path.clone(), cx)))
+        .update(|cx| repo_b.read(cx).branches())
        .await
+        .unwrap()
        .unwrap();

    let new_branch = branches[2];
@@ -292,13 +294,10 @@ async fn test_ssh_collaboration_git_branches(

    assert_eq!(&branches_b, &branches_set);

-    cx_b.update(|cx| {
-        project_b.update(cx, |project, cx| {
-            project.update_or_create_branch(root_path.clone(), new_branch.to_string(), cx)
-        })
-    })
-    .await
-    .unwrap();
+    cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
+        .await
+        .unwrap()
+        .unwrap();

    executor.run_until_parked();

@@ -318,11 +317,21 @@ async fn test_ssh_collaboration_git_branches(

    // Also try creating a new branch
    cx_b.update(|cx| {
-        project_b.update(cx, |project, cx| {
-            project.update_or_create_branch(root_path.clone(), "totally-new-branch".to_string(), cx)
-        })
+        repo_b
+            .read(cx)
+            .create_branch("totally-new-branch".to_string())
    })
    .await
+    .unwrap()
+    .unwrap();
+
+    cx_b.update(|cx| {
+        repo_b
+            .read(cx)
+            .change_branch("totally-new-branch".to_string())
+    })
+    .await
+    .unwrap()
    .unwrap();

    executor.run_until_parked();
--- a/crates/collab_ui/src/chat_panel.rs
+++ b/crates/collab_ui/src/chat_panel.rs
@@ -323,7 +323,7 @@ impl ChatPanel {
                        .my_0p5()
                        .px_0p5()
                        .gap_x_1()
-                        .rounded_md()
+                        .rounded_sm()
                        .child(Icon::new(IconName::ReplyArrowRight).color(Color::Muted))
                        .when(reply_to_message.is_none(), |el| {
                            el.child(
@@ -358,7 +358,7 @@ impl ChatPanel {
                .my_0p5()
                .px_0p5()
                .gap_x_1()
-                .rounded_md()
+                .rounded_sm()
                .overflow_hidden()
                .hover(|style| style.bg(cx.theme().colors().element_background))
                .child(Icon::new(IconName::ReplyArrowRight).color(Color::Muted))
@@ -476,7 +476,7 @@ impl ChatPanel {
                div()
                    .group("")
                    .bg(background)
-                    .rounded_md()
+                    .rounded_sm()
                    .overflow_hidden()
                    .px_1p5()
                    .py_0p5()
@@ -563,7 +563,7 @@ impl ChatPanel {
                            .child(
                                div()
                                    .px_1()
-                                    .rounded_md()
+                                    .rounded_sm()
                                    .text_ui_xs(cx)
                                    .bg(cx.theme().colors().background)
                                    .child("New messages"),
@@ -589,7 +589,7 @@ impl ChatPanel {
        div()
            .w_6()
            .bg(cx.theme().colors().element_background)
-            .hover(|style| style.bg(cx.theme().colors().element_hover).rounded_md())
+            .hover(|style| style.bg(cx.theme().colors().element_hover).rounded_sm())
            .child(child)
    }

@@ -604,7 +604,7 @@ impl ChatPanel {
            .absolute()
            .right_2()
            .overflow_hidden()
-            .rounded_md()
+            .rounded_sm()
            .border_color(cx.theme().colors().element_selected)
            .border_1()
            .when(!self.has_open_menu(message_id), |el| {
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -10,9 +10,9 @@ use gpui::{
 };
 use language::{
    language_settings::SoftWrap, Anchor, Buffer, BufferSnapshot, CodeLabel, LanguageRegistry,
-    LanguageServerId, ToOffset,
+    ToOffset,
 };
-use project::{search::SearchQuery, Completion};
+use project::{search::SearchQuery, Completion, CompletionSource};
 use settings::Settings;
 use std::{
    cell::RefCell,
@@ -309,11 +309,9 @@ impl MessageEditor {
                    old_range: range.clone(),
                    new_text,
                    label,
-                    documentation: None,
-                    server_id: LanguageServerId(0), // TODO: Make this optional or something?
-                    lsp_completion: Default::default(), // TODO: Make this optional or something?
                    confirm: None,
-                    resolved: true,
+                    documentation: None,
+                    source: CompletionSource::Custom,
                }
            })
            .collect()
@@ -531,7 +529,7 @@ impl Render for MessageEditor {
            .px_2()
            .py_1()
            .bg(cx.theme().colors().editor_background)
-            .rounded_md()
+            .rounded_sm()
            .child(EditorElement::new(
                &self.editor,
                EditorStyle {
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -300,7 +300,7 @@ impl NotificationPanel {
                                        .hover(|style| {
                                            style
                                                .bg(cx.theme().colors().element_selected)
-                                                .rounded_md()
+                                                .rounded_sm()
                                        })
                                        .child(Label::new(relative_timestamp).color(Color::Muted))
                                        .tooltip(move |_, cx| {
--- a/crates/component/src/component.rs
+++ b/crates/component/src/component.rs
@@ -1,3 +1,4 @@
+use std::fmt::Display;
 use std::ops::{Deref, DerefMut};
 use std::sync::LazyLock;

@@ -8,7 +9,7 @@ use parking_lot::RwLock;
 use theme::ActiveTheme;

 pub trait Component {
-    fn scope() -> Option<&'static str>;
+    fn scope() -> Option<ComponentScope>;
    fn name() -> &'static str {
        std::any::type_name::<Self>()
    }
@@ -31,7 +32,7 @@ pub static COMPONENT_DATA: LazyLock<RwLock<ComponentRegistry>> =
    LazyLock::new(|| RwLock::new(ComponentRegistry::new()));

 pub struct ComponentRegistry {
-    components: Vec<(Option<&'static str>, &'static str, Option<&'static str>)>,
+    components: Vec<(Option<ComponentScope>, &'static str, Option<&'static str>)>,
    previews: HashMap<&'static str, fn(&mut Window, &mut App) -> AnyElement>,
 }

@@ -77,18 +78,23 @@ pub struct ComponentId(pub &'static str);

 #[derive(Clone)]
 pub struct ComponentMetadata {
+    id: ComponentId,
    name: SharedString,
-    scope: Option<SharedString>,
+    scope: Option<ComponentScope>,
    description: Option<SharedString>,
    preview: Option<fn(&mut Window, &mut App) -> AnyElement>,
 }

 impl ComponentMetadata {
+    pub fn id(&self) -> ComponentId {
+        self.id.clone()
+    }
+
    pub fn name(&self) -> SharedString {
        self.name.clone()
    }

-    pub fn scope(&self) -> Option<SharedString> {
+    pub fn scope(&self) -> Option<ComponentScope> {
        self.scope.clone()
    }

@@ -152,14 +158,16 @@ pub fn components() -> AllComponents {
    let data = COMPONENT_DATA.read();
    let mut all_components = AllComponents::new();

-    for &(scope, name, description) in &data.components {
-        let scope = scope.map(Into::into);
+    for (ref scope, name, description) in &data.components {
        let preview = data.previews.get(name).cloned();
+        let component_name = SharedString::new_static(name);
+        let id = ComponentId(name);
        all_components.insert(
-            ComponentId(name),
+            id.clone(),
            ComponentMetadata {
-                name: name.into(),
-                scope,
+                id,
+                name: component_name,
+                scope: scope.clone(),
                description: description.map(Into::into),
                preview,
            },
@@ -169,6 +177,59 @@ pub fn components() -> AllComponents {
    all_components
 }

+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum ComponentScope {
+    Layout,
+    Input,
+    Notification,
+    Editor,
+    Collaboration,
+    VersionControl,
+    Unknown(SharedString),
+}
+
+impl Display for ComponentScope {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ComponentScope::Layout => write!(f, "Layout"),
+            ComponentScope::Input => write!(f, "Input"),
+            ComponentScope::Notification => write!(f, "Notification"),
+            ComponentScope::Editor => write!(f, "Editor"),
+            ComponentScope::Collaboration => write!(f, "Collaboration"),
+            ComponentScope::VersionControl => write!(f, "Version Control"),
+            ComponentScope::Unknown(name) => write!(f, "Unknown: {}", name),
+        }
+    }
+}
+
+impl From<&str> for ComponentScope {
+    fn from(value: &str) -> Self {
+        match value {
+            "Layout" => ComponentScope::Layout,
+            "Input" => ComponentScope::Input,
+            "Notification" => ComponentScope::Notification,
+            "Editor" => ComponentScope::Editor,
+            "Collaboration" => ComponentScope::Collaboration,
+            "Version Control" | "VersionControl" => ComponentScope::VersionControl,
+            _ => ComponentScope::Unknown(SharedString::new(value)),
+        }
+    }
+}
+
+impl From<String> for ComponentScope {
+    fn from(value: String) -> Self {
+        match value.as_str() {
+            "Layout" => ComponentScope::Layout,
+            "Input" => ComponentScope::Input,
+            "Notification" => ComponentScope::Notification,
+            "Editor" => ComponentScope::Editor,
+            "Collaboration" => ComponentScope::Collaboration,
+            "Version Control" | "VersionControl" => ComponentScope::VersionControl,
+            _ => ComponentScope::Unknown(SharedString::new(value)),
+        }
+    }
+}
+
 /// Which side of the preview to show labels on
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
 pub enum ExampleLabelSide {
@@ -177,8 +238,8 @@ pub enum ExampleLabelSide {
    /// Right side
    Right,
    /// Top side
-    Top,
    #[default]
+    Top,
    /// Bottom side
    Bottom,
 }
@@ -208,6 +269,7 @@ impl RenderOnce for ComponentExample {
            .text_size(px(10.))
            .text_color(cx.theme().colors().text_muted)
            .when(self.grow, |this| this.flex_1())
+            .when(!self.grow, |this| this.flex_none())
            .child(self.element)
            .child(self.variant_name)
            .into_any_element()
--- a/crates/component_preview/Cargo.toml
+++ b/crates/component_preview/Cargo.toml
@@ -15,7 +15,12 @@ path = "src/component_preview.rs"
 default = []

 [dependencies]
+client.workspace = true
 component.workspace = true
 gpui.workspace = true
+languages.workspace = true
+project.workspace = true
 ui.workspace = true
 workspace.workspace = true
+notifications.workspace = true
+collections.workspace = true
--- a/crates/component_preview/src/component_preview.rs
+++ b/crates/component_preview/src/component_preview.rs
@@ -2,18 +2,51 @@
 //!
 //! A view for exploring Zed components.

-use component::{components, ComponentMetadata};
-use gpui::{list, prelude::*, uniform_list, App, EventEmitter, FocusHandle, Focusable, Window};
+use std::iter::Iterator;
+use std::sync::Arc;
+
+use client::UserStore;
+use component::{components, ComponentId, ComponentMetadata};
+use gpui::{
+    list, prelude::*, uniform_list, App, Entity, EventEmitter, FocusHandle, Focusable, Task,
+    WeakEntity, Window,
+};
+
+use collections::HashMap;
+
 use gpui::{ListState, ScrollHandle, UniformListScrollHandle};
-use ui::{prelude::*, ListItem};
+use languages::LanguageRegistry;
+use notifications::status_toast::{StatusToast, ToastIcon};
+use project::Project;
+use ui::{prelude::*, Divider, ListItem, ListSubHeader};

 use workspace::{item::ItemEvent, Item, Workspace, WorkspaceId};
+use workspace::{AppState, ItemId, SerializableItem};
+
+pub fn init(app_state: Arc<AppState>, cx: &mut App) {
+    let app_state = app_state.clone();
+
+    cx.observe_new(move |workspace: &mut Workspace, _, cx| {
+        let app_state = app_state.clone();
+        let weak_workspace = cx.entity().downgrade();

-pub fn init(cx: &mut App) {
-    cx.observe_new(|workspace: &mut Workspace, _, _cx| {
        workspace.register_action(
-            |workspace, _: &workspace::OpenComponentPreview, window, cx| {
-                let component_preview = cx.new(|cx| ComponentPreview::new(window, cx));
+            move |workspace, _: &workspace::OpenComponentPreview, window, cx| {
+                let app_state = app_state.clone();
+
+                let language_registry = app_state.languages.clone();
+                let user_store = app_state.user_store.clone();
+
+                let component_preview = cx.new(|cx| {
+                    ComponentPreview::new(
+                        weak_workspace.clone(),
+                        language_registry,
+                        user_store,
+                        None,
+                        cx,
+                    )
+                });
+
                workspace.add_item_to_active_pane(
                    Box::new(component_preview),
                    None,
@@ -27,43 +60,105 @@ pub fn init(cx: &mut App) {
    .detach();
 }

+enum PreviewEntry {
+    AllComponents,
+    Separator,
+    Component(ComponentMetadata),
+    SectionHeader(SharedString),
+}
+
+impl From<ComponentMetadata> for PreviewEntry {
+    fn from(component: ComponentMetadata) -> Self {
+        PreviewEntry::Component(component)
+    }
+}
+
+impl From<SharedString> for PreviewEntry {
+    fn from(section_header: SharedString) -> Self {
+        PreviewEntry::SectionHeader(section_header)
+    }
+}
+
+#[derive(Default, Debug, Clone, PartialEq, Eq)]
+enum PreviewPage {
+    #[default]
+    AllComponents,
+    Component(ComponentId),
+}
+
 struct ComponentPreview {
    focus_handle: FocusHandle,
    _view_scroll_handle: ScrollHandle,
    nav_scroll_handle: UniformListScrollHandle,
+    component_map: HashMap<ComponentId, ComponentMetadata>,
+    active_page: PreviewPage,
    components: Vec<ComponentMetadata>,
    component_list: ListState,
-    selected_index: usize,
+    cursor_index: usize,
+    language_registry: Arc<LanguageRegistry>,
+    workspace: WeakEntity<Workspace>,
+    user_store: Entity<UserStore>,
 }

 impl ComponentPreview {
-    pub fn new(_window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let components = components().all_sorted();
-        let initial_length = components.len();
+    pub fn new(
+        workspace: WeakEntity<Workspace>,
+        language_registry: Arc<LanguageRegistry>,
+        user_store: Entity<UserStore>,
+        selected_index: impl Into<Option<usize>>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let sorted_components = components().all_sorted();
+        let selected_index = selected_index.into().unwrap_or(0);

-        let component_list = ListState::new(initial_length, gpui::ListAlignment::Top, px(500.0), {
-            let this = cx.entity().downgrade();
-            move |ix, window: &mut Window, cx: &mut App| {
-                this.update(cx, |this, cx| {
-                    this.render_preview(ix, window, cx).into_any_element()
-                })
-                .unwrap()
-            }
-        });
+        let component_list = ListState::new(
+            sorted_components.len(),
+            gpui::ListAlignment::Top,
+            px(1500.0),
+            {
+                let this = cx.entity().downgrade();
+                move |ix, window: &mut Window, cx: &mut App| {
+                    this.update(cx, |this, cx| {
+                        let component = this.get_component(ix);
+                        this.render_preview(&component, window, cx)
+                            .into_any_element()
+                    })
+                    .unwrap()
+                }
+            },
+        );

-        Self {
+        let mut component_preview = Self {
            focus_handle: cx.focus_handle(),
            _view_scroll_handle: ScrollHandle::new(),
            nav_scroll_handle: UniformListScrollHandle::new(),
-            components,
+            language_registry,
+            user_store,
+            workspace,
+            active_page: PreviewPage::AllComponents,
+            component_map: components().0,
+            components: sorted_components,
            component_list,
-            selected_index: 0,
+            cursor_index: selected_index,
+        };
+
+        if component_preview.cursor_index > 0 {
+            component_preview.scroll_to_preview(component_preview.cursor_index, cx);
        }
+
+        component_preview.update_component_list(cx);
+
+        component_preview
    }

    fn scroll_to_preview(&mut self, ix: usize, cx: &mut Context<Self>) {
        self.component_list.scroll_to_reveal_item(ix);
-        self.selected_index = ix;
+        self.cursor_index = ix;
+        cx.notify();
+    }
+
+    fn set_active_page(&mut self, page: PreviewPage, cx: &mut Context<Self>) {
+        self.active_page = page;
        cx.notify();
    }

@@ -71,32 +166,173 @@ impl ComponentPreview {
        self.components[ix].clone()
    }

+    fn scope_ordered_entries(&self) -> Vec<PreviewEntry> {
+        use std::collections::HashMap;
+
+        let mut scope_groups: HashMap<Option<ComponentScope>, Vec<ComponentMetadata>> =
+            HashMap::default();
+
+        for component in &self.components {
+            scope_groups
+                .entry(component.scope())
+                .or_insert_with(Vec::new)
+                .push(component.clone());
+        }
+
+        for components in scope_groups.values_mut() {
+            components.sort_by_key(|c| c.name().to_lowercase());
+        }
+
+        let mut entries = Vec::new();
+
+        let known_scopes = [
+            ComponentScope::Layout,
+            ComponentScope::Input,
+            ComponentScope::Editor,
+            ComponentScope::Notification,
+            ComponentScope::Collaboration,
+            ComponentScope::VersionControl,
+        ];
+
+        // Always show all components first
+        entries.push(PreviewEntry::AllComponents);
+        entries.push(PreviewEntry::Separator);
+
+        for scope in known_scopes.iter() {
+            let scope_key = Some(scope.clone());
+            if let Some(components) = scope_groups.remove(&scope_key) {
+                if !components.is_empty() {
+                    entries.push(PreviewEntry::SectionHeader(scope.to_string().into()));
+
+                    for component in components {
+                        entries.push(PreviewEntry::Component(component));
+                    }
+                }
+            }
+        }
+
+        for (scope, components) in &scope_groups {
+            if let Some(ComponentScope::Unknown(_)) = scope {
+                if !components.is_empty() {
+                    if let Some(scope_value) = scope {
+                        entries.push(PreviewEntry::SectionHeader(scope_value.to_string().into()));
+                    }
+
+                    for component in components {
+                        entries.push(PreviewEntry::Component(component.clone()));
+                    }
+                }
+            }
+        }
+
+        if let Some(components) = scope_groups.get(&None) {
+            if !components.is_empty() {
+                entries.push(PreviewEntry::Separator);
+                entries.push(PreviewEntry::SectionHeader("Uncategorized".into()));
+
+                for component in components {
+                    entries.push(PreviewEntry::Component(component.clone()));
+                }
+            }
+        }
+
+        entries
+    }
+
    fn render_sidebar_entry(
        &self,
        ix: usize,
-        selected: bool,
+        entry: &PreviewEntry,
        cx: &Context<Self>,
    ) -> impl IntoElement {
-        let component = self.get_component(ix);
+        match entry {
+            PreviewEntry::Component(component_metadata) => {
+                let id = component_metadata.id();
+                let selected = self.active_page == PreviewPage::Component(id.clone());
+                ListItem::new(ix)
+                    .child(Label::new(component_metadata.name().clone()).color(Color::Default))
+                    .selectable(true)
+                    .toggle_state(selected)
+                    .inset(true)
+                    .on_click(cx.listener(move |this, _, _, cx| {
+                        let id = id.clone();
+                        this.set_active_page(PreviewPage::Component(id), cx);
+                    }))
+                    .into_any_element()
+            }
+            PreviewEntry::SectionHeader(shared_string) => ListSubHeader::new(shared_string)
+                .inset(true)
+                .into_any_element(),
+            PreviewEntry::AllComponents => {
+                let selected = self.active_page == PreviewPage::AllComponents;

-        ListItem::new(ix)
-            .child(Label::new(component.name().clone()).color(Color::Default))
-            .selectable(true)
-            .toggle_state(selected)
-            .inset(true)
-            .on_click(cx.listener(move |this, _, _, cx| {
-                this.scroll_to_preview(ix, cx);
-            }))
+                ListItem::new(ix)
+                    .child(Label::new("All Components").color(Color::Default))
+                    .selectable(true)
+                    .toggle_state(selected)
+                    .inset(true)
+                    .on_click(cx.listener(move |this, _, _, cx| {
+                        this.set_active_page(PreviewPage::AllComponents, cx);
+                    }))
+                    .into_any_element()
+            }
+            PreviewEntry::Separator => ListItem::new(ix)
+                .child(h_flex().pt_3().child(Divider::horizontal_dashed()))
+                .into_any_element(),
+        }
+    }
+
+    fn update_component_list(&mut self, cx: &mut Context<Self>) {
+        let new_len = self.scope_ordered_entries().len();
+        let entries = self.scope_ordered_entries();
+        let weak_entity = cx.entity().downgrade();
+
+        let new_list = ListState::new(
+            new_len,
+            gpui::ListAlignment::Top,
+            px(1500.0),
+            move |ix, window, cx| {
+                let entry = &entries[ix];
+
+                weak_entity
+                    .update(cx, |this, cx| match entry {
+                        PreviewEntry::Component(component) => this
+                            .render_preview(component, window, cx)
+                            .into_any_element(),
+                        PreviewEntry::SectionHeader(shared_string) => this
+                            .render_scope_header(ix, shared_string.clone(), window, cx)
+                            .into_any_element(),
+                        PreviewEntry::AllComponents => div().w_full().h_0().into_any_element(),
+                        PreviewEntry::Separator => div().w_full().h_0().into_any_element(),
+                    })
+                    .unwrap()
+            },
+        );
+
+        self.component_list = new_list;
+    }
+
+    fn render_scope_header(
+        &self,
+        _ix: usize,
+        title: SharedString,
+        _window: &Window,
+        _cx: &App,
+    ) -> impl IntoElement {
+        h_flex()
+            .w_full()
+            .h_10()
+            .items_center()
+            .child(Headline::new(title).size(HeadlineSize::XSmall))
+            .child(Divider::horizontal())
    }

    fn render_preview(
        &self,
-        ix: usize,
+        component: &ComponentMetadata,
        window: &mut Window,
-        cx: &mut Context<Self>,
+        cx: &mut App,
    ) -> impl IntoElement {
-        let component = self.get_component(ix);
-
        let name = component.name();
        let scope = component.scope();

@@ -108,7 +344,7 @@ impl ComponentPreview {
                v_flex()
                    .border_1()
                    .border_color(cx.theme().colors().border)
-                    .rounded_md()
+                    .rounded_sm()
                    .w_full()
                    .gap_4()
                    .py_4()
@@ -142,10 +378,71 @@ impl ComponentPreview {
            )
            .into_any_element()
    }
+
+    fn render_all_components(&self) -> impl IntoElement {
+        v_flex()
+            .id("component-list")
+            .px_8()
+            .pt_4()
+            .size_full()
+            .child(
+                list(self.component_list.clone())
+                    .flex_grow()
+                    .with_sizing_behavior(gpui::ListSizingBehavior::Auto),
+            )
+    }
+
+    fn render_component_page(
+        &mut self,
+        component_id: &ComponentId,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let component = self.component_map.get(&component_id);
+
+        if let Some(component) = component {
+            v_flex()
+                .w_full()
+                .flex_initial()
+                .min_h_full()
+                .child(self.render_preview(component, window, cx))
+                .into_any_element()
+        } else {
+            v_flex()
+                .size_full()
+                .items_center()
+                .justify_center()
+                .child("Component not found")
+                .into_any_element()
+        }
+    }
+
+    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!",
+                    window,
+                    cx,
+                    |this, _, cx| {
+                        this.icon(ToastIcon::new(IconName::GitBranchSmall).color(Color::Muted))
+                            .action(
+                                "Open Pull Request",
+                                cx.listener(|_, _, _, cx| cx.open_url("https://github.com/")),
+                            )
+                    },
+                );
+                workspace.toggle_status_toast(window, cx, status_toast)
+            });
+        }
+    }
 }

 impl Render for ComponentPreview {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<'_, Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let sidebar_entries = self.scope_ordered_entries();
+        let active_page = self.active_page.clone();
+
        h_flex()
            .id("component-preview")
            .key_context("ComponentPreview")
@@ -155,35 +452,47 @@ impl Render for ComponentPreview {
            .track_focus(&self.focus_handle)
            .px_2()
            .bg(cx.theme().colors().editor_background)
-            .child(
-                uniform_list(
-                    cx.entity().clone(),
-                    "component-nav",
-                    self.components.len(),
-                    move |this, range, _window, cx| {
-                        range
-                            .map(|ix| this.render_sidebar_entry(ix, ix == this.selected_index, cx))
-                            .collect()
-                    },
-                )
-                .track_scroll(self.nav_scroll_handle.clone())
-                .pt_4()
-                .w(px(240.))
-                .h_full()
-                .flex_grow(),
-            )
            .child(
                v_flex()
-                    .id("component-list")
-                    .px_8()
-                    .pt_4()
-                    .size_full()
+                    .h_full()
                    .child(
-                        list(self.component_list.clone())
-                            .flex_grow()
-                            .with_sizing_behavior(gpui::ListSizingBehavior::Auto),
+                        uniform_list(
+                            cx.entity().clone(),
+                            "component-nav",
+                            sidebar_entries.len(),
+                            move |this, range, _window, cx| {
+                                range
+                                    .map(|ix| {
+                                        this.render_sidebar_entry(ix, &sidebar_entries[ix], cx)
+                                    })
+                                    .collect()
+                            },
+                        )
+                        .track_scroll(self.nav_scroll_handle.clone())
+                        .pt_4()
+                        .w(px(240.))
+                        .h_full()
+                        .flex_1(),
+                    )
+                    .child(
+                        div().w_full().pb_4().child(
+                            Button::new("toast-test", "Launch Toast")
+                                .on_click(cx.listener({
+                                    move |this, _, window, cx| {
+                                        this.test_status_toast(window, cx);
+                                        cx.notify();
+                                    }
+                                }))
+                                .full_width(),
+                        ),
                    ),
            )
+            .child(match active_page {
+                PreviewPage::AllComponents => self.render_all_components().into_any_element(),
+                PreviewPage::Component(id) => self
+                    .render_component_page(&id, window, cx)
+                    .into_any_element(),
+            })
    }
 }

@@ -213,13 +522,26 @@ impl Item for ComponentPreview {
    fn clone_on_split(
        &self,
        _workspace_id: Option<WorkspaceId>,
-        window: &mut Window,
+        _window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Option<gpui::Entity<Self>>
    where
        Self: Sized,
    {
-        Some(cx.new(|cx| Self::new(window, cx)))
+        let language_registry = self.language_registry.clone();
+        let user_store = self.user_store.clone();
+        let weak_workspace = self.workspace.clone();
+        let selected_index = self.cursor_index;
+
+        Some(cx.new(|cx| {
+            Self::new(
+                weak_workspace,
+                language_registry,
+                user_store,
+                selected_index,
+                cx,
+            )
+        }))
    }

    fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
@@ -227,6 +549,59 @@ impl Item for ComponentPreview {
    }
 }

-// TODO: impl serializable item for component preview so it will restore with the workspace
-// ref: https://github.com/zed-industries/zed/blob/32201ac70a501e63dfa2ade9c00f85aea2d4dd94/crates/image_viewer/src/image_viewer.rs#L199
-// Use `ImageViewer` as a model for how to do it, except it'll be even simpler
+impl SerializableItem for ComponentPreview {
+    fn serialized_item_kind() -> &'static str {
+        "ComponentPreview"
+    }
+
+    fn deserialize(
+        project: Entity<Project>,
+        workspace: WeakEntity<Workspace>,
+        _workspace_id: WorkspaceId,
+        _item_id: ItemId,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Task<gpui::Result<Entity<Self>>> {
+        let user_store = project.read(cx).user_store().clone();
+        let language_registry = project.read(cx).languages().clone();
+
+        window.spawn(cx, |mut cx| async move {
+            let user_store = user_store.clone();
+            let language_registry = language_registry.clone();
+            let weak_workspace = workspace.clone();
+            cx.update(|_, cx| {
+                Ok(cx.new(|cx| {
+                    ComponentPreview::new(weak_workspace, language_registry, user_store, None, cx)
+                }))
+            })?
+        })
+    }
+
+    fn cleanup(
+        _workspace_id: WorkspaceId,
+        _alive_items: Vec<ItemId>,
+        _window: &mut Window,
+        _cx: &mut App,
+    ) -> Task<gpui::Result<()>> {
+        Task::ready(Ok(()))
+        // window.spawn(cx, |_| {
+        // ...
+        // })
+    }
+
+    fn serialize(
+        &mut self,
+        _workspace: &mut Workspace,
+        _item_id: ItemId,
+        _closing: bool,
+        _window: &mut Window,
+        _cx: &mut Context<Self>,
+    ) -> Option<Task<gpui::Result<()>>> {
+        // TODO: Serialize the active index so we can re-open to the same place
+        None
+    }
+
+    fn should_serialize(&self, _event: &Self::Event) -> bool {
+        false
+    }
+}
--- a/crates/context_server/Cargo.toml
+++ b/crates/context_server/Cargo.toml
@@ -31,4 +31,3 @@ settings.workspace = true
 smol.workspace = true
 url = { workspace = true, features = ["serde"] }
 util.workspace = true
-workspace.workspace = true
--- a/crates/context_server/src/context_server_tool.rs
+++ b/crates/context_server/src/context_server_tool.rs
@@ -1,8 +1,9 @@
 use std::sync::Arc;

-use anyhow::{anyhow, bail};
+use anyhow::{anyhow, bail, Result};
 use assistant_tool::Tool;
-use gpui::{App, Entity, Task, Window};
+use gpui::{App, Entity, Task};
+use project::Project;

 use crate::manager::ContextServerManager;
 use crate::types;
@@ -49,12 +50,11 @@ impl Tool for ContextServerTool {
    }

    fn run(
-        self: std::sync::Arc<Self>,
+        self: Arc<Self>,
        input: serde_json::Value,
-        _workspace: gpui::WeakEntity<workspace::Workspace>,
-        _: &mut Window,
+        _project: Entity<Project>,
        cx: &mut App,
-    ) -> gpui::Task<gpui::Result<String>> {
+    ) -> Task<Result<String>> {
        if let Some(server) = self.server_manager.read(cx).get_server(&self.server_id) {
            cx.foreground_executor().spawn({
                let tool_name = self.tool.name.clone();
--- a/crates/copilot/src/sign_in.rs
+++ b/crates/copilot/src/sign_in.rs
@@ -122,7 +122,7 @@ impl CopilotCodeVerification {
            .p_1()
            .border_1()
            .border_muted(cx)
-            .rounded_md()
+            .rounded_sm()
            .cursor_pointer()
            .justify_between()
            .on_mouse_down(gpui::MouseButton::Left, {
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -973,7 +973,7 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
                h_flex()
                    .gap_2()
                    .px_1()
-                    .rounded_md()
+                    .rounded_sm()
                    .bg(color.surface_background.opacity(0.5))
                    .map(|stack| {
                        stack.child(
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -94,6 +94,7 @@ ctor.workspace = true
 env_logger.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
+languages = {workspace = true, features = ["test-support"] }
 lsp = { workspace = true, features = ["test-support"] }
 multi_buffer = { workspace = true, features = ["test-support"] }
 project = { workspace = true, features = ["test-support"] }
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -340,7 +340,9 @@ gpui::actions!(
        MoveToPreviousWordStart,
        MoveToStartOfParagraph,
        MoveToStartOfExcerpt,
+        MoveToStartOfNextExcerpt,
        MoveToEndOfExcerpt,
+        MoveToEndOfPreviousExcerpt,
        MoveUp,
        Newline,
        NewlineAbove,
@@ -378,7 +380,9 @@ gpui::actions!(
        SelectAll,
        SelectAllMatches,
        SelectToStartOfExcerpt,
+        SelectToStartOfNextExcerpt,
        SelectToEndOfExcerpt,
+        SelectToEndOfPreviousExcerpt,
        SelectDown,
        SelectEnclosingSymbol,
        SelectLargerSyntaxNode,
--- a/crates/editor/src/blink_manager.rs
+++ b/crates/editor/src/blink_manager.rs
@@ -7,7 +7,6 @@ use std::time::Duration;

 pub struct BlinkManager {
    blink_interval: Duration,
-
    blink_epoch: usize,
    blinking_paused: bool,
    visible: bool,
@@ -24,7 +23,6 @@ impl BlinkManager {

        Self {
            blink_interval,
-
            blink_epoch: 0,
            blinking_paused: false,
            visible: true,
--- a/crates/editor/src/clangd_ext.rs
+++ b/crates/editor/src/clangd_ext.rs
@@ -2,12 +2,13 @@ use anyhow::Context as _;
 use gpui::{App, Context, Entity, Window};
 use language::Language;
 use url::Url;
+use workspace::{OpenOptions, OpenVisible};

 use crate::lsp_ext::find_specific_language_server_in_selection;

 use crate::{element::register_action, Editor, SwitchSourceHeader};

-const CLANGD_SERVER_NAME: &str = "clangd";
+use project::lsp_store::clangd_ext::CLANGD_SERVER_NAME;

 fn is_c_language(language: &Language) -> bool {
    return language.name() == "C++".into() || language.name() == "C".into();
@@ -46,7 +47,7 @@ pub fn switch_source_header(
        project.request_lsp(
            buffer,
            project::LanguageServerToQuery::Other(server_to_query),
-            project::lsp_ext_command::SwitchSourceHeader,
+            project::lsp_store::lsp_ext_command::SwitchSourceHeader,
            cx,
        )
    });
@@ -72,7 +73,7 @@ pub fn switch_source_header(

        workspace
            .update_in(&mut cx, |workspace, window, cx| {
-                workspace.open_abs_path(path, false, window, cx)
+                workspace.open_abs_path(path, OpenOptions { visible: Some(OpenVisible::None), ..Default::default() }, window, cx)
            })
            .with_context(|| {
                format!(
--- a/crates/editor/src/code_context_menus.rs
+++ b/crates/editor/src/code_context_menus.rs
@@ -6,11 +6,11 @@ use gpui::{
 };
 use language::Buffer;
 use language::CodeLabel;
-use lsp::LanguageServerId;
 use markdown::Markdown;
 use multi_buffer::{Anchor, ExcerptId};
 use ordered_float::OrderedFloat;
 use project::lsp_store::CompletionDocumentation;
+use project::CompletionSource;
 use project::{CodeAction, Completion, TaskSourceKind};

 use std::{
@@ -233,11 +233,9 @@ impl CompletionsMenu {
                    runs: Default::default(),
                    filter_range: Default::default(),
                },
-                server_id: LanguageServerId(usize::MAX),
                documentation: None,
-                lsp_completion: Default::default(),
                confirm: None,
-                resolved: true,
+                source: CompletionSource::Custom,
            })
            .collect();

@@ -500,7 +498,12 @@ impl CompletionsMenu {
                                    // Ignore font weight for syntax highlighting, as we'll use it
                                    // for fuzzy matches.
                                    highlight.font_weight = None;
-                                    if completion.lsp_completion.deprecated.unwrap_or(false) {
+                                    if completion
+                                        .source
+                                        .lsp_completion()
+                                        .and_then(|lsp_completion| lsp_completion.deprecated)
+                                        .unwrap_or(false)
+                                    {
                                        highlight.strikethrough = Some(StrikethroughStyle {
                                            thickness: 1.0.into(),
                                            ..Default::default()
@@ -534,7 +537,7 @@ impl CompletionsMenu {
                        };
                        let color_swatch = completion
                            .color()
-                            .map(|color| div().size_4().bg(color).rounded_sm());
+                            .map(|color| div().size_4().bg(color).rounded_xs());

                        div().min_w(px(280.)).max_w(px(540.)).child(
                            ListItem::new(mat.candidate_id)
@@ -708,7 +711,10 @@ impl CompletionsMenu {

                let completion = &completions[mat.candidate_id];
                let sort_key = completion.sort_key();
-                let sort_text = completion.lsp_completion.sort_text.as_deref();
+                let sort_text = completion
+                    .source
+                    .lsp_completion()
+                    .and_then(|lsp_completion| lsp_completion.sort_text.as_deref());
                let score = Reverse(OrderedFloat(mat.score));

                if mat.score >= 0.2 {
@@ -851,7 +857,7 @@ impl CodeActionsItem {

    pub fn label(&self) -> String {
        match self {
-            Self::CodeAction { action, .. } => action.lsp_action.title.clone(),
+            Self::CodeAction { action, .. } => action.lsp_action.title().to_owned(),
            Self::Task(_, task) => task.resolved_label.clone(),
        }
    }
@@ -984,7 +990,7 @@ impl CodeActionsMenu {
                                            .overflow_hidden()
                                            .child(
                                                // TASK: It would be good to make lsp_action.title a SharedString to avoid allocating here.
-                                                action.lsp_action.title.replace("\n", ""),
+                                                action.lsp_action.title().replace("\n", ""),
                                            )
                                            .when(selected, |this| {
                                                this.text_color(colors.text_accent)
@@ -1029,7 +1035,7 @@ impl CodeActionsMenu {
                .max_by_key(|(_, action)| match action {
                    CodeActionsItem::Task(_, task) => task.resolved_label.chars().count(),
                    CodeActionsItem::CodeAction { action, .. } => {
-                        action.lsp_action.title.chars().count()
+                        action.lsp_action.title().chars().count()
                    }
                })
                .map(|(ix, _)| ix),
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -43,7 +43,7 @@ use gpui::{App, Context, Entity, Font, HighlightStyle, LineLayout, Pixels, Under
 pub use inlay_map::Inlay;
 use inlay_map::{InlayMap, InlaySnapshot};
 pub use inlay_map::{InlayOffset, InlayPoint};
-use invisibles::{is_invisible, replacement};
+pub use invisibles::{is_invisible, replacement};
 use language::{
    language_settings::language_settings, ChunkRenderer, OffsetUtf16, Point,
    Subscription as BufferSubscription,
--- a/crates/editor/src/display_map/invisibles.rs
+++ b/crates/editor/src/display_map/invisibles.rs
@@ -45,7 +45,7 @@ pub fn is_invisible(c: char) -> bool {
 // ASCII control characters have fancy unicode glyphs, everything else
 // is replaced by a space - unless it is used in combining characters in
 // which case we need to leave it in the string.
-pub(crate) fn replacement(c: char) -> Option<&'static str> {
+pub fn replacement(c: char) -> Option<&'static str> {
    if c <= '\x1f' {
        Some(C0_SYMBOLS[c as usize])
    } else if c == '\x7f' {
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -4931,6 +4931,34 @@ async fn test_paste_multiline(cx: &mut TestAppContext) {
            )
        );
    "});
+
+    // Copy an indented block, starting mid-line
+    cx.set_state(indoc! {"
+        const a: B = (
+            c(),
+            somethin«g(
+                e,
+                f
+            )ˇ»
+        );
+    "});
+    cx.update_editor(|e, window, cx| e.copy(&Copy, window, cx));
+
+    // Paste it on a line with a lower indent level
+    cx.update_editor(|e, window, cx| e.move_to_end(&Default::default(), window, cx));
+    cx.update_editor(|e, window, cx| e.paste(&Paste, window, cx));
+    cx.assert_editor_state(indoc! {"
+        const a: B = (
+            c(),
+            something(
+                e,
+                f
+            )
+        );
+        g(
+            e,
+            f
+        )ˇ"});
 }

 #[gpui::test]
@@ -16385,6 +16413,199 @@ async fn test_folding_buffer_when_multibuffer_has_only_one_excerpt(cx: &mut Test
    );
 }

+#[gpui::test]
+async fn test_multi_buffer_navigation_with_folded_buffers(cx: &mut TestAppContext) {
+    init_test(cx, |_| {});
+    cx.update(|cx| {
+        let default_key_bindings = settings::KeymapFile::load_asset_allow_partial_failure(
+            "keymaps/default-linux.json",
+            cx,
+        )
+        .unwrap();
+        cx.bind_keys(default_key_bindings);
+    });
+
+    let (editor, cx) = cx.add_window_view(|window, cx| {
+        let multi_buffer = MultiBuffer::build_multi(
+            [
+                ("a0\nb0\nc0\nd0\ne0\n", vec![Point::row_range(0..2)]),
+                ("a1\nb1\nc1\nd1\ne1\n", vec![Point::row_range(0..2)]),
+                ("a2\nb2\nc2\nd2\ne2\n", vec![Point::row_range(0..2)]),
+                ("a3\nb3\nc3\nd3\ne3\n", vec![Point::row_range(0..2)]),
+            ],
+            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
+        // adjacent folded buffers, as well as folded buffers at the start and
+        // end the multibuffer
+        editor.fold_buffer(buffer_ids[0], cx);
+        editor.fold_buffer(buffer_ids[2], cx);
+        editor.fold_buffer(buffer_ids[3], cx);
+
+        editor
+    });
+    cx.simulate_resize(size(px(1000.), px(1000.)));
+
+    let mut cx = EditorTestContext::for_editor_in(editor.clone(), cx).await;
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        ˇ[FOLDED]
+        [EXCERPT]
+        a1
+        b1
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("down");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        ˇa1
+        b1
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("down");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        a1
+        ˇb1
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("down");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        a1
+        b1
+        ˇ[EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("down");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        a1
+        b1
+        [EXCERPT]
+        ˇ[FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    for _ in 0..5 {
+        cx.simulate_keystroke("down");
+        cx.assert_excerpts_with_selections(indoc! {"
+            [EXCERPT]
+            [FOLDED]
+            [EXCERPT]
+            a1
+            b1
+            [EXCERPT]
+            [FOLDED]
+            [EXCERPT]
+            ˇ[FOLDED]
+            "
+        });
+    }
+
+    cx.simulate_keystroke("up");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        a1
+        b1
+        [EXCERPT]
+        ˇ[FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("up");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        a1
+        b1
+        ˇ[EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("up");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        a1
+        ˇb1
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    cx.simulate_keystroke("up");
+    cx.assert_excerpts_with_selections(indoc! {"
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        ˇa1
+        b1
+        [EXCERPT]
+        [FOLDED]
+        [EXCERPT]
+        [FOLDED]
+        "
+    });
+    for _ in 0..5 {
+        cx.simulate_keystroke("up");
+        cx.assert_excerpts_with_selections(indoc! {"
+            [EXCERPT]
+            ˇ[FOLDED]
+            [EXCERPT]
+            a1
+            b1
+            [EXCERPT]
+            [FOLDED]
+            [EXCERPT]
+            [FOLDED]
+            "
+        });
+    }
+}
+
 #[gpui::test]
 async fn test_inline_completion_text(cx: &mut TestAppContext) {
    init_test(cx, |_| {});
@@ -16779,6 +17000,245 @@ async fn test_tree_sitter_brackets_newline_insertion(cx: &mut TestAppContext) {
    "});
 }

+mod autoclose_tags {
+    use super::*;
+    use language::language_settings::JsxTagAutoCloseSettings;
+    use languages::language;
+
+    async fn test_setup(cx: &mut TestAppContext) -> EditorTestContext {
+        init_test(cx, |settings| {
+            settings.defaults.jsx_tag_auto_close = Some(JsxTagAutoCloseSettings { enabled: true });
+        });
+
+        let mut cx = EditorTestContext::new(cx).await;
+        cx.update_buffer(|buffer, cx| {
+            let language = language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into());
+
+            buffer.set_language(Some(language), cx)
+        });
+
+        cx
+    }
+
+    macro_rules! check {
+        ($name:ident, $initial:literal + $input:literal => $expected:expr) => {
+            #[gpui::test]
+            async fn $name(cx: &mut TestAppContext) {
+                let mut cx = test_setup(cx).await;
+                cx.set_state($initial);
+                cx.run_until_parked();
+
+                cx.update_editor(|editor, window, cx| {
+                    editor.handle_input($input, window, cx);
+                });
+                cx.run_until_parked();
+                cx.assert_editor_state($expected);
+            }
+        };
+    }
+
+    check!(
+        test_basic,
+        "<divˇ" + ">" => "<div>ˇ</div>"
+    );
+
+    check!(
+        test_basic_nested,
+        "<div><divˇ</div>" + ">" => "<div><div>ˇ</div></div>"
+    );
+
+    check!(
+        test_basic_ignore_already_closed,
+        "<div><divˇ</div></div>" + ">" => "<div><div>ˇ</div></div>"
+    );
+
+    check!(
+        test_doesnt_autoclose_closing_tag,
+        "</divˇ" + ">" => "</div>ˇ"
+    );
+
+    check!(
+        test_jsx_attr,
+        "<div attr={</div>}ˇ" + ">" => "<div attr={</div>}>ˇ</div>"
+    );
+
+    check!(
+        test_ignores_closing_tags_in_expr_block,
+        "<div><divˇ{</div>}</div>" + ">" => "<div><div>ˇ</div>{</div>}</div>"
+    );
+
+    check!(
+        test_doesnt_autoclose_on_gt_in_expr,
+        "<div attr={1 ˇ" + ">" => "<div attr={1 >ˇ"
+    );
+
+    check!(
+        test_ignores_closing_tags_with_different_tag_names,
+        "<div><divˇ</div></span>" + ">" => "<div><div>ˇ</div></div></span>"
+    );
+
+    check!(
+        test_autocloses_in_jsx_expression,
+        "<div>{<divˇ}</div>" + ">" => "<div>{<div>ˇ</div>}</div>"
+    );
+
+    check!(
+        test_doesnt_autoclose_already_closed_in_jsx_expression,
+        "<div>{<divˇ</div>}</div>" + ">" => "<div>{<div>ˇ</div>}</div>"
+    );
+
+    check!(
+        test_autocloses_fragment,
+        "<ˇ" + ">" => "<>ˇ</>"
+    );
+
+    check!(
+        test_does_not_include_type_argument_in_autoclose_tag_name,
+        "<Component<T> attr={boolean_value}ˇ" + ">" => "<Component<T> attr={boolean_value}>ˇ</Component>"
+    );
+
+    check!(
+        test_does_not_autoclose_doctype,
+        "<!DOCTYPE htmlˇ" + ">" => "<!DOCTYPE html>ˇ"
+    );
+
+    check!(
+        test_does_not_autoclose_comment,
+        "<!-- comment --ˇ" + ">" => "<!-- comment -->ˇ"
+    );
+
+    check!(
+        test_multi_cursor_autoclose_same_tag,
+        r#"
+        <divˇ
+        <divˇ
+        "#
+        + ">" =>
+        r#"
+        <div>ˇ</div>
+        <div>ˇ</div>
+        "#
+    );
+
+    check!(
+        test_multi_cursor_autoclose_different_tags,
+        r#"
+        <divˇ
+        <spanˇ
+        "#
+        + ">" =>
+        r#"
+        <div>ˇ</div>
+        <span>ˇ</span>
+        "#
+    );
+
+    check!(
+        test_multi_cursor_autoclose_some_dont_autoclose_others,
+        r#"
+        <divˇ
+        <div /ˇ
+        <spanˇ</span>
+        <!DOCTYPE htmlˇ
+        </headˇ
+        <Component<T>ˇ
+        ˇ
+        "#
+        + ">" =>
+        r#"
+        <div>ˇ</div>
+        <div />ˇ
+        <span>ˇ</span>
+        <!DOCTYPE html>ˇ
+        </head>ˇ
+        <Component<T>>ˇ</Component>
+        >ˇ
+        "#
+    );
+
+    check!(
+        test_doesnt_mess_up_trailing_text,
+        "<divˇfoobar" + ">" => "<div>ˇ</div>foobar"
+    );
+
+    #[gpui::test]
+    async fn test_multibuffer(cx: &mut TestAppContext) {
+        init_test(cx, |settings| {
+            settings.defaults.jsx_tag_auto_close = Some(JsxTagAutoCloseSettings { enabled: true });
+        });
+
+        let buffer_a = cx.new(|cx| {
+            let mut buf = language::Buffer::local("<div", cx);
+            buf.set_language(
+                Some(language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into())),
+                cx,
+            );
+            buf
+        });
+        let buffer_b = cx.new(|cx| {
+            let mut buf = language::Buffer::local("<pre", cx);
+            buf.set_language(
+                Some(language("tsx", tree_sitter_typescript::LANGUAGE_TSX.into())),
+                cx,
+            );
+            buf
+        });
+        let buffer_c = cx.new(|cx| {
+            let buf = language::Buffer::local("<span", cx);
+            buf
+        });
+        let buffer = cx.new(|cx| {
+            let mut buf = MultiBuffer::new(language::Capability::ReadWrite);
+            buf.push_excerpts(
+                buffer_a,
+                [ExcerptRange {
+                    context: text::Anchor::MIN..text::Anchor::MAX,
+                    primary: None,
+                }],
+                cx,
+            );
+            buf.push_excerpts(
+                buffer_b,
+                [ExcerptRange {
+                    context: text::Anchor::MIN..text::Anchor::MAX,
+                    primary: None,
+                }],
+                cx,
+            );
+            buf.push_excerpts(
+                buffer_c,
+                [ExcerptRange {
+                    context: text::Anchor::MIN..text::Anchor::MAX,
+                    primary: None,
+                }],
+                cx,
+            );
+            buf
+        });
+        let editor = cx.add_window(|window, cx| build_editor(buffer.clone(), window, cx));
+
+        let mut cx = EditorTestContext::for_editor(editor, cx).await;
+
+        cx.update_editor(|editor, window, cx| {
+            editor.change_selections(None, window, cx, |selections| {
+                selections.select(vec![
+                    Selection::from_offset(4),
+                    Selection::from_offset(9),
+                    Selection::from_offset(15),
+                ])
+            })
+        });
+        cx.run_until_parked();
+
+        cx.update_editor(|editor, window, cx| {
+            editor.handle_input(">", window, cx);
+        });
+        cx.run_until_parked();
+
+        cx.assert_editor_state("<div>ˇ</div>\n<pre>ˇ</pre>\n<span>ˇ");
+    }
+}
+
 fn empty_range(row: usize, column: usize) -> Range<DisplayPoint> {
    let point = DisplayPoint::new(DisplayRow(row as u32), column as u32);
    point..point
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -20,10 +20,10 @@ use crate::{
    DisplayRow, DocumentHighlightRead, DocumentHighlightWrite, EditDisplayMode, Editor, EditorMode,
    EditorSettings, EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GoToHunk,
    GoToPreviousHunk, GutterDimensions, HalfPageDown, HalfPageUp, HandleInput, HoveredCursor,
-    InlayHintRefreshReason, InlineCompletion, JumpData, LineDown, 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,
+    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};
@@ -77,7 +77,7 @@ use ui::{
    POPOVER_Y_PADDING,
 };
 use unicode_segmentation::UnicodeSegmentation;
-use util::{debug_panic, maybe, RangeExt, ResultExt};
+use util::{debug_panic, RangeExt, ResultExt};
 use workspace::{item::Item, notifications::NotifyTaskExt};

 const INLINE_BLAME_PADDING_EM_WIDTHS: f32 = 7.;
@@ -282,7 +282,9 @@ impl EditorElement {
        register_action(editor, window, Editor::move_to_beginning);
        register_action(editor, window, Editor::move_to_end);
        register_action(editor, window, Editor::move_to_start_of_excerpt);
+        register_action(editor, window, Editor::move_to_start_of_next_excerpt);
        register_action(editor, window, Editor::move_to_end_of_excerpt);
+        register_action(editor, window, Editor::move_to_end_of_previous_excerpt);
        register_action(editor, window, Editor::select_up);
        register_action(editor, window, Editor::select_down);
        register_action(editor, window, Editor::select_left);
@@ -296,7 +298,9 @@ impl EditorElement {
        register_action(editor, window, Editor::select_to_start_of_paragraph);
        register_action(editor, window, Editor::select_to_end_of_paragraph);
        register_action(editor, window, Editor::select_to_start_of_excerpt);
+        register_action(editor, window, Editor::select_to_start_of_next_excerpt);
        register_action(editor, window, Editor::select_to_end_of_excerpt);
+        register_action(editor, window, Editor::select_to_end_of_previous_excerpt);
        register_action(editor, window, Editor::select_to_beginning);
        register_action(editor, window, Editor::select_to_end);
        register_action(editor, window, Editor::select_all);
@@ -1691,7 +1695,7 @@ impl EditorElement {
            let pos_y = content_origin.y
                + line_height * (row.0 as f32 - scroll_pixel_position.y / line_height);

-            let window_ix = row.minus(start_row) as usize;
+            let window_ix = row.0.saturating_sub(start_row.0) as usize;
            let pos_x = {
                let crease_trailer_layout = &crease_trailers[window_ix];
                let line_layout = &line_layouts[window_ix];
@@ -1724,7 +1728,7 @@ impl EditorElement {
                .h(line_height)
                .w_full()
                .px_1()
-                .rounded_sm()
+                .rounded_xs()
                .opacity(opacity)
                .bg(severity_to_color(&diagnostic_to_render.severity)
                    .color(cx)
@@ -2676,24 +2680,21 @@ impl EditorElement {
        window: &mut Window,
        cx: &mut App,
    ) -> Div {
-        let file_status = maybe!({
-            let project = self.editor.read(cx).project.as_ref()?.read(cx);
-            let (repo, path) =
-                project.repository_and_path_for_buffer_id(for_excerpt.buffer_id, cx)?;
-            let status = repo.read(cx).repository_entry.status_for_path(&path)?;
-            Some(status.status)
-        })
-        .filter(|_| {
-            self.editor
-                .read(cx)
-                .buffer
-                .read(cx)
-                .all_diff_hunks_expanded()
-        });
-
-        let include_root = self
-            .editor
+        let editor = self.editor.read(cx);
+        let file_status = editor
+            .buffer
            .read(cx)
+            .all_diff_hunks_expanded()
+            .then(|| {
+                editor
+                    .project
+                    .as_ref()?
+                    .read(cx)
+                    .status_for_buffer_id(for_excerpt.buffer_id, cx)
+            })
+            .flatten();
+
+        let include_root = editor
            .project
            .as_ref()
            .map(|project| project.read(cx).visible_worktrees(cx).count() > 1)
@@ -2705,7 +2706,7 @@ impl EditorElement {
        let parent_path = path.as_ref().and_then(|path| {
            Some(path.parent()?.to_string_lossy().to_string() + std::path::MAIN_SEPARATOR_STR)
        });
-        let focus_handle = self.editor.focus_handle(cx);
+        let focus_handle = editor.focus_handle(cx);
        let colors = cx.theme().colors();

        div()
@@ -2720,7 +2721,7 @@ impl EditorElement {
                    .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667)))
                    .pl_0p5()
                    .pr_5()
-                    .rounded_md()
+                    .rounded_sm()
                    .shadow_md()
                    .border_1()
                    .map(|div| {
@@ -2744,7 +2745,7 @@ impl EditorElement {
                        header.child(
                            div()
                                .hover(|style| style.bg(colors.element_selected))
-                                .rounded_sm()
+                                .rounded_xs()
                                .child(
                                    ButtonLike::new("toggle-buffer-fold")
                                        .style(ui::ButtonStyle::Transparent)
@@ -2778,8 +2779,7 @@ impl EditorElement {
                        )
                    })
                    .children(
-                        self.editor
-                            .read(cx)
+                        editor
                            .addons
                            .values()
                            .filter_map(|addon| {
@@ -3952,6 +3952,7 @@ impl EditorElement {
                display_row_range,
                multi_buffer_range,
                status,
+                is_created_file,
                ..
            } = &hunk
            {
@@ -3983,6 +3984,7 @@ impl EditorElement {
                        display_row_range.start.0,
                        status,
                        multi_buffer_range.clone(),
+                        *is_created_file,
                        line_height,
                        &editor,
                        cx,
@@ -4134,46 +4136,74 @@ impl EditorElement {
                    }
                }

-                let mut paint_highlight =
-                    |highlight_row_start: DisplayRow, highlight_row_end: DisplayRow, color| {
-                        let origin = point(
-                            layout.hitbox.origin.x,
-                            layout.hitbox.origin.y
-                                + (highlight_row_start.as_f32() - scroll_top)
-                                    * layout.position_map.line_height,
-                        );
-                        let size = size(
-                            layout.hitbox.size.width,
-                            layout.position_map.line_height
-                                * highlight_row_end.next_row().minus(highlight_row_start) as f32,
-                        );
-                        window.paint_quad(fill(Bounds { origin, size }, color));
-                    };
+                let mut paint_highlight = |highlight_row_start: DisplayRow,
+                                           highlight_row_end: DisplayRow,
+                                           highlight: crate::LineHighlight,
+                                           edges| {
+                    let origin = point(
+                        layout.hitbox.origin.x,
+                        layout.hitbox.origin.y
+                            + (highlight_row_start.as_f32() - scroll_top)
+                                * layout.position_map.line_height,
+                    );
+                    let size = size(
+                        layout.hitbox.size.width,
+                        layout.position_map.line_height
+                            * highlight_row_end.next_row().minus(highlight_row_start) as f32,
+                    );
+                    let mut quad = fill(Bounds { origin, size }, highlight.background);
+                    if let Some(border_color) = highlight.border {
+                        quad.border_color = border_color;
+                        quad.border_widths = edges
+                    }
+                    window.paint_quad(quad);
+                };

-                let mut current_paint: Option<(gpui::Background, Range<DisplayRow>)> = None;
+                let mut current_paint: Option<(LineHighlight, Range<DisplayRow>, Edges<Pixels>)> =
+                    None;
                for (&new_row, &new_background) in &layout.highlighted_rows {
                    match &mut current_paint {
-                        Some((current_background, current_range)) => {
+                        Some((current_background, current_range, mut edges)) => {
                            let current_background = *current_background;
                            let new_range_started = current_background != new_background
                                || current_range.end.next_row() != new_row;
                            if new_range_started {
+                                if current_range.end.next_row() == new_row {
+                                    edges.bottom = px(0.);
+                                };
                                paint_highlight(
                                    current_range.start,
                                    current_range.end,
                                    current_background,
+                                    edges,
                                );
-                                current_paint = Some((new_background, new_row..new_row));
+                                let edges = Edges {
+                                    top: if current_range.end.next_row() != new_row {
+                                        px(1.)
+                                    } else {
+                                        px(0.)
+                                    },
+                                    bottom: px(1.),
+                                    ..Default::default()
+                                };
+                                current_paint = Some((new_background, new_row..new_row, edges));
                                continue;
                            } else {
                                current_range.end = current_range.end.next_row();
                            }
                        }
-                        None => current_paint = Some((new_background, new_row..new_row)),
+                        None => {
+                            let edges = Edges {
+                                top: px(1.),
+                                bottom: px(1.),
+                                ..Default::default()
+                            };
+                            current_paint = Some((new_background, new_row..new_row, edges))
+                        }
                    };
                }
-                if let Some((color, range)) = current_paint {
-                    paint_highlight(range.start, range.end, color);
+                if let Some((color, range, edges)) = current_paint {
+                    paint_highlight(range.start, range.end, color, edges);
                }

                let scroll_left =
@@ -4351,6 +4381,11 @@ 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;
        }
@@ -4414,9 +4449,23 @@ impl EditorElement {
                if let Some((hunk_bounds, mut background_color, corner_radii, secondary_status)) =
                    hunk_to_paint
                {
-                    if secondary_status.has_secondary_hunk() {
-                        background_color =
-                            background_color.opacity(if is_light { 0.2 } else { 0.32 });
+                    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
@@ -4696,7 +4745,7 @@ impl EditorElement {
            .read(cx)
            .buffer
            .read(cx)
-            .settings_at(0, cx)
+            .language_settings(cx)
            .show_whitespaces;

        for (ix, line_with_invisibles) in layout.position_map.line_layouts.iter().enumerate() {
@@ -6736,10 +6785,10 @@ impl Element for EditorElement {
                        .update(cx, |editor, cx| editor.highlighted_display_rows(window, cx));

                    let is_light = cx.theme().appearance().is_light();
-                    let use_pattern = ProjectSettings::get_global(cx)
+                    let hunk_style = ProjectSettings::get_global(cx)
                        .git
                        .hunk_style
-                        .map_or(false, |style| matches!(style, GitHunkStyleSetting::Pattern));
+                        .unwrap_or_default();

                    for (ix, row_info) in row_infos.iter().enumerate() {
                        let Some(diff_status) = row_info.diff_status else {
@@ -6759,26 +6808,74 @@ 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_background =
-                            solid_background(background_color.opacity(hunk_opacity));
-                        let unstaged_background = if use_pattern {
-                            pattern_slash(
-                                background_color.opacity(hunk_opacity),
-                                window.rem_size().0 * 1.125, // ~18 by default
-                            )
-                        } else {
-                            solid_background(background_color.opacity(if is_light {
-                                0.08
-                            } else {
-                                0.04
-                            }))
+                        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 = 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_background
+                            unstaged_highlight
                        } else {
-                            staged_background
+                            staged_highlight
                        };

                        highlighted_rows
@@ -7627,7 +7724,7 @@ pub struct EditorLayout {
    indent_guides: Option<Vec<IndentGuideLayout>>,
    visible_display_row_range: Range<DisplayRow>,
    active_rows: BTreeMap<DisplayRow, bool>,
-    highlighted_rows: BTreeMap<DisplayRow, gpui::Background>,
+    highlighted_rows: BTreeMap<DisplayRow, LineHighlight>,
    line_elements: SmallVec<[AnyElement; 1]>,
    line_numbers: Arc<HashMap<MultiBufferRow, LineNumberLayout>>,
    display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
@@ -8790,6 +8887,7 @@ fn diff_hunk_controls(
    row: u32,
    status: &DiffHunkStatus,
    hunk_range: Range<Anchor>,
+    is_created_file: bool,
    line_height: Pixels,
    editor: &Entity<Editor>,
    cx: &mut App,
@@ -8798,13 +8896,16 @@ fn diff_hunk_controls(
        .h(line_height)
        .mr_1()
        .gap_1()
-        .px_1()
+        .px_0p5()
        .pb_1()
+        .border_x_1()
        .border_b_1()
        .border_color(cx.theme().colors().border_variant)
        .rounded_b_lg()
        .bg(cx.theme().colors().editor_background)
        .gap_1()
+        .occlude()
+        .shadow_md()
        .child(if status.has_secondary_hunk() {
            Button::new(("stage", row as u64), "Stage")
                .alpha(if status.is_pending() { 0.66 } else { 1.0 })
@@ -8822,12 +8923,11 @@ fn diff_hunk_controls(
                })
                .on_click({
                    let editor = editor.clone();
-                    move |_event, window, cx| {
+                    move |_event, _window, cx| {
                        editor.update(cx, |editor, cx| {
                            editor.stage_or_unstage_diff_hunks(
                                true,
-                                &[hunk_range.start..hunk_range.start],
-                                window,
+                                vec![hunk_range.start..hunk_range.start],
                                cx,
                            );
                        });
@@ -8850,12 +8950,11 @@ fn diff_hunk_controls(
                })
                .on_click({
                    let editor = editor.clone();
-                    move |_event, window, cx| {
+                    move |_event, _window, cx| {
                        editor.update(cx, |editor, cx| {
                            editor.stage_or_unstage_diff_hunks(
                                false,
-                                &[hunk_range.start..hunk_range.start],
-                                window,
+                                vec![hunk_range.start..hunk_range.start],
                                cx,
                            );
                        });
@@ -8863,7 +8962,7 @@ fn diff_hunk_controls(
                })
        })
        .child(
-            Button::new("discard", "Restore")
+            Button::new("restore", "Restore")
                .tooltip({
                    let focus_handle = editor.focus_handle(cx);
                    move |window, cx| {
@@ -8885,7 +8984,8 @@ fn diff_hunk_controls(
                            editor.restore_hunks_in_ranges(vec![point..point], window, cx);
                        });
                    }
-                }),
+                })
+                .disabled(is_created_file),
        )
        .when(
            !editor.read(cx).buffer().read(cx).all_diff_hunks_expanded(),
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -241,8 +241,10 @@ impl Editor {
                        }
                    })
                    .collect();
-
-                return self.navigate_to_hover_links(None, links, modifiers.alt, window, cx);
+                let navigate_task =
+                    self.navigate_to_hover_links(None, links, modifiers.alt, window, cx);
+                self.select(SelectPhase::End, window, cx);
+                return navigate_task;
            }
        }

@@ -258,7 +260,7 @@ impl Editor {
            cx,
        );

-        if point.as_valid().is_some() {
+        let navigate_task = if point.as_valid().is_some() {
            if modifiers.shift {
                self.go_to_type_definition(&GoToTypeDefinition, window, cx)
            } else {
@@ -266,7 +268,9 @@ impl Editor {
            }
        } else {
            Task::ready(Ok(Navigated::No))
-        }
+        };
+        self.select(SelectPhase::End, window, cx);
+        return navigate_task;
    }
 }

--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -25,7 +25,7 @@ use theme::ThemeSettings;
 use ui::{prelude::*, theme_is_transparent, Scrollbar, ScrollbarState};
 use url::Url;
 use util::TryFutureExt;
-use workspace::Workspace;
+use workspace::{OpenOptions, OpenVisible, Workspace};
 pub const HOVER_REQUEST_DELAY_MILLIS: u64 = 200;

 pub const MIN_POPOVER_CHARACTER_WIDTH: f32 = 20.;
@@ -618,12 +618,12 @@ pub fn hover_markdown_style(window: &Window, cx: &App) -> MarkdownStyle {
        },
        syntax: cx.theme().syntax().clone(),
        selection_background_color: { cx.theme().players().local().selection },
-
        heading: StyleRefinement::default()
            .font_weight(FontWeight::BOLD)
            .text_base()
            .mt(rems(1.))
            .mb_0(),
+        ..Default::default()
    }
 }

@@ -632,8 +632,15 @@ pub fn open_markdown_url(link: SharedString, window: &mut Window, cx: &mut App)
        if uri.scheme() == "file" {
            if let Some(workspace) = window.root::<Workspace>().flatten() {
                workspace.update(cx, |workspace, cx| {
-                    let task =
-                        workspace.open_abs_path(PathBuf::from(uri.path()), false, window, cx);
+                    let task = workspace.open_abs_path(
+                        PathBuf::from(uri.path()),
+                        OpenOptions {
+                            visible: Some(OpenVisible::None),
+                            ..Default::default()
+                        },
+                        window,
+                        cx,
+                    );

                    cx.spawn_in(window, |_, mut cx| async move {
                        let item = task.await?;
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -38,10 +38,14 @@ use text::{BufferId, Selection};
 use theme::{Theme, ThemeSettings};
 use ui::{prelude::*, IconDecorationKind};
 use util::{paths::PathExt, ResultExt, TryFutureExt};
-use workspace::item::{Dedup, ItemSettings, SerializableItem, TabContentParams};
 use workspace::{
    item::{BreadcrumbText, FollowEvent},
    searchable::SearchOptions,
+    OpenVisible,
+};
+use workspace::{
+    item::{Dedup, ItemSettings, SerializableItem, TabContentParams},
+    OpenOptions,
 };
 use workspace::{
    item::{FollowableItem, Item, ItemEvent, ProjectItem},
@@ -618,11 +622,8 @@ impl Item for Editor {
        ItemSettings::get_global(cx)
            .file_icons
            .then(|| {
-                self.buffer
-                    .read(cx)
-                    .as_singleton()
-                    .and_then(|buffer| buffer.read(cx).project_path(cx))
-                    .and_then(|path| FileIcons::get_icon(path.path.as_ref(), cx))
+                path_for_buffer(&self.buffer, 0, true, cx)
+                    .and_then(|path| FileIcons::get_icon(path.as_ref(), cx))
            })
            .flatten()
            .map(Icon::from_path)
@@ -1160,7 +1161,15 @@ impl SerializableItem for Editor {
                    }
                    None => {
                        let open_by_abs_path = workspace.update(cx, |workspace, cx| {
-                            workspace.open_abs_path(abs_path.clone(), false, window, cx)
+                            workspace.open_abs_path(
+                                abs_path.clone(),
+                                OpenOptions {
+                                    visible: Some(OpenVisible::None),
+                                    ..Default::default()
+                                },
+                                window,
+                                cx,
+                            )
                        });
                        window.spawn(cx, |mut cx| async move {
                            let editor = open_by_abs_path?.await?.downcast::<Editor>().with_context(|| format!("Failed to downcast to Editor after opening abs path {abs_path:?}"))?;
@@ -1592,11 +1601,13 @@ impl SearchableItem for Editor {

    fn active_match_index(
        &mut self,
+        direction: Direction,
        matches: &[Range<Anchor>],
        _: &mut Window,
        cx: &mut Context<Self>,
    ) -> Option<usize> {
        active_match_index(
+            direction,
            matches,
            &self.selections.newest_anchor().head(),
            &self.buffer().read(cx).snapshot(cx),
@@ -1609,6 +1620,7 @@ impl SearchableItem for Editor {
 }

 pub fn active_match_index(
+    direction: Direction,
    ranges: &[Range<Anchor>],
    cursor: &Anchor,
    buffer: &MultiBufferSnapshot,
@@ -1616,7 +1628,7 @@ pub fn active_match_index(
    if ranges.is_empty() {
        None
    } else {
-        match ranges.binary_search_by(|probe| {
+        let r = ranges.binary_search_by(|probe| {
            if probe.end.cmp(cursor, buffer).is_lt() {
                Ordering::Less
            } else if probe.start.cmp(cursor, buffer).is_gt() {
@@ -1624,8 +1636,15 @@ pub fn active_match_index(
            } else {
                Ordering::Equal
            }
-        }) {
-            Ok(i) | Err(i) => Some(cmp::min(i, ranges.len() - 1)),
+        });
+        match direction {
+            Direction::Prev => match r {
+                Ok(i) => Some(i),
+                Err(i) => Some(i.saturating_sub(1)),
+            },
+            Direction::Next => match r {
+                Ok(i) | Err(i) => Some(cmp::min(i, ranges.len() - 1)),
+            },
        }
    }
 }
--- a/crates/editor/src/jsx_tag_auto_close.rs
+++ b/crates/editor/src/jsx_tag_auto_close.rs
@@ -0,0 +1,616 @@
+use anyhow::{anyhow, Context as _, Result};
+use collections::HashMap;
+use gpui::{Context, Entity, Window};
+use multi_buffer::{MultiBuffer, ToOffset};
+use std::ops::Range;
+use util::ResultExt as _;
+
+use language::{BufferSnapshot, JsxTagAutoCloseConfig, Node};
+use text::{Anchor, OffsetRangeExt as _};
+
+use crate::Editor;
+
+pub struct JsxTagCompletionState {
+    edit_index: usize,
+    open_tag_range: Range<usize>,
+}
+
+/// Index of the named child within an open or close tag
+/// that corresponds to the tag name
+/// Note that this is not configurable, i.e. we assume the first
+/// named child of a tag node is the tag name
+const TS_NODE_TAG_NAME_CHILD_INDEX: usize = 0;
+
+/// Maximum number of parent elements to walk back when checking if an open tag
+/// is already closed.
+///
+/// See the comment in `generate_auto_close_edits` for more details
+const ALREADY_CLOSED_PARENT_ELEMENT_WALK_BACK_LIMIT: usize = 2;
+
+pub(crate) fn should_auto_close(
+    buffer: &BufferSnapshot,
+    edited_ranges: &[Range<usize>],
+    config: &JsxTagAutoCloseConfig,
+) -> Option<Vec<JsxTagCompletionState>> {
+    let mut to_auto_edit = vec![];
+    for (index, edited_range) in edited_ranges.iter().enumerate() {
+        let text = buffer
+            .text_for_range(edited_range.clone())
+            .collect::<String>();
+        if !text.ends_with(">") {
+            continue;
+        }
+        let Some(layer) = buffer.smallest_syntax_layer_containing(edited_range.clone()) else {
+            continue;
+        };
+        let Some(node) = layer
+            .node()
+            .named_descendant_for_byte_range(edited_range.start, edited_range.end)
+        else {
+            continue;
+        };
+        let mut jsx_open_tag_node = node;
+        if node.grammar_name() != config.open_tag_node_name {
+            if let Some(parent) = node.parent() {
+                if parent.grammar_name() == config.open_tag_node_name {
+                    jsx_open_tag_node = parent;
+                }
+            }
+        }
+        if jsx_open_tag_node.grammar_name() != config.open_tag_node_name {
+            continue;
+        }
+
+        let first_two_chars: Option<[char; 2]> = {
+            let mut chars = buffer
+                .text_for_range(jsx_open_tag_node.byte_range())
+                .flat_map(|chunk| chunk.chars());
+            if let (Some(c1), Some(c2)) = (chars.next(), chars.next()) {
+                Some([c1, c2])
+            } else {
+                None
+            }
+        };
+        if let Some(chars) = first_two_chars {
+            if chars[0] != '<' {
+                continue;
+            }
+            if chars[1] == '!' || chars[1] == '/' {
+                continue;
+            }
+        }
+
+        to_auto_edit.push(JsxTagCompletionState {
+            edit_index: index,
+            open_tag_range: jsx_open_tag_node.byte_range(),
+        });
+    }
+    if to_auto_edit.is_empty() {
+        return None;
+    } else {
+        return Some(to_auto_edit);
+    }
+}
+
+pub(crate) fn generate_auto_close_edits(
+    buffer: &BufferSnapshot,
+    ranges: &[Range<usize>],
+    config: &JsxTagAutoCloseConfig,
+    state: Vec<JsxTagCompletionState>,
+) -> Result<Vec<(Range<Anchor>, String)>> {
+    let mut edits = Vec::with_capacity(state.len());
+    for auto_edit in state {
+        let edited_range = ranges[auto_edit.edit_index].clone();
+        let Some(layer) = buffer.smallest_syntax_layer_containing(edited_range.clone()) else {
+            continue;
+        };
+        let layer_root_node = layer.node();
+        let Some(open_tag) = layer_root_node.descendant_for_byte_range(
+            auto_edit.open_tag_range.start,
+            auto_edit.open_tag_range.end,
+        ) else {
+            continue;
+        };
+        assert!(open_tag.kind() == config.open_tag_node_name);
+        let tag_name = open_tag
+            .named_child(TS_NODE_TAG_NAME_CHILD_INDEX)
+            .filter(|node| node.kind() == config.tag_name_node_name)
+            .map_or("".to_string(), |node| {
+                buffer.text_for_range(node.byte_range()).collect::<String>()
+            });
+
+        /*
+         * Naive check to see if the tag is already closed
+         * Essentially all we do is count the number of open and close tags
+         * with the same tag name as the open tag just entered by the user
+         * The search is limited to some scope determined by
+         * `ALREADY_CLOSED_PARENT_ELEMENT_WALK_BACK_LIMIT`
+         *
+         * The limit is preferable to walking up the tree until we find a non-tag node,
+         * and then checking the entire tree, as this is unnecessarily expensive, and
+         * risks false positives
+         * eg. a `</div>` tag without a corresponding opening tag exists 25 lines away
+         *     and the user typed in `<div>`, intuitively we still want to auto-close it because
+         *     the other `</div>` tag is almost certainly not supposed to be the closing tag for the
+         *     current element
+         *
+         * We have to walk up the tree some amount because tree-sitters error correction is not
+         * designed to handle this case, and usually does not represent the tree structure
+         * in the way we might expect,
+         *
+         * We half to walk up the tree until we hit an element with a different open tag name (`doing_deep_search == true`)
+         * because tree-sitter may pair the new open tag with the root of the tree's closing tag leaving the
+         * root's opening tag unclosed.
+         * e.g
+         *      ```
+         *      <div>
+         *          <div>|cursor here|
+         *      </div>
+         *      ```
+         *     in Astro/vue/svelte tree-sitter represented the tree as
+         *      (
+         *          (jsx_element
+         *              (jsx_opening_element
+         *                  "<div>")
+         *          )
+         *          (jsx_element
+         *              (jsx_opening_element
+         *                  "<div>") // <- cursor is here
+         *              (jsx_closing_element
+         *                  "</div>")
+         *          )
+         *      )
+         *     so if we only walked to the first `jsx_element` node,
+         *     we would mistakenly identify the div entered by the
+         *     user as already being closed, despite this clearly
+         *     being false
+         *
+         * The errors with the tree-sitter tree caused by error correction,
+         * are also why the naive algorithm was chosen, as the alternative
+         * approach would be to maintain or construct a full parse tree (like tree-sitter)
+         * that better represents errors in a way that we can simply check
+         * the enclosing scope of the entered tag for a closing tag
+         * This is far more complex and expensive, and was deemed impractical
+         * given that the naive algorithm is sufficient in the majority of cases.
+         */
+        {
+            let tag_node_name_equals = |node: &Node, tag_name_node_name: &str, name: &str| {
+                let is_empty = name.len() == 0;
+                if let Some(node_name) = node.named_child(TS_NODE_TAG_NAME_CHILD_INDEX) {
+                    if node_name.kind() != tag_name_node_name {
+                        return is_empty;
+                    }
+                    let range = node_name.byte_range();
+                    return buffer.text_for_range(range).equals_str(name);
+                }
+                return is_empty;
+            };
+
+            let tree_root_node = {
+                let mut ancestors = Vec::with_capacity(
+                    // estimate of max, not based on any data,
+                    // but trying to avoid excessive reallocation
+                    16,
+                );
+                ancestors.push(layer_root_node);
+                let mut cur = layer_root_node;
+                // walk down the tree until we hit the open tag
+                // note: this is what node.parent() does internally
+                while let Some(descendant) = cur.child_with_descendant(open_tag) {
+                    if descendant == open_tag {
+                        break;
+                    }
+                    ancestors.push(descendant);
+                    cur = descendant;
+                }
+
+                assert!(ancestors.len() > 0);
+
+                let mut tree_root_node = open_tag;
+
+                let mut parent_element_node_count = 0;
+                let mut doing_deep_search = false;
+
+                for &ancestor in ancestors.iter().rev() {
+                    tree_root_node = ancestor;
+                    let is_element = ancestor.kind() == config.jsx_element_node_name;
+                    let is_error = ancestor.is_error();
+                    if is_error || !is_element {
+                        break;
+                    }
+                    if is_element {
+                        let is_first = parent_element_node_count == 0;
+                        if !is_first {
+                            let has_open_tag_with_same_tag_name = ancestor
+                                .named_child(0)
+                                .filter(|n| n.kind() == config.open_tag_node_name)
+                                .map_or(false, |element_open_tag_node| {
+                                    tag_node_name_equals(
+                                        &element_open_tag_node,
+                                        &config.tag_name_node_name,
+                                        &tag_name,
+                                    )
+                                });
+                            if has_open_tag_with_same_tag_name {
+                                doing_deep_search = true;
+                            } else if doing_deep_search {
+                                break;
+                            }
+                        }
+                        parent_element_node_count += 1;
+                        if !doing_deep_search
+                            && parent_element_node_count
+                                >= ALREADY_CLOSED_PARENT_ELEMENT_WALK_BACK_LIMIT
+                        {
+                            break;
+                        }
+                    }
+                }
+                tree_root_node
+            };
+
+            let mut unclosed_open_tag_count: i32 = 0;
+
+            let mut cursor = layer_root_node.walk();
+
+            let mut stack = Vec::with_capacity(tree_root_node.descendant_count());
+            stack.extend(tree_root_node.children(&mut cursor));
+
+            let mut has_erroneous_close_tag = false;
+            let mut erroneous_close_tag_node_name = "";
+            let mut erroneous_close_tag_name_node_name = "";
+            if let Some(name) = config.erroneous_close_tag_node_name.as_deref() {
+                has_erroneous_close_tag = true;
+                erroneous_close_tag_node_name = name;
+                erroneous_close_tag_name_node_name = config
+                    .erroneous_close_tag_name_node_name
+                    .as_deref()
+                    .unwrap_or(&config.tag_name_node_name);
+            }
+
+            let is_after_open_tag = |node: &Node| {
+                return node.start_byte() < open_tag.start_byte()
+                    && node.end_byte() < open_tag.start_byte();
+            };
+
+            // perf: use cursor for more efficient traversal
+            // if child -> go to child
+            // else if next sibling -> go to next sibling
+            // else -> go to parent
+            // if parent == tree_root_node -> break
+            while let Some(node) = stack.pop() {
+                let kind = node.kind();
+                if kind == config.open_tag_node_name {
+                    if tag_node_name_equals(&node, &config.tag_name_node_name, &tag_name) {
+                        unclosed_open_tag_count += 1;
+                    }
+                } else if kind == config.close_tag_node_name {
+                    if tag_node_name_equals(&node, &config.tag_name_node_name, &tag_name) {
+                        unclosed_open_tag_count -= 1;
+                    }
+                } else if has_erroneous_close_tag && kind == erroneous_close_tag_node_name {
+                    if tag_node_name_equals(&node, erroneous_close_tag_name_node_name, &tag_name) {
+                        if !is_after_open_tag(&node) {
+                            unclosed_open_tag_count -= 1;
+                        }
+                    }
+                } else if kind == config.jsx_element_node_name {
+                    // perf: filter only open,close,element,erroneous nodes
+                    stack.extend(node.children(&mut cursor));
+                }
+            }
+
+            if unclosed_open_tag_count <= 0 {
+                // skip if already closed
+                continue;
+            }
+        }
+        let edit_anchor = buffer.anchor_after(edited_range.end);
+        let edit_range = edit_anchor..edit_anchor;
+        edits.push((edit_range, format!("</{}>", tag_name)));
+    }
+    return Ok(edits);
+}
+
+pub(crate) fn refresh_enabled_in_any_buffer(
+    editor: &mut Editor,
+    multi_buffer: &Entity<MultiBuffer>,
+    cx: &Context<Editor>,
+) {
+    editor.jsx_tag_auto_close_enabled_in_any_buffer = {
+        let multi_buffer = multi_buffer.read(cx);
+        let mut found_enabled = false;
+        multi_buffer.for_each_buffer(|buffer| {
+            let buffer = buffer.read(cx);
+            let snapshot = buffer.snapshot();
+            for syntax_layer in snapshot.syntax_layers() {
+                let language = syntax_layer.language;
+                if language.config().jsx_tag_auto_close.is_none() {
+                    continue;
+                }
+                let language_settings = language::language_settings::language_settings(
+                    Some(language.name()),
+                    snapshot.file(),
+                    cx,
+                );
+                if language_settings.jsx_tag_auto_close.enabled {
+                    found_enabled = true;
+                }
+            }
+        });
+
+        found_enabled
+    };
+}
+
+pub(crate) type InitialBufferVersionsMap = HashMap<language::BufferId, clock::Global>;
+
+pub(crate) fn construct_initial_buffer_versions_map<
+    D: ToOffset + Copy,
+    _S: Into<std::sync::Arc<str>>,
+>(
+    editor: &Editor,
+    edits: &[(Range<D>, _S)],
+    cx: &Context<Editor>,
+) -> InitialBufferVersionsMap {
+    let mut initial_buffer_versions = InitialBufferVersionsMap::default();
+
+    if !editor.jsx_tag_auto_close_enabled_in_any_buffer {
+        return initial_buffer_versions;
+    }
+
+    for (edit_range, _) in edits {
+        let edit_range_buffer = editor
+            .buffer()
+            .read(cx)
+            .excerpt_containing(edit_range.end, cx)
+            .map(|e| e.1);
+        if let Some(buffer) = edit_range_buffer {
+            let (buffer_id, buffer_version) =
+                buffer.read_with(cx, |buffer, _| (buffer.remote_id(), buffer.version.clone()));
+            initial_buffer_versions.insert(buffer_id, buffer_version);
+        }
+    }
+    return initial_buffer_versions;
+}
+
+pub(crate) fn handle_from(
+    editor: &Editor,
+    initial_buffer_versions: InitialBufferVersionsMap,
+    window: &mut Window,
+    cx: &mut Context<Editor>,
+) {
+    if !editor.jsx_tag_auto_close_enabled_in_any_buffer {
+        return;
+    }
+
+    struct JsxAutoCloseEditContext {
+        buffer: Entity<language::Buffer>,
+        config: language::JsxTagAutoCloseConfig,
+        edits: Vec<Range<usize>>,
+    }
+
+    let mut edit_contexts =
+        HashMap::<(language::BufferId, language::LanguageId), JsxAutoCloseEditContext>::default();
+
+    for (buffer_id, buffer_version_initial) in initial_buffer_versions {
+        let Some(buffer) = editor.buffer.read(cx).buffer(buffer_id) else {
+            continue;
+        };
+        let snapshot = buffer.read(cx).snapshot();
+        for edit in buffer.read(cx).edits_since(&buffer_version_initial) {
+            let Some(language) = snapshot.language_at(edit.new.end) else {
+                continue;
+            };
+
+            let Some(config) = language.config().jsx_tag_auto_close.as_ref() else {
+                continue;
+            };
+
+            let language_settings = snapshot.settings_at(edit.new.end, cx);
+            if !language_settings.jsx_tag_auto_close.enabled {
+                continue;
+            }
+
+            edit_contexts
+                .entry((snapshot.remote_id(), language.id()))
+                .or_insert_with(|| JsxAutoCloseEditContext {
+                    buffer: buffer.clone(),
+                    config: config.clone(),
+                    edits: vec![],
+                })
+                .edits
+                .push(edit.new);
+        }
+    }
+
+    for ((buffer_id, _), auto_close_context) in edit_contexts {
+        let JsxAutoCloseEditContext {
+            buffer,
+            config: jsx_tag_auto_close_config,
+            edits: edited_ranges,
+        } = auto_close_context;
+
+        let (buffer_version_initial, mut buffer_parse_status_rx) =
+            buffer.read_with(cx, |buffer, _| (buffer.version(), buffer.parse_status()));
+
+        cx.spawn_in(window, |this, mut cx| async move {
+            let Some(buffer_parse_status) = buffer_parse_status_rx.recv().await.ok() else {
+                return Some(());
+            };
+            if buffer_parse_status == language::ParseStatus::Parsing {
+                let Some(language::ParseStatus::Idle) = buffer_parse_status_rx.recv().await.ok()
+                else {
+                    return Some(());
+                };
+            }
+
+            let buffer_snapshot = buffer.read_with(&cx, |buf, _| buf.snapshot()).ok()?;
+
+            let Some(edit_behavior_state) =
+                should_auto_close(&buffer_snapshot, &edited_ranges, &jsx_tag_auto_close_config)
+            else {
+                return Some(());
+            };
+
+            let ensure_no_edits_since_start = || -> Option<()> {
+                // <div>wef,wefwef
+                let has_edits_since_start = this
+                    .read_with(&cx, |this, cx| {
+                        this.buffer.read_with(cx, |buffer, cx| {
+                            buffer.buffer(buffer_id).map_or(true, |buffer| {
+                                buffer.read_with(cx, |buffer, _| {
+                                    buffer.has_edits_since(&buffer_version_initial)
+                                })
+                            })
+                        })
+                    })
+                    .ok()?;
+
+                if has_edits_since_start {
+                    Err(anyhow!(
+                        "Auto-close Operation Failed - Buffer has edits since start"
+                    ))
+                    .log_err()?;
+                }
+
+                Some(())
+            };
+
+            ensure_no_edits_since_start()?;
+
+            let edits = cx
+                .background_executor()
+                .spawn({
+                    let buffer_snapshot = buffer_snapshot.clone();
+                    async move {
+                        generate_auto_close_edits(
+                            &buffer_snapshot,
+                            &edited_ranges,
+                            &jsx_tag_auto_close_config,
+                            edit_behavior_state,
+                        )
+                    }
+                })
+                .await;
+
+            let edits = edits
+                .context("Auto-close Operation Failed - Failed to compute edits")
+                .log_err()?;
+
+            if edits.is_empty() {
+                return Some(());
+            }
+
+            // check again after awaiting background task before applying edits
+            ensure_no_edits_since_start()?;
+
+            let multi_buffer_snapshot = this
+                .read_with(&cx, |this, cx| {
+                    this.buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx))
+                })
+                .ok()?;
+
+            let mut base_selections = Vec::new();
+            let mut buffer_selection_map = HashMap::default();
+
+            {
+                let selections = this
+                    .read_with(&cx, |this, _| this.selections.disjoint_anchors().clone())
+                    .ok()?;
+                for selection in selections.iter() {
+                    let Some(selection_buffer_offset_head) =
+                        multi_buffer_snapshot.point_to_buffer_offset(selection.head())
+                    else {
+                        base_selections.push(selection.clone());
+                        continue;
+                    };
+                    let Some(selection_buffer_offset_tail) =
+                        multi_buffer_snapshot.point_to_buffer_offset(selection.tail())
+                    else {
+                        base_selections.push(selection.clone());
+                        continue;
+                    };
+
+                    let is_entirely_in_buffer = selection_buffer_offset_head.0.remote_id()
+                        == buffer_id
+                        && selection_buffer_offset_tail.0.remote_id() == buffer_id;
+                    if !is_entirely_in_buffer {
+                        base_selections.push(selection.clone());
+                        continue;
+                    }
+
+                    let selection_buffer_offset_head = selection_buffer_offset_head.1;
+                    let selection_buffer_offset_tail = selection_buffer_offset_tail.1;
+                    buffer_selection_map.insert(
+                        (selection_buffer_offset_head, selection_buffer_offset_tail),
+                        (selection.clone(), None),
+                    );
+                }
+            }
+
+            let mut any_selections_need_update = false;
+            for edit in &edits {
+                let edit_range_offset = edit.0.to_offset(&buffer_snapshot);
+                if edit_range_offset.start != edit_range_offset.end {
+                    continue;
+                }
+                if let Some(selection) =
+                    buffer_selection_map.get_mut(&(edit_range_offset.start, edit_range_offset.end))
+                {
+                    if selection.0.head().bias() != text::Bias::Right
+                        || selection.0.tail().bias() != text::Bias::Right
+                    {
+                        continue;
+                    }
+                    if selection.1.is_none() {
+                        any_selections_need_update = true;
+                        selection.1 = Some(
+                            selection
+                                .0
+                                .clone()
+                                .map(|anchor| multi_buffer_snapshot.anchor_before(anchor)),
+                        );
+                    }
+                }
+            }
+
+            buffer
+                .update(&mut cx, |buffer, cx| {
+                    buffer.edit(edits, None, cx);
+                })
+                .ok()?;
+
+            if any_selections_need_update {
+                let multi_buffer_snapshot = this
+                    .read_with(&cx, |this, cx| {
+                        this.buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx))
+                    })
+                    .ok()?;
+
+                base_selections.extend(buffer_selection_map.values().map(|selection| {
+                    match &selection.1 {
+                        Some(left_biased_selection) => left_biased_selection.clone(),
+                        None => selection.0.clone(),
+                    }
+                }));
+
+                let base_selections = base_selections
+                    .into_iter()
+                    .map(|selection| {
+                        selection.map(|anchor| anchor.to_offset(&multi_buffer_snapshot))
+                    })
+                    .collect::<Vec<_>>();
+                this.update_in(&mut cx, |this, window, cx| {
+                    this.change_selections_inner(None, false, window, cx, |s| {
+                        s.select(base_selections);
+                    });
+                })
+                .ok()?;
+            }
+
+            Some(())
+        })
+        .detach();
+    }
+}
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -448,7 +448,9 @@ pub fn end_of_excerpt(
            if start.row() > DisplayRow(0) {
                *start.row_mut() -= 1;
            }
-            map.clip_point(start, Bias::Left)
+            start = map.clip_point(start, Bias::Left);
+            *start.column_mut() = 0;
+            start
        }
        Direction::Next => {
            let mut end = excerpt.end_anchor().to_display_point(&map);
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@@ -4,7 +4,7 @@ use anyhow::Context as _;
 use gpui::{App, AppContext as _, Context, Entity, Window};
 use language::{Capability, Language};
 use multi_buffer::MultiBuffer;
-use project::lsp_ext_command::ExpandMacro;
+use project::lsp_store::{lsp_ext_command::ExpandMacro, rust_analyzer_ext::RUST_ANALYZER_NAME};
 use text::ToPointUtf16;

 use crate::{
@@ -12,8 +12,6 @@ use crate::{
    ExpandMacroRecursively, OpenDocs,
 };

-const RUST_ANALYZER_NAME: &str = "rust-analyzer";
-
 fn is_rust_language(language: &Language) -> bool {
    language.name() == "Rust".into()
 }
@@ -131,7 +129,7 @@ pub fn open_docs(editor: &mut Editor, _: &OpenDocs, window: &mut Window, cx: &mu
        project.request_lsp(
            buffer,
            project::LanguageServerToQuery::Other(server_to_query),
-            project::lsp_ext_command::OpenDocs { position },
+            project::lsp_store::lsp_ext_command::OpenDocs { position },
            cx,
        )
    });
--- a/crates/editor/src/test/editor_test_context.rs
+++ b/crates/editor/src/test/editor_test_context.rs
@@ -429,12 +429,14 @@ impl EditorTestContext {
                if expected_selections.len() > 0 {
                    assert!(
                        is_selected,
-                        "excerpt {} should be selected. Got {:?}",
-                        ix,
-                        self.editor_state()
+                        "excerpt {ix} should be selected. got {:?}",
+                        self.editor_state(),
                    );
                } else {
-                    assert!(!is_selected, "excerpt {} should not be selected", ix);
+                    assert!(
+                        !is_selected,
+                        "excerpt {ix} should not be selected, got: {selections:?}",
+                    );
                }
                continue;
            }
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -17,6 +17,7 @@ async-compression.workspace = true
 async-tar.workspace = true
 async-trait.workspace = true
 collections.workspace = true
+convert_case.workspace = true
 fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -4,6 +4,7 @@ use crate::{
 use anyhow::{anyhow, bail, Context as _, Result};
 use async_compression::futures::bufread::GzipDecoder;
 use async_tar::Archive;
+use convert_case::{Case, Casing as _};
 use futures::io::BufReader;
 use futures::AsyncReadExt;
 use http_client::{self, AsyncBody, HttpClient};
@@ -97,6 +98,11 @@ impl ExtensionBuilder {
        }

        for (grammar_name, grammar_metadata) in &extension_manifest.grammars {
+            let snake_cased_grammar_name = grammar_name.to_case(Case::Snake);
+            if grammar_name.as_ref() != snake_cased_grammar_name.as_str() {
+                bail!("grammar name '{grammar_name}' must be written in snake_case: {snake_cased_grammar_name}");
+            }
+
            log::info!(
                "compiling grammar {grammar_name} for extension {}",
                extension_dir.display()
--- a/crates/extension/src/extension_manifest.rs
+++ b/crates/extension/src/extension_manifest.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context as _, Result};
+use anyhow::{anyhow, bail, Context as _, Result};
 use collections::{BTreeMap, HashMap};
 use fs::Fs;
 use language::LanguageName;
@@ -85,6 +85,61 @@ pub struct ExtensionManifest {
    pub indexed_docs_providers: BTreeMap<Arc<str>, IndexedDocsProviderEntry>,
    #[serde(default)]
    pub snippets: Option<PathBuf>,
+    #[serde(default)]
+    pub capabilities: Vec<ExtensionCapability>,
+}
+
+impl ExtensionManifest {
+    pub fn allow_exec(
+        &self,
+        desired_command: &str,
+        desired_args: &[impl AsRef<str> + std::fmt::Debug],
+    ) -> Result<()> {
+        let is_allowed = self.capabilities.iter().any(|capability| match capability {
+            ExtensionCapability::ProcessExec { command, args } if command == desired_command => {
+                for (ix, arg) in args.iter().enumerate() {
+                    if arg == "**" {
+                        return true;
+                    }
+
+                    if ix >= desired_args.len() {
+                        return false;
+                    }
+
+                    if arg != "*" && arg != desired_args[ix].as_ref() {
+                        return false;
+                    }
+                }
+                if args.len() < desired_args.len() {
+                    return false;
+                }
+                true
+            }
+            _ => false,
+        });
+
+        if !is_allowed {
+            bail!(
+                "capability for process:exec {desired_command} {desired_args:?} was not listed in the extension manifest",
+            );
+        }
+
+        Ok(())
+    }
+}
+
+/// A capability for an extension.
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+#[serde(tag = "kind")]
+pub enum ExtensionCapability {
+    #[serde(rename = "process:exec")]
+    ProcessExec {
+        /// The command to execute.
+        command: String,
+        /// The arguments to pass to the command. Use `*` for a single wildcard argument.
+        /// If the last element is `**`, then any trailing arguments are allowed.
+        args: Vec<String>,
+    },
 }

 #[derive(Clone, Default, PartialEq, Eq, Debug, Deserialize, Serialize)]
@@ -218,5 +273,104 @@ fn manifest_from_old_manifest(
        slash_commands: BTreeMap::default(),
        indexed_docs_providers: BTreeMap::default(),
        snippets: None,
+        capabilities: Vec::new(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn extension_manifest() -> ExtensionManifest {
+        ExtensionManifest {
+            id: "test".into(),
+            name: "Test".to_string(),
+            version: "1.0.0".into(),
+            schema_version: SchemaVersion::ZERO,
+            description: None,
+            repository: None,
+            authors: vec![],
+            lib: Default::default(),
+            themes: vec![],
+            icon_themes: vec![],
+            languages: vec![],
+            grammars: BTreeMap::default(),
+            language_servers: BTreeMap::default(),
+            context_servers: BTreeMap::default(),
+            slash_commands: BTreeMap::default(),
+            indexed_docs_providers: BTreeMap::default(),
+            snippets: None,
+            capabilities: vec![],
+        }
+    }
+
+    #[test]
+    fn test_allow_exact_match() {
+        let manifest = ExtensionManifest {
+            capabilities: vec![ExtensionCapability::ProcessExec {
+                command: "ls".to_string(),
+                args: vec!["-la".to_string()],
+            }],
+            ..extension_manifest()
+        };
+
+        assert!(manifest.allow_exec("ls", &["-la"]).is_ok());
+        assert!(manifest.allow_exec("ls", &["-l"]).is_err());
+        assert!(manifest.allow_exec("pwd", &[] as &[&str]).is_err());
+    }
+
+    #[test]
+    fn test_allow_wildcard_arg() {
+        let manifest = ExtensionManifest {
+            capabilities: vec![ExtensionCapability::ProcessExec {
+                command: "git".to_string(),
+                args: vec!["*".to_string()],
+            }],
+            ..extension_manifest()
+        };
+
+        assert!(manifest.allow_exec("git", &["status"]).is_ok());
+        assert!(manifest.allow_exec("git", &["commit"]).is_ok());
+        assert!(manifest.allow_exec("git", &["status", "-s"]).is_err()); // too many args
+        assert!(manifest.allow_exec("npm", &["install"]).is_err()); // wrong command
+    }
+
+    #[test]
+    fn test_allow_double_wildcard() {
+        let manifest = ExtensionManifest {
+            capabilities: vec![ExtensionCapability::ProcessExec {
+                command: "cargo".to_string(),
+                args: vec!["test".to_string(), "**".to_string()],
+            }],
+            ..extension_manifest()
+        };
+
+        assert!(manifest.allow_exec("cargo", &["test"]).is_ok());
+        assert!(manifest.allow_exec("cargo", &["test", "--all"]).is_ok());
+        assert!(manifest
+            .allow_exec("cargo", &["test", "--all", "--no-fail-fast"])
+            .is_ok());
+        assert!(manifest.allow_exec("cargo", &["build"]).is_err()); // wrong first arg
+    }
+
+    #[test]
+    fn test_allow_mixed_wildcards() {
+        let manifest = ExtensionManifest {
+            capabilities: vec![ExtensionCapability::ProcessExec {
+                command: "docker".to_string(),
+                args: vec!["run".to_string(), "*".to_string(), "**".to_string()],
+            }],
+            ..extension_manifest()
+        };
+
+        assert!(manifest.allow_exec("docker", &["run", "nginx"]).is_ok());
+        assert!(manifest.allow_exec("docker", &["run"]).is_err());
+        assert!(manifest
+            .allow_exec("docker", &["run", "ubuntu", "bash"])
+            .is_ok());
+        assert!(manifest
+            .allow_exec("docker", &["run", "alpine", "sh", "-c", "echo hello"])
+            .is_ok());
+        assert!(manifest.allow_exec("docker", &["ps"]).is_err()); // wrong first arg
    }
 }
--- a/crates/extension_host/src/extension_store_test.rs
+++ b/crates/extension_host/src/extension_store_test.rs
@@ -163,6 +163,7 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                        slash_commands: BTreeMap::default(),
                        indexed_docs_providers: BTreeMap::default(),
                        snippets: None,
+                        capabilities: Vec::new(),
                    }),
                    dev: false,
                },
@@ -191,6 +192,7 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                        slash_commands: BTreeMap::default(),
                        indexed_docs_providers: BTreeMap::default(),
                        snippets: None,
+                        capabilities: Vec::new(),
                    }),
                    dev: false,
                },
@@ -356,6 +358,7 @@ async fn test_extension_store(cx: &mut TestAppContext) {
                slash_commands: BTreeMap::default(),
                indexed_docs_providers: BTreeMap::default(),
                snippets: None,
+                capabilities: Vec::new(),
            }),
            dev: false,
        },
--- a/crates/extension_host/src/wasm_host/wit/since_v0_3_0.rs
+++ b/crates/extension_host/src/wasm_host/wit/since_v0_3_0.rs
@@ -592,6 +592,8 @@ impl process::Host for WasmState {
        command: process::Command,
    ) -> wasmtime::Result<Result<process::Output, String>> {
        maybe!(async {
+            self.manifest.allow_exec(&command.command, &command.args)?;
+
            let output = util::command::new_smol_command(command.command.as_str())
                .args(&command.args)
                .envs(command.env)
--- a/crates/extensions_ui/src/components/extension_card.rs
+++ b/crates/extensions_ui/src/components/extension_card.rs
@@ -40,7 +40,7 @@ impl RenderOnce for ExtensionCard {
                .bg(cx.theme().colors().elevated_surface_background)
                .border_1()
                .border_color(cx.theme().colors().border)
-                .rounded_md()
+                .rounded_sm()
                .children(self.children)
                .when(self.overridden_by_dev_extension, |card| {
                    card.child(
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -632,7 +632,7 @@ impl ExtensionsPage {
                                                    .px_0p5()
                                                    .border_1()
                                                    .border_color(cx.theme().colors().border)
-                                                    .rounded_md()
+                                                    .rounded_sm()
                                                    .child(
                                                        Label::new(label).size(LabelSize::XSmall),
                                                    )
--- a/crates/feedback/src/feedback_modal.rs
+++ b/crates/feedback/src/feedback_modal.rs
@@ -470,7 +470,7 @@ impl Render for FeedbackModal {
                    .bg(cx.theme().colors().editor_background)
                    .p_2()
                    .border_1()
-                    .rounded_md()
+                    .rounded_sm()
                    .border_color(cx.theme().colors().border)
                    .child(self.feedback_editor.clone()),
            )
@@ -482,7 +482,7 @@ impl Render for FeedbackModal {
                            .bg(cx.theme().colors().editor_background)
                            .p_2()
                            .border_1()
-                            .rounded_md()
+                            .rounded_sm()
                            .border_color(if self.valid_email_address() {
                                cx.theme().colors().border
                            } else {
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1,5 +1,7 @@
 #[cfg(test)]
 mod file_finder_tests;
+#[cfg(test)]
+mod open_path_prompt_tests;

 pub mod file_finder_settings;
 mod new_path_prompt;
@@ -40,8 +42,8 @@ use ui::{
 };
 use util::{maybe, paths::PathWithPosition, post_inc, ResultExt};
 use workspace::{
-    item::PreviewTabsSettings, notifications::NotifyResultExt, pane, ModalView, SplitDirection,
-    Workspace,
+    item::PreviewTabsSettings, notifications::NotifyResultExt, pane, ModalView, OpenOptions,
+    OpenVisible, SplitDirection, Workspace,
 };

 actions!(file_finder, [SelectPrevious, ToggleMenu]);
@@ -1237,7 +1239,10 @@ impl PickerDelegate for FileFinderDelegate {
                                        } else {
                                            workspace.open_abs_path(
                                                abs_path.to_path_buf(),
-                                                false,
+                                                OpenOptions {
+                                                    visible: Some(OpenVisible::None),
+                                                    ..Default::default()
+                                                },
                                                window,
                                                cx,
                                            )
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -7,7 +7,7 @@ use menu::{Confirm, SelectNext, SelectPrevious};
 use project::{RemoveOptions, FS_WATCH_LATENCY};
 use serde_json::json;
 use util::path;
-use workspace::{AppState, ToggleFileFinder, Workspace};
+use workspace::{AppState, OpenOptions, ToggleFileFinder, Workspace};

 #[ctor::ctor]
 fn init_logger() {
@@ -951,7 +951,10 @@ async fn test_external_files_history(cx: &mut gpui::TestAppContext) {
        .update_in(cx, |workspace, window, cx| {
            workspace.open_abs_path(
                PathBuf::from(path!("/external-src/test/third.rs")),
-                false,
+                OpenOptions {
+                    visible: Some(OpenVisible::None),
+                    ..Default::default()
+                },
                window,
                cx,
            )
--- a/crates/file_finder/src/open_path_prompt.rs
+++ b/crates/file_finder/src/open_path_prompt.rs
@@ -3,7 +3,7 @@ use fuzzy::StringMatchCandidate;
 use picker::{Picker, PickerDelegate};
 use project::DirectoryLister;
 use std::{
-    path::{Path, PathBuf},
+    path::{Path, PathBuf, MAIN_SEPARATOR_STR},
    sync::{
        atomic::{self, AtomicBool},
        Arc,
@@ -38,14 +38,38 @@ impl OpenPathDelegate {
            should_dismiss: true,
        }
    }
+
+    #[cfg(any(test, feature = "test-support"))]
+    pub fn collect_match_candidates(&self) -> Vec<String> {
+        if let Some(state) = self.directory_state.as_ref() {
+            self.matches
+                .iter()
+                .filter_map(|&index| {
+                    state
+                        .match_candidates
+                        .get(index)
+                        .map(|candidate| candidate.path.string.clone())
+                })
+                .collect()
+        } else {
+            Vec::new()
+        }
+    }
 }

+#[derive(Debug)]
 struct DirectoryState {
    path: String,
-    match_candidates: Vec<StringMatchCandidate>,
+    match_candidates: Vec<CandidateInfo>,
    error: Option<SharedString>,
 }

+#[derive(Debug, Clone)]
+struct CandidateInfo {
+    path: StringMatchCandidate,
+    is_dir: bool,
+}
+
 impl OpenPathPrompt {
    pub(crate) fn register(
        workspace: &mut Workspace,
@@ -93,8 +117,6 @@ impl PickerDelegate for OpenPathDelegate {
        cx.notify();
    }

-    // todo(windows)
-    // Is this method woring correctly on Windows? This method uses `/` for path separator.
    fn update_matches(
        &mut self,
        query: String,
@@ -102,13 +124,26 @@ impl PickerDelegate for OpenPathDelegate {
        cx: &mut Context<Picker<Self>>,
    ) -> gpui::Task<()> {
        let lister = self.lister.clone();
-        let (mut dir, suffix) = if let Some(index) = query.rfind('/') {
-            (query[..index].to_string(), query[index + 1..].to_string())
+        let query_path = Path::new(&query);
+        let last_item = query_path
+            .file_name()
+            .unwrap_or_default()
+            .to_string_lossy()
+            .to_string();
+        let (mut dir, suffix) = if let Some(dir) = query.strip_suffix(&last_item) {
+            (dir.to_string(), last_item)
        } else {
            (query, String::new())
        };
        if dir == "" {
-            dir = "/".to_string();
+            #[cfg(not(target_os = "windows"))]
+            {
+                dir = "/".to_string();
+            }
+            #[cfg(target_os = "windows")]
+            {
+                dir = "C:\\".to_string();
+            }
        }

        let query = if self
@@ -134,12 +169,16 @@ impl PickerDelegate for OpenPathDelegate {
                this.update(&mut cx, |this, _| {
                    this.delegate.directory_state = Some(match paths {
                        Ok(mut paths) => {
-                            paths.sort_by(|a, b| compare_paths((a, true), (b, true)));
+                            paths.sort_by(|a, b| compare_paths((&a.path, true), (&b.path, true)));
                            let match_candidates = paths
                                .iter()
                                .enumerate()
-                                .map(|(ix, path)| {
-                                    StringMatchCandidate::new(ix, &path.to_string_lossy())
+                                .map(|(ix, item)| CandidateInfo {
+                                    path: StringMatchCandidate::new(
+                                        ix,
+                                        &item.path.to_string_lossy(),
+                                    ),
+                                    is_dir: item.is_dir,
                                })
                                .collect::<Vec<_>>();

@@ -178,7 +217,7 @@ impl PickerDelegate for OpenPathDelegate {
            };

            if !suffix.starts_with('.') {
-                match_candidates.retain(|m| !m.string.starts_with('.'));
+                match_candidates.retain(|m| !m.path.string.starts_with('.'));
            }

            if suffix == "" {
@@ -186,7 +225,7 @@ impl PickerDelegate for OpenPathDelegate {
                    this.delegate.matches.clear();
                    this.delegate
                        .matches
-                        .extend(match_candidates.iter().map(|m| m.id));
+                        .extend(match_candidates.iter().map(|m| m.path.id));

                    cx.notify();
                })
@@ -194,8 +233,9 @@ impl PickerDelegate for OpenPathDelegate {
                return;
            }

+            let candidates = match_candidates.iter().map(|m| &m.path).collect::<Vec<_>>();
            let matches = fuzzy::match_strings(
-                match_candidates.as_slice(),
+                candidates.as_slice(),
                &suffix,
                false,
                100,
@@ -217,7 +257,7 @@ impl PickerDelegate for OpenPathDelegate {
                        this.delegate.directory_state.as_ref().and_then(|d| {
                            d.match_candidates
                                .get(*m)
-                                .map(|c| !c.string.starts_with(&suffix))
+                                .map(|c| !c.path.string.starts_with(&suffix))
                        }),
                        *m,
                    )
@@ -239,7 +279,16 @@ impl PickerDelegate for OpenPathDelegate {
                let m = self.matches.get(self.selected_index)?;
                let directory_state = self.directory_state.as_ref()?;
                let candidate = directory_state.match_candidates.get(*m)?;
-                Some(format!("{}/{}", directory_state.path, candidate.string))
+                Some(format!(
+                    "{}{}{}",
+                    directory_state.path,
+                    candidate.path.string,
+                    if candidate.is_dir {
+                        MAIN_SEPARATOR_STR
+                    } else {
+                        ""
+                    }
+                ))
            })
            .unwrap_or(query),
        )
@@ -260,7 +309,7 @@ impl PickerDelegate for OpenPathDelegate {
                .resolve_tilde(&directory_state.path, cx)
                .as_ref(),
        )
-        .join(&candidate.string);
+        .join(&candidate.path.string);
        if let Some(tx) = self.tx.take() {
            tx.send(Some(vec![result])).ok();
        }
@@ -294,7 +343,7 @@ impl PickerDelegate for OpenPathDelegate {
                .spacing(ListItemSpacing::Sparse)
                .inset(true)
                .toggle_state(selected)
-                .child(LabelLike::new().child(candidate.string.clone())),
+                .child(LabelLike::new().child(candidate.path.string.clone())),
        )
    }

@@ -307,6 +356,6 @@ impl PickerDelegate for OpenPathDelegate {
    }

    fn placeholder_text(&self, _window: &mut Window, _cx: &mut App) -> Arc<str> {
-        Arc::from("[directory/]filename.ext")
+        Arc::from(format!("[directory{MAIN_SEPARATOR_STR}]filename.ext"))
    }
 }
--- a/crates/file_finder/src/open_path_prompt_tests.rs
+++ b/crates/file_finder/src/open_path_prompt_tests.rs
@@ -0,0 +1,324 @@
+use std::sync::Arc;
+
+use gpui::{AppContext, Entity, TestAppContext, VisualTestContext};
+use picker::{Picker, PickerDelegate};
+use project::Project;
+use serde_json::json;
+use ui::rems;
+use util::path;
+use workspace::{AppState, Workspace};
+
+use crate::OpenPathDelegate;
+
+#[gpui::test]
+async fn test_open_path_prompt(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            path!("/root"),
+            json!({
+                "a1": "A1",
+                "a2": "A2",
+                "a3": "A3",
+                "dir1": {},
+                "dir2": {
+                    "c": "C",
+                    "d1": "D1",
+                    "d2": "D2",
+                    "d3": "D3",
+                    "dir3": {},
+                    "dir4": {}
+                }
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
+
+    let (picker, cx) = build_open_path_prompt(project, cx);
+
+    let query = path!("/root");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["root"]);
+
+    // If the query ends with a slash, the picker should show the contents of the directory.
+    let query = path!("/root/");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["a1", "a2", "a3", "dir1", "dir2"]
+    );
+
+    // Show candidates for the query "a".
+    let query = path!("/root/a");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["a1", "a2", "a3"]
+    );
+
+    // Show candidates for the query "d".
+    let query = path!("/root/d");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
+
+    let query = path!("/root/dir2");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir2"]);
+
+    let query = path!("/root/dir2/");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["c", "d1", "d2", "d3", "dir3", "dir4"]
+    );
+
+    // Show candidates for the query "d".
+    let query = path!("/root/dir2/d");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["d1", "d2", "d3", "dir3", "dir4"]
+    );
+
+    let query = path!("/root/dir2/di");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir3", "dir4"]);
+}
+
+#[gpui::test]
+async fn test_open_path_prompt_completion(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            path!("/root"),
+            json!({
+                "a": "A",
+                "dir1": {},
+                "dir2": {
+                    "c": "C",
+                    "d": "D",
+                    "dir3": {},
+                    "dir4": {}
+                }
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
+
+    let (picker, cx) = build_open_path_prompt(project, cx);
+
+    // Confirm completion for the query "/root", since it's a directory, it should add a trailing slash.
+    let query = path!("/root");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(confirm_completion(query, 0, &picker, cx), path!("/root/"));
+
+    // Confirm completion for the query "/root/", selecting the first candidate "a", since it's a file, it should not add a trailing slash.
+    let query = path!("/root/");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(confirm_completion(query, 0, &picker, cx), path!("/root/a"));
+
+    // Confirm completion for the query "/root/", selecting the second candidate "dir1", since it's a directory, it should add a trailing slash.
+    let query = path!("/root/");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx),
+        path!("/root/dir1/")
+    );
+
+    let query = path!("/root/a");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(confirm_completion(query, 0, &picker, cx), path!("/root/a"));
+
+    let query = path!("/root/d");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx),
+        path!("/root/dir2/")
+    );
+
+    let query = path!("/root/dir2");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx),
+        path!("/root/dir2/")
+    );
+
+    let query = path!("/root/dir2/");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx),
+        path!("/root/dir2/c")
+    );
+
+    let query = path!("/root/dir2/");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 2, &picker, cx),
+        path!("/root/dir2/dir3/")
+    );
+
+    let query = path!("/root/dir2/d");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx),
+        path!("/root/dir2/d")
+    );
+
+    let query = path!("/root/dir2/d");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx),
+        path!("/root/dir2/dir3/")
+    );
+
+    let query = path!("/root/dir2/di");
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        confirm_completion(query, 1, &picker, cx),
+        path!("/root/dir2/dir4/")
+    );
+}
+
+#[gpui::test]
+#[cfg(target_os = "windows")]
+async fn test_open_path_prompt_on_windows(cx: &mut TestAppContext) {
+    let app_state = init_test(cx);
+    app_state
+        .fs
+        .as_fake()
+        .insert_tree(
+            path!("/root"),
+            json!({
+                "a": "A",
+                "dir1": {},
+                "dir2": {}
+            }),
+        )
+        .await;
+
+    let project = Project::test(app_state.fs.clone(), [path!("/root").as_ref()], cx).await;
+
+    let (picker, cx) = build_open_path_prompt(project, cx);
+
+    // Support both forward and backward slashes.
+    let query = "C:/root/";
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["a", "dir1", "dir2"]
+    );
+    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:/root/a");
+
+    let query = "C:\\root/";
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["a", "dir1", "dir2"]
+    );
+    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:\\root/a");
+
+    let query = "C:\\root\\";
+    insert_query(query, &picker, cx).await;
+    assert_eq!(
+        collect_match_candidates(&picker, cx),
+        vec!["a", "dir1", "dir2"]
+    );
+    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:\\root\\a");
+
+    // Confirm completion for the query "C:/root/d", selecting the second candidate "dir2", since it's a directory, it should add a trailing slash.
+    let query = "C:/root/d";
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
+    assert_eq!(confirm_completion(query, 1, &picker, cx), "C:/root/dir2\\");
+
+    let query = "C:\\root/d";
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
+    assert_eq!(confirm_completion(query, 0, &picker, cx), "C:\\root/dir1\\");
+
+    let query = "C:\\root\\d";
+    insert_query(query, &picker, cx).await;
+    assert_eq!(collect_match_candidates(&picker, cx), vec!["dir1", "dir2"]);
+    assert_eq!(
+        confirm_completion(query, 0, &picker, cx),
+        "C:\\root\\dir1\\"
+    );
+}
+
+fn init_test(cx: &mut TestAppContext) -> Arc<AppState> {
+    cx.update(|cx| {
+        let state = AppState::test(cx);
+        theme::init(theme::LoadThemes::JustBase, cx);
+        language::init(cx);
+        super::init(cx);
+        editor::init(cx);
+        workspace::init_settings(cx);
+        Project::init_settings(cx);
+        state
+    })
+}
+
+fn build_open_path_prompt(
+    project: Entity<Project>,
+    cx: &mut TestAppContext,
+) -> (Entity<Picker<OpenPathDelegate>>, &mut VisualTestContext) {
+    let (tx, _) = futures::channel::oneshot::channel();
+    let lister = project::DirectoryLister::Project(project.clone());
+    let delegate = OpenPathDelegate::new(tx, lister.clone());
+
+    let (workspace, cx) = cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));
+    (
+        workspace.update_in(cx, |_, window, cx| {
+            cx.new(|cx| {
+                let picker = Picker::uniform_list(delegate, window, cx)
+                    .width(rems(34.))
+                    .modal(false);
+                let query = lister.default_query(cx);
+                picker.set_query(query, window, cx);
+                picker
+            })
+        }),
+        cx,
+    )
+}
+
+async fn insert_query(
+    query: &str,
+    picker: &Entity<Picker<OpenPathDelegate>>,
+    cx: &mut VisualTestContext,
+) {
+    picker
+        .update_in(cx, |f, window, cx| {
+            f.delegate.update_matches(query.to_string(), window, cx)
+        })
+        .await;
+}
+
+fn confirm_completion(
+    query: &str,
+    select: usize,
+    picker: &Entity<Picker<OpenPathDelegate>>,
+    cx: &mut VisualTestContext,
+) -> String {
+    picker
+        .update_in(cx, |f, window, cx| {
+            if f.delegate.selected_index() != select {
+                f.delegate.set_selected_index(select, window, cx);
+            }
+            f.delegate.confirm_completion(query.to_string(), window, cx)
+        })
+        .unwrap()
+}
+
+fn collect_match_candidates(
+    picker: &Entity<Picker<OpenPathDelegate>>,
+    cx: &mut VisualTestContext,
+) -> Vec<String> {
+    picker.update(cx, |f, _| f.delegate.collect_match_candidates())
+}
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -1448,6 +1448,12 @@ impl FakeFs {
        });
    }

+    pub fn set_error_message_for_index_write(&self, dot_git: &Path, message: Option<String>) {
+        self.with_git_state(dot_git, true, |state| {
+            state.simulated_index_write_error_message = message;
+        });
+    }
+
    pub fn paths(&self, include_dot_git: bool) -> Vec<PathBuf> {
        let mut result = Vec::new();
        let mut queue = collections::VecDeque::new();
--- a/crates/fuzzy/src/matcher.rs
+++ b/crates/fuzzy/src/matcher.rs
@@ -1,5 +1,5 @@
 use std::{
-    borrow::Cow,
+    borrow::{Borrow, Cow},
    sync::atomic::{self, AtomicBool},
 };

@@ -50,22 +50,24 @@ impl<'a> Matcher<'a> {

    /// Filter and score fuzzy match candidates. Results are returned unsorted, in the same order as
    /// the input candidates.
-    pub fn match_candidates<C: MatchCandidate, R, F>(
+    pub fn match_candidates<C, R, F, T>(
        &mut self,
        prefix: &[char],
        lowercase_prefix: &[char],
-        candidates: impl Iterator<Item = C>,
+        candidates: impl Iterator<Item = T>,
        results: &mut Vec<R>,
        cancel_flag: &AtomicBool,
        build_match: F,
    ) where
+        C: MatchCandidate,
+        T: Borrow<C>,
        F: Fn(&C, f64, &Vec<usize>) -> R,
    {
        let mut candidate_chars = Vec::new();
        let mut lowercase_candidate_chars = Vec::new();

        for candidate in candidates {
-            if !candidate.has_chars(self.query_char_bag) {
+            if !candidate.borrow().has_chars(self.query_char_bag) {
                continue;
            }

@@ -75,7 +77,7 @@ impl<'a> Matcher<'a> {

            candidate_chars.clear();
            lowercase_candidate_chars.clear();
-            for c in candidate.to_string().chars() {
+            for c in candidate.borrow().to_string().chars() {
                candidate_chars.push(c);
                lowercase_candidate_chars.append(&mut c.to_lowercase().collect::<Vec<_>>());
            }
@@ -98,7 +100,11 @@ impl<'a> Matcher<'a> {
            );

            if score > 0.0 {
-                results.push(build_match(&candidate, score, &self.match_positions));
+                results.push(build_match(
+                    candidate.borrow(),
+                    score,
+                    &self.match_positions,
+                ));
            }
        }
    }
--- a/crates/fuzzy/src/strings.rs
+++ b/crates/fuzzy/src/strings.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use gpui::BackgroundExecutor;
 use std::{
-    borrow::Cow,
+    borrow::{Borrow, Cow},
    cmp::{self, Ordering},
    iter,
    ops::Range,
@@ -113,14 +113,17 @@ impl Ord for StringMatch {
    }
 }

-pub async fn match_strings(
-    candidates: &[StringMatchCandidate],
+pub async fn match_strings<T>(
+    candidates: &[T],
    query: &str,
    smart_case: bool,
    max_results: usize,
    cancel_flag: &AtomicBool,
    executor: BackgroundExecutor,
-) -> Vec<StringMatch> {
+) -> Vec<StringMatch>
+where
+    T: Borrow<StringMatchCandidate> + Sync,
+{
    if candidates.is_empty() || max_results == 0 {
        return Default::default();
    }
@@ -129,10 +132,10 @@ pub async fn match_strings(
        return candidates
            .iter()
            .map(|candidate| StringMatch {
-                candidate_id: candidate.id,
+                candidate_id: candidate.borrow().id,
                score: 0.,
                positions: Default::default(),
-                string: candidate.string.clone(),
+                string: candidate.borrow().string.clone(),
            })
            .collect();
    }
@@ -163,10 +166,12 @@ pub async fn match_strings(
                    matcher.match_candidates(
                        &[],
                        &[],
-                        candidates[segment_start..segment_end].iter(),
+                        candidates[segment_start..segment_end]
+                            .iter()
+                            .map(|c| c.borrow()),
                        results,
                        cancel_flag,
-                        |candidate, score, positions| StringMatch {
+                        |candidate: &&StringMatchCandidate, score, positions| StringMatch {
                            candidate_id: candidate.id,
                            score,
                            positions: positions.clone(),
--- a/crates/git/Cargo.toml
+++ b/crates/git/Cargo.toml
@@ -16,6 +16,7 @@ test-support = []

 [dependencies]
 anyhow.workspace = true
+askpass.workspace = true
 async-trait.workspace = true
 collections.workspace = true
 derive_more.workspace = true
@@ -34,7 +35,7 @@ text.workspace = true
 time.workspace = true
 url.workspace = true
 util.workspace = true
-tempfile.workspace = true
+futures.workspace = true

 [dev-dependencies]
 pretty_assertions.workspace = true
--- a/crates/git/src/git.rs
+++ b/crates/git/src/git.rs
@@ -8,9 +8,6 @@ pub mod status;
 use anyhow::{anyhow, Context as _, Result};
 use gpui::action_with_deprecated_aliases;
 use gpui::actions;
-use gpui::impl_actions;
-use repository::PushOptions;
-use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use std::ffi::OsStr;
 use std::fmt;
@@ -31,13 +28,6 @@ pub static COMMIT_MESSAGE: LazyLock<&'static OsStr> =
    LazyLock::new(|| OsStr::new("COMMIT_EDITMSG"));
 pub static INDEX_LOCK: LazyLock<&'static OsStr> = LazyLock::new(|| OsStr::new("index.lock"));

-#[derive(Debug, Copy, Clone, PartialEq, Deserialize, JsonSchema)]
-pub struct Push {
-    pub options: Option<PushOptions>,
-}
-
-impl_actions!(git, [Push]);
-
 actions!(
    git,
    [
@@ -54,10 +44,13 @@ actions!(
        RestoreTrackedFiles,
        TrashUntrackedFiles,
        Uncommit,
+        Push,
+        ForcePush,
        Pull,
        Fetch,
        Commit,
-        ShowCommitEditor,
+        ExpandCommitEditor,
+        GenerateCommitMessage
    ]
 );
 action_with_deprecated_aliases!(git, RestoreFile, ["editor::RevertFile"]);
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -2,7 +2,9 @@ use crate::status::FileStatus;
 use crate::GitHostingProviderRegistry;
 use crate::{blame::Blame, status::GitStatus};
 use anyhow::{anyhow, Context, Result};
+use askpass::{AskPassResult, AskPassSession};
 use collections::{HashMap, HashSet};
+use futures::{select_biased, FutureExt as _};
 use git2::BranchType;
 use gpui::SharedString;
 use parking_lot::Mutex;
@@ -11,8 +13,6 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use std::borrow::Borrow;
 use std::io::Write as _;
-#[cfg(not(windows))]
-use std::os::unix::fs::PermissionsExt;
 use std::process::Stdio;
 use std::sync::LazyLock;
 use std::{
@@ -21,9 +21,11 @@ use std::{
    sync::Arc,
 };
 use sum_tree::MapSeekTarget;
-use util::command::new_std_command;
+use util::command::{new_smol_command, new_std_command};
 use util::ResultExt;

+pub const REMOTE_CANCELLED_BY_USER: &str = "Operation cancelled by user";
+
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
 pub struct Branch {
    pub is_head: bool,
@@ -106,6 +108,7 @@ pub struct CommitSummary {
    pub subject: SharedString,
    /// This is a unix timestamp
    pub commit_timestamp: i64,
+    pub has_parent: bool,
 }

 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -199,10 +202,29 @@ pub trait GitRepository: Send + Sync {
        branch_name: &str,
        upstream_name: &str,
        options: Option<PushOptions>,
+        askpass: AskPassSession,
    ) -> Result<RemoteCommandOutput>;
-    fn pull(&self, branch_name: &str, upstream_name: &str) -> Result<RemoteCommandOutput>;
+
+    fn pull(
+        &self,
+        branch_name: &str,
+        upstream_name: &str,
+        askpass: AskPassSession,
+    ) -> Result<RemoteCommandOutput>;
+    fn fetch(&self, askpass: AskPassSession) -> Result<RemoteCommandOutput>;
+
    fn get_remotes(&self, branch_name: Option<&str>) -> Result<Vec<Remote>>;
-    fn fetch(&self) -> Result<RemoteCommandOutput>;
+
+    /// returns a list of remote branches that contain HEAD
+    fn check_for_pushed_commit(&self) -> Result<Vec<SharedString>>;
+
+    /// Run git diff
+    fn diff(&self, diff: DiffType) -> Result<String>;
+}
+
+pub enum DiffType {
+    HeadToIndex,
+    HeadToWorktree,
 }

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Deserialize, JsonSchema)]
@@ -427,6 +449,15 @@ impl GitRepository for RealGitRepository {
                true
            })
            .ok();
+        if let Some(oid) = self
+            .repository
+            .lock()
+            .find_reference("CHERRY_PICK_HEAD")
+            .ok()
+            .and_then(|reference| reference.target())
+        {
+            shas.push(oid.to_string())
+        }
        shas
    }

@@ -462,6 +493,7 @@ impl GitRepository for RealGitRepository {
        let fields = [
            "%(HEAD)",
            "%(objectname)",
+            "%(parent)",
            "%(refname)",
            "%(upstream)",
            "%(upstream:track)",
@@ -553,6 +585,28 @@ impl GitRepository for RealGitRepository {
        )
    }

+    fn diff(&self, diff: DiffType) -> Result<String> {
+        let working_directory = self.working_directory()?;
+        let args = match diff {
+            DiffType::HeadToIndex => Some("--staged"),
+            DiffType::HeadToWorktree => None,
+        };
+
+        let output = new_std_command(&self.git_binary_path)
+            .current_dir(&working_directory)
+            .args(["diff"])
+            .args(args)
+            .output()?;
+
+        if !output.status.success() {
+            return Err(anyhow!(
+                "Failed to run git diff:\n{}",
+                String::from_utf8_lossy(&output.stderr)
+            ));
+        }
+        Ok(String::from_utf8_lossy(&output.stdout).to_string())
+    }
+
    fn stage_paths(&self, paths: &[RepoPath]) -> Result<()> {
        let working_directory = self.working_directory()?;

@@ -563,7 +617,6 @@ impl GitRepository for RealGitRepository {
                .args(paths.iter().map(|p| p.as_ref()))
                .output()?;

-            // TODO: Get remote response out of this and show it to the user
            if !output.status.success() {
                return Err(anyhow!(
                    "Failed to stage paths:\n{}",
@@ -584,7 +637,6 @@ impl GitRepository for RealGitRepository {
                .args(paths.iter().map(|p| p.as_ref()))
                .output()?;

-            // TODO: Get remote response out of this and show it to the user
            if !output.status.success() {
                return Err(anyhow!(
                    "Failed to unstage:\n{}",
@@ -610,7 +662,6 @@ impl GitRepository for RealGitRepository {

        let output = cmd.output()?;

-        // TODO: Get remote response out of this and show it to the user
        if !output.status.success() {
            return Err(anyhow!(
                "Failed to commit:\n{}",
@@ -625,15 +676,15 @@ impl GitRepository for RealGitRepository {
        branch_name: &str,
        remote_name: &str,
        options: Option<PushOptions>,
+        ask_pass: AskPassSession,
    ) -> Result<RemoteCommandOutput> {
        let working_directory = self.working_directory()?;

-        // We do this on every operation to ensure that the askpass script exists and is executable.
-        #[cfg(not(windows))]
-        let (askpass_script_path, _temp_dir) = setup_askpass()?;
-
-        let mut command = new_std_command("git");
+        let mut command = new_smol_command("git");
        command
+            .env("GIT_ASKPASS", ask_pass.script_path())
+            .env("SSH_ASKPASS", ask_pass.script_path())
+            .env("SSH_ASKPASS_REQUIRE", "force")
            .current_dir(&working_directory)
            .args(["push"])
            .args(options.map(|option| match option {
@@ -641,92 +692,53 @@ impl GitRepository for RealGitRepository {
                PushOptions::Force => "--force-with-lease",
            }))
            .arg(remote_name)
-            .arg(format!("{}:{}", branch_name, branch_name));
+            .arg(format!("{}:{}", branch_name, branch_name))
+            .stdout(smol::process::Stdio::piped())
+            .stderr(smol::process::Stdio::piped());
+        let git_process = command.spawn()?;

-        #[cfg(not(windows))]
-        {
-            command.env("GIT_ASKPASS", askpass_script_path);
-        }
-
-        let output = command.output()?;
-
-        if !output.status.success() {
-            return Err(anyhow!(
-                "Failed to push:\n{}",
-                String::from_utf8_lossy(&output.stderr)
-            ));
-        } else {
-            return Ok(RemoteCommandOutput {
-                stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-                stderr: String::from_utf8_lossy(&output.stderr).to_string(),
-            });
-        }
+        run_remote_command(ask_pass, git_process)
    }

-    fn pull(&self, branch_name: &str, remote_name: &str) -> Result<RemoteCommandOutput> {
+    fn pull(
+        &self,
+        branch_name: &str,
+        remote_name: &str,
+        ask_pass: AskPassSession,
+    ) -> Result<RemoteCommandOutput> {
        let working_directory = self.working_directory()?;

-        // We do this on every operation to ensure that the askpass script exists and is executable.
-        #[cfg(not(windows))]
-        let (askpass_script_path, _temp_dir) = setup_askpass()?;
-
-        let mut command = new_std_command("git");
+        let mut command = new_smol_command("git");
        command
+            .env("GIT_ASKPASS", ask_pass.script_path())
+            .env("SSH_ASKPASS", ask_pass.script_path())
+            .env("SSH_ASKPASS_REQUIRE", "force")
            .current_dir(&working_directory)
            .args(["pull"])
            .arg(remote_name)
-            .arg(branch_name);
+            .arg(branch_name)
+            .stdout(smol::process::Stdio::piped())
+            .stderr(smol::process::Stdio::piped());
+        let git_process = command.spawn()?;

-        #[cfg(not(windows))]
-        {
-            command.env("GIT_ASKPASS", askpass_script_path);
-        }
-
-        let output = command.output()?;
-
-        if !output.status.success() {
-            return Err(anyhow!(
-                "Failed to pull:\n{}",
-                String::from_utf8_lossy(&output.stderr)
-            ));
-        } else {
-            return Ok(RemoteCommandOutput {
-                stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-                stderr: String::from_utf8_lossy(&output.stderr).to_string(),
-            });
-        }
+        run_remote_command(ask_pass, git_process)
    }

-    fn fetch(&self) -> Result<RemoteCommandOutput> {
+    fn fetch(&self, ask_pass: AskPassSession) -> Result<RemoteCommandOutput> {
        let working_directory = self.working_directory()?;

-        // We do this on every operation to ensure that the askpass script exists and is executable.
-        #[cfg(not(windows))]
-        let (askpass_script_path, _temp_dir) = setup_askpass()?;
-
-        let mut command = new_std_command("git");
+        let mut command = new_smol_command("git");
        command
+            .env("GIT_ASKPASS", ask_pass.script_path())
+            .env("SSH_ASKPASS", ask_pass.script_path())
+            .env("SSH_ASKPASS_REQUIRE", "force")
            .current_dir(&working_directory)
-            .args(["fetch", "--all"]);
+            .args(["fetch", "--all"])
+            .stdout(smol::process::Stdio::piped())
+            .stderr(smol::process::Stdio::piped());
+        let git_process = command.spawn()?;

-        #[cfg(not(windows))]
-        {
-            command.env("GIT_ASKPASS", askpass_script_path);
-        }
-
-        let output = command.output()?;
-
-        if !output.status.success() {
-            return Err(anyhow!(
-                "Failed to fetch:\n{}",
-                String::from_utf8_lossy(&output.stderr)
-            ));
-        } else {
-            return Ok(RemoteCommandOutput {
-                stdout: String::from_utf8_lossy(&output.stdout).to_string(),
-                stderr: String::from_utf8_lossy(&output.stderr).to_string(),
-            });
-        }
+        run_remote_command(ask_pass, git_process)
    }

    fn get_remotes(&self, branch_name: Option<&str>) -> Result<Vec<Remote>> {
@@ -770,18 +782,88 @@ impl GitRepository for RealGitRepository {
            ));
        }
    }
+
+    fn check_for_pushed_commit(&self) -> Result<Vec<SharedString>> {
+        let working_directory = self.working_directory()?;
+        let git_cmd = |args: &[&str]| -> Result<String> {
+            let output = new_std_command(&self.git_binary_path)
+                .current_dir(&working_directory)
+                .args(args)
+                .output()?;
+            if output.status.success() {
+                Ok(String::from_utf8(output.stdout)?)
+            } else {
+                Err(anyhow!(String::from_utf8_lossy(&output.stderr).to_string()))
+            }
+        };
+
+        let head = git_cmd(&["rev-parse", "HEAD"])
+            .context("Failed to get HEAD")?
+            .trim()
+            .to_owned();
+
+        let mut remote_branches = vec![];
+        let mut add_if_matching = |remote_head: &str| {
+            if let Ok(merge_base) = git_cmd(&["merge-base", &head, remote_head]) {
+                if merge_base.trim() == head {
+                    if let Some(s) = remote_head.strip_prefix("refs/remotes/") {
+                        remote_branches.push(s.to_owned().into());
+                    }
+                }
+            }
+        };
+
+        // check the main branch of each remote
+        let remotes = git_cmd(&["remote"]).context("Failed to get remotes")?;
+        for remote in remotes.lines() {
+            if let Ok(remote_head) =
+                git_cmd(&["symbolic-ref", &format!("refs/remotes/{remote}/HEAD")])
+            {
+                add_if_matching(remote_head.trim());
+            }
+        }
+
+        // ... and the remote branch that the checked-out one is tracking
+        if let Ok(remote_head) = git_cmd(&["rev-parse", "--symbolic-full-name", "@{u}"]) {
+            add_if_matching(remote_head.trim());
+        }
+
+        Ok(remote_branches)
+    }
 }

-#[cfg(not(windows))]
-fn setup_askpass() -> Result<(PathBuf, tempfile::TempDir), anyhow::Error> {
-    let temp_dir = tempfile::Builder::new()
-        .prefix("zed-git-askpass")
-        .tempdir()?;
-    let askpass_script = "#!/bin/sh\necho ''";
-    let askpass_script_path = temp_dir.path().join("git-askpass.sh");
-    std::fs::write(&askpass_script_path, askpass_script)?;
-    std::fs::set_permissions(&askpass_script_path, std::fs::Permissions::from_mode(0o755))?;
-    Ok((askpass_script_path, temp_dir))
+fn run_remote_command(
+    mut ask_pass: AskPassSession,
+    git_process: smol::process::Child,
+) -> std::result::Result<RemoteCommandOutput, anyhow::Error> {
+    smol::block_on(async {
+        select_biased! {
+            result = ask_pass.run().fuse() => {
+                match result {
+                    AskPassResult::CancelledByUser => {
+                        Err(anyhow!(REMOTE_CANCELLED_BY_USER))?
+                    }
+                    AskPassResult::Timedout => {
+                        Err(anyhow!("Connecting to host timed out"))?
+                    }
+                }
+            }
+            output = git_process.output().fuse() => {
+                let output = output?;
+                if !output.status.success() {
+                    Err(anyhow!(
+                        "Operation failed:\n{}",
+                        String::from_utf8_lossy(&output.stderr)
+                    ))
+                } else {
+                    Ok(RemoteCommandOutput {
+                        stdout: String::from_utf8_lossy(&output.stdout).to_string(),
+                        stderr: String::from_utf8_lossy(&output.stderr).to_string(),
+                    })
+                }
+            }
+        }
+    })
 }

 #[derive(Debug, Clone)]
@@ -799,6 +881,7 @@ pub struct FakeGitRepositoryState {
    pub statuses: HashMap<RepoPath, FileStatus>,
    pub current_branch_name: Option<String>,
    pub branches: HashSet<String>,
+    pub simulated_index_write_error_message: Option<String>,
 }

 impl FakeGitRepository {
@@ -818,6 +901,7 @@ impl FakeGitRepositoryState {
            statuses: Default::default(),
            current_branch_name: Default::default(),
            branches: Default::default(),
+            simulated_index_write_error_message: None,
        }
    }
 }
@@ -837,6 +921,9 @@ impl GitRepository for FakeGitRepository {

    fn set_index_text(&self, path: &RepoPath, content: Option<String>) -> anyhow::Result<()> {
        let mut state = self.state.lock();
+        if let Some(message) = state.simulated_index_write_error_message.clone() {
+            return Err(anyhow::anyhow!(message));
+        }
        if let Some(content) = content {
            state.index_contents.insert(path.clone(), content);
        } else {
@@ -972,21 +1059,35 @@ impl GitRepository for FakeGitRepository {
        _branch: &str,
        _remote: &str,
        _options: Option<PushOptions>,
+        _ask_pass: AskPassSession,
    ) -> Result<RemoteCommandOutput> {
        unimplemented!()
    }

-    fn pull(&self, _branch: &str, _remote: &str) -> Result<RemoteCommandOutput> {
+    fn pull(
+        &self,
+        _branch: &str,
+        _remote: &str,
+        _ask_pass: AskPassSession,
+    ) -> Result<RemoteCommandOutput> {
        unimplemented!()
    }

-    fn fetch(&self) -> Result<RemoteCommandOutput> {
+    fn fetch(&self, _ask_pass: AskPassSession) -> Result<RemoteCommandOutput> {
        unimplemented!()
    }

    fn get_remotes(&self, _branch: Option<&str>) -> Result<Vec<Remote>> {
        unimplemented!()
    }
+
+    fn check_for_pushed_commit(&self) -> Result<Vec<SharedString>> {
+        unimplemented!()
+    }
+
+    fn diff(&self, _diff: DiffType) -> Result<String> {
+        unimplemented!()
+    }
 }

 fn check_path_to_repo_path_errors(relative_file_path: &Path) -> Result<()> {
@@ -1117,6 +1218,7 @@ fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
        let mut fields = line.split('\x00');
        let is_current_branch = fields.next().context("no HEAD")? == "*";
        let head_sha: SharedString = fields.next().context("no objectname")?.to_string().into();
+        let parent_sha: SharedString = fields.next().context("no parent")?.to_string().into();
        let ref_name: SharedString = fields
            .next()
            .context("no refname")?
@@ -1140,6 +1242,7 @@ fn parse_branch_input(input: &str) -> Result<Vec<Branch>> {
                sha: head_sha,
                subject,
                commit_timestamp: commiterdate,
+                has_parent: !parent_sha.is_empty(),
            }),
            upstream: if upstream_name.is_empty() {
                None
@@ -1192,7 +1295,7 @@ fn parse_upstream_track(upstream_track: &str) -> Result<UpstreamTracking> {
 fn test_branches_parsing() {
    // suppress "help: octal escapes are not supported, `\0` is always null"
    #[allow(clippy::octal_escapes)]
-    let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0generated protobuf\n";
+    let input = "*\0060964da10574cd9bf06463a53bf6e0769c5c45e\0\0refs/heads/zed-patches\0refs/remotes/origin/zed-patches\0\01733187470\0generated protobuf\n";
    assert_eq!(
        parse_branch_input(&input).unwrap(),
        vec![Branch {
@@ -1209,6 +1312,7 @@ fn test_branches_parsing() {
                sha: "060964da10574cd9bf06463a53bf6e0769c5c45e".into(),
                subject: "generated protobuf".into(),
                commit_timestamp: 1733187470,
+                has_parent: false,
            })
        }]
    )
--- a/crates/git/src/status.rs
+++ b/crates/git/src/status.rs
@@ -54,6 +54,39 @@ impl From<TrackedStatus> for FileStatus {
    }
 }

+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
+pub enum StageStatus {
+    Staged,
+    Unstaged,
+    PartiallyStaged,
+}
+
+impl StageStatus {
+    pub fn is_fully_staged(&self) -> bool {
+        matches!(self, StageStatus::Staged)
+    }
+
+    pub fn is_fully_unstaged(&self) -> bool {
+        matches!(self, StageStatus::Unstaged)
+    }
+
+    pub fn has_staged(&self) -> bool {
+        matches!(self, StageStatus::Staged | StageStatus::PartiallyStaged)
+    }
+
+    pub fn has_unstaged(&self) -> bool {
+        matches!(self, StageStatus::Unstaged | StageStatus::PartiallyStaged)
+    }
+
+    pub fn as_bool(self) -> Option<bool> {
+        match self {
+            StageStatus::Staged => Some(true),
+            StageStatus::Unstaged => Some(false),
+            StageStatus::PartiallyStaged => None,
+        }
+    }
+}
+
 impl FileStatus {
    pub const fn worktree(worktree_status: StatusCode) -> Self {
        FileStatus::Tracked(TrackedStatus {
@@ -106,15 +139,15 @@ impl FileStatus {
        Ok(status)
    }

-    pub fn is_staged(self) -> Option<bool> {
+    pub fn staging(self) -> StageStatus {
        match self {
            FileStatus::Untracked | FileStatus::Ignored | FileStatus::Unmerged { .. } => {
-                Some(false)
+                StageStatus::Unstaged
            }
            FileStatus::Tracked(tracked) => match (tracked.index_status, tracked.worktree_status) {
-                (StatusCode::Unmodified, _) => Some(false),
-                (_, StatusCode::Unmodified) => Some(true),
-                _ => None,
+                (StatusCode::Unmodified, _) => StageStatus::Unstaged,
+                (_, StatusCode::Unmodified) => StageStatus::Staged,
+                _ => StageStatus::PartiallyStaged,
            },
        }
    }
--- a/crates/git_ui/Cargo.toml
+++ b/crates/git_ui/Cargo.toml
@@ -18,6 +18,7 @@ test-support = ["multi_buffer/test-support"]

 [dependencies]
 anyhow.workspace = true
+askpass.workspace= true
 buffer_diff.workspace = true
 collections.workspace = true
 component.workspace = true
@@ -30,6 +31,7 @@ git.workspace = true
 gpui.workspace = true
 itertools.workspace = true
 language.workspace = true
+language_model.workspace = true
 linkify.workspace = true
 linkme.workspace = true
 log.workspace = true
@@ -46,6 +48,7 @@ serde_json.workspace = true
 settings.workspace = true
 smallvec.workspace = true
 strum.workspace = true
+telemetry.workspace = true
 theme.workspace = true
 time.workspace = true
 ui.workspace = true
@@ -61,6 +64,7 @@ ctor.workspace = true
 env_logger.workspace = true
 editor = { workspace = true, features = ["test-support"] }
 gpui = { workspace = true, features = ["test-support"] }
+pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
 settings = { workspace = true, features = ["test-support"] }
 unindent.workspace = true
--- a/crates/git_ui/src/askpass_modal.rs
+++ b/crates/git_ui/src/askpass_modal.rs
@@ -0,0 +1,101 @@
+use editor::Editor;
+use futures::channel::oneshot;
+use gpui::{AppContext, DismissEvent, Entity, EventEmitter, Focusable, Styled};
+use ui::{
+    div, h_flex, v_flex, ActiveTheme, App, Context, DynamicSpacing, Headline, HeadlineSize, Icon,
+    IconName, IconSize, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    StyledExt, StyledTypography, Window,
+};
+use workspace::ModalView;
+
+pub(crate) struct AskPassModal {
+    operation: SharedString,
+    prompt: SharedString,
+    editor: Entity<Editor>,
+    tx: Option<oneshot::Sender<String>>,
+}
+
+impl EventEmitter<DismissEvent> for AskPassModal {}
+impl ModalView for AskPassModal {}
+impl Focusable for AskPassModal {
+    fn focus_handle(&self, cx: &App) -> gpui::FocusHandle {
+        self.editor.focus_handle(cx)
+    }
+}
+
+impl AskPassModal {
+    pub fn new(
+        operation: SharedString,
+        prompt: SharedString,
+        tx: oneshot::Sender<String>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let editor = cx.new(|cx| {
+            let mut editor = Editor::single_line(window, cx);
+            if prompt.contains("yes/no") {
+                editor.set_masked(false, cx);
+            } else {
+                editor.set_masked(true, cx);
+            }
+            editor
+        });
+        Self {
+            operation,
+            prompt,
+            editor,
+            tx: Some(tx),
+        }
+    }
+
+    fn cancel(&mut self, _: &menu::Cancel, _window: &mut Window, cx: &mut Context<Self>) {
+        cx.emit(DismissEvent);
+    }
+
+    fn confirm(&mut self, _: &menu::Confirm, _window: &mut Window, cx: &mut Context<Self>) {
+        if let Some(tx) = self.tx.take() {
+            tx.send(self.editor.read(cx).text(cx)).ok();
+        }
+        cx.emit(DismissEvent);
+    }
+}
+
+impl Render for AskPassModal {
+    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .key_context("PasswordPrompt")
+            .on_action(cx.listener(Self::cancel))
+            .on_action(cx.listener(Self::confirm))
+            .elevation_2(cx)
+            .size_full()
+            .font_buffer(cx)
+            .child(
+                h_flex()
+                    .px(DynamicSpacing::Base12.rems(cx))
+                    .pt(DynamicSpacing::Base08.rems(cx))
+                    .pb(DynamicSpacing::Base04.rems(cx))
+                    .rounded_t_sm()
+                    .w_full()
+                    .gap_1p5()
+                    .child(Icon::new(IconName::GitBranch).size(IconSize::XSmall))
+                    .child(h_flex().gap_1().overflow_x_hidden().child(
+                        div().max_w_96().overflow_x_hidden().text_ellipsis().child(
+                            Headline::new(self.operation.clone()).size(HeadlineSize::XSmall),
+                        ),
+                    )),
+            )
+            .child(
+                div()
+                    .text_buffer(cx)
+                    .py_2()
+                    .px_3()
+                    .bg(cx.theme().colors().editor_background)
+                    .border_t_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .size_full()
+                    .overflow_hidden()
+                    .child(self.prompt.clone())
+                    .child(self.editor.clone()),
+            )
+    }
+}
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -1,4 +1,4 @@
-use anyhow::Context as _;
+use anyhow::{anyhow, Context as _};
 use fuzzy::{StringMatch, StringMatchCandidate};

 use git::repository::Branch;
@@ -8,7 +8,7 @@ use gpui::{
    Task, Window,
 };
 use picker::{Picker, PickerDelegate};
-use project::{Project, ProjectPath};
+use project::git::Repository;
 use std::sync::Arc;
 use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing, PopoverMenuHandle};
 use util::ResultExt;
@@ -18,26 +18,50 @@ use workspace::{ModalView, Workspace};
 pub fn init(cx: &mut App) {
    cx.observe_new(|workspace: &mut Workspace, _, _| {
        workspace.register_action(open);
+        workspace.register_action(switch);
+        workspace.register_action(checkout_branch);
    })
    .detach();
 }

+pub fn checkout_branch(
+    workspace: &mut Workspace,
+    _: &zed_actions::git::CheckoutBranch,
+    window: &mut Window,
+    cx: &mut Context<Workspace>,
+) {
+    open(workspace, &zed_actions::git::Branch, window, cx);
+}
+
+pub fn switch(
+    workspace: &mut Workspace,
+    _: &zed_actions::git::Switch,
+    window: &mut Window,
+    cx: &mut Context<Workspace>,
+) {
+    open(workspace, &zed_actions::git::Branch, window, cx);
+}
+
 pub fn open(
    workspace: &mut Workspace,
    _: &zed_actions::git::Branch,
    window: &mut Window,
    cx: &mut Context<Workspace>,
 ) {
-    let project = workspace.project().clone();
+    let repository = workspace.project().read(cx).active_repository(cx).clone();
    let style = BranchListStyle::Modal;
    workspace.toggle_modal(window, cx, |window, cx| {
-        BranchList::new(project, style, 34., window, cx)
+        BranchList::new(repository, style, 34., window, cx)
    })
 }

-pub fn popover(project: Entity<Project>, window: &mut Window, cx: &mut App) -> Entity<BranchList> {
+pub fn popover(
+    repository: Option<Entity<Repository>>,
+    window: &mut Window,
+    cx: &mut App,
+) -> Entity<BranchList> {
    cx.new(|cx| {
-        let list = BranchList::new(project, BranchListStyle::Popover, 15., window, cx);
+        let list = BranchList::new(repository, BranchListStyle::Popover, 15., window, cx);
        list.focus_handle(cx).focus(window);
        list
    })
@@ -58,22 +82,21 @@ pub struct BranchList {

 impl BranchList {
    fn new(
-        project_handle: Entity<Project>,
+        repository: Option<Entity<Repository>>,
        style: BranchListStyle,
        rem_width: f32,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
        let popover_handle = PopoverMenuHandle::default();
-        let project = project_handle.read(cx);
-        let all_branches_request = project
-            .visible_worktrees(cx)
-            .next()
-            .map(|worktree| project.branches(ProjectPath::root_path(worktree.read(cx).id()), cx))
-            .context("No worktrees found");
+        let all_branches_request = repository
+            .clone()
+            .map(|repository| repository.read(cx).branches());

        cx.spawn_in(window, |this, mut cx| async move {
-            let all_branches = all_branches_request?.await?;
+            let all_branches = all_branches_request
+                .context("No active repository")?
+                .await??;

            this.update_in(&mut cx, |this, window, cx| {
                this.picker.update(cx, |picker, cx| {
@@ -86,7 +109,7 @@ impl BranchList {
        })
        .detach_and_log_err(cx);

-        let delegate = BranchListDelegate::new(project_handle.clone(), style, 20);
+        let delegate = BranchListDelegate::new(repository.clone(), style, 20);
        let picker = cx.new(|cx| Picker::uniform_list(delegate, window, cx));

        let _subscription = cx.subscribe(&picker, |_, _, _, cx| {
@@ -145,7 +168,7 @@ impl BranchEntry {
 pub struct BranchListDelegate {
    matches: Vec<BranchEntry>,
    all_branches: Option<Vec<Branch>>,
-    project: Entity<Project>,
+    repo: Option<Entity<Repository>>,
    style: BranchListStyle,
    selected_index: usize,
    last_query: String,
@@ -155,13 +178,13 @@ pub struct BranchListDelegate {

 impl BranchListDelegate {
    fn new(
-        project: Entity<Project>,
+        repo: Option<Entity<Repository>>,
        style: BranchListStyle,
        branch_name_trailoff_after: usize,
    ) -> Self {
        Self {
            matches: vec![],
-            project,
+            repo,
            style,
            all_branches: None,
            selected_index: 0,
@@ -280,14 +303,16 @@ impl PickerDelegate for BranchListDelegate {
            return;
        };

-        let current_branch = self.project.update(cx, |project, cx| {
-            project
-                .active_repository(cx)
-                .and_then(|repo| repo.read(cx).current_branch())
-                .map(|branch| branch.name.to_string())
+        let current_branch = self.repo.as_ref().map(|repo| {
+            repo.update(cx, |repo, _| {
+                repo.current_branch().map(|branch| branch.name.clone())
+            })
        });

-        if current_branch == Some(branch.name().to_string()) {
+        if current_branch
+            .flatten()
+            .is_some_and(|current_branch| current_branch == branch.name())
+        {
            cx.emit(DismissEvent);
            return;
        }
@@ -296,19 +321,33 @@ impl PickerDelegate for BranchListDelegate {
            let branch = branch.clone();
            |picker, mut cx| async move {
                let branch_change_task = picker.update(&mut cx, |this, cx| {
-                    let project = this.delegate.project.read(cx);
-                    let branch_to_checkout = match branch {
-                        BranchEntry::Branch(branch) => branch.string,
-                        BranchEntry::History(string) => string,
-                        BranchEntry::NewBranch { name: branch_name } => branch_name,
-                    };
-                    let worktree = project
-                        .visible_worktrees(cx)
-                        .next()
-                        .context("worktree disappeared")?;
-                    let repository = ProjectPath::root_path(worktree.read(cx).id());
+                    let repo = this
+                        .delegate
+                        .repo
+                        .as_ref()
+                        .ok_or_else(|| anyhow!("No active repository"))?
+                        .clone();

-                    anyhow::Ok(project.update_or_create_branch(repository, branch_to_checkout, cx))
+                    let cx = cx.to_async();
+
+                    anyhow::Ok(async move {
+                        match branch {
+                            BranchEntry::Branch(StringMatch {
+                                string: branch_name,
+                                ..
+                            })
+                            | BranchEntry::History(branch_name) => {
+                                cx.update(|cx| repo.read(cx).change_branch(branch_name))?
+                                    .await?
+                            }
+                            BranchEntry::NewBranch { name: branch_name } => {
+                                cx.update(|cx| repo.read(cx).create_branch(branch_name.clone()))?
+                                    .await??;
+                                cx.update(|cx| repo.read(cx).change_branch(branch_name))?
+                                    .await?
+                            }
+                        }
+                    })
                })??;

                branch_change_task.await?;
@@ -316,7 +355,7 @@ impl PickerDelegate for BranchListDelegate {
                picker.update(&mut cx, |_, cx| {
                    cx.emit(DismissEvent);

-                    Ok::<(), anyhow::Error>(())
+                    anyhow::Ok(())
                })
            }
        })
--- a/crates/git_ui/src/commit_message_prompt.txt
+++ b/crates/git_ui/src/commit_message_prompt.txt
@@ -0,0 +1,17 @@
+You are an expert at writing Git commits. Your job is to write a short clear commit message that summarizes the changes.
+
+If you can accurately express the change in just the subject line, don't include anything in the message body. Only use the body when it is providing *useful* information.
+
+Don't repeat information from the subject line in the message body.
+
+Only return the commit message in your response. Do not include any additional meta-commentary about the task. Do not include the raw diff output in the commit message.
+
+Follow good Git style:
+
+- Separate the subject from the body with a blank line
+- Try to limit the subject line to 50 characters
+- Capitalize the subject line
+- Do not end the subject line with any punctuation
+- Use the imperative mood in the subject line
+- Wrap the body at 72 characters
+- Keep the body short and concise (omit it entirely if not useful)
--- a/crates/git_ui/src/commit_modal.rs
+++ b/crates/git_ui/src/commit_modal.rs
@@ -2,9 +2,8 @@

 use crate::branch_picker::{self, BranchList};
 use crate::git_panel::{commit_message_editor, GitPanel};
-use git::{Commit, ShowCommitEditor};
+use git::{Commit, GenerateCommitMessage};
 use panel::{panel_button, panel_editor_style, panel_filled_button};
-use project::Project;
 use ui::{prelude::*, KeybindingHint, PopoverMenu, Tooltip};

 use editor::{Editor, EditorElement};
@@ -110,41 +109,44 @@ struct RestoreDock {

 impl CommitModal {
    pub fn register(workspace: &mut Workspace, _: &mut Window, _cx: &mut Context<Workspace>) {
-        workspace.register_action(|workspace, _: &ShowCommitEditor, window, cx| {
-            let Some(git_panel) = workspace.panel::<GitPanel>(cx) else {
-                return;
-            };
-
-            git_panel.update(cx, |git_panel, cx| {
-                git_panel.set_modal_open(true, cx);
-            });
-
-            let dock = workspace.dock_at_position(git_panel.position(window, cx));
-            let is_open = dock.read(cx).is_open();
-            let active_index = dock.read(cx).active_panel_index();
-            let dock = dock.downgrade();
-            let restore_dock_position = RestoreDock {
-                dock,
-                is_open,
-                active_index,
-            };
-
-            let project = workspace.project().clone();
-            workspace.open_panel::<GitPanel>(window, cx);
-            workspace.toggle_modal(window, cx, move |window, cx| {
-                CommitModal::new(git_panel, restore_dock_position, project, window, cx)
-            })
+        workspace.register_action(|workspace, _: &Commit, window, cx| {
+            CommitModal::toggle(workspace, window, cx);
        });
    }

+    pub fn toggle(workspace: &mut Workspace, window: &mut Window, cx: &mut Context<'_, Workspace>) {
+        let Some(git_panel) = workspace.panel::<GitPanel>(cx) else {
+            return;
+        };
+
+        git_panel.update(cx, |git_panel, cx| {
+            git_panel.set_modal_open(true, cx);
+        });
+
+        let dock = workspace.dock_at_position(git_panel.position(window, cx));
+        let is_open = dock.read(cx).is_open();
+        let active_index = dock.read(cx).active_panel_index();
+        let dock = dock.downgrade();
+        let restore_dock_position = RestoreDock {
+            dock,
+            is_open,
+            active_index,
+        };
+
+        workspace.open_panel::<GitPanel>(window, cx);
+        workspace.toggle_modal(window, cx, move |window, cx| {
+            CommitModal::new(git_panel, restore_dock_position, window, cx)
+        })
+    }
+
    fn new(
        git_panel: Entity<GitPanel>,
        restore_dock: RestoreDock,
-        project: Entity<Project>,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
        let panel = git_panel.read(cx);
+        let active_repository = panel.active_repository.clone();
        let suggested_commit_message = panel.suggest_commit_message();

        let commit_editor = git_panel.update(cx, |git_panel, cx| {
@@ -188,7 +190,7 @@ impl CommitModal {
        let properties = ModalContainerProperties::new(window, 50);

        Self {
-            branch_list: branch_picker::popover(project.clone(), window, cx),
+            branch_list: branch_picker::popover(active_repository.clone(), window, cx),
            git_panel,
            commit_editor,
            restore_dock,
@@ -232,7 +234,7 @@ impl CommitModal {
    pub fn render_footer(&self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let git_panel = self.git_panel.clone();

-        let (branch, can_commit, tooltip, commit_label, co_authors) =
+        let (branch, can_commit, tooltip, commit_label, co_authors, generate_commit_message) =
            self.git_panel.update(cx, |git_panel, cx| {
                let branch = git_panel
                    .active_repository
@@ -247,7 +249,15 @@ impl CommitModal {
                let (can_commit, tooltip) = git_panel.configure_commit_button(cx);
                let title = git_panel.commit_button_title();
                let co_authors = git_panel.render_co_authors(cx);
-                (branch, can_commit, tooltip, title, co_authors)
+                let generate_commit_message = git_panel.render_generate_commit_message_button(cx);
+                (
+                    branch,
+                    can_commit,
+                    tooltip,
+                    title,
+                    co_authors,
+                    generate_commit_message,
+                )
            });

        let branch_picker_button = panel_button(branch)
@@ -294,11 +304,15 @@ impl CommitModal {
            git_panel.update(cx, |git_panel, cx| git_panel.editor_focus_handle(cx));

        let commit_button = panel_filled_button(commit_label)
-            .tooltip(move |window, cx| {
-                Tooltip::for_action_in(tooltip, &Commit, &panel_editor_focus_handle, window, cx)
+            .tooltip({
+                let panel_editor_focus_handle = panel_editor_focus_handle.clone();
+                move |window, cx| {
+                    Tooltip::for_action_in(tooltip, &Commit, &panel_editor_focus_handle, window, cx)
+                }
            })
            .disabled(!can_commit)
            .on_click(cx.listener(move |this, _: &ClickEvent, window, cx| {
+                telemetry::event!("Git Committed", source = "Git Modal");
                this.git_panel
                    .update(cx, |git_panel, cx| git_panel.commit_changes(window, cx));
                cx.emit(DismissEvent);
@@ -313,7 +327,13 @@ impl CommitModal {
            .w_full()
            .h(px(self.properties.footer_height))
            .gap_1()
-            .child(h_flex().gap_1().child(branch_picker).children(co_authors))
+            .child(
+                h_flex()
+                    .gap_1()
+                    .child(branch_picker)
+                    .children(generate_commit_message)
+                    .children(co_authors),
+            )
            .child(div().flex_1())
            .child(
                h_flex()
@@ -332,6 +352,7 @@ impl CommitModal {
    }

    fn commit(&mut self, _: &git::Commit, window: &mut Window, cx: &mut Context<Self>) {
+        telemetry::event!("Git Committed", source = "Git Modal");
        self.git_panel
            .update(cx, |git_panel, cx| git_panel.commit_changes(window, cx));
        cx.emit(DismissEvent);
@@ -351,11 +372,24 @@ impl Render for CommitModal {
            .key_context("GitCommit")
            .on_action(cx.listener(Self::dismiss))
            .on_action(cx.listener(Self::commit))
+            .on_action(cx.listener(|this, _: &GenerateCommitMessage, _, cx| {
+                this.git_panel.update(cx, |panel, cx| {
+                    panel.generate_commit_message(cx);
+                })
+            }))
            .on_action(
                cx.listener(|this, _: &zed_actions::git::Branch, window, cx| {
-                    this.branch_list.update(cx, |branch_list, cx| {
-                        branch_list.popover_handle.toggle(window, cx);
-                    })
+                    toggle_branch_picker(this, window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &zed_actions::git::CheckoutBranch, window, cx| {
+                    toggle_branch_picker(this, window, cx);
+                }),
+            )
+            .on_action(
+                cx.listener(|this, _: &zed_actions::git::Switch, window, cx| {
+                    toggle_branch_picker(this, window, cx);
                }),
            )
            .elevation_3(cx)
@@ -394,3 +428,13 @@ impl Render for CommitModal {
            )
    }
 }
+
+fn toggle_branch_picker(
+    this: &mut CommitModal,
+    window: &mut Window,
+    cx: &mut Context<'_, CommitModal>,
+) {
+    this.branch_list.update(cx, |branch_list, cx| {
+        branch_list.popover_handle.toggle(window, cx);
+    })
+}
--- a/crates/git_ui/src/git_panel.rs
+++ b/crates/git_ui/src/git_panel.rs
--- a/crates/git_ui/src/git_ui.rs
+++ b/crates/git_ui/src/git_ui.rs
@@ -1,11 +1,16 @@
 use ::settings::Settings;
-use git::status::FileStatus;
+use git::{
+    repository::{Branch, Upstream, UpstreamTracking, UpstreamTrackingStatus},
+    status::FileStatus,
+};
 use git_panel_settings::GitPanelSettings;
-use gpui::App;
+use gpui::{App, Entity, FocusHandle};
+use project::Project;
 use project_diff::ProjectDiff;
-use ui::{ActiveTheme, Color, Icon, IconName, IntoElement};
+use ui::{ActiveTheme, Color, Icon, IconName, IntoElement, SharedString};
 use workspace::Workspace;

+mod askpass_modal;
 pub mod branch_picker;
 mod commit_modal;
 pub mod git_panel;
@@ -20,30 +25,43 @@ pub fn init(cx: &mut App) {
    branch_picker::init(cx);
    cx.observe_new(ProjectDiff::register).detach();
    commit_modal::init(cx);
+    git_panel::init(cx);

-    cx.observe_new(|workspace: &mut Workspace, _, _| {
-        workspace.register_action(|workspace, fetch: &git::Fetch, window, cx| {
+    cx.observe_new(|workspace: &mut Workspace, _, cx| {
+        let project = workspace.project().read(cx);
+        if project.is_via_collab() {
+            return;
+        }
+        workspace.register_action(|workspace, _: &git::Fetch, window, cx| {
            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
                return;
            };
            panel.update(cx, |panel, cx| {
-                panel.fetch(fetch, window, cx);
+                panel.fetch(window, cx);
            });
        });
-        workspace.register_action(|workspace, push: &git::Push, window, cx| {
+        workspace.register_action(|workspace, _: &git::Push, window, cx| {
            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
                return;
            };
            panel.update(cx, |panel, cx| {
-                panel.push(push, window, cx);
+                panel.push(false, window, cx);
            });
        });
-        workspace.register_action(|workspace, pull: &git::Pull, window, cx| {
+        workspace.register_action(|workspace, _: &git::ForcePush, window, cx| {
            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
                return;
            };
            panel.update(cx, |panel, cx| {
-                panel.pull(pull, window, cx);
+                panel.push(true, window, cx);
+            });
+        });
+        workspace.register_action(|workspace, _: &git::Pull, window, cx| {
+            let Some(panel) = workspace.panel::<git_panel::GitPanel>(cx) else {
+                return;
+            };
+            panel.update(cx, |panel, cx| {
+                panel.pull(window, cx);
            });
        });
    })
@@ -75,3 +93,343 @@ pub fn git_status_icon(status: FileStatus, cx: &App) -> impl IntoElement {
    };
    Icon::new(icon_name).color(Color::Custom(color))
 }
+
+fn can_push_and_pull(project: &Entity<Project>, cx: &App) -> bool {
+    !project.read(cx).is_via_collab()
+}
+
+fn render_remote_button(
+    id: impl Into<SharedString>,
+    branch: &Branch,
+    keybinding_target: Option<FocusHandle>,
+    show_fetch_button: bool,
+) -> Option<impl IntoElement> {
+    let id = id.into();
+    let upstream = branch.upstream.as_ref();
+    match upstream {
+        Some(Upstream {
+            tracking: UpstreamTracking::Tracked(UpstreamTrackingStatus { ahead, behind }),
+            ..
+        }) => match (*ahead, *behind) {
+            (0, 0) if show_fetch_button => {
+                Some(remote_button::render_fetch_button(keybinding_target, id))
+            }
+            (0, 0) => None,
+            (ahead, 0) => Some(remote_button::render_push_button(
+                keybinding_target.clone(),
+                id,
+                ahead,
+            )),
+            (ahead, behind) => Some(remote_button::render_pull_button(
+                keybinding_target.clone(),
+                id,
+                ahead,
+                behind,
+            )),
+        },
+        Some(Upstream {
+            tracking: UpstreamTracking::Gone,
+            ..
+        }) => Some(remote_button::render_republish_button(
+            keybinding_target,
+            id,
+        )),
+        None => Some(remote_button::render_publish_button(keybinding_target, id)),
+    }
+}
+
+mod remote_button {
+    use gpui::{hsla, point, Action, AnyView, BoxShadow, ClickEvent, Corner, FocusHandle};
+    use ui::{
+        div, h_flex, px, rems, ActiveTheme, AnyElement, App, ButtonCommon, ButtonLike, Clickable,
+        ContextMenu, ElementId, ElevationIndex, FluentBuilder, Icon, IconName, IconSize,
+        IntoElement, Label, LabelCommon, LabelSize, LineHeightStyle, ParentElement, PopoverMenu,
+        RenderOnce, SharedString, Styled, Tooltip, Window,
+    };
+
+    pub fn render_fetch_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Fetch",
+            0,
+            0,
+            Some(IconName::ArrowCircle),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Fetch), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Fetch updates from remote",
+                    &git::Fetch,
+                    "git fetch",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_push_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+        ahead: u32,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Push",
+            ahead as usize,
+            0,
+            None,
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Push), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Push committed changes to remote",
+                    &git::Push,
+                    "git push",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_pull_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+        ahead: u32,
+        behind: u32,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Pull",
+            ahead as usize,
+            behind as usize,
+            None,
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Pull), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Pull",
+                    &git::Pull,
+                    "git pull",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_publish_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Publish",
+            0,
+            0,
+            Some(IconName::ArrowUpFromLine),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Push), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Publish branch to remote",
+                    &git::Push,
+                    "git push --set-upstream",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    pub fn render_republish_button(
+        keybinding_target: Option<FocusHandle>,
+        id: SharedString,
+    ) -> SplitButton {
+        SplitButton::new(
+            id,
+            "Republish",
+            0,
+            0,
+            Some(IconName::ArrowUpFromLine),
+            move |_, window, cx| {
+                window.dispatch_action(Box::new(git::Push), cx);
+            },
+            move |window, cx| {
+                git_action_tooltip(
+                    "Re-publish branch to remote",
+                    &git::Push,
+                    "git push --set-upstream",
+                    keybinding_target.clone(),
+                    window,
+                    cx,
+                )
+            },
+        )
+    }
+
+    fn git_action_tooltip(
+        label: impl Into<SharedString>,
+        action: &dyn Action,
+        command: impl Into<SharedString>,
+        focus_handle: Option<FocusHandle>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> AnyView {
+        let label = label.into();
+        let command = command.into();
+
+        if let Some(handle) = focus_handle {
+            Tooltip::with_meta_in(
+                label.clone(),
+                Some(action),
+                command.clone(),
+                &handle,
+                window,
+                cx,
+            )
+        } else {
+            Tooltip::with_meta(label.clone(), Some(action), command.clone(), window, cx)
+        }
+    }
+
+    fn render_git_action_menu(id: impl Into<ElementId>) -> impl IntoElement {
+        PopoverMenu::new(id.into())
+            .trigger(
+                ui::ButtonLike::new_rounded_right("split-button-right")
+                    .layer(ui::ElevationIndex::ModalSurface)
+                    .size(ui::ButtonSize::None)
+                    .child(
+                        div()
+                            .px_1()
+                            .child(Icon::new(IconName::ChevronDownSmall).size(IconSize::XSmall)),
+                    ),
+            )
+            .menu(move |window, cx| {
+                Some(ContextMenu::build(window, cx, |context_menu, _, _| {
+                    context_menu
+                        .action("Fetch", git::Fetch.boxed_clone())
+                        .action("Pull", git::Pull.boxed_clone())
+                        .separator()
+                        .action("Push", git::Push.boxed_clone())
+                        .action("Force Push", git::ForcePush.boxed_clone())
+                }))
+            })
+            .anchor(Corner::TopRight)
+    }
+
+    #[derive(IntoElement)]
+    pub struct SplitButton {
+        pub left: ButtonLike,
+        pub right: AnyElement,
+    }
+
+    impl SplitButton {
+        fn new(
+            id: impl Into<SharedString>,
+            left_label: impl Into<SharedString>,
+            ahead_count: usize,
+            behind_count: usize,
+            left_icon: Option<IconName>,
+            left_on_click: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+            tooltip: impl Fn(&mut Window, &mut App) -> AnyView + 'static,
+        ) -> Self {
+            let id = id.into();
+
+            fn count(count: usize) -> impl IntoElement {
+                h_flex()
+                    .ml_neg_px()
+                    .h(rems(0.875))
+                    .items_center()
+                    .overflow_hidden()
+                    .px_0p5()
+                    .child(
+                        Label::new(count.to_string())
+                            .size(LabelSize::XSmall)
+                            .line_height_style(LineHeightStyle::UiLabel),
+                    )
+            }
+
+            let should_render_counts = left_icon.is_none() && (ahead_count > 0 || behind_count > 0);
+
+            let left = ui::ButtonLike::new_rounded_left(ElementId::Name(
+                format!("split-button-left-{}", id).into(),
+            ))
+            .layer(ui::ElevationIndex::ModalSurface)
+            .size(ui::ButtonSize::Compact)
+            .when(should_render_counts, |this| {
+                this.child(
+                    h_flex()
+                        .ml_neg_0p5()
+                        .mr_1()
+                        .when(behind_count > 0, |this| {
+                            this.child(Icon::new(IconName::ArrowDown).size(IconSize::XSmall))
+                                .child(count(behind_count))
+                        })
+                        .when(ahead_count > 0, |this| {
+                            this.child(Icon::new(IconName::ArrowUp).size(IconSize::XSmall))
+                                .child(count(ahead_count))
+                        }),
+                )
+            })
+            .when_some(left_icon, |this, left_icon| {
+                this.child(
+                    h_flex()
+                        .ml_neg_0p5()
+                        .mr_1()
+                        .child(Icon::new(left_icon).size(IconSize::XSmall)),
+                )
+            })
+            .child(
+                div()
+                    .child(Label::new(left_label).size(LabelSize::Small))
+                    .mr_0p5(),
+            )
+            .on_click(left_on_click)
+            .tooltip(tooltip);
+
+            let right = render_git_action_menu(ElementId::Name(
+                format!("split-button-right-{}", id).into(),
+            ))
+            .into_any_element();
+
+            Self { left, right }
+        }
+    }
+
+    impl RenderOnce for SplitButton {
+        fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+            h_flex()
+                .rounded_sm()
+                .border_1()
+                .border_color(cx.theme().colors().text_muted.alpha(0.12))
+                .child(div().flex_grow().child(self.left))
+                .child(
+                    div()
+                        .h_full()
+                        .w_px()
+                        .bg(cx.theme().colors().text_muted.alpha(0.16)),
+                )
+                .child(self.right)
+                .bg(ElevationIndex::Surface.on_elevation_bg(cx))
+                .shadow(smallvec::smallvec![BoxShadow {
+                    color: hsla(0.0, 0.0, 0.0, 0.16),
+                    offset: point(px(0.), px(1.)),
+                    blur_radius: px(0.),
+                    spread_radius: px(0.),
+                }])
+        }
+    }
+}
--- a/crates/git_ui/src/project_diff.rs
+++ b/crates/git_ui/src/project_diff.rs
@@ -10,8 +10,8 @@ use editor::{
 use feature_flags::FeatureFlagViewExt;
 use futures::StreamExt;
 use git::{
-    status::FileStatus, ShowCommitEditor, StageAll, StageAndNext, ToggleStaged, UnstageAll,
-    UnstageAndNext,
+    repository::Branch, status::FileStatus, Commit, StageAll, StageAndNext, ToggleStaged,
+    UnstageAll, UnstageAndNext,
 };
 use gpui::{
    actions, Action, AnyElement, AnyView, App, AppContext as _, AsyncWindowContext, Entity,
@@ -19,30 +19,33 @@ use gpui::{
 };
 use language::{Anchor, Buffer, Capability, OffsetRangeExt};
 use multi_buffer::{MultiBuffer, PathKey};
-use project::{git::GitStore, Project, ProjectPath};
+use project::{
+    git::{GitEvent, GitStore},
+    Project, ProjectPath,
+};
 use std::any::{Any, TypeId};
 use theme::ActiveTheme;
-use ui::{prelude::*, vertical_divider, Tooltip};
+use ui::{prelude::*, vertical_divider, KeyBinding, Tooltip};
 use util::ResultExt as _;
 use workspace::{
    item::{BreadcrumbText, Item, ItemEvent, ItemHandle, TabContentParams},
    searchable::SearchableItemHandle,
-    ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation, ToolbarItemView,
-    Workspace,
+    CloseActiveItem, ItemNavHistory, SerializableItem, ToolbarItemEvent, ToolbarItemLocation,
+    ToolbarItemView, Workspace,
 };

-actions!(git, [Diff]);
+actions!(git, [Diff, Add]);

 pub struct ProjectDiff {
+    project: Entity<Project>,
    multibuffer: Entity<MultiBuffer>,
    editor: Entity<Editor>,
-    project: Entity<Project>,
    git_store: Entity<GitStore>,
    workspace: WeakEntity<Workspace>,
    focus_handle: FocusHandle,
    update_needed: postage::watch::Sender<()>,
    pending_scroll: Option<PathKey>,
-
+    current_branch: Option<Branch>,
    _task: Task<Result<()>>,
    _subscription: Subscription,
 }
@@ -68,6 +71,9 @@ impl ProjectDiff {
        let Some(window) = window else { return };
        cx.when_flag_enabled::<feature_flags::GitUiFeatureFlag>(window, |workspace, _, _cx| {
            workspace.register_action(Self::deploy);
+            workspace.register_action(|workspace, _: &Add, window, cx| {
+                Self::deploy(workspace, &Diff, window, cx);
+            });
        });

        workspace::register_serializable_item::<ProjectDiff>(cx);
@@ -88,6 +94,14 @@ impl ProjectDiff {
        window: &mut Window,
        cx: &mut Context<Workspace>,
    ) {
+        telemetry::event!(
+            "Git Diff Opened",
+            source = if entry.is_some() {
+                "Git Panel"
+            } else {
+                "Action"
+            }
+        );
        let project_diff = if let Some(existing) = workspace.item_of_type::<Self>(cx) {
            workspace.activate_item(&existing, true, true, window, cx);
            existing
@@ -128,6 +142,7 @@ impl ProjectDiff {
                window,
                cx,
            );
+            diff_display_editor.disable_inline_diagnostics();
            diff_display_editor.set_expand_all_diff_hunks(cx);
            diff_display_editor.register_addon(GitPanelAddon {
                workspace: workspace.downgrade(),
@@ -141,8 +156,13 @@ impl ProjectDiff {
        let git_store_subscription = cx.subscribe_in(
            &git_store,
            window,
-            move |this, _git_store, _event, _window, _cx| {
-                *this.update_needed.borrow_mut() = ();
+            move |this, _git_store, event, _window, _cx| match event {
+                GitEvent::ActiveRepositoryChanged
+                | GitEvent::FileSystemUpdated
+                | GitEvent::GitStateUpdated => {
+                    *this.update_needed.borrow_mut() = ();
+                }
+                _ => {}
            },
        );

@@ -151,7 +171,7 @@ impl ProjectDiff {
            let this = cx.weak_entity();
            |cx| Self::handle_status_updates(this, recv, cx)
        });
-        // Kick of a refresh immediately
+        // Kick off a refresh immediately
        *send.borrow_mut() = ();

        Self {
@@ -163,6 +183,7 @@ impl ProjectDiff {
            multibuffer,
            pending_scroll: None,
            update_needed: send,
+            current_branch: None,
            _task: worker,
            _subscription: git_store_subscription,
        }
@@ -428,6 +449,20 @@ impl ProjectDiff {
        mut cx: AsyncWindowContext,
    ) -> Result<()> {
        while let Some(_) = recv.next().await {
+            this.update(&mut cx, |this, cx| {
+                let new_branch =
+                    this.git_store
+                        .read(cx)
+                        .active_repository()
+                        .and_then(|active_repository| {
+                            active_repository.read(cx).current_branch().cloned()
+                        });
+                if new_branch != this.current_branch {
+                    this.current_branch = new_branch;
+                    cx.notify();
+                }
+            })?;
+
            let buffers_to_load = this.update(&mut cx, |this, cx| this.load_buffers(cx))?;
            for buffer_to_load in buffers_to_load {
                if let Some(buffer) = buffer_to_load.await.log_err() {
@@ -626,9 +661,11 @@ impl Item for ProjectDiff {
 }

 impl Render for ProjectDiff {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        let is_empty = self.multibuffer.read(cx).is_empty();

+        let can_push_and_pull = crate::can_push_and_pull(&self.project, cx);
+
        div()
            .track_focus(&self.focus_handle)
            .key_context(if is_empty { "EmptyPane" } else { "GitDiff" })
@@ -638,7 +675,61 @@ impl Render for ProjectDiff {
            .justify_center()
            .size_full()
            .when(is_empty, |el| {
-                el.child(Label::new("No uncommitted changes"))
+                el.child(
+                    v_flex()
+                        .gap_1()
+                        .child(
+                            h_flex()
+                                .justify_around()
+                                .child(Label::new("No uncommitted changes")),
+                        )
+                        .when(can_push_and_pull, |this_div| {
+                            let keybinding_focus_handle = self.focus_handle(cx);
+
+                            this_div.when_some(self.current_branch.as_ref(), |this_div, branch| {
+                                let remote_button = crate::render_remote_button(
+                                    "project-diff-remote-button",
+                                    branch,
+                                    Some(keybinding_focus_handle.clone()),
+                                    false,
+                                );
+
+                                match remote_button {
+                                    Some(button) => {
+                                        this_div.child(h_flex().justify_around().child(button))
+                                    }
+                                    None => this_div.child(
+                                        h_flex()
+                                            .justify_around()
+                                            .child(Label::new("Remote up to date")),
+                                    ),
+                                }
+                            })
+                        })
+                        .map(|this| {
+                            let keybinding_focus_handle = self.focus_handle(cx).clone();
+
+                            this.child(
+                                h_flex().justify_around().mt_1().child(
+                                    Button::new("project-diff-close-button", "Close")
+                                        // .style(ButtonStyle::Transparent)
+                                        .key_binding(KeyBinding::for_action_in(
+                                            &CloseActiveItem::default(),
+                                            &keybinding_focus_handle,
+                                            window,
+                                            cx,
+                                        ))
+                                        .on_click(move |_, window, cx| {
+                                            window.focus(&keybinding_focus_handle);
+                                            window.dispatch_action(
+                                                Box::new(CloseActiveItem::default()),
+                                                cx,
+                                            );
+                                        }),
+                                ),
+                            )
+                        }),
+                )
            })
            .when(!is_empty, |el| el.child(self.editor.clone()))
    }
@@ -915,11 +1006,11 @@ impl Render for ProjectDiffToolbar {
                        Button::new("commit", "Commit")
                            .tooltip(Tooltip::for_action_title_in(
                                "Commit",
-                                &ShowCommitEditor,
+                                &Commit,
                                &focus_handle,
                            ))
                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dispatch_action(&ShowCommitEditor, window, cx);
+                                this.dispatch_action(&Commit, window, cx);
                            })),
                    ),
            )
@@ -1017,9 +1108,6 @@ mod tests {
        editor.update_in(cx, |editor, window, cx| {
            editor.git_restore(&Default::default(), window, cx);
        });
-        fs.with_git_state(path!("/project/.git").as_ref(), true, |state| {
-            state.statuses = HashMap::default();
-        });
        cx.run_until_parked();

        assert_state_with_diff(&editor, cx, &"ˇ".unindent());
--- a/crates/git_ui/src/repository_selector.rs
+++ b/crates/git_ui/src/repository_selector.rs
@@ -1,7 +1,7 @@
 use gpui::{
-    AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Subscription,
-    Task, WeakEntity,
+    AnyElement, App, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable, Task, WeakEntity,
 };
+use itertools::Itertools;
 use picker::{Picker, PickerDelegate};
 use project::{
    git::{GitStore, Repository},
@@ -12,56 +12,73 @@ use ui::{prelude::*, ListItem, ListItemSpacing};

 pub struct RepositorySelector {
    picker: Entity<Picker<RepositorySelectorDelegate>>,
-    /// The task used to update the picker's matches when there is a change to
-    /// the repository list.
-    update_matches_task: Option<Task<()>>,
-    _subscriptions: Vec<Subscription>,
 }

 impl RepositorySelector {
-    pub fn new(project: Entity<Project>, window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let git_store = project.read(cx).git_store().clone();
-        let all_repositories = git_store.read(cx).all_repositories();
-        let filtered_repositories = all_repositories.clone();
+    pub fn new(
+        project_handle: Entity<Project>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let git_store = project_handle.read(cx).git_store().clone();
+        let repository_entries = git_store.update(cx, |git_store, cx| {
+            filtered_repository_entries(git_store, cx)
+        });
+        let project = project_handle.read(cx);
+        let filtered_repositories = repository_entries.clone();
+
+        let widest_item_ix = repository_entries.iter().position_max_by(|a, b| {
+            a.read(cx)
+                .display_name(project, cx)
+                .len()
+                .cmp(&b.read(cx).display_name(project, cx).len())
+        });
+
        let delegate = RepositorySelectorDelegate {
-            project: project.downgrade(),
+            project: project_handle.downgrade(),
            repository_selector: cx.entity().downgrade(),
-            repository_entries: all_repositories,
+            repository_entries,
            filtered_repositories,
            selected_index: 0,
        };

        let picker = cx.new(|cx| {
            Picker::nonsearchable_uniform_list(delegate, window, cx)
+                .widest_item(widest_item_ix)
                .max_height(Some(rems(20.).into()))
-                .width(rems(15.))
        });

-        let _subscriptions =
-            vec![cx.subscribe_in(&git_store, window, Self::handle_project_git_event)];
-
-        RepositorySelector {
-            picker,
-            update_matches_task: None,
-            _subscriptions,
-        }
+        RepositorySelector { picker }
    }
+}

-    fn handle_project_git_event(
-        &mut self,
-        git_store: &Entity<GitStore>,
-        _event: &project::git::GitEvent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // TODO handle events individually
-        let task = self.picker.update(cx, |this, cx| {
-            let query = this.query(cx);
-            this.delegate.repository_entries = git_store.read(cx).all_repositories();
-            this.delegate.update_matches(query, window, cx)
-        });
-        self.update_matches_task = Some(task);
-    }
+pub(crate) fn filtered_repository_entries(
+    git_store: &GitStore,
+    cx: &App,
+) -> Vec<Entity<Repository>> {
+    let mut repository_entries = git_store.all_repositories();
+    repository_entries.sort_by_key(|repo| {
+        let repo = repo.read(cx);
+        (
+            repo.dot_git_abs_path.clone(),
+            repo.worktree_abs_path.clone(),
+        )
+    });
+    // Remove any entry that comes from a single file worktree and represents a repository that is also represented by a non-single-file worktree.
+    repository_entries
+        .chunk_by(|a, b| a.read(cx).dot_git_abs_path == b.read(cx).dot_git_abs_path)
+        .flat_map(|chunk| {
+            let has_non_single_file_worktree = chunk
+                .iter()
+                .any(|repo| !repo.read(cx).is_from_single_file_worktree);
+            chunk
+                .iter()
+                .filter(move |repo| {
+                    !repo.read(cx).is_from_single_file_worktree || !has_non_single_file_worktree
+                })
+                .cloned()
+        })
+        .collect()
 }

 impl EventEmitter<DismissEvent> for RepositorySelector {}
@@ -186,7 +203,6 @@ impl PickerDelegate for RepositorySelectorDelegate {
        let project = self.project.upgrade()?;
        let repo_info = self.filtered_repositories.get(ix)?;
        let display_name = repo_info.read(cx).display_name(project.read(cx), cx);
-        // TODO: Implement repository item rendering
        Some(
            ListItem::new(ix)
                .inset(true)
--- a/crates/gpui/examples/data_table.rs
+++ b/crates/gpui/examples/data_table.rs
@@ -402,7 +402,7 @@ impl Render for DataTable {
                    .overflow_hidden()
                    .border_1()
                    .border_color(rgb(0xE0E0E0))
-                    .rounded_md()
+                    .rounded_sm()
                    .child(
                        div()
                            .flex()
--- a/Show More
+++ b/Show More