sfsa

Co-authored-by: Cole Miller <m@cole-miller.net> Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
wip hscroll
2025-03-10 15:38:03 -04:00 · 2025-03-10 15:35:09 -04:00 · 2025-03-10 12:16:24 -04:00 · 2025-03-10 12:12:17 -04:00 · 2025-03-10 12:03:40 -04:00 · 2025-03-10 11:59:42 -04:00
509 changed files with 21154 additions and 10242 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/ISSUE_TEMPLATE/0_git_beta_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/0_git_beta_bug_report.yml
@@ -0,0 +1,51 @@
+name: Git Beta
+description: There is a bug related to new Git features in Zed
+type: "Bug"
+labels: [git]
+title: "Git Beta: <a short description of the Git bug>"
+body:
+  - type: textarea
+    attributes:
+      label: Summary
+      description: Describe the bug with a one line summary, and provide detailed reproduction steps
+      value: |
+        <!-- Please insert a one line summary of the issue below -->
+
+        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
+        Steps to trigger the problem:
+        1.
+        2.
+        3.
+
+        Actual Behavior:
+
+        Expected Behavior:
+
+    validations:
+      required: true
+  - type: textarea
+    id: environment
+    attributes:
+      label: Zed Version and System Specs
+      description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
+      placeholder: |
+        Output of "zed: Copy System Specs Into Clipboard"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
+      description: |
+        macOS: `~/Library/Logs/Zed/Zed.log`
+        Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
+        If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
+      value: |
+        <details><summary>Zed.log</summary>
+
+        <!-- Click below this line and paste or drag-and-drop your log-->
+        ```
+
+        ```
+        <!-- Click above this line and paste or drag-and-drop your log--></details>
+    validations:
+      required: false
--- 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",
@@ -103,6 +104,7 @@ members = [
    "crates/project_panel",
    "crates/project_symbols",
    "crates/prompt_library",
+    "crates/prompt_store",
    "crates/proto",
    "crates/recent_projects",
    "crates/refineable",
@@ -116,6 +118,7 @@ members = [
    "crates/rope",
    "crates/rpc",
    "crates/schema_generator",
+    "crates/assistant_scripting",
    "crates/search",
    "crates/semantic_index",
    "crates/semantic_version",
@@ -166,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",
@@ -208,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" }
@@ -308,6 +306,7 @@ project = { path = "crates/project" }
 project_panel = { path = "crates/project_panel" }
 project_symbols = { path = "crates/project_symbols" }
 prompt_library = { path = "crates/prompt_library" }
+prompt_store = { path = "crates/prompt_store" }
 proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
@@ -319,6 +318,7 @@ reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
+assistant_scripting = { path = "crates/assistant_scripting" }
 search = { path = "crates/search" }
 semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
@@ -370,7 +370,7 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e" }
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -451,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"
@@ -536,7 +537,7 @@ tiny_http = "0.8"
 toml = "0.8"
 tokio = { version = "1" }
 tower-http = "0.4.4"
-tree-sitter = { version = "0.25.2", features = ["wasm"] }
+tree-sitter = { version = "0.25.3", features = ["wasm"] }
 tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
@@ -599,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",
@@ -749,4 +752,4 @@ should_implement_trait = { level = "allow" }
 let_underscore_future = "allow"

 [workspace.metadata.cargo-machete]
-ignored = ["bindgen", "cbindgen", "prost_build", "serde"]
+ignored = ["bindgen", "cbindgen", "prost_build", "serde", "component", "linkme"]
--- 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/cloud.svg
+++ b/assets/icons/cloud.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-cloud"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9Z"/></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/git_branch_small.svg
+++ b/assets/icons/git_branch_small.svg
@@ -0,0 +1,6 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.75 3.25C4.02614 3.25 4.25 3.02614 4.25 2.75C4.25 2.47386 4.02614 2.25 3.75 2.25C3.47386 2.25 3.25 2.47386 3.25 2.75C3.25 3.02614 3.47386 3.25 3.75 3.25ZM3.75 4.25C4.57843 4.25 5.25 3.57843 5.25 2.75C5.25 1.92157 4.57843 1.25 3.75 1.25C2.92157 1.25 2.25 1.92157 2.25 2.75C2.25 3.57843 2.92157 4.25 3.75 4.25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.25 3.25C8.52614 3.25 8.75 3.02614 8.75 2.75C8.75 2.47386 8.52614 2.25 8.25 2.25C7.97386 2.25 7.75 2.47386 7.75 2.75C7.75 3.02614 7.97386 3.25 8.25 3.25ZM8.25 4.25C9.07843 4.25 9.75 3.57843 9.75 2.75C9.75 1.92157 9.07843 1.25 8.25 1.25C7.42157 1.25 6.75 1.92157 6.75 2.75C6.75 3.57843 7.42157 4.25 8.25 4.25Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.75 9.75C4.02614 9.75 4.25 9.52614 4.25 9.25C4.25 8.97386 4.02614 8.75 3.75 8.75C3.47386 8.75 3.25 8.97386 3.25 9.25C3.25 9.52614 3.47386 9.75 3.75 9.75ZM3.75 10.75C4.57843 10.75 5.25 10.0784 5.25 9.25C5.25 8.42157 4.57843 7.75 3.75 7.75C2.92157 7.75 2.25 8.42157 2.25 9.25C2.25 10.0784 2.92157 10.75 3.75 10.75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.25 3.75H4.25V5.59609C4.67823 5.35824 5.24991 5.25 6 5.25H7.25017C7.5262 5.25 7.75 5.02625 7.75 4.75V3.75H8.75V4.75C8.75 5.57832 8.07871 6.25 7.25017 6.25H6C5.14559 6.25 4.77639 6.41132 4.59684 6.56615C4.42571 6.71373 4.33877 6.92604 4.25 7.30651V8.25H3.25V3.75Z" 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
@@ -10,8 +10,8 @@
      "pagedown": "menu::SelectLast",
      "ctrl-n": "menu::SelectNext",
      "tab": "menu::SelectNext",
-      "ctrl-p": "menu::SelectPrev",
-      "shift-tab": "menu::SelectPrev",
+      "ctrl-p": "menu::SelectPrevious",
+      "shift-tab": "menu::SelectPrevious",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "ctrl-escape": "menu::Cancel",
@@ -38,14 +38,14 @@
  {
    "context": "Picker || menu",
    "bindings": {
-      "up": "menu::SelectPrev",
+      "up": "menu::SelectPrevious",
      "down": "menu::SelectNext"
    }
  },
  {
    "context": "Prompt",
    "bindings": {
-      "left": "menu::SelectPrev",
+      "left": "menu::SelectPrevious",
      "right": "menu::SelectNext"
    }
  },
@@ -57,7 +57,7 @@
      "backspace": "editor::Backspace",
      "delete": "editor::Delete",
      "tab": "editor::Tab",
-      "shift-tab": "editor::TabPrev",
+      "shift-tab": "editor::Backtab",
      "ctrl-k": "editor::CutToEndOfLine",
      // "ctrl-t": "editor::Transpose",
      "ctrl-k ctrl-q": "editor::Rewrap",
@@ -180,7 +180,7 @@
      "ctrl-k c": "assistant::CopyCode",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-g": "search::SelectNextMatch",
-      "ctrl-shift-g": "search::SelectPrevMatch",
+      "ctrl-shift-g": "search::SelectPreviousMatch",
      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-k h": "assistant::DeployHistory",
      "ctrl-k l": "assistant::DeployPromptLibrary",
@@ -203,7 +203,7 @@
      "escape": "buffer_search::Dismiss",
      "tab": "buffer_search::FocusEditor",
      "enter": "search::SelectNextMatch",
-      "shift-enter": "search::SelectPrevMatch",
+      "shift-enter": "search::SelectPreviousMatch",
      "alt-enter": "search::SelectAllMatches",
      "find": "search::FocusSearch",
      "ctrl-f": "search::FocusSearch",
@@ -272,7 +272,7 @@
      "alt-8": ["pane::ActivateItem", 7],
      "alt-9": ["pane::ActivateItem", 8],
      "alt-0": "pane::ActivateLastItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
@@ -290,8 +290,8 @@
      "forward": "pane::GoForward",
      "ctrl-alt-g": "search::SelectNextMatch",
      "f3": "search::SelectNextMatch",
-      "ctrl-alt-shift-g": "search::SelectPrevMatch",
-      "shift-f3": "search::SelectPrevMatch",
+      "ctrl-alt-shift-g": "search::SelectPreviousMatch",
+      "shift-f3": "search::SelectPreviousMatch",
      "shift-find": "project_search::ToggleFocus",
      "ctrl-shift-f": "project_search::ToggleFocus",
      "ctrl-alt-shift-h": "search::ToggleReplace",
@@ -334,7 +334,7 @@
      "ctrl-u": "editor::UndoSelection",
      "ctrl-shift-u": "editor::RedoSelection",
      "f8": "editor::GoToDiagnostic",
-      "shift-f8": "editor::GoToPrevDiagnostic",
+      "shift-f8": "editor::GoToPreviousDiagnostic",
      "f2": "editor::Rename",
      "f12": "editor::GoToDefinition",
      "alt-f12": "editor::GoToDefinitionSplit",
@@ -373,7 +373,7 @@
      "alt-y": "git::StageAndNext",
      "alt-shift-y": "git::UnstageAndNext",
      "alt-.": "editor::GoToHunk",
-      "alt-,": "editor::GoToPrevHunk"
+      "alt-,": "editor::GoToPreviousHunk"
    }
  },
  {
@@ -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",
@@ -536,8 +534,8 @@
  {
    "context": "Editor && (showing_code_actions || showing_completions)",
    "bindings": {
-      "ctrl-p": "editor::ContextMenuPrev",
-      "up": "editor::ContextMenuPrev",
+      "ctrl-p": "editor::ContextMenuPrevious",
+      "up": "editor::ContextMenuPrevious",
      "ctrl-n": "editor::ContextMenuNext",
      "down": "editor::ContextMenuNext",
      "pageup": "editor::ContextMenuFirst",
@@ -565,7 +563,7 @@
      "ctrl-alt-enter": "editor::OpenExcerptsSplit",
      "ctrl-shift-e": "pane::RevealInProjectPanel",
      "ctrl-f8": "editor::GoToHunk",
-      "ctrl-shift-f8": "editor::GoToPrevHunk",
+      "ctrl-shift-f8": "editor::GoToPreviousHunk",
      "ctrl-enter": "assistant::InlineAssist",
      "ctrl-:": "editor::ToggleInlayHints"
    }
@@ -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": {
@@ -662,7 +677,7 @@
      "alt-ctrl-r": "outline_panel::RevealInFileManager",
      "space": "outline_panel::Open",
      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
+      "shift-up": "menu::SelectPrevious",
      "alt-enter": "editor::OpenExcerpts",
      "ctrl-alt-enter": "editor::OpenExcerptsSplit"
    }
@@ -700,7 +715,7 @@
      "shift-find": "project_panel::NewSearchInDirectory",
      "ctrl-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
+      "shift-up": "menu::SelectPrevious",
      "escape": "menu::Cancel"
    }
  },
@@ -713,7 +728,7 @@
  {
    "context": "GitPanel && ChangesList",
    "bindings": {
-      "up": "menu::SelectPrev",
+      "up": "menu::SelectPrevious",
      "down": "menu::SelectNext",
      "enter": "menu::Confirm",
      "space": "git::ToggleStaged",
@@ -730,7 +745,8 @@
    "context": "GitCommit > Editor",
    "bindings": {
      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit"
+      "ctrl-enter": "git::Commit",
+      "alt-l": "git::GenerateCommitMessage"
    }
  },
  {
@@ -739,6 +755,12 @@
      "ctrl-enter": "git::Commit"
    }
  },
+  {
+    "context": "AskPass > Editor",
+    "bindings": {
+      "enter": "menu::Confirm"
+    }
+  },
  {
    "context": "GitPanel > Editor",
    "bindings": {
@@ -746,15 +768,8 @@
      "tab": "git_panel::FocusChanges",
      "shift-tab": "git_panel::FocusChanges",
      "ctrl-enter": "git::Commit",
-      "alt-up": "git_panel::FocusChanges"
-    }
-  },
-  {
-    "context": "GitCommit > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit"
+      "alt-up": "git_panel::FocusChanges",
+      "alt-l": "git::GenerateCommitMessage"
    }
  },
  {
@@ -779,6 +794,9 @@
  {
    "context": "Picker > Editor",
    "bindings": {
+      "escape": "menu::Cancel",
+      "up": "menu::SelectPrevious",
+      "down": "menu::SelectNext",
      "tab": "picker::ConfirmCompletion",
      "alt-enter": ["picker::ConfirmInput", { "secondary": false }]
    }
@@ -792,7 +810,7 @@
  {
    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "bindings": {
-      "ctrl-shift-p": "file_finder::SelectPrev",
+      "ctrl-shift-p": "file_finder::SelectPrevious",
      "ctrl-j": "pane::SplitDown",
      "ctrl-k": "pane::SplitUp",
      "ctrl-h": "pane::SplitLeft",
@@ -802,8 +820,8 @@
  {
    "context": "TabSwitcher",
    "bindings": {
-      "ctrl-shift-tab": "menu::SelectPrev",
-      "ctrl-up": "menu::SelectPrev",
+      "ctrl-shift-tab": "menu::SelectPrevious",
+      "ctrl-up": "menu::SelectPrevious",
      "ctrl-down": "menu::SelectNext",
      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
    }
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1,4 +1,15 @@
 [
+  // Moved before Standard macOS bindings so that `cmd-w` is not the last binding for
+  // `workspace::CloseWindow` and displayed/intercepted by macOS
+  {
+    "context": "PromptLibrary",
+    "use_key_equivalents": true,
+    "bindings": {
+      "cmd-n": "prompt_library::NewPrompt",
+      "cmd-shift-s": "prompt_library::ToggleDefaultPrompt",
+      "cmd-w": "workspace::CloseWindow"
+    }
+  },
  // Standard macOS bindings
  {
    "use_key_equivalents": true,
@@ -14,19 +25,19 @@
      "tab": "menu::SelectNext",
      "ctrl-n": "menu::SelectNext",
      "down": "menu::SelectNext",
-      "shift-tab": "menu::SelectPrev",
-      "ctrl-p": "menu::SelectPrev",
-      "up": "menu::SelectPrev",
+      "shift-tab": "menu::SelectPrevious",
+      "ctrl-p": "menu::SelectPrevious",
+      "up": "menu::SelectPrevious",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "cmd-enter": "menu::SecondaryConfirm",
      "ctrl-escape": "menu::Cancel",
-      "cmd-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
      "escape": "menu::Cancel",
      "alt-shift-enter": "menu::Restart",
      "cmd-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
+      "cmd-escape": "menu::Cancel",
      "cmd-o": "workspace::Open",
      "cmd-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
      "cmd-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
@@ -54,7 +65,7 @@
      "ctrl-d": "editor::Delete",
      "delete": "editor::Delete",
      "tab": "editor::Tab",
-      "shift-tab": "editor::TabPrev",
+      "shift-tab": "editor::Backtab",
      "ctrl-t": "editor::Transpose",
      "ctrl-k": "editor::KillRingCut",
      "ctrl-y": "editor::KillRingYank",
@@ -97,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",
@@ -113,11 +124,12 @@
      "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",
+      "alt-shift-o": "editor::OrganizeImports",
      "cmd-shift-left": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
      "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true, "stop_at_indent": true }],
@@ -160,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,
@@ -207,7 +229,7 @@
      "cmd-k c": "assistant::CopyCode",
      "cmd-shift-e": "project_panel::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPrevMatch",
+      "cmd-shift-g": "search::SelectPreviousMatch",
      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-k h": "assistant::DeployHistory",
      "cmd-k l": "assistant::DeployPromptLibrary",
@@ -244,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,
@@ -251,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,
@@ -269,15 +308,6 @@
      "backspace": "assistant2::RemoveSelectedThread"
    }
  },
-  {
-    "context": "PromptLibrary",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd-n": "prompt_library::NewPrompt",
-      "cmd-shift-s": "prompt_library::ToggleDefaultPrompt",
-      "cmd-w": "workspace::CloseWindow"
-    }
-  },
  {
    "context": "BufferSearchBar",
    "use_key_equivalents": true,
@@ -285,7 +315,7 @@
      "escape": "buffer_search::Dismiss",
      "tab": "buffer_search::FocusEditor",
      "enter": "search::SelectNextMatch",
-      "shift-enter": "search::SelectPrevMatch",
+      "shift-enter": "search::SelectPreviousMatch",
      "alt-enter": "search::SelectAllMatches",
      "cmd-f": "search::FocusSearch",
      "cmd-alt-f": "search::ToggleReplace",
@@ -352,8 +382,8 @@
    "context": "Pane",
    "use_key_equivalents": true,
    "bindings": {
-      "alt-cmd-left": "pane::ActivatePrevItem",
-      "cmd-{": "pane::ActivatePrevItem",
+      "alt-cmd-left": "pane::ActivatePreviousItem",
+      "cmd-{": "pane::ActivatePreviousItem",
      "alt-cmd-right": "pane::ActivateNextItem",
      "cmd-}": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
@@ -367,7 +397,7 @@
      "cmd-k cmd-w": ["pane::CloseAllItems", { "close_pinned": false }],
      "cmd-f": "project_search::ToggleFocus",
      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPrevMatch",
+      "cmd-shift-g": "search::SelectPreviousMatch",
      "cmd-shift-h": "search::ToggleReplace",
      "cmd-alt-l": "search::ToggleSelection",
      "alt-enter": "search::SelectAllMatches",
@@ -407,7 +437,7 @@
      "cmd-u": "editor::UndoSelection",
      "cmd-shift-u": "editor::RedoSelection",
      "f8": "editor::GoToDiagnostic",
-      "shift-f8": "editor::GoToPrevDiagnostic",
+      "shift-f8": "editor::GoToPreviousDiagnostic",
      "f2": "editor::Rename",
      "f12": "editor::GoToDefinition",
      "alt-f12": "editor::GoToDefinitionSplit",
@@ -613,8 +643,8 @@
    "context": "Editor && (showing_code_actions || showing_completions)",
    "use_key_equivalents": true,
    "bindings": {
-      "up": "editor::ContextMenuPrev",
-      "ctrl-p": "editor::ContextMenuPrev",
+      "up": "editor::ContextMenuPrevious",
+      "ctrl-p": "editor::ContextMenuPrevious",
      "down": "editor::ContextMenuNext",
      "ctrl-n": "editor::ContextMenuNext",
      "pageup": "editor::ContextMenuFirst",
@@ -640,7 +670,7 @@
      "cmd-alt-enter": "editor::OpenExcerptsSplit",
      "cmd-shift-e": "pane::RevealInProjectPanel",
      "cmd-f8": "editor::GoToHunk",
-      "cmd-shift-f8": "editor::GoToPrevHunk",
+      "cmd-shift-f8": "editor::GoToPreviousHunk",
      "ctrl-enter": "assistant::InlineAssist",
      "ctrl-:": "editor::ToggleInlayHints"
    }
@@ -683,7 +713,7 @@
      "alt-cmd-r": "outline_panel::RevealInFileManager",
      "space": "outline_panel::Open",
      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
+      "shift-up": "menu::SelectPrevious",
      "alt-enter": "editor::OpenExcerpts",
      "cmd-alt-enter": "editor::OpenExcerptsSplit"
    }
@@ -713,7 +743,7 @@
      "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "cmd-shift-f": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
+      "shift-up": "menu::SelectPrevious",
      "escape": "menu::Cancel"
    }
  },
@@ -728,7 +758,7 @@
    "context": "GitPanel && ChangesList",
    "use_key_equivalents": true,
    "bindings": {
-      "up": "menu::SelectPrev",
+      "up": "menu::SelectPrevious",
      "down": "menu::SelectNext",
      "cmd-up": "menu::SelectFirst",
      "cmd-down": "menu::SelectLast",
@@ -750,6 +780,13 @@
      "cmd-enter": "git::Commit"
    }
  },
+  {
+    "context": "AskPass > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "menu::Confirm"
+    }
+  },
  {
    "context": "GitPanel > Editor",
    "use_key_equivalents": true,
@@ -758,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"
    }
  },
  {
@@ -766,7 +805,8 @@
    "use_key_equivalents": true,
    "bindings": {
      "enter": "editor::Newline",
-      "cmd-enter": "git::Commit"
+      "cmd-enter": "git::Commit",
+      "alt-tab": "git::GenerateCommitMessage"
    }
  },
  {
@@ -795,6 +835,9 @@
    "context": "Picker > Editor",
    "use_key_equivalents": true,
    "bindings": {
+      "escape": "menu::Cancel",
+      "up": "menu::SelectPrevious",
+      "down": "menu::SelectNext",
      "tab": "picker::ConfirmCompletion",
      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
@@ -811,7 +854,7 @@
    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-shift-p": "file_finder::SelectPrev",
+      "cmd-shift-p": "file_finder::SelectPrevious",
      "cmd-j": "pane::SplitDown",
      "cmd-k": "pane::SplitUp",
      "cmd-h": "pane::SplitLeft",
@@ -822,8 +865,8 @@
    "context": "TabSwitcher",
    "use_key_equivalents": true,
    "bindings": {
-      "ctrl-shift-tab": "menu::SelectPrev",
-      "ctrl-up": "menu::SelectPrev",
+      "ctrl-shift-tab": "menu::SelectPrevious",
+      "ctrl-up": "menu::SelectPrevious",
      "ctrl-down": "menu::SelectNext",
      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
    }
--- a/assets/keymaps/linux/atom.json
+++ b/assets/keymaps/linux/atom.json
@@ -39,7 +39,7 @@
    "context": "BufferSearchBar",
    "bindings": {
      "ctrl-f3": "search::SelectNextMatch", // find-and-replace:find-next-selected
-      "ctrl-shift-f3": "search::SelectPrevMatch" // find-and-replace:find-previous-selected
+      "ctrl-shift-f3": "search::SelectPreviousMatch" // find-and-replace:find-previous-selected
    }
  },
  {
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -122,7 +122,7 @@
    "context": "BufferSearchBar > Editor",
    "bindings": {
      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-r": "search::SelectPrevMatch",
+      "ctrl-r": "search::SelectPreviousMatch",
      "ctrl-g": "buffer_search::Dismiss"
    }
  },
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -2,7 +2,7 @@
  {
    "bindings": {
      "ctrl-alt-s": "zed::OpenSettings",
-      "ctrl-{": "pane::ActivatePrevItem",
+      "ctrl-{": "pane::ActivatePreviousItem",
      "ctrl-}": "pane::ActivateNextItem"
    }
  },
@@ -41,9 +41,9 @@
      "ctrl-shift-b": "editor::GoToTypeDefinition",
      "ctrl-alt-shift-b": "editor::GoToTypeDefinitionSplit",
      "f2": "editor::GoToDiagnostic",
-      "shift-f2": "editor::GoToPrevDiagnostic",
+      "shift-f2": "editor::GoToPreviousDiagnostic",
      "ctrl-alt-shift-down": "editor::GoToHunk",
-      "ctrl-alt-shift-up": "editor::GoToPrevHunk",
+      "ctrl-alt-shift-up": "editor::GoToPreviousHunk",
      "ctrl-alt-z": "git::Restore",
      "ctrl-home": "editor::MoveToBeginning",
      "ctrl-end": "editor::MoveToEnd",
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -1,9 +1,9 @@
 [
  {
    "bindings": {
-      "ctrl-{": "pane::ActivatePrevItem",
+      "ctrl-{": "pane::ActivatePreviousItem",
      "ctrl-}": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-1": ["workspace::ActivatePane", 0],
      "ctrl-2": ["workspace::ActivatePane", 1],
@@ -44,7 +44,7 @@
      "shift-f12": "editor::FindAllReferences",
      "ctrl-shift-f12": "editor::FindAllReferences",
      "ctrl-.": "editor::GoToHunk",
-      "ctrl-,": "editor::GoToPrevHunk",
+      "ctrl-,": "editor::GoToPreviousHunk",
      "ctrl-k ctrl-u": "editor::ConvertToUpperCase",
      "ctrl-k ctrl-l": "editor::ConvertToLowerCase",
      "shift-alt-m": "markdown::OpenPreviewToTheSide",
@@ -62,7 +62,7 @@
    "context": "Pane",
    "bindings": {
      "f4": "search::SelectNextMatch",
-      "shift-f4": "search::SelectPrevMatch",
+      "shift-f4": "search::SelectPreviousMatch",
      "alt-1": ["pane::ActivateItem", 0],
      "alt-2": ["pane::ActivateItem", 1],
      "alt-3": ["pane::ActivateItem", 2],
--- a/assets/keymaps/macos/atom.json
+++ b/assets/keymaps/macos/atom.json
@@ -40,7 +40,7 @@
    "context": "BufferSearchBar",
    "bindings": {
      "cmd-f3": "search::SelectNextMatch",
-      "cmd-shift-f3": "search::SelectPrevMatch"
+      "cmd-shift-f3": "search::SelectPreviousMatch"
    }
  },
  {
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -122,7 +122,7 @@
    "context": "BufferSearchBar > Editor",
    "bindings": {
      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-r": "search::SelectPrevMatch",
+      "ctrl-r": "search::SelectPreviousMatch",
      "ctrl-g": "buffer_search::Dismiss"
    }
  },
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -1,7 +1,7 @@
 [
  {
    "bindings": {
-      "cmd-{": "pane::ActivatePrevItem",
+      "cmd-{": "pane::ActivatePreviousItem",
      "cmd-}": "pane::ActivateNextItem"
    }
  },
@@ -39,9 +39,9 @@
      "cmd-shift-b": "editor::GoToTypeDefinition",
      "cmd-alt-shift-b": "editor::GoToTypeDefinitionSplit",
      "f2": "editor::GoToDiagnostic",
-      "shift-f2": "editor::GoToPrevDiagnostic",
+      "shift-f2": "editor::GoToPreviousDiagnostic",
      "ctrl-alt-shift-down": "editor::GoToHunk",
-      "ctrl-alt-shift-up": "editor::GoToPrevHunk",
+      "ctrl-alt-shift-up": "editor::GoToPreviousHunk",
      "cmd-home": "editor::MoveToBeginning",
      "cmd-end": "editor::MoveToEnd",
      "cmd-shift-home": "editor::SelectToBeginning",
@@ -61,7 +61,7 @@
  {
    "context": "BufferSearchBar > Editor",
    "bindings": {
-      "shift-enter": "search::SelectPrevMatch"
+      "shift-enter": "search::SelectPreviousMatch"
    }
  },
  {
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -1,9 +1,9 @@
 [
  {
    "bindings": {
-      "cmd-{": "pane::ActivatePrevItem",
+      "cmd-{": "pane::ActivatePreviousItem",
      "cmd-}": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-1": ["workspace::ActivatePane", 0],
      "ctrl-2": ["workspace::ActivatePane", 1],
@@ -45,7 +45,7 @@
      "ctrl-alt-cmd-down": "editor::GoToDefinitionSplit",
      "alt-shift-cmd-down": "editor::FindAllReferences",
      "ctrl-.": "editor::GoToHunk",
-      "ctrl-,": "editor::GoToPrevHunk",
+      "ctrl-,": "editor::GoToPreviousHunk",
      "cmd-k cmd-u": "editor::ConvertToUpperCase",
      "cmd-k cmd-l": "editor::ConvertToLowerCase",
      "cmd-shift-j": "editor::JoinLines",
@@ -64,7 +64,7 @@
    "context": "Pane",
    "bindings": {
      "f4": "search::SelectNextMatch",
-      "shift-f4": "search::SelectPrevMatch",
+      "shift-f4": "search::SelectPreviousMatch",
      "cmd-1": ["pane::ActivateItem", 0],
      "cmd-2": ["pane::ActivateItem", 1],
      "cmd-3": ["pane::ActivateItem", 2],
--- a/assets/keymaps/macos/textmate.json
+++ b/assets/keymaps/macos/textmate.json
@@ -47,7 +47,7 @@
    "context": "BufferSearchBar",
    "bindings": {
      "ctrl-s": "search::SelectNextMatch",
-      "ctrl-shift-s": "search::SelectPrevMatch"
+      "ctrl-shift-s": "search::SelectPreviousMatch"
    }
  },
  {
--- a/assets/keymaps/storybook.json
+++ b/assets/keymaps/storybook.json
@@ -13,9 +13,9 @@
      "tab": "menu::SelectNext",
      "ctrl-n": "menu::SelectNext",
      "down": "menu::SelectNext",
-      "shift-tab": "menu::SelectPrev",
-      "ctrl-p": "menu::SelectPrev",
-      "up": "menu::SelectPrev",
+      "shift-tab": "menu::SelectPrevious",
+      "ctrl-p": "menu::SelectPrevious",
+      "up": "menu::SelectPrevious",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "cmd-enter": "menu::SecondaryConfirm",
--- 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",
@@ -62,9 +62,9 @@
      "g /": "pane::DeploySearch",
      "?": ["vim::Search", { "backwards": true }],
      "*": "vim::MoveToNext",
-      "#": "vim::MoveToPrev",
+      "#": "vim::MoveToPrevious",
      "n": "vim::MoveToNextMatch",
-      "shift-n": "vim::MoveToPrevMatch",
+      "shift-n": "vim::MoveToPreviousMatch",
      "%": "vim::Matching",
      "] }": ["vim::UnmatchedForward", { "char": "}" }],
      "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
@@ -106,7 +106,7 @@
      "g g": "vim::StartOfDocument",
      "g h": "editor::Hover",
      "g t": "pane::ActivateNextItem",
-      "g shift-t": "pane::ActivatePrevItem",
+      "g shift-t": "pane::ActivatePreviousItem",
      "g d": "editor::GoToDefinition",
      "g shift-d": "editor::GoToDeclaration",
      "g y": "editor::GoToTypeDefinition",
@@ -126,7 +126,7 @@
      "g shift-a": "editor::FindAllReferences", // zed specific
      "g space": "editor::OpenExcerpts", // zed specific
      "g *": ["vim::MoveToNext", { "partial_word": true }],
-      "g #": ["vim::MoveToPrev", { "partial_word": true }],
+      "g #": ["vim::MoveToPrevious", { "partial_word": true }],
      "g j": ["vim::Down", { "display_lines": true }],
      "g down": ["vim::Down", { "display_lines": true }],
      "g k": ["vim::Up", { "display_lines": true }],
@@ -138,7 +138,7 @@
      "g ^": ["vim::FirstNonWhitespace", { "display_lines": true }],
      "g v": "vim::RestoreVisualSelection",
      "g ]": "editor::GoToDiagnostic",
-      "g [": "editor::GoToPrevDiagnostic",
+      "g [": "editor::GoToPreviousDiagnostic",
      "g i": "vim::InsertAtPrevious",
      "g ,": "vim::ChangeListNewer",
      "g ;": "vim::ChangeListOlder",
@@ -231,15 +231,15 @@
      "g w": "vim::PushRewrap",
      "g q": "vim::PushRewrap",
      "ctrl-pagedown": "pane::ActivateNextItem",
-      "ctrl-pageup": "pane::ActivatePrevItem",
+      "ctrl-pageup": "pane::ActivatePreviousItem",
      "insert": "vim::InsertBefore",
      // tree-sitter related commands
      "[ x": "vim::SelectLargerSyntaxNode",
      "] x": "vim::SelectSmallerSyntaxNode",
      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPrevDiagnostic",
+      "[ d": "editor::GoToPreviousDiagnostic",
      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPrevHunk",
+      "[ c": "editor::GoToPreviousHunk",
      "g c": "vim::PushToggleComments"
    }
  },
@@ -247,7 +247,8 @@
    "context": "VimControl && VimCount",
    "bindings": {
      "0": ["vim::Number", 0],
-      ":": "vim::CountCommand"
+      ":": "vim::CountCommand",
+      "%": "vim::GoToPercentage"
    }
  },
  {
@@ -272,7 +273,7 @@
      "shift-s": "vim::SubstituteLine",
      "~": "vim::ChangeCase",
      "*": ["vim::MoveToNext", { "partial_word": true }],
-      "#": ["vim::MoveToPrev", { "partial_word": true }],
+      "#": ["vim::MoveToPrevious", { "partial_word": true }],
      "ctrl-a": "vim::Increment",
      "ctrl-x": "vim::Decrement",
      "g ctrl-a": ["vim::Increment", { "step": true }],
@@ -448,7 +449,10 @@
      "d": "vim::CurrentLine",
      "s": "vim::PushDeleteSurrounds",
      "o": "editor::ToggleSelectedDiffHunks", // "d o"
-      "p": "git::Restore" // "d p"
+      "shift-o": "git::ToggleStaged",
+      "p": "git::Restore", // "d p"
+      "u": "git::StageAndNext", // "d u"
+      "shift-u": "git::UnstageAndNext" // "d shift-u"
    }
  },
  {
@@ -620,8 +624,8 @@
      "ctrl-w =": "vim::ResetPaneSizes",
      "ctrl-w g t": "pane::ActivateNextItem",
      "ctrl-w ctrl-g t": "pane::ActivateNextItem",
-      "ctrl-w g shift-t": "pane::ActivatePrevItem",
-      "ctrl-w ctrl-g shift-t": "pane::ActivatePrevItem",
+      "ctrl-w g shift-t": "pane::ActivatePreviousItem",
+      "ctrl-w ctrl-g shift-t": "pane::ActivatePreviousItem",
      "ctrl-w w": "workspace::ActivateNextPane",
      "ctrl-w ctrl-w": "workspace::ActivateNextPane",
      "ctrl-w p": "workspace::ActivatePreviousPane",
@@ -664,7 +668,7 @@
      "escape": "project_panel::ToggleFocus",
      "h": "project_panel::CollapseSelectedEntry",
      "j": "menu::SelectNext",
-      "k": "menu::SelectPrev",
+      "k": "menu::SelectPrevious",
      "l": "project_panel::ExpandSelectedEntry",
      "o": "project_panel::OpenPermanent",
      "shift-d": "project_panel::Delete",
@@ -690,7 +694,7 @@
    "context": "OutlinePanel && not_editing",
    "bindings": {
      "j": "menu::SelectNext",
-      "k": "menu::SelectPrev",
+      "k": "menu::SelectPrevious",
      "shift-g": "menu::SelectLast",
      "g g": "menu::SelectFirst"
    }
@@ -699,7 +703,7 @@
    "context": "GitPanel && ChangesList",
    "use_key_equivalents": true,
    "bindings": {
-      "k": "menu::SelectPrev",
+      "k": "menu::SelectPrevious",
      "j": "menu::SelectNext",
      "g g": "menu::SelectFirst",
      "shift-g": "menu::SelectLast",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -648,11 +648,19 @@
    // Show git status colors in the editor tabs.
    "git_status": false,
    // Position of the close button on the editor tabs.
+    // One of: ["right", "left", "hidden"]
    "close_position": "right",
    // Whether to show the file icon for a tab.
    "file_icons": false,
-    // Whether to always show the close button on tabs.
-    "always_show_close_button": false,
+    // Controls the appearance behavior of the tab's close button.
+    //
+    // 1. Show it just upon hovering the tab. (default)
+    //     "hover"
+    // 2. Show it persistently.
+    //     "always"
+    // 3. Never show it, even if hovering it.
+    //     "hidden"
+    "show_close_button": "hover",
    // What to do after closing the current tab.
    //
    // 1. Activate the tab that was open previously (default)
@@ -712,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
  //
@@ -829,7 +837,15 @@
      //
      // The minimum column number to show the inline blame information at
      // "min_column": 0
-    }
+    },
+    // How git hunks are displayed visually in the editor.
+    // This setting can take two values:
+    //
+    // 1. Show unstaged hunks with a transparent background (default):
+    //    "hunk_style": "transparent"
+    // 2. Show unstaged hunks with a pattern background:
+    //    "hunk_style": "pattern"
+    "hunk_style": "staged_border"
  },
  // Configuration for how direnv configuration should be loaded. May take 2 values:
  // 1. Load direnv configuration using `direnv export json` directly.
@@ -843,15 +859,7 @@
    // Any addition to this list will be merged with the default list.
    // Globs are matched relative to the worktree root,
    // except when starting with a slash (/) or equivalent in Windows.
-    "disabled_globs": [
-      "**/.env*",
-      "**/*.pem",
-      "**/*.key",
-      "**/*.cert",
-      "**/*.crt",
-      "**/.dev.vars",
-      "**/secrets.yml"
-    ],
+    "disabled_globs": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/.dev.vars", "**/secrets.yml"],
    // When to show edit predictions previews in buffer.
    // This setting takes two possible values:
    // 1. Display predictions inline when there are no language server completions available.
@@ -1047,7 +1055,6 @@
  // }
  //
  "file_types": {
-    "Plain Text": ["txt"],
    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json", "**/.vscode/**/*.json"],
    "Shell Script": [".env.*"]
  },
@@ -1167,6 +1174,7 @@
      "format_on_save": "off",
      "use_on_type_format": false,
      "allow_rewrap": "anywhere",
+      "soft_wrap": "bounded",
      "prettier": {
        "allowed": true
      }
@@ -1290,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/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -51,6 +51,7 @@ parking_lot.workspace = true
 paths.workspace = true
 project.workspace = true
 prompt_library.workspace = true
+prompt_store.workspace = true
 proto.workspace = true
 rope.workspace = true
 schemars.workspace = true
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -19,7 +19,7 @@ use gpui::{actions, App, Global, UpdateGlobal};
 use language_model::{
    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
 };
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use semantic_index::{CloudEmbeddingProvider, SemanticDb};
 use serde::Deserialize;
 use settings::{Settings, SettingsStore};
--- 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/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -24,7 +24,8 @@ use language_model::{
    AuthenticateError, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
 };
 use project::Project;
-use prompt_library::{open_prompt_library, PromptBuilder, PromptLibrary};
+use prompt_library::{open_prompt_library, PromptLibrary};
+use prompt_store::PromptBuilder;
 use search::{buffer_search::DivRegistrar, BufferSearchBar};
 use settings::{update_settings_file, Settings};
 use smol::stream::StreamExt;
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -35,11 +35,11 @@ use language_model::{
    report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, LanguageModelTextStream, Role,
 };
-use language_model_selector::{InlineLanguageModelSelector, LanguageModelSelector};
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use project::{CodeAction, ProjectTransaction};
-use prompt_library::PromptBuilder;
+use project::{CodeAction, LspAction, ProjectTransaction};
+use prompt_store::PromptBuilder;
 use rope::Rope;
 use settings::{update_settings_file, Settings, SettingsStore};
 use smol::future::FutureExt;
@@ -1589,10 +1589,29 @@ impl Render for PromptEditor {
                    .w(gutter_dimensions.full_width() + (gutter_dimensions.margin / 2.0))
                    .justify_center()
                    .gap_2()
-                    .child(
-                        InlineLanguageModelSelector::new(self.language_model_selector.clone())
-                            .render(window, cx),
-                    )
+                    .child(LanguageModelSelectorPopoverMenu::new(
+                        self.language_model_selector.clone(),
+                        IconButton::new("context", IconName::SettingsAlt)
+                            .shape(IconButtonShape::Square)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted),
+                        move |window, cx| {
+                            Tooltip::with_meta(
+                                format!(
+                                    "Using {}",
+                                    LanguageModelRegistry::read_global(cx)
+                                        .active_model()
+                                        .map(|model| model.name().0)
+                                        .unwrap_or_else(|| "No model selected".into()),
+                                ),
+                                None,
+                                "Change Model",
+                                window,
+                                cx,
+                            )
+                        },
+                        gpui::Corner::TopRight,
+                    ))
                    .map(|el| {
                        let CodegenStatus::Error(error) = self.codegen.read(cx).status(cx) else {
                            return el;
@@ -3550,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/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -19,8 +19,8 @@ use language_model::{
    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, Role,
 };
-use language_model_selector::{InlineLanguageModelSelector, LanguageModelSelector};
-use prompt_library::PromptBuilder;
+use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use prompt_store::PromptBuilder;
 use settings::{update_settings_file, Settings};
 use std::{
    cmp,
@@ -506,7 +506,7 @@ struct PromptEditor {
 impl EventEmitter<PromptEditorEvent> for PromptEditor {}

 impl Render for PromptEditor {
-    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 status = &self.codegen.read(cx).status;
        let buttons = match status {
            CodegenStatus::Idle => {
@@ -641,10 +641,29 @@ impl Render for PromptEditor {
                    .w_12()
                    .justify_center()
                    .gap_2()
-                    .child(
-                        InlineLanguageModelSelector::new(self.language_model_selector.clone())
-                            .render(window, cx),
-                    )
+                    .child(LanguageModelSelectorPopoverMenu::new(
+                        self.language_model_selector.clone(),
+                        IconButton::new("change-model", IconName::SettingsAlt)
+                            .shape(IconButtonShape::Square)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted),
+                        move |window, cx| {
+                            Tooltip::with_meta(
+                                format!(
+                                    "Using {}",
+                                    LanguageModelRegistry::read_global(cx)
+                                        .active_model()
+                                        .map(|model| model.name().0)
+                                        .unwrap_or_else(|| "No model selected".into()),
+                                ),
+                                None,
+                                "Change Model",
+                                window,
+                                cx,
+                            )
+                        },
+                        gpui::Corner::TopRight,
+                    ))
                    .children(
                        if let CodegenStatus::Error(error) = &self.codegen.read(cx).status {
                            let error_message = SharedString::from(error.to_string());
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -56,12 +56,14 @@ paths.workspace = true
 picker.workspace = true
 project.workspace = true
 prompt_library.workspace = true
+prompt_store.workspace = true
 proto.workspace = true
 rope.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+assistant_scripting.workspace = true
 streaming_diff.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -1,18 +1,20 @@
 use std::sync::Arc;

-use assistant_tool::ToolWorkingSet;
-use collections::HashMap;
+use assistant_scripting::{ScriptId, ScriptState};
+use collections::{HashMap, HashSet};
+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, WeakEntity,
 };
-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 ui::{prelude::*, Disclosure, KeyBinding};
+use util::ResultExt as _;
 use workspace::Workspace;

 use crate::thread::{MessageId, RequestKind, Thread, ThreadError, ThreadEvent};
@@ -23,24 +25,29 @@ 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>,
+    expanded_scripts: HashSet<ScriptId>,
    last_error: Option<ThreadError>,
    _subscriptions: Vec<Subscription>,
 }

+struct EditMessageState {
+    editor: Entity<Editor>,
+}
+
 impl ActiveThread {
    pub fn new(
+        workspace: WeakEntity<Workspace>,
        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 {
@@ -52,19 +59,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(),
+            expanded_scripts: HashSet::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 +126,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 +172,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 +183,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 +208,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 +217,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,25 +235,20 @@ 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(
        &mut self,
-        _: &Entity<Thread>,
+        _thread: &Entity<Thread>,
        event: &ThreadEvent,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -208,11 +258,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,56 +277,180 @@ 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.use_pending_tools(cx);
+                });
+            }
+            ThreadEvent::ToolFinished { .. } => {
+                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| {
-                            thread.insert_tool_output(tool_use.id.clone(), task, cx);
+                            thread.send_tool_results_to_model(model, 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 {
-                    let model_registry = LanguageModelRegistry::read_global(cx);
-                    if let Some(model) = model_registry.active_model() {
-                        self.thread.update(cx, |thread, cx| {
-                            // Insert an empty user message to contain the tool results.
-                            thread.insert_user_message("", Vec::new(), cx);
-                            thread.send_to_model(model, RequestKind::Chat, true, cx);
-                        });
-                    }
+            ThreadEvent::ScriptFinished => {
+                let model_registry = LanguageModelRegistry::read_global(cx);
+                if let Some(model) = model_registry.active_model() {
+                    self.thread.update(cx, |thread, cx| {
+                        thread.send_to_model(model, RequestKind::Chat, false, cx);
+                    });
                }
            }
        }
    }

-    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();
@@ -290,20 +460,43 @@ impl ActiveThread {
            return Empty.into_any();
        };

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

        // Don't render user messages that are just there for returning tool results.
        if message.role == Role::User
-            && message.text.is_empty()
-            && self.thread.read(cx).message_has_tool_results(message_id)
+            && (thread.message_has_tool_results(message_id)
+                || thread.message_has_script_output(message_id))
        {
            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 colors = cx.theme().colors();
+
        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(
@@ -333,7 +526,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)
@@ -352,6 +546,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),
@@ -359,6 +618,7 @@ impl ActiveThread {
            Role::Assistant => div()
                .id(("message-container", ix))
                .child(message_content)
+                .children(self.render_script(message_id, cx))
                .map(|parent| {
                    if tool_uses.is_empty() {
                        return parent;
@@ -375,7 +635,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),
            ),
        };
@@ -404,7 +664,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()
@@ -478,6 +738,139 @@ impl ActiveThread {
                }),
        )
    }
+
+    fn render_script(&self, message_id: MessageId, cx: &mut Context<Self>) -> Option<AnyElement> {
+        let script = self.thread.read(cx).script_for_message(message_id, cx)?;
+
+        let is_open = self.expanded_scripts.contains(&script.id);
+        let colors = cx.theme().colors();
+
+        let element = div().px_2p5().child(
+            v_flex()
+                .gap_1()
+                .rounded_lg()
+                .border_1()
+                .border_color(colors.border)
+                .child(
+                    h_flex()
+                        .justify_between()
+                        .py_0p5()
+                        .pl_1()
+                        .pr_2()
+                        .bg(colors.editor_foreground.opacity(0.02))
+                        .when(is_open, |element| element.border_b_1().rounded_t(px(6.)))
+                        .when(!is_open, |element| element.rounded_md())
+                        .border_color(colors.border)
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(Disclosure::new("script-disclosure", is_open).on_click(
+                                    cx.listener({
+                                        let script_id = script.id;
+                                        move |this, _event, _window, _cx| {
+                                            if this.expanded_scripts.contains(&script_id) {
+                                                this.expanded_scripts.remove(&script_id);
+                                            } else {
+                                                this.expanded_scripts.insert(script_id);
+                                            }
+                                        }
+                                    }),
+                                ))
+                                // TODO: Generate script description
+                                .child(Label::new("Script")),
+                        )
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(
+                                    Label::new(match script.state {
+                                        ScriptState::Generating => "Generating",
+                                        ScriptState::Running { .. } => "Running",
+                                        ScriptState::Succeeded { .. } => "Finished",
+                                        ScriptState::Failed { .. } => "Error",
+                                    })
+                                    .size(LabelSize::XSmall)
+                                    .buffer_font(cx),
+                                )
+                                .child(
+                                    IconButton::new("view-source", IconName::Eye)
+                                        .icon_color(Color::Muted)
+                                        .disabled(matches!(script.state, ScriptState::Generating))
+                                        .on_click(cx.listener({
+                                            let source = script.source.clone();
+                                            move |this, _event, window, cx| {
+                                                this.open_script_source(source.clone(), window, cx);
+                                            }
+                                        })),
+                                ),
+                        ),
+                )
+                .when(is_open, |parent| {
+                    let stdout = script.stdout_snapshot();
+                    let error = script.error();
+
+                    parent.child(
+                        v_flex()
+                            .p_2()
+                            .bg(colors.editor_background)
+                            .gap_2()
+                            .child(if stdout.is_empty() && error.is_none() {
+                                Label::new("No output yet")
+                                    .size(LabelSize::Small)
+                                    .color(Color::Muted)
+                            } else {
+                                Label::new(stdout).size(LabelSize::Small).buffer_font(cx)
+                            })
+                            .children(script.error().map(|err| {
+                                Label::new(err.to_string())
+                                    .size(LabelSize::Small)
+                                    .color(Color::Error)
+                            })),
+                    )
+                }),
+        );
+
+        Some(element.into_any())
+    }
+
+    fn open_script_source(
+        &mut self,
+        source: SharedString,
+        window: &mut Window,
+        cx: &mut Context<'_, ActiveThread>,
+    ) {
+        let language_registry = self.language_registry.clone();
+        let workspace = self.workspace.clone();
+        let source = source.clone();
+
+        cx.spawn_in(window, |_, mut cx| async move {
+            let lua = language_registry.language_for_name("Lua").await.log_err();
+
+            workspace.update_in(&mut cx, |workspace, window, cx| {
+                let project = workspace.project().clone();
+
+                let buffer = project.update(cx, |project, cx| {
+                    project.create_local_buffer(&source.trim(), lua, cx)
+                });
+
+                let buffer = cx.new(|cx| {
+                    MultiBuffer::singleton(buffer, cx)
+                        // TODO: Generate script description
+                        .with_title("Assistant script".into())
+                });
+
+                let editor = cx.new(|cx| {
+                    let mut editor =
+                        Editor::for_multibuffer(buffer, Some(project), true, window, cx);
+                    editor.set_read_only(true);
+                    editor
+                });
+
+                workspace.add_item_to_active_pane(Box::new(editor), None, true, window, cx);
+            })
+        })
+        .detach_and_log_err(cx);
+    }
 }

 impl Render for ActiveThread {
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -27,7 +27,7 @@ use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{actions, App};
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use settings::Settings as _;

 pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate};
--- 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_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -1,19 +1,24 @@
 use assistant_settings::AssistantSettings;
 use fs::Fs;
-use gpui::{Entity, FocusHandle};
-use language_model_selector::{AssistantLanguageModelSelector, LanguageModelSelector};
+use gpui::{Entity, FocusHandle, SharedString};
+use language_model::LanguageModelRegistry;
+use language_model_selector::{
+    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
+};
 use settings::update_settings_file;
 use std::sync::Arc;
-use ui::prelude::*;
+use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};

 pub struct AssistantModelSelector {
-    pub selector: Entity<LanguageModelSelector>,
+    selector: Entity<LanguageModelSelector>,
+    menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    focus_handle: FocusHandle,
 }

 impl AssistantModelSelector {
    pub(crate) fn new(
        fs: Arc<dyn Fs>,
+        menu_handle: PopoverMenuHandle<LanguageModelSelector>,
        focus_handle: FocusHandle,
        window: &mut Window,
        cx: &mut App,
@@ -33,14 +38,54 @@ impl AssistantModelSelector {
                    cx,
                )
            }),
+            menu_handle,
            focus_handle,
        }
    }
+
+    pub fn toggle(&self, window: &mut Window, cx: &mut Context<Self>) {
+        self.menu_handle.toggle(window, cx);
+    }
 }

 impl Render for AssistantModelSelector {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        AssistantLanguageModelSelector::new(self.focus_handle.clone(), self.selector.clone())
-            .render(window, cx)
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+        let focus_handle = self.focus_handle.clone();
+        let model_name = match active_model {
+            Some(model) => model.name().0,
+            _ => SharedString::from("No model selected"),
+        };
+
+        LanguageModelSelectorPopoverMenu::new(
+            self.selector.clone(),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .gap_0p5()
+                        .child(
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                ),
+            move |window, cx| {
+                Tooltip::for_action_in(
+                    "Change Model",
+                    &ToggleModelSelector,
+                    &focus_handle,
+                    window,
+                    cx,
+                )
+            },
+            gpui::Corner::BottomRight,
+        )
+        .with_handle(self.menu_handle.clone())
    }
 }
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -15,12 +15,14 @@ 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};
 use project::Project;
-use prompt_library::{open_prompt_library, PromptBuilder, PromptLibrary};
+use prompt_library::{open_prompt_library, PromptLibrary};
+use prompt_store::PromptBuilder;
 use settings::{update_settings_file, Settings};
 use time::UtcOffset;
 use ui::{prelude::*, ContextMenu, KeyBinding, PopoverMenu, PopoverMenuHandle, Tab, Tooltip};
@@ -90,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>,
@@ -131,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))
            })
        })
    }
@@ -140,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 {
@@ -166,30 +166,30 @@ impl AssistantPanel {
        let history_store =
            cx.new(|cx| HistoryStore::new(thread_store.clone(), context_store.clone(), cx));

+        let thread = cx.new(|cx| {
+            ActiveThread::new(
+                workspace.clone(),
+                thread.clone(),
+                thread_store.clone(),
+                language_registry.clone(),
+                window,
+                cx,
+            )
+        });
+
        Self {
            active_view: ActiveView::Thread,
-            workspace: workspace.clone(),
-            project,
+            workspace,
+            project: project.clone(),
            fs: fs.clone(),
-            language_registry: language_registry.clone(),
+            language_registry,
            thread_store: thread_store.clone(),
-            thread: cx.new(|cx| {
-                ActiveThread::new(
-                    thread.clone(),
-                    thread_store.clone(),
-                    workspace,
-                    language_registry,
-                    tools.clone(),
-                    window,
-                    cx,
-                )
-            }),
+            thread,
            message_editor,
            context_store,
            context_editor: None,
            configuration: None,
            configuration_subscription: None,
-            tools,
            local_timezone: UtcOffset::from_whole_seconds(
                chrono::Local::now().offset().local_minus_utc(),
            )
@@ -242,11 +242,10 @@ impl AssistantPanel {
        self.active_view = ActiveView::Thread;
        self.thread = cx.new(|cx| {
            ActiveThread::new(
+                self.workspace.clone(),
                thread.clone(),
                self.thread_store.clone(),
-                self.workspace.clone(),
                self.language_registry.clone(),
-                self.tools.clone(),
                window,
                cx,
            )
@@ -377,11 +376,10 @@ impl AssistantPanel {
                this.active_view = ActiveView::Thread;
                this.thread = cx.new(|cx| {
                    ActiveThread::new(
+                        this.workspace.clone(),
                        thread.clone(),
                        this.thread_store.clone(),
-                        this.workspace.clone(),
                        this.language_registry.clone(),
-                        this.tools.clone(),
                        window,
                        cx,
                    )
@@ -608,7 +606,7 @@ impl AssistantPanel {
                    .id("title")
                    .overflow_x_scroll()
                    .px(DynamicSpacing::Base08.rems(cx))
-                    .child(Label::new(title).text_ellipsis()),
+                    .child(Label::new(title).truncate()),
            )
            .child(
                h_flex()
@@ -992,12 +990,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))
@@ -1012,12 +1019,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/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -14,7 +14,7 @@ use language_model::{
 };
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use rope::Rope;
 use smol::future::FutureExt;
 use std::{
--- 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,8 +27,9 @@ 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_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use settings::{Settings, SettingsStore};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
@@ -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/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -20,6 +20,7 @@ use gpui::{
    EventEmitter, FocusHandle, Focusable, FontWeight, Subscription, TextStyle, WeakEntity, Window,
 };
 use language_model::{LanguageModel, LanguageModelRegistry};
+use language_model_selector::ToggleModelSelector;
 use parking_lot::Mutex;
 use settings::Settings;
 use std::cmp;
@@ -102,11 +103,9 @@ impl<T: 'static> Render for PromptEditor<T> {
                    .items_start()
                    .cursor(CursorStyle::Arrow)
                    .on_action(cx.listener(Self::toggle_context_picker))
-                    .on_action(cx.listener(|this, action, window, cx| {
-                        let selector = this.model_selector.read(cx).selector.clone();
-                        selector.update(cx, |selector, cx| {
-                            selector.toggle_model_selector(action, window, cx);
-                        })
+                    .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::confirm))
                    .on_action(cx.listener(Self::cancel))
@@ -858,6 +857,7 @@ impl PromptEditor<BufferCodegen> {
            editor
        });
        let context_picker_menu_handle = PopoverMenuHandle::default();
+        let model_selector_menu_handle = PopoverMenuHandle::default();

        let context_strip = cx.new(|cx| {
            ContextStrip::new(
@@ -881,7 +881,13 @@ impl PromptEditor<BufferCodegen> {
            context_strip,
            context_picker_menu_handle,
            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(fs, prompt_editor.focus_handle(cx), window, cx)
+                AssistantModelSelector::new(
+                    fs,
+                    model_selector_menu_handle,
+                    prompt_editor.focus_handle(cx),
+                    window,
+                    cx,
+                )
            }),
            edited_since_done: false,
            prompt_history,
@@ -1006,6 +1012,7 @@ impl PromptEditor<TerminalCodegen> {
            editor
        });
        let context_picker_menu_handle = PopoverMenuHandle::default();
+        let model_selector_menu_handle = PopoverMenuHandle::default();

        let context_strip = cx.new(|cx| {
            ContextStrip::new(
@@ -1029,7 +1036,13 @@ impl PromptEditor<TerminalCodegen> {
            context_strip,
            context_picker_menu_handle,
            model_selector: cx.new(|cx| {
-                AssistantModelSelector::new(fs, prompt_editor.focus_handle(cx), window, cx)
+                AssistantModelSelector::new(
+                    fs,
+                    model_selector_menu_handle.clone(),
+                    prompt_editor.focus_handle(cx),
+                    window,
+                    cx,
+                )
            }),
            edited_since_done: false,
            prompt_history,
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -4,10 +4,11 @@ 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;
 use rope::Point;
 use settings::Settings;
 use std::time::Duration;
@@ -15,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;
@@ -53,6 +54,7 @@ impl MessageEditor {
        let context_store = cx.new(|_cx| ContextStore::new(workspace.clone()));
        let context_picker_menu_handle = PopoverMenuHandle::default();
        let inline_context_picker_menu_handle = PopoverMenuHandle::default();
+        let model_selector_menu_handle = PopoverMenuHandle::default();

        let editor = cx.new(|cx| {
            let mut editor = Editor::auto_height(10, window, cx);
@@ -105,8 +107,15 @@ impl MessageEditor {
            context_picker_menu_handle,
            inline_context_picker,
            inline_context_picker_menu_handle,
-            model_selector: cx
-                .new(|cx| AssistantModelSelector::new(fs, editor.focus_handle(cx), window, cx)),
+            model_selector: cx.new(|cx| {
+                AssistantModelSelector::new(
+                    fs,
+                    model_selector_menu_handle,
+                    editor.focus_handle(cx),
+                    window,
+                    cx,
+                )
+            }),
            use_tools: false,
            _subscriptions: subscriptions,
        }
@@ -289,168 +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, action, window, cx| {
-                let selector = this.model_selector.read(cx).selector.clone();
-                selector.update(cx, |this, cx| {
-                    this.toggle_model_selector(action, 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/terminal_inline_assistant.rs
+++ b/crates/assistant2/src/terminal_inline_assistant.rs
@@ -16,7 +16,7 @@ use language_model::{
    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
    LanguageModelRequestMessage, Role,
 };
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use std::sync::Arc;
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::TerminalView;
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -1,16 +1,21 @@
 use std::sync::Arc;

 use anyhow::Result;
+use assistant_scripting::{
+    Script, ScriptEvent, ScriptId, ScriptSession, ScriptTagParser, SCRIPTING_PROMPT,
+};
 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, AppContext, Context, Entity, EventEmitter, SharedString, Subscription, 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 +75,24 @@ 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,
+    scripts_by_assistant_message: HashMap<MessageId, ScriptId>,
+    script_output_messages: HashSet<MessageId>,
+    script_session: Entity<ScriptSession>,
+    _script_session_subscription: Subscription,
 }

 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 {
+        let script_session = cx.new(|cx| ScriptSession::new(project.clone(), cx));
+        let script_session_subscription = cx.subscribe(&script_session, Self::handle_script_event);
+
        Self {
            id: ThreadId::new(),
            updated_at: Utc::now(),
@@ -87,18 +104,33 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
+            project,
            tools,
-            tool_use: ToolUseState::default(),
+            tool_use: ToolUseState::new(),
+            scripts_by_assistant_message: HashMap::default(),
+            script_output_messages: HashSet::default(),
+            script_session,
+            _script_session_subscription: script_session_subscription,
        }
    }

    pub fn from_saved(
        id: ThreadId,
        saved: SavedThread,
+        project: Entity<Project>,
        tools: Arc<ToolWorkingSet>,
-        _cx: &mut Context<Self>,
+        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);
+        let script_session = cx.new(|cx| ScriptSession::new(project.clone(), cx));
+        let script_session_subscription = cx.subscribe(&script_session, Self::handle_script_event);

        Self {
            id,
@@ -119,8 +151,13 @@ impl Thread {
            context_by_message: HashMap::default(),
            completion_count: 0,
            pending_completions: Vec::new(),
+            project,
            tools,
-            tool_use: ToolUseState::default(),
+            tool_use,
+            scripts_by_assistant_message: HashMap::default(),
+            script_output_messages: HashSet::default(),
+            script_session,
+            _script_session_subscription: script_session_subscription,
        }
    }

@@ -185,25 +222,43 @@ 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)
    }

+    pub fn message_has_script_output(&self, message_id: MessageId) -> bool {
+        self.script_output_messages.contains(&message_id)
+    }
+
    pub fn insert_user_message(
        &mut self,
        text: impl Into<String>,
        context: Vec<ContextSnapshot>,
        cx: &mut Context<Self>,
-    ) {
+    ) -> MessageId {
        let message_id = self.insert_message(Role::User, text, cx);
        let context_ids = context.iter().map(|context| context.id).collect::<Vec<_>>();
        self.context
            .extend(context.into_iter().map(|context| (context.id, context)));
        self.context_by_message.insert(message_id, context_ids);
+        message_id
    }

    pub fn insert_message(
@@ -223,6 +278,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.
@@ -244,6 +327,39 @@ impl Thread {
        text
    }

+    pub fn script_for_message<'a>(
+        &'a self,
+        message_id: MessageId,
+        cx: &'a App,
+    ) -> Option<&'a Script> {
+        self.scripts_by_assistant_message
+            .get(&message_id)
+            .map(|script_id| self.script_session.read(cx).get(*script_id))
+    }
+
+    fn handle_script_event(
+        &mut self,
+        _script_session: Entity<ScriptSession>,
+        event: &ScriptEvent,
+        cx: &mut Context<Self>,
+    ) {
+        match event {
+            ScriptEvent::Spawned(_) => {}
+            ScriptEvent::Exited(script_id) => {
+                if let Some(output_message) = self
+                    .script_session
+                    .read(cx)
+                    .get(*script_id)
+                    .output_message_for_llm()
+                {
+                    let message_id = self.insert_user_message(output_message, vec![], cx);
+                    self.script_output_messages.insert(message_id);
+                    cx.emit(ThreadEvent::ScriptFinished)
+                }
+            }
+        }
+    }
+
    pub fn send_to_model(
        &mut self,
        model: Arc<dyn LanguageModel>,
@@ -272,7 +388,7 @@ impl Thread {
    pub fn to_completion_request(
        &self,
        request_kind: RequestKind,
-        _cx: &App,
+        cx: &App,
    ) -> LanguageModelRequest {
        let mut request = LanguageModelRequest {
            messages: vec![],
@@ -281,6 +397,12 @@ impl Thread {
            temperature: None,
        };

+        request.messages.push(LanguageModelRequestMessage {
+            role: Role::System,
+            content: vec![SCRIPTING_PROMPT.to_string().into()],
+            cache: true,
+        });
+
        let mut referenced_context_ids = HashSet::default();

        for message in &self.messages {
@@ -293,6 +415,7 @@ impl Thread {
                content: Vec::new(),
                cache: false,
            };
+
            match request_kind {
                RequestKind::Chat => {
                    self.tool_use
@@ -313,11 +436,20 @@ impl Thread {
                RequestKind::Chat => {
                    self.tool_use
                        .attach_tool_uses(message.id, &mut request_message);
+
+                    if matches!(message.role, Role::Assistant) {
+                        if let Some(script_id) = self.scripts_by_assistant_message.get(&message.id)
+                        {
+                            let script = self.script_session.read(cx).get(*script_id);
+
+                            request_message.content.push(script.source_tag().into());
+                        }
+                    }
                }
                RequestKind::Summarize => {
                    // We don't care about tool use during summarization.
                }
-            }
+            };

            request.messages.push(request_message);
        }
@@ -354,6 +486,8 @@ impl Thread {
            let stream_completion = async {
                let mut events = stream.await?;
                let mut stop_reason = StopReason::EndTurn;
+                let mut script_tag_parser = ScriptTagParser::new();
+                let mut script_id = None;

                while let Some(event) = events.next().await {
                    let event = event?;
@@ -368,19 +502,43 @@ impl Thread {
                            }
                            LanguageModelCompletionEvent::Text(chunk) => {
                                if let Some(last_message) = thread.messages.last_mut() {
-                                    if last_message.role == Role::Assistant {
-                                        last_message.text.push_str(&chunk);
+                                    let chunk = script_tag_parser.parse_chunk(&chunk);
+
+                                    let message_id = if last_message.role == Role::Assistant {
+                                        last_message.text.push_str(&chunk.content);
                                        cx.emit(ThreadEvent::StreamedAssistantText(
                                            last_message.id,
-                                            chunk,
+                                            chunk.content,
                                        ));
+                                        last_message.id
                                    } else {
                                        // If we won't have an Assistant message yet, assume this chunk marks the beginning
                                        // of a new Assistant response.
                                        //
                                        // Importantly: We do *not* want to emit a `StreamedAssistantText` event here, as it
                                        // will result in duplicating the text of the chunk in the rendered Markdown.
-                                        thread.insert_message(Role::Assistant, chunk, cx);
+                                        thread.insert_message(Role::Assistant, chunk.content, cx)
+                                    };
+
+                                    if script_id.is_none() && script_tag_parser.found_script() {
+                                        let id = thread
+                                            .script_session
+                                            .update(cx, |session, _cx| session.new_script());
+                                        thread.scripts_by_assistant_message.insert(message_id, id);
+
+                                        script_id = Some(id);
+                                    }
+
+                                    if let (Some(script_source), Some(script_id)) =
+                                        (chunk.script_source, script_id)
+                                    {
+                                        // TODO: move buffer to script and run as it streams
+                                        thread
+                                            .script_session
+                                            .update(cx, |this, cx| {
+                                                this.run_script(script_id, script_source, cx)
+                                            })
+                                            .detach_and_log_err(cx);
                                    }
                                }
                            }
@@ -510,6 +668,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 +711,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,12 +753,15 @@ pub enum ThreadEvent {
    StreamedCompletion,
    StreamedAssistantText(MessageId, String),
    MessageAdded(MessageId),
+    MessageEdited(MessageId),
+    MessageDeleted(MessageId),
    SummaryChanged,
    UsePendingTools,
    ToolFinished {
        #[allow(unused)]
        tool_use_id: LanguageModelToolUseId,
    },
+    ScriptFinished,
 }

 impl EventEmitter<ThreadEvent> for Thread {}
--- a/crates/assistant2/src/thread_history.rs
+++ b/crates/assistant2/src/thread_history.rs
@@ -33,9 +33,9 @@ impl ThreadHistory {
        }
    }

-    pub fn select_prev(
+    pub fn select_previous(
        &mut self,
-        _: &menu::SelectPrev,
+        _: &menu::SelectPrevious,
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
@@ -166,7 +166,7 @@ impl Render for ThreadHistory {
            .overflow_y_scroll()
            .size_full()
            .p_1()
-            .on_action(cx.listener(Self::select_prev))
+            .on_action(cx.listener(Self::select_previous))
            .on_action(cx.listener(Self::select_next))
            .on_action(cx.listener(Self::select_first))
            .on_action(cx.listener(Self::select_last))
@@ -260,7 +260,7 @@ impl RenderOnce for PastThread {
            .start_slot(
                div()
                    .max_w_4_5()
-                    .child(Label::new(summary).size(LabelSize::Small).text_ellipsis()),
+                    .child(Label::new(summary).size(LabelSize::Small).truncate()),
            )
            .end_slot(
                h_flex()
@@ -356,7 +356,7 @@ impl RenderOnce for PastContext {
        .start_slot(
            div()
                .max_w_4_5()
-                .child(Label::new(summary).size(LabelSize::Small).text_ellipsis()),
+                .child(Label::new(summary).size(LabelSize::Small).truncate()),
        )
        .end_slot(
            h_flex()
--- 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/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -37,7 +37,7 @@ parking_lot.workspace = true
 paths.workspace = true
 picker.workspace = true
 project.workspace = true
-prompt_library.workspace = true
+prompt_store.workspace = true
 regex.workspace = true
 rope.workspace = true
 rpc.workspace = true
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -27,7 +27,7 @@ use language_model::{
 use open_ai::Model as OpenAiModel;
 use paths::contexts_dir;
 use project::Project;
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::{
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
@@ -20,7 +20,7 @@ use language_model::{LanguageModelCacheConfiguration, LanguageModelRegistry, Rol
 use parking_lot::Mutex;
 use pretty_assertions::assert_eq;
 use project::Project;
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use rand::prelude::*;
 use serde_json::json;
 use settings::SettingsStore;
@@ -671,7 +671,7 @@ async fn test_slash_commands(cx: &mut TestAppContext) {

 #[gpui::test]
 async fn test_workflow_step_parsing(cx: &mut TestAppContext) {
-    cx.update(prompt_library::init);
+    cx.update(prompt_store::init);
    let mut settings_store = cx.update(SettingsStore::test);
    cx.update(|cx| {
        settings_store
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -37,7 +37,9 @@ use language_model::{
    LanguageModelImage, LanguageModelProvider, LanguageModelProviderTosView, LanguageModelRegistry,
    Role,
 };
-use language_model_selector::{AssistantLanguageModelSelector, LanguageModelSelector};
+use language_model_selector::{
+    LanguageModelSelector, LanguageModelSelectorPopoverMenu, ToggleModelSelector,
+};
 use multi_buffer::MultiBufferRow;
 use picker::Picker;
 use project::lsp_store::LocalLspAdapterDelegate;
@@ -52,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,
@@ -196,6 +198,7 @@ pub struct ContextEditor {
    // context editor, we keep a reference here.
    dragged_file_worktrees: Vec<Entity<Worktree>>,
    language_model_selector: Entity<LanguageModelSelector>,
+    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

 pub const DEFAULT_TAB_TITLE: &str = "New Chat";
@@ -249,21 +252,6 @@ impl ContextEditor {
            cx.observe_global_in::<SettingsStore>(window, Self::settings_changed),
        ];

-        let fs_clone = fs.clone();
-        let language_model_selector = cx.new(|cx| {
-            LanguageModelSelector::new(
-                move |model, cx| {
-                    update_settings_file::<AssistantSettings>(
-                        fs_clone.clone(),
-                        cx,
-                        move |settings, _| settings.set_model(model.clone()),
-                    );
-                },
-                window,
-                cx,
-            )
-        });
-
        let sections = context.read(cx).slash_command_output_sections().to_vec();
        let patch_ranges = context.read(cx).patch_ranges().collect::<Vec<_>>();
        let slash_commands = context.read(cx).slash_commands().clone();
@@ -276,7 +264,7 @@ impl ContextEditor {
            image_blocks: Default::default(),
            scroll_position: None,
            remote_id: None,
-            fs,
+            fs: fs.clone(),
            workspace,
            project,
            pending_slash_command_creases: HashMap::default(),
@@ -288,7 +276,20 @@ impl ContextEditor {
            show_accept_terms: false,
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
-            language_model_selector,
+            language_model_selector: cx.new(|cx| {
+                LanguageModelSelector::new(
+                    move |model, cx| {
+                        update_settings_file::<AssistantSettings>(
+                            fs.clone(),
+                            cx,
+                            move |settings, _| settings.set_model(model.clone()),
+                        );
+                    },
+                    window,
+                    cx,
+                )
+            }),
+            language_model_selector_menu_handle: PopoverMenuHandle::default(),
        };
        this.update_message_headers(cx);
        this.update_image_blocks(cx);
@@ -1240,7 +1241,7 @@ impl ContextEditor {
            .child("Press")
            .child(
                h_flex()
-                    .rounded_md()
+                    .rounded_sm()
                    .px_1()
                    .mr_0p5()
                    .border_1()
@@ -2091,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()
@@ -2388,6 +2389,46 @@ impl ContextEditor {
        )
    }

+    fn render_language_model_selector(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+        let focus_handle = self.editor().focus_handle(cx).clone();
+        let model_name = match active_model {
+            Some(model) => model.name().0,
+            None => SharedString::from("No model selected"),
+        };
+
+        LanguageModelSelectorPopoverMenu::new(
+            self.language_model_selector.clone(),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .gap_0p5()
+                        .child(
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                ),
+            move |window, cx| {
+                Tooltip::for_action_in(
+                    "Change Model",
+                    &ToggleModelSelector,
+                    &focus_handle,
+                    window,
+                    cx,
+                )
+            },
+            gpui::Corner::BottomLeft,
+        )
+        .with_handle(self.language_model_selector_menu_handle.clone())
+    }
+
    fn render_last_error(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let last_error = self.last_error.as_ref()?;

@@ -2832,7 +2873,7 @@ impl Render for ContextEditor {
            None
        };

-        let language_model_selector = self.language_model_selector.clone();
+        let language_model_selector = self.language_model_selector_menu_handle.clone();
        v_flex()
            .key_context("ContextEditor")
            .capture_action(cx.listener(ContextEditor::cancel))
@@ -2845,10 +2886,8 @@ impl Render for ContextEditor {
            .on_action(cx.listener(ContextEditor::edit))
            .on_action(cx.listener(ContextEditor::assist))
            .on_action(cx.listener(ContextEditor::split))
-            .on_action(move |action, window, cx| {
-                language_model_selector.update(cx, |this, cx| {
-                    this.toggle_model_selector(action, window, cx);
-                })
+            .on_action(move |_: &ToggleModelSelector, window, cx| {
+                language_model_selector.toggle(window, cx);
            })
            .size_full()
            .children(self.render_notice(cx))
@@ -2887,14 +2926,11 @@ impl Render for ContextEditor {
                                .gap_1()
                                .child(self.render_inject_context_menu(cx))
                                .child(ui::Divider::vertical())
-                                .child(div().pl_0p5().child({
-                                    let focus_handle = self.editor().focus_handle(cx).clone();
-                                    AssistantLanguageModelSelector::new(
-                                        focus_handle,
-                                        self.language_model_selector.clone(),
-                                    )
-                                    .render(window, cx)
-                                })),
+                                .child(
+                                    div()
+                                        .pl_0p5()
+                                        .child(self.render_language_model_selector(cx)),
+                                ),
                        )
                        .child(
                            h_flex()
@@ -3070,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)
        })
    }
 }
@@ -3385,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
@@ -16,7 +16,7 @@ use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task,
 use language::LanguageRegistry;
 use paths::contexts_dir;
 use project::Project;
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use regex::Regex;
 use rpc::AnyProtoClient;
 use std::sync::LazyLock;
@@ -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_context_editor/src/slash_command_picker.rs
+++ b/crates/assistant_context_editor/src/slash_command_picker.rs
@@ -207,24 +207,31 @@ impl PickerDelegate for SlashCommandDelegate {
                            .child(
                                h_flex()
                                    .gap_1p5()
-                                    .child(Icon::new(info.icon).size(IconSize::XSmall))
-                                    .child(div().font_buffer(cx).child({
+                                    .child(
+                                        Icon::new(info.icon)
+                                            .size(IconSize::XSmall)
+                                            .color(Color::Muted),
+                                    )
+                                    .child({
                                        let mut label = format!("{}", info.name);
                                        if let Some(args) = info.args.as_ref().filter(|_| selected)
                                        {
                                            label.push_str(&args);
                                        }
-                                        Label::new(label).single_line().size(LabelSize::Small)
-                                    }))
+                                        Label::new(label)
+                                            .single_line()
+                                            .size(LabelSize::Small)
+                                            .buffer_font(cx)
+                                    })
                                    .children(info.args.clone().filter(|_| !selected).map(
                                        |args| {
                                            div()
-                                                .font_buffer(cx)
                                                .child(
                                                    Label::new(args)
                                                        .single_line()
                                                        .size(LabelSize::Small)
-                                                        .color(Color::Muted),
+                                                        .color(Color::Muted)
+                                                        .buffer_font(cx),
                                                )
                                                .visible_on_hover(format!(
                                                    "command-entry-label-{ix}"
@@ -236,7 +243,7 @@ impl PickerDelegate for SlashCommandDelegate {
                                Label::new(info.description.clone())
                                    .size(LabelSize::Small)
                                    .color(Color::Muted)
-                                    .text_ellipsis(),
+                                    .truncate(),
                            ),
                    ),
            ),
@@ -294,10 +301,9 @@ where
                                        .gap_1p5()
                                        .child(Icon::new(IconName::Plus).size(IconSize::XSmall))
                                        .child(
-                                            div().font_buffer(cx).child(
-                                                Label::new("create-your-command")
-                                                    .size(LabelSize::Small),
-                                            ),
+                                            Label::new("create-your-command")
+                                                .size(LabelSize::Small)
+                                                .buffer_font(cx),
                                        ),
                                )
                                .child(
@@ -341,7 +347,7 @@ where
            .anchor(gpui::Corner::BottomLeft)
            .offset(gpui::Point {
                x: px(0.0),
-                y: px(-16.0),
+                y: px(-2.0),
            })
            .when_some(handle, |this, handle| this.with_handle(handle))
    }
--- a/crates/assistant_scripting/Cargo.toml
+++ b/crates/assistant_scripting/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "assistant_scripting"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant_scripting.rs"
+doctest = false
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+futures.workspace = true
+gpui.workspace = true
+log.workspace = true
+mlua.workspace = true
+parking_lot.workspace = true
+project.workspace = true
+regex.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+util.workspace = true
+
+[dev-dependencies]
+collections = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, features = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
+rand.workspace = true
+settings = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_scripting/LICENSE-GPL
+++ b/crates/assistant_scripting/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
--- a/crates/assistant_scripting/src/assistant_scripting.rs
+++ b/crates/assistant_scripting/src/assistant_scripting.rs
@@ -0,0 +1,7 @@
+mod session;
+mod tag;
+
+pub use session::*;
+pub use tag::*;
+
+pub const SCRIPTING_PROMPT: &str = include_str!("./system_prompt.txt");
--- a/crates/assistant_scripting/src/sandbox_preamble.lua
+++ b/crates/assistant_scripting/src/sandbox_preamble.lua
@@ -0,0 +1,43 @@
+---@diagnostic disable: undefined-global
+
+-- Create a sandbox environment
+local sandbox = {}
+
+-- Allow access to standard libraries (safe subset)
+sandbox.string = string
+sandbox.table = table
+sandbox.math = math
+sandbox.print = sb_print
+sandbox.type = type
+sandbox.tostring = tostring
+sandbox.tonumber = tonumber
+sandbox.pairs = pairs
+sandbox.ipairs = ipairs
+
+-- Access to custom functions
+sandbox.search = search
+sandbox.outline = outline
+
+-- Create a sandboxed version of LuaFileIO
+local io = {}
+
+-- File functions
+io.open = sb_io_open
+
+-- Add the sandboxed io library to the sandbox environment
+sandbox.io = io
+
+
+-- Load the script with the sandbox environment
+local user_script_fn, err = load(user_script, nil, "t", sandbox)
+
+if not user_script_fn then
+  error("Failed to load user script: " .. tostring(err))
+end
+
+-- Execute the user script within the sandbox
+local success, result = pcall(user_script_fn)
+
+if not success then
+  error("Error executing user script: " .. tostring(result))
+end
--- a/crates/assistant_scripting/src/session.rs
+++ b/crates/assistant_scripting/src/session.rs
@@ -0,0 +1,945 @@
+use anyhow::anyhow;
+use collections::{HashMap, HashSet};
+use futures::{
+    channel::{mpsc, oneshot},
+    pin_mut, SinkExt, StreamExt,
+};
+use gpui::{AppContext, AsyncApp, Context, Entity, EventEmitter, SharedString, Task, WeakEntity};
+use mlua::{ExternalResult, Lua, MultiValue, Table, UserData, UserDataMethods};
+use parking_lot::Mutex;
+use project::{search::SearchQuery, Fs, Project};
+use regex::Regex;
+use std::{
+    cell::RefCell,
+    path::{Path, PathBuf},
+    sync::Arc,
+};
+use util::{paths::PathMatcher, ResultExt};
+
+use crate::{SCRIPT_END_TAG, SCRIPT_START_TAG};
+
+struct ForegroundFn(Box<dyn FnOnce(WeakEntity<ScriptSession>, AsyncApp) + Send>);
+
+pub struct ScriptSession {
+    project: Entity<Project>,
+    // TODO Remove this
+    fs_changes: Arc<Mutex<HashMap<PathBuf, Vec<u8>>>>,
+    foreground_fns_tx: mpsc::Sender<ForegroundFn>,
+    _invoke_foreground_fns: Task<()>,
+    scripts: Vec<Script>,
+}
+
+impl ScriptSession {
+    pub fn new(project: Entity<Project>, cx: &mut Context<Self>) -> Self {
+        let (foreground_fns_tx, mut foreground_fns_rx) = mpsc::channel(128);
+        ScriptSession {
+            project,
+            fs_changes: Arc::new(Mutex::new(HashMap::default())),
+            foreground_fns_tx,
+            _invoke_foreground_fns: cx.spawn(|this, cx| async move {
+                while let Some(foreground_fn) = foreground_fns_rx.next().await {
+                    foreground_fn.0(this.clone(), cx.clone());
+                }
+            }),
+            scripts: Vec::new(),
+        }
+    }
+
+    pub fn new_script(&mut self) -> ScriptId {
+        let id = ScriptId(self.scripts.len() as u32);
+        let script = Script {
+            id,
+            state: ScriptState::Generating,
+            source: SharedString::new_static(""),
+        };
+        self.scripts.push(script);
+        id
+    }
+
+    pub fn run_script(
+        &mut self,
+        script_id: ScriptId,
+        script_src: String,
+        cx: &mut Context<Self>,
+    ) -> Task<anyhow::Result<()>> {
+        let script = self.get_mut(script_id);
+
+        let stdout = Arc::new(Mutex::new(String::new()));
+        script.source = script_src.clone().into();
+        script.state = ScriptState::Running {
+            stdout: stdout.clone(),
+        };
+
+        let task = self.run_lua(script_src, stdout, cx);
+
+        cx.emit(ScriptEvent::Spawned(script_id));
+
+        cx.spawn(|session, mut cx| async move {
+            let result = task.await;
+
+            session.update(&mut cx, |session, cx| {
+                let script = session.get_mut(script_id);
+                let stdout = script.stdout_snapshot();
+
+                script.state = match result {
+                    Ok(()) => ScriptState::Succeeded { stdout },
+                    Err(error) => ScriptState::Failed { stdout, error },
+                };
+
+                cx.emit(ScriptEvent::Exited(script_id))
+            })
+        })
+    }
+
+    fn run_lua(
+        &mut self,
+        script: String,
+        stdout: Arc<Mutex<String>>,
+        cx: &mut Context<Self>,
+    ) -> Task<anyhow::Result<()>> {
+        const SANDBOX_PREAMBLE: &str = include_str!("sandbox_preamble.lua");
+
+        // TODO Remove fs_changes
+        let fs_changes = self.fs_changes.clone();
+        // TODO Honor all worktrees instead of the first one
+        let root_dir = self
+            .project
+            .read(cx)
+            .visible_worktrees(cx)
+            .next()
+            .map(|worktree| worktree.read(cx).abs_path());
+
+        let fs = self.project.read(cx).fs().clone();
+        let foreground_fns_tx = self.foreground_fns_tx.clone();
+
+        let task = cx.background_spawn({
+            let stdout = stdout.clone();
+
+            async move {
+                let lua = Lua::new();
+                lua.set_memory_limit(2 * 1024 * 1024 * 1024)?; // 2 GB
+                let globals = lua.globals();
+                globals.set(
+                    "sb_print",
+                    lua.create_function({
+                        let stdout = stdout.clone();
+                        move |_, args: MultiValue| Self::print(args, &stdout)
+                    })?,
+                )?;
+                globals.set(
+                    "search",
+                    lua.create_async_function({
+                        let foreground_fns_tx = foreground_fns_tx.clone();
+                        move |lua, regex| {
+                            let mut foreground_fns_tx = foreground_fns_tx.clone();
+                            let fs = fs.clone();
+                            async move {
+                                Self::search(&lua, &mut foreground_fns_tx, fs, regex)
+                                    .await
+                                    .into_lua_err()
+                            }
+                        }
+                    })?,
+                )?;
+                globals.set(
+                    "outline",
+                    lua.create_async_function({
+                        let root_dir = root_dir.clone();
+                        move |_lua, path| {
+                            let mut foreground_fns_tx = foreground_fns_tx.clone();
+                            let root_dir = root_dir.clone();
+                            async move {
+                                Self::outline(root_dir, &mut foreground_fns_tx, path)
+                                    .await
+                                    .into_lua_err()
+                            }
+                        }
+                    })?,
+                )?;
+                globals.set(
+                    "sb_io_open",
+                    lua.create_function({
+                        let fs_changes = fs_changes.clone();
+                        let root_dir = root_dir.clone();
+                        move |lua, (path_str, mode)| {
+                            Self::io_open(&lua, &fs_changes, root_dir.as_ref(), path_str, mode)
+                        }
+                    })?,
+                )?;
+                globals.set("user_script", script)?;
+
+                lua.load(SANDBOX_PREAMBLE).exec_async().await?;
+
+                // Drop Lua instance to decrement reference count.
+                drop(lua);
+
+                anyhow::Ok(())
+            }
+        });
+
+        task
+    }
+
+    pub fn get(&self, script_id: ScriptId) -> &Script {
+        &self.scripts[script_id.0 as usize]
+    }
+
+    fn get_mut(&mut self, script_id: ScriptId) -> &mut Script {
+        &mut self.scripts[script_id.0 as usize]
+    }
+
+    /// Sandboxed print() function in Lua.
+    fn print(args: MultiValue, stdout: &Mutex<String>) -> mlua::Result<()> {
+        for (index, arg) in args.into_iter().enumerate() {
+            // Lua's `print()` prints tab characters between each argument.
+            if index > 0 {
+                stdout.lock().push('\t');
+            }
+
+            // If the argument's to_string() fails, have the whole function call fail.
+            stdout.lock().push_str(&arg.to_string()?);
+        }
+        stdout.lock().push('\n');
+
+        Ok(())
+    }
+
+    /// Sandboxed io.open() function in Lua.
+    fn io_open(
+        lua: &Lua,
+        fs_changes: &Arc<Mutex<HashMap<PathBuf, Vec<u8>>>>,
+        root_dir: Option<&Arc<Path>>,
+        path_str: String,
+        mode: Option<String>,
+    ) -> mlua::Result<(Option<Table>, String)> {
+        let root_dir = root_dir
+            .ok_or_else(|| mlua::Error::runtime("cannot open file without a root directory"))?;
+
+        let mode = mode.unwrap_or_else(|| "r".to_string());
+
+        // Parse the mode string to determine read/write permissions
+        let read_perm = mode.contains('r');
+        let write_perm = mode.contains('w') || mode.contains('a') || mode.contains('+');
+        let append = mode.contains('a');
+        let truncate = mode.contains('w');
+
+        // This will be the Lua value returned from the `open` function.
+        let file = lua.create_table()?;
+
+        // Store file metadata in the file
+        file.set("__path", path_str.clone())?;
+        file.set("__mode", mode.clone())?;
+        file.set("__read_perm", read_perm)?;
+        file.set("__write_perm", write_perm)?;
+
+        let path = match Self::parse_abs_path_in_root_dir(&root_dir, &path_str) {
+            Ok(path) => path,
+            Err(err) => return Ok((None, format!("{err}"))),
+        };
+
+        // close method
+        let close_fn = {
+            let fs_changes = fs_changes.clone();
+            lua.create_function(move |_lua, file_userdata: mlua::Table| {
+                let write_perm = file_userdata.get::<bool>("__write_perm")?;
+                let path = file_userdata.get::<String>("__path")?;
+
+                if write_perm {
+                    // When closing a writable file, record the content
+                    let content = file_userdata.get::<mlua::AnyUserData>("__content")?;
+                    let content_ref = content.borrow::<FileContent>()?;
+                    let content_vec = content_ref.0.borrow();
+
+                    // Don't actually write to disk; instead, just update fs_changes.
+                    let path_buf = PathBuf::from(&path);
+                    fs_changes
+                        .lock()
+                        .insert(path_buf.clone(), content_vec.clone());
+                }
+
+                Ok(true)
+            })?
+        };
+        file.set("close", close_fn)?;
+
+        // If it's a directory, give it a custom read() and return early.
+        if path.is_dir() {
+            // TODO handle the case where we changed it in the in-memory fs
+
+            // Create a special directory handle
+            file.set("__is_directory", true)?;
+
+            // Store directory entries
+            let entries = match std::fs::read_dir(&path) {
+                Ok(entries) => {
+                    let mut entry_names = Vec::new();
+                    for entry in entries.flatten() {
+                        entry_names.push(entry.file_name().to_string_lossy().into_owned());
+                    }
+                    entry_names
+                }
+                Err(e) => return Ok((None, format!("Error reading directory: {}", e))),
+            };
+
+            // Save the list of entries
+            file.set("__dir_entries", entries)?;
+            file.set("__dir_position", 0usize)?;
+
+            // Create a directory-specific read function
+            let read_fn = lua.create_function(|_lua, file_userdata: mlua::Table| {
+                let position = file_userdata.get::<usize>("__dir_position")?;
+                let entries = file_userdata.get::<Vec<String>>("__dir_entries")?;
+
+                if position >= entries.len() {
+                    return Ok(None); // No more entries
+                }
+
+                let entry = entries[position].clone();
+                file_userdata.set("__dir_position", position + 1)?;
+
+                Ok(Some(entry))
+            })?;
+            file.set("read", read_fn)?;
+
+            // If we got this far, the directory was opened successfully
+            return Ok((Some(file), String::new()));
+        }
+
+        let fs_changes_map = fs_changes.lock();
+
+        let is_in_changes = fs_changes_map.contains_key(&path);
+        let file_exists = is_in_changes || path.exists();
+        let mut file_content = Vec::new();
+
+        if file_exists && !truncate {
+            if is_in_changes {
+                file_content = fs_changes_map.get(&path).unwrap().clone();
+            } else {
+                // Try to read existing content if file exists and we're not truncating
+                match std::fs::read(&path) {
+                    Ok(content) => file_content = content,
+                    Err(e) => return Ok((None, format!("Error reading file: {}", e))),
+                }
+            }
+        }
+
+        drop(fs_changes_map); // Unlock the fs_changes mutex.
+
+        // If in append mode, position should be at the end
+        let position = if append && file_exists {
+            file_content.len()
+        } else {
+            0
+        };
+        file.set("__position", position)?;
+        file.set(
+            "__content",
+            lua.create_userdata(FileContent(RefCell::new(file_content)))?,
+        )?;
+
+        // Create file methods
+
+        // read method
+        let read_fn = {
+            lua.create_function(
+                |_lua, (file_userdata, format): (mlua::Table, Option<mlua::Value>)| {
+                    let read_perm = file_userdata.get::<bool>("__read_perm")?;
+                    if !read_perm {
+                        return Err(mlua::Error::runtime("File not open for reading"));
+                    }
+
+                    let content = file_userdata.get::<mlua::AnyUserData>("__content")?;
+                    let mut position = file_userdata.get::<usize>("__position")?;
+                    let content_ref = content.borrow::<FileContent>()?;
+                    let content_vec = content_ref.0.borrow();
+
+                    if position >= content_vec.len() {
+                        return Ok(None); // EOF
+                    }
+
+                    match format {
+                        Some(mlua::Value::String(s)) => {
+                            let lossy_string = s.to_string_lossy();
+                            let format_str: &str = lossy_string.as_ref();
+
+                            // Only consider the first 2 bytes, since it's common to pass e.g. "*all"  instead of "*a"
+                            match &format_str[0..2] {
+                                "*a" => {
+                                    // Read entire file from current position
+                                    let result = String::from_utf8_lossy(&content_vec[position..])
+                                        .to_string();
+                                    position = content_vec.len();
+                                    file_userdata.set("__position", position)?;
+                                    Ok(Some(result))
+                                }
+                                "*l" => {
+                                    // Read next line
+                                    let mut line = Vec::new();
+                                    let mut found_newline = false;
+
+                                    while position < content_vec.len() {
+                                        let byte = content_vec[position];
+                                        position += 1;
+
+                                        if byte == b'\n' {
+                                            found_newline = true;
+                                            break;
+                                        }
+
+                                        // Skip \r in \r\n sequence but add it if it's alone
+                                        if byte == b'\r' {
+                                            if position < content_vec.len()
+                                                && content_vec[position] == b'\n'
+                                            {
+                                                position += 1;
+                                                found_newline = true;
+                                                break;
+                                            }
+                                        }
+
+                                        line.push(byte);
+                                    }
+
+                                    file_userdata.set("__position", position)?;
+
+                                    if !found_newline
+                                        && line.is_empty()
+                                        && position >= content_vec.len()
+                                    {
+                                        return Ok(None); // EOF
+                                    }
+
+                                    let result = String::from_utf8_lossy(&line).to_string();
+                                    Ok(Some(result))
+                                }
+                                "*n" => {
+                                    // Try to parse as a number (number of bytes to read)
+                                    match format_str.parse::<usize>() {
+                                        Ok(n) => {
+                                            let end =
+                                                std::cmp::min(position + n, content_vec.len());
+                                            let bytes = &content_vec[position..end];
+                                            let result = String::from_utf8_lossy(bytes).to_string();
+                                            position = end;
+                                            file_userdata.set("__position", position)?;
+                                            Ok(Some(result))
+                                        }
+                                        Err(_) => Err(mlua::Error::runtime(format!(
+                                            "Invalid format: {}",
+                                            format_str
+                                        ))),
+                                    }
+                                }
+                                "*L" => {
+                                    // Read next line keeping the end of line
+                                    let mut line = Vec::new();
+
+                                    while position < content_vec.len() {
+                                        let byte = content_vec[position];
+                                        position += 1;
+
+                                        line.push(byte);
+
+                                        if byte == b'\n' {
+                                            break;
+                                        }
+
+                                        // If we encounter a \r, add it and check if the next is \n
+                                        if byte == b'\r'
+                                            && position < content_vec.len()
+                                            && content_vec[position] == b'\n'
+                                        {
+                                            line.push(content_vec[position]);
+                                            position += 1;
+                                            break;
+                                        }
+                                    }
+
+                                    file_userdata.set("__position", position)?;
+
+                                    if line.is_empty() && position >= content_vec.len() {
+                                        return Ok(None); // EOF
+                                    }
+
+                                    let result = String::from_utf8_lossy(&line).to_string();
+                                    Ok(Some(result))
+                                }
+                                _ => Err(mlua::Error::runtime(format!(
+                                    "Unsupported format: {}",
+                                    format_str
+                                ))),
+                            }
+                        }
+                        Some(mlua::Value::Number(n)) => {
+                            // Read n bytes
+                            let n = n as usize;
+                            let end = std::cmp::min(position + n, content_vec.len());
+                            let bytes = &content_vec[position..end];
+                            let result = String::from_utf8_lossy(bytes).to_string();
+                            position = end;
+                            file_userdata.set("__position", position)?;
+                            Ok(Some(result))
+                        }
+                        Some(_) => Err(mlua::Error::runtime("Invalid format")),
+                        None => {
+                            // Default is to read a line
+                            let mut line = Vec::new();
+                            let mut found_newline = false;
+
+                            while position < content_vec.len() {
+                                let byte = content_vec[position];
+                                position += 1;
+
+                                if byte == b'\n' {
+                                    found_newline = true;
+                                    break;
+                                }
+
+                                // Handle \r\n
+                                if byte == b'\r' {
+                                    if position < content_vec.len()
+                                        && content_vec[position] == b'\n'
+                                    {
+                                        position += 1;
+                                        found_newline = true;
+                                        break;
+                                    }
+                                }
+
+                                line.push(byte);
+                            }
+
+                            file_userdata.set("__position", position)?;
+
+                            if !found_newline && line.is_empty() && position >= content_vec.len() {
+                                return Ok(None); // EOF
+                            }
+
+                            let result = String::from_utf8_lossy(&line).to_string();
+                            Ok(Some(result))
+                        }
+                    }
+                },
+            )?
+        };
+        file.set("read", read_fn)?;
+
+        // write method
+        let write_fn = {
+            let fs_changes = fs_changes.clone();
+
+            lua.create_function(move |_lua, (file_userdata, text): (mlua::Table, String)| {
+                let write_perm = file_userdata.get::<bool>("__write_perm")?;
+                if !write_perm {
+                    return Err(mlua::Error::runtime("File not open for writing"));
+                }
+
+                let content = file_userdata.get::<mlua::AnyUserData>("__content")?;
+                let position = file_userdata.get::<usize>("__position")?;
+                let content_ref = content.borrow::<FileContent>()?;
+                let mut content_vec = content_ref.0.borrow_mut();
+
+                let bytes = text.as_bytes();
+
+                // Ensure the vector has enough capacity
+                if position + bytes.len() > content_vec.len() {
+                    content_vec.resize(position + bytes.len(), 0);
+                }
+
+                // Write the bytes
+                for (i, &byte) in bytes.iter().enumerate() {
+                    content_vec[position + i] = byte;
+                }
+
+                // Update position
+                let new_position = position + bytes.len();
+                file_userdata.set("__position", new_position)?;
+
+                // Update fs_changes
+                let path = file_userdata.get::<String>("__path")?;
+                let path_buf = PathBuf::from(path);
+                fs_changes.lock().insert(path_buf, content_vec.clone());
+
+                Ok(true)
+            })?
+        };
+        file.set("write", write_fn)?;
+
+        // If we got this far, the file was opened successfully
+        Ok((Some(file), String::new()))
+    }
+
+    async fn search(
+        lua: &Lua,
+        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
+        fs: Arc<dyn Fs>,
+        regex: String,
+    ) -> anyhow::Result<Table> {
+        // TODO: Allow specification of these options.
+        let search_query = SearchQuery::regex(
+            &regex,
+            false,
+            false,
+            false,
+            PathMatcher::default(),
+            PathMatcher::default(),
+            None,
+        );
+        let search_query = match search_query {
+            Ok(query) => query,
+            Err(e) => return Err(anyhow!("Invalid search query: {}", e)),
+        };
+
+        // TODO: Should use `search_query.regex`. The tool description should also be updated,
+        // as it specifies standard regex.
+        let search_regex = match Regex::new(&regex) {
+            Ok(re) => re,
+            Err(e) => return Err(anyhow!("Invalid regex: {}", e)),
+        };
+
+        let mut abs_paths_rx = Self::find_search_candidates(search_query, foreground_tx).await?;
+
+        let mut search_results: Vec<Table> = Vec::new();
+        while let Some(path) = abs_paths_rx.next().await {
+            // Skip files larger than 1MB
+            if let Ok(Some(metadata)) = fs.metadata(&path).await {
+                if metadata.len > 1_000_000 {
+                    continue;
+                }
+            }
+
+            // Attempt to read the file as text
+            if let Ok(content) = fs.load(&path).await {
+                let mut matches = Vec::new();
+
+                // Find all regex matches in the content
+                for capture in search_regex.find_iter(&content) {
+                    matches.push(capture.as_str().to_string());
+                }
+
+                // If we found matches, create a result entry
+                if !matches.is_empty() {
+                    let result_entry = lua.create_table()?;
+                    result_entry.set("path", path.to_string_lossy().to_string())?;
+
+                    let matches_table = lua.create_table()?;
+                    for (ix, m) in matches.iter().enumerate() {
+                        matches_table.set(ix + 1, m.clone())?;
+                    }
+                    result_entry.set("matches", matches_table)?;
+
+                    search_results.push(result_entry);
+                }
+            }
+        }
+
+        // Create a table to hold our results
+        let results_table = lua.create_table()?;
+        for (ix, entry) in search_results.into_iter().enumerate() {
+            results_table.set(ix + 1, entry)?;
+        }
+
+        Ok(results_table)
+    }
+
+    async fn find_search_candidates(
+        search_query: SearchQuery,
+        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
+    ) -> anyhow::Result<mpsc::UnboundedReceiver<PathBuf>> {
+        Self::run_foreground_fn(
+            "finding search file candidates",
+            foreground_tx,
+            Box::new(move |session, mut cx| {
+                session.update(&mut cx, |session, cx| {
+                    session.project.update(cx, |project, cx| {
+                        project.worktree_store().update(cx, |worktree_store, cx| {
+                            // TODO: Better limit? For now this is the same as
+                            // MAX_SEARCH_RESULT_FILES.
+                            let limit = 5000;
+                            // TODO: Providing non-empty open_entries can make this a bit more
+                            // efficient as it can skip checking that these paths are textual.
+                            let open_entries = HashSet::default();
+                            let candidates = worktree_store.find_search_candidates(
+                                search_query,
+                                limit,
+                                open_entries,
+                                project.fs().clone(),
+                                cx,
+                            );
+                            let (abs_paths_tx, abs_paths_rx) = mpsc::unbounded();
+                            cx.spawn(|worktree_store, cx| async move {
+                                pin_mut!(candidates);
+
+                                while let Some(project_path) = candidates.next().await {
+                                    worktree_store.read_with(&cx, |worktree_store, cx| {
+                                        if let Some(worktree) = worktree_store
+                                            .worktree_for_id(project_path.worktree_id, cx)
+                                        {
+                                            if let Some(abs_path) = worktree
+                                                .read(cx)
+                                                .absolutize(&project_path.path)
+                                                .log_err()
+                                            {
+                                                abs_paths_tx.unbounded_send(abs_path)?;
+                                            }
+                                        }
+                                        anyhow::Ok(())
+                                    })??;
+                                }
+                                anyhow::Ok(())
+                            })
+                            .detach();
+                            abs_paths_rx
+                        })
+                    })
+                })
+            }),
+        )
+        .await?
+    }
+
+    async fn outline(
+        root_dir: Option<Arc<Path>>,
+        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
+        path_str: String,
+    ) -> anyhow::Result<String> {
+        let root_dir = root_dir
+            .ok_or_else(|| mlua::Error::runtime("cannot get outline without a root directory"))?;
+        let path = Self::parse_abs_path_in_root_dir(&root_dir, &path_str)?;
+        let outline = Self::run_foreground_fn(
+            "getting code outline",
+            foreground_tx,
+            Box::new(move |session, cx| {
+                cx.spawn(move |mut cx| async move {
+                    // TODO: This will not use file content from `fs_changes`. It will also reflect
+                    // user changes that have not been saved.
+                    let buffer = session
+                        .update(&mut cx, |session, cx| {
+                            session
+                                .project
+                                .update(cx, |project, cx| project.open_local_buffer(&path, cx))
+                        })?
+                        .await?;
+                    buffer.update(&mut cx, |buffer, _cx| {
+                        if let Some(outline) = buffer.snapshot().outline(None) {
+                            Ok(outline)
+                        } else {
+                            Err(anyhow!("No outline for file {path_str}"))
+                        }
+                    })
+                })
+            }),
+        )
+        .await?
+        .await??;
+
+        Ok(outline
+            .items
+            .into_iter()
+            .map(|item| {
+                if item.text.contains('\n') {
+                    log::error!("Outline item unexpectedly contains newline");
+                }
+                format!("{}{}", "  ".repeat(item.depth), item.text)
+            })
+            .collect::<Vec<String>>()
+            .join("\n"))
+    }
+
+    async fn run_foreground_fn<R: Send + 'static>(
+        description: &str,
+        foreground_tx: &mut mpsc::Sender<ForegroundFn>,
+        function: Box<dyn FnOnce(WeakEntity<Self>, AsyncApp) -> R + Send>,
+    ) -> anyhow::Result<R> {
+        let (response_tx, response_rx) = oneshot::channel();
+        let send_result = foreground_tx
+            .send(ForegroundFn(Box::new(move |this, cx| {
+                response_tx.send(function(this, cx)).ok();
+            })))
+            .await;
+        match send_result {
+            Ok(()) => (),
+            Err(err) => {
+                return Err(anyhow::Error::new(err).context(format!(
+                    "Internal error while enqueuing work for {description}"
+                )));
+            }
+        }
+        match response_rx.await {
+            Ok(result) => Ok(result),
+            Err(oneshot::Canceled) => Err(anyhow!(
+                "Internal error: response oneshot was canceled while {description}."
+            )),
+        }
+    }
+
+    fn parse_abs_path_in_root_dir(root_dir: &Path, path_str: &str) -> anyhow::Result<PathBuf> {
+        let path = Path::new(&path_str);
+        if path.is_absolute() {
+            // Check if path starts with root_dir prefix without resolving symlinks
+            if path.starts_with(&root_dir) {
+                Ok(path.to_path_buf())
+            } else {
+                Err(anyhow!(
+                    "Error: Absolute path {} is outside the current working directory",
+                    path_str
+                ))
+            }
+        } else {
+            // TODO: Does use of `../` break sandbox - is path canonicalization needed?
+            Ok(root_dir.join(path))
+        }
+    }
+}
+
+struct FileContent(RefCell<Vec<u8>>);
+
+impl UserData for FileContent {
+    fn add_methods<M: UserDataMethods<Self>>(_methods: &mut M) {
+        // FileContent doesn't have any methods so far.
+    }
+}
+
+#[derive(Debug)]
+pub enum ScriptEvent {
+    Spawned(ScriptId),
+    Exited(ScriptId),
+}
+
+impl EventEmitter<ScriptEvent> for ScriptSession {}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct ScriptId(u32);
+
+pub struct Script {
+    pub id: ScriptId,
+    pub state: ScriptState,
+    pub source: SharedString,
+}
+
+pub enum ScriptState {
+    Generating,
+    Running {
+        stdout: Arc<Mutex<String>>,
+    },
+    Succeeded {
+        stdout: String,
+    },
+    Failed {
+        stdout: String,
+        error: anyhow::Error,
+    },
+}
+
+impl Script {
+    pub fn source_tag(&self) -> String {
+        format!("{}{}{}", SCRIPT_START_TAG, self.source, SCRIPT_END_TAG)
+    }
+
+    /// If exited, returns a message with the output for the LLM
+    pub fn output_message_for_llm(&self) -> Option<String> {
+        match &self.state {
+            ScriptState::Generating { .. } => None,
+            ScriptState::Running { .. } => None,
+            ScriptState::Succeeded { stdout } => {
+                format!("Here's the script output:\n{}", stdout).into()
+            }
+            ScriptState::Failed { stdout, error } => format!(
+                "The script failed with:\n{}\n\nHere's the output it managed to print:\n{}",
+                error, stdout
+            )
+            .into(),
+        }
+    }
+
+    /// Get a snapshot of the script's stdout
+    pub fn stdout_snapshot(&self) -> String {
+        match &self.state {
+            ScriptState::Generating { .. } => String::new(),
+            ScriptState::Running { stdout } => stdout.lock().clone(),
+            ScriptState::Succeeded { stdout } => stdout.clone(),
+            ScriptState::Failed { stdout, .. } => stdout.clone(),
+        }
+    }
+
+    /// Returns the error if the script failed, otherwise None
+    pub fn error(&self) -> Option<&anyhow::Error> {
+        match &self.state {
+            ScriptState::Generating { .. } => None,
+            ScriptState::Running { .. } => None,
+            ScriptState::Succeeded { .. } => None,
+            ScriptState::Failed { error, .. } => Some(error),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use gpui::TestAppContext;
+    use project::FakeFs;
+    use serde_json::json;
+    use settings::SettingsStore;
+
+    use super::*;
+
+    #[gpui::test]
+    async fn test_print(cx: &mut TestAppContext) {
+        let script = r#"
+            print("Hello", "world!")
+            print("Goodbye", "moon!")
+        "#;
+
+        let output = test_script(script, cx).await.unwrap();
+        assert_eq!(output, "Hello\tworld!\nGoodbye\tmoon!\n");
+    }
+
+    #[gpui::test]
+    async fn test_search(cx: &mut TestAppContext) {
+        let script = r#"
+            local results = search("world")
+            for i, result in ipairs(results) do
+                print("File: " .. result.path)
+                print("Matches:")
+                for j, match in ipairs(result.matches) do
+                    print("  " .. match)
+                end
+            end
+        "#;
+
+        let output = test_script(script, cx).await.unwrap();
+        assert_eq!(output, "File: /file1.txt\nMatches:\n  world\n");
+    }
+
+    async fn test_script(source: &str, cx: &mut TestAppContext) -> anyhow::Result<String> {
+        init_test(cx);
+        let fs = FakeFs::new(cx.executor());
+        fs.insert_tree(
+            "/",
+            json!({
+                "file1.txt": "Hello world!",
+                "file2.txt": "Goodbye moon!"
+            }),
+        )
+        .await;
+
+        let project = Project::test(fs, [Path::new("/")], cx).await;
+        let session = cx.new(|cx| ScriptSession::new(project, cx));
+
+        let (script_id, task) = session.update(cx, |session, cx| {
+            let script_id = session.new_script();
+            let task = session.run_script(script_id, source.to_string(), cx);
+
+            (script_id, task)
+        });
+
+        task.await?;
+
+        Ok(session.read_with(cx, |session, _cx| session.get(script_id).stdout_snapshot()))
+    }
+
+    fn init_test(cx: &mut TestAppContext) {
+        let settings_store = cx.update(SettingsStore::test);
+        cx.set_global(settings_store);
+        cx.update(Project::init_settings);
+    }
+}
--- a/crates/assistant_scripting/src/system_prompt.txt
+++ b/crates/assistant_scripting/src/system_prompt.txt
@@ -0,0 +1,36 @@
+You can write a Lua script and I'll run it on my codebase and tell you what its
+output was, including both stdout as well as the git diff of changes it made to
+the filesystem. That way, you can get more information about the code base, or
+make changes to the code base directly.
+
+Put the Lua script inside of an `<eval>` tag like so:
+
+<eval type="lua">
+print("Hello, world!")
+</eval>
+
+The Lua script will have access to `io` and it will run with the current working
+directory being in the root of the code base, so you can use it to explore,
+search, make changes, etc. You can also have the script print things, and I'll
+tell you what the output was. Note that `io` only has `open`, and then the file
+it returns only has the methods read, write, and close - it doesn't have popen
+or anything else.
+
+There is a function called `search` which accepts a regex (it's implemented
+using Rust's regex crate, so use that regex syntax) and runs that regex on the
+contents of every file in the code base (aside from gitignored files), then
+returns an array of tables with two fields: "path" (the path to the file that
+had the matches) and "matches" (an array of strings, with each string being a
+match that was found within the file).
+
+There is a function called `outline` which accepts the path to a source file,
+and returns a string where each line is a declaration. These lines are indented
+with 2 spaces to indicate when a declaration is inside another.
+
+When I send you the script output, do not thank me for running it,
+act as if you ran it yourself.
+
+IMPORTANT!
+Only include a maximum of one Lua script at the very end of your message
+DO NOT WRITE ANYTHING ELSE AFTER THE SCRIPT. Wait for my response with the script
+output to continue.
--- a/crates/assistant_scripting/src/tag.rs
+++ b/crates/assistant_scripting/src/tag.rs
@@ -0,0 +1,260 @@
+pub const SCRIPT_START_TAG: &str = "<eval type=\"lua\">";
+pub const SCRIPT_END_TAG: &str = "</eval>";
+
+const START_TAG: &[u8] = SCRIPT_START_TAG.as_bytes();
+const END_TAG: &[u8] = SCRIPT_END_TAG.as_bytes();
+
+/// Parses a script tag in an assistant message as it is being streamed.
+pub struct ScriptTagParser {
+    state: State,
+    buffer: Vec<u8>,
+    tag_match_ix: usize,
+}
+
+enum State {
+    Unstarted,
+    Streaming,
+    Ended,
+}
+
+#[derive(Debug, PartialEq)]
+pub struct ChunkOutput {
+    /// The chunk with script tags removed.
+    pub content: String,
+    /// The full script tag content. `None` until closed.
+    pub script_source: Option<String>,
+}
+
+impl ScriptTagParser {
+    /// Create a new script tag parser.
+    pub fn new() -> Self {
+        Self {
+            state: State::Unstarted,
+            buffer: Vec::new(),
+            tag_match_ix: 0,
+        }
+    }
+
+    /// Returns true if the parser has found a script tag.
+    pub fn found_script(&self) -> bool {
+        match self.state {
+            State::Unstarted => false,
+            State::Streaming | State::Ended => true,
+        }
+    }
+
+    /// Process a new chunk of input, splitting it into surrounding content and script source.
+    pub fn parse_chunk(&mut self, input: &str) -> ChunkOutput {
+        let mut content = Vec::with_capacity(input.len());
+
+        for byte in input.bytes() {
+            match self.state {
+                State::Unstarted => {
+                    if collect_until_tag(byte, START_TAG, &mut self.tag_match_ix, &mut content) {
+                        self.state = State::Streaming;
+                        self.buffer = Vec::with_capacity(1024);
+                        self.tag_match_ix = 0;
+                    }
+                }
+                State::Streaming => {
+                    if collect_until_tag(byte, END_TAG, &mut self.tag_match_ix, &mut self.buffer) {
+                        self.state = State::Ended;
+                    }
+                }
+                State::Ended => content.push(byte),
+            }
+        }
+
+        let content = unsafe { String::from_utf8_unchecked(content) };
+
+        let script_source = if matches!(self.state, State::Ended) && !self.buffer.is_empty() {
+            let source = unsafe { String::from_utf8_unchecked(std::mem::take(&mut self.buffer)) };
+
+            Some(source)
+        } else {
+            None
+        };
+
+        ChunkOutput {
+            content,
+            script_source,
+        }
+    }
+}
+
+fn collect_until_tag(byte: u8, tag: &[u8], tag_match_ix: &mut usize, buffer: &mut Vec<u8>) -> bool {
+    // this can't be a method because it'd require a mutable borrow on both self and self.buffer
+
+    if match_tag_byte(byte, tag, tag_match_ix) {
+        *tag_match_ix >= tag.len()
+    } else {
+        if *tag_match_ix > 0 {
+            // push the partially matched tag to the buffer
+            buffer.extend_from_slice(&tag[..*tag_match_ix]);
+            *tag_match_ix = 0;
+
+            // the tag might start to match again
+            if match_tag_byte(byte, tag, tag_match_ix) {
+                return *tag_match_ix >= tag.len();
+            }
+        }
+
+        buffer.push(byte);
+
+        false
+    }
+}
+
+fn match_tag_byte(byte: u8, tag: &[u8], tag_match_ix: &mut usize) -> bool {
+    if byte == tag[*tag_match_ix] {
+        *tag_match_ix += 1;
+        true
+    } else {
+        false
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_complete_tag() {
+        let mut parser = ScriptTagParser::new();
+        let input = "<eval type=\"lua\">print(\"Hello, World!\")</eval>";
+        let result = parser.parse_chunk(input);
+        assert_eq!(result.content, "");
+        assert_eq!(
+            result.script_source,
+            Some("print(\"Hello, World!\")".to_string())
+        );
+    }
+
+    #[test]
+    fn test_no_tag() {
+        let mut parser = ScriptTagParser::new();
+        let input = "No tags here, just plain text";
+        let result = parser.parse_chunk(input);
+        assert_eq!(result.content, "No tags here, just plain text");
+        assert_eq!(result.script_source, None);
+    }
+
+    #[test]
+    fn test_partial_end_tag() {
+        let mut parser = ScriptTagParser::new();
+
+        // Start the tag
+        let result = parser.parse_chunk("<eval type=\"lua\">let x = '</e");
+        assert_eq!(result.content, "");
+        assert_eq!(result.script_source, None);
+
+        // Finish with the rest
+        let result = parser.parse_chunk("val' + 'not the end';</eval>");
+        assert_eq!(result.content, "");
+        assert_eq!(
+            result.script_source,
+            Some("let x = '</eval' + 'not the end';".to_string())
+        );
+    }
+
+    #[test]
+    fn test_text_before_and_after_tag() {
+        let mut parser = ScriptTagParser::new();
+        let input = "Before tag <eval type=\"lua\">print(\"Hello\")</eval> After tag";
+        let result = parser.parse_chunk(input);
+        assert_eq!(result.content, "Before tag  After tag");
+        assert_eq!(result.script_source, Some("print(\"Hello\")".to_string()));
+    }
+
+    #[test]
+    fn test_multiple_chunks_with_surrounding_text() {
+        let mut parser = ScriptTagParser::new();
+
+        // First chunk with text before
+        let result = parser.parse_chunk("Before script <eval type=\"lua\">local x = 10");
+        assert_eq!(result.content, "Before script ");
+        assert_eq!(result.script_source, None);
+
+        // Second chunk with script content
+        let result = parser.parse_chunk("\nlocal y = 20");
+        assert_eq!(result.content, "");
+        assert_eq!(result.script_source, None);
+
+        // Last chunk with text after
+        let result = parser.parse_chunk("\nprint(x + y)</eval> After script");
+        assert_eq!(result.content, " After script");
+        assert_eq!(
+            result.script_source,
+            Some("local x = 10\nlocal y = 20\nprint(x + y)".to_string())
+        );
+
+        let result = parser.parse_chunk(" there's more text");
+        assert_eq!(result.content, " there's more text");
+        assert_eq!(result.script_source, None);
+    }
+
+    #[test]
+    fn test_partial_start_tag_matching() {
+        let mut parser = ScriptTagParser::new();
+
+        // partial match of start tag...
+        let result = parser.parse_chunk("<ev");
+        assert_eq!(result.content, "");
+
+        // ...that's abandandoned when the < of a real tag is encountered
+        let result = parser.parse_chunk("<eval type=\"lua\">script content</eval>");
+        // ...so it gets pushed to content
+        assert_eq!(result.content, "<ev");
+        // ...and the real tag is parsed correctly
+        assert_eq!(result.script_source, Some("script content".to_string()));
+    }
+
+    #[test]
+    fn test_random_chunked_parsing() {
+        use rand::rngs::StdRng;
+        use rand::{Rng, SeedableRng};
+        use std::time::{SystemTime, UNIX_EPOCH};
+
+        let test_inputs = [
+            "Before <eval type=\"lua\">print(\"Hello\")</eval> After",
+            "No tags here at all",
+            "<eval type=\"lua\">local x = 10\nlocal y = 20\nprint(x + y)</eval>",
+            "Text <eval type=\"lua\">if true then\nprint(\"nested </e\")\nend</eval> more",
+        ];
+
+        let seed = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+
+        eprintln!("Using random seed: {}", seed);
+        let mut rng = StdRng::seed_from_u64(seed);
+
+        for test_input in &test_inputs {
+            let mut reference_parser = ScriptTagParser::new();
+            let expected = reference_parser.parse_chunk(test_input);
+
+            let mut chunked_parser = ScriptTagParser::new();
+            let mut remaining = test_input.as_bytes();
+            let mut actual_content = String::new();
+            let mut actual_script = None;
+
+            while !remaining.is_empty() {
+                let chunk_size = rng.gen_range(1..=remaining.len().min(5));
+                let (chunk, rest) = remaining.split_at(chunk_size);
+                remaining = rest;
+
+                let chunk_str = std::str::from_utf8(chunk).unwrap();
+                let result = chunked_parser.parse_chunk(chunk_str);
+
+                actual_content.push_str(&result.content);
+                if result.script_source.is_some() {
+                    actual_script = result.script_source;
+                }
+            }
+
+            assert_eq!(actual_content, expected.content);
+            assert_eq!(actual_script, expected.script_source);
+        }
+    }
+}
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -32,7 +32,7 @@ language.workspace = true
 language_model.workspace = true
 log.workspace = true
 project.workspace = true
-prompt_library.workspace = true
+prompt_store.workspace = true
 rope.workspace = true
 schemars.workspace = true
 semantic_index.workspace = true
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ b/crates/assistant_slash_commands/src/default_command.rs
@@ -5,7 +5,7 @@ use assistant_slash_command::{
 };
 use gpui::{Task, WeakEntity};
 use language::{BufferSnapshot, LspAdapterDelegate};
-use prompt_library::PromptStore;
+use prompt_store::PromptStore;
 use std::{
    fmt::Write,
    sync::{atomic::AtomicBool, Arc},
--- a/crates/assistant_slash_commands/src/project_command.rs
+++ b/crates/assistant_slash_commands/src/project_command.rs
@@ -13,7 +13,7 @@ use feature_flags::FeatureFlag;
 use gpui::{App, Task, WeakEntity};
 use language::{Anchor, CodeLabel, LspAdapterDelegate};
 use language_model::{LanguageModelRegistry, LanguageModelTool};
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;
 use schemars::JsonSchema;
 use semantic_index::SemanticDb;
 use serde::Deserialize;
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -5,7 +5,7 @@ use assistant_slash_command::{
 };
 use gpui::{Task, WeakEntity};
 use language::{BufferSnapshot, LspAdapterDelegate};
-use prompt_library::PromptStore;
+use prompt_store::PromptStore;
 use std::sync::{atomic::AtomicBool, Arc};
 use ui::prelude::*;
 use workspace::Workspace;
--- 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/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -141,19 +141,20 @@ pub fn notify_if_app_was_updated(cx: &mut App) {
                    cx,
                    move |cx| {
                        let workspace_handle = cx.entity().downgrade();
-                        cx.new(|_cx| {
-                            MessageNotification::new(format!("Updated to {app_name} {}", version))
-                                .primary_message("View Release Notes")
-                                .primary_on_click(move |window, cx| {
-                                    if let Some(workspace) = workspace_handle.upgrade() {
-                                        workspace.update(cx, |workspace, cx| {
-                                            crate::view_release_notes_locally(
-                                                workspace, window, cx,
-                                            );
-                                        })
-                                    }
-                                    cx.emit(DismissEvent);
-                                })
+                        cx.new(|cx| {
+                            MessageNotification::new(
+                                format!("Updated to {app_name} {}", version),
+                                cx,
+                            )
+                            .primary_message("View Release Notes")
+                            .primary_on_click(move |window, cx| {
+                                if let Some(workspace) = workspace_handle.upgrade() {
+                                    workspace.update(cx, |workspace, cx| {
+                                        crate::view_release_notes_locally(workspace, window, cx);
+                                    })
+                                }
+                                cx.emit(DismissEvent);
+                            })
                        })
                    },
                );
--- a/crates/breadcrumbs/src/breadcrumbs.rs
+++ b/crates/breadcrumbs/src/breadcrumbs.rs
@@ -82,7 +82,7 @@ impl Render for Breadcrumbs {
            text_style.color = Color::Muted.color(cx);

            StyledText::new(segment.text.replace('\n', "⏎"))
-                .with_highlights(&text_style, segment.highlights.unwrap_or_default())
+                .with_default_highlights(&text_style, segment.highlights.unwrap_or_default())
                .into_any()
        });
        let breadcrumbs = Itertools::intersperse_with(highlighted_segments, || {
--- a/crates/buffer_diff/Cargo.toml
+++ b/crates/buffer_diff/Cargo.toml
@@ -16,6 +16,7 @@ test-support = []

 [dependencies]
 anyhow.workspace = true
+clock.workspace = true
 futures.workspace = true
 git2.workspace = true
 gpui.workspace = true
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
@@ -1,11 +1,12 @@
-use futures::{channel::oneshot, future::OptionFuture};
+use futures::channel::oneshot;
 use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as GitPatch};
-use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task};
 use language::{Language, LanguageRegistry};
 use rope::Rope;
 use std::cmp::Ordering;
+use std::mem;
 use std::{future::Future, iter, ops::Range, sync::Arc};
-use sum_tree::SumTree;
+use sum_tree::{SumTree, TreeMap};
 use text::ToOffset as _;
 use text::{Anchor, Bias, BufferId, OffsetRangeExt, Point};
 use util::ResultExt;
@@ -20,13 +21,14 @@ pub struct BufferDiff {
 pub struct BufferDiffSnapshot {
    inner: BufferDiffInner,
    secondary_diff: Option<Box<BufferDiffSnapshot>>,
-    pub is_single_insertion: bool,
 }

 #[derive(Clone)]
 struct BufferDiffInner {
    hunks: SumTree<InternalDiffHunk>,
-    base_text: Option<language::BufferSnapshot>,
+    pending_hunks: TreeMap<usize, PendingHunk>,
+    base_text: language::BufferSnapshot,
+    base_text_exists: bool,
 }

 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -47,23 +49,15 @@ pub enum DiffHunkSecondaryStatus {
    HasSecondaryHunk,
    OverlapsWithSecondaryHunk,
    None,
-}
-
-impl DiffHunkSecondaryStatus {
-    pub fn is_secondary(&self) -> bool {
-        match self {
-            DiffHunkSecondaryStatus::HasSecondaryHunk => true,
-            DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk => true,
-            DiffHunkSecondaryStatus::None => false,
-        }
-    }
+    SecondaryHunkAdditionPending,
+    SecondaryHunkRemovalPending,
 }

 /// A diff hunk resolved to rows in the buffer.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DiffHunk {
-    /// The buffer range, expressed in terms of rows.
-    pub row_range: Range<u32>,
+    /// The buffer range as points.
+    pub range: Range<Point>,
    /// The range in the buffer to which this hunk corresponds.
    pub buffer_range: Range<Anchor>,
    /// The range in the buffer's diff base text to which this hunk corresponds.
@@ -78,6 +72,17 @@ struct InternalDiffHunk {
    diff_base_byte_range: Range<usize>,
 }

+#[derive(Debug, Clone, PartialEq, Eq)]
+struct PendingHunk {
+    buffer_version: clock::Global,
+    new_status: DiffHunkSecondaryStatus,
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct DiffHunkSummary {
+    buffer_range: Range<Anchor>,
+}
+
 impl sum_tree::Item for InternalDiffHunk {
    type Summary = DiffHunkSummary;

@@ -88,11 +93,6 @@ impl sum_tree::Item for InternalDiffHunk {
    }
 }

-#[derive(Debug, Default, Clone)]
-pub struct DiffHunkSummary {
-    buffer_range: Range<Anchor>,
-}
-
 impl sum_tree::Summary for DiffHunkSummary {
    type Context = text::BufferSnapshot;

@@ -159,131 +159,166 @@ impl BufferDiffSnapshot {
        self.inner.hunks_intersecting_range_rev(range, buffer)
    }

-    pub fn base_text(&self) -> Option<&language::BufferSnapshot> {
-        self.inner.base_text.as_ref()
+    pub fn base_text(&self) -> &language::BufferSnapshot {
+        &self.inner.base_text
    }

    pub fn base_texts_eq(&self, other: &Self) -> bool {
-        match (other.base_text(), self.base_text()) {
-            (None, None) => true,
-            (None, Some(_)) => false,
-            (Some(_), None) => false,
-            (Some(old), Some(new)) => {
-                let (old_id, old_empty) = (old.remote_id(), old.is_empty());
-                let (new_id, new_empty) = (new.remote_id(), new.is_empty());
-                new_id == old_id || (new_empty && old_empty)
-            }
+        if self.inner.base_text_exists != other.inner.base_text_exists {
+            return false;
        }
+        let left = &self.inner.base_text;
+        let right = &other.inner.base_text;
+        let (old_id, old_empty) = (left.remote_id(), left.is_empty());
+        let (new_id, new_empty) = (right.remote_id(), right.is_empty());
+        new_id == old_id || (new_empty && old_empty)
    }
+}

-    pub fn new_secondary_text_for_stage_or_unstage(
-        &self,
+impl BufferDiffInner {
+    fn stage_or_unstage_hunks(
+        &mut self,
+        unstaged_diff: &Self,
        stage: bool,
-        hunks: impl Iterator<Item = (Range<Anchor>, Range<usize>)>,
+        hunks: &[DiffHunk],
        buffer: &text::BufferSnapshot,
-        cx: &mut App,
-    ) -> Option<Rope> {
-        let secondary_diff = self.secondary_diff()?;
-        let head_text = self.base_text().map(|text| text.as_rope().clone());
-        let index_text = secondary_diff
-            .base_text()
-            .map(|text| text.as_rope().clone());
+        file_exists: bool,
+    ) -> (Option<Rope>, Vec<(usize, PendingHunk)>) {
+        let head_text = self
+            .base_text_exists
+            .then(|| self.base_text.as_rope().clone());
+        let index_text = unstaged_diff
+            .base_text_exists
+            .then(|| unstaged_diff.base_text.as_rope().clone());
+
+        // If the file doesn't exist in either HEAD or the index, then the
+        // entire file must be either created or deleted in the index.
        let (index_text, head_text) = match (index_text, head_text) {
-            (Some(index_text), Some(head_text)) => (index_text, head_text),
-            // file is deleted in both index and head
-            (None, None) => return None,
-            // file is deleted in index
-            (None, Some(head_text)) => {
-                return if stage {
-                    Some(buffer.as_rope().clone())
+            (Some(index_text), Some(head_text)) if file_exists || !stage => (index_text, head_text),
+            (_, head_text @ _) => {
+                if stage {
+                    log::debug!("stage all");
+                    return (
+                        file_exists.then(|| buffer.as_rope().clone()),
+                        vec![(
+                            0,
+                            PendingHunk {
+                                buffer_version: buffer.version().clone(),
+                                new_status: DiffHunkSecondaryStatus::SecondaryHunkRemovalPending,
+                            },
+                        )],
+                    );
                } else {
-                    Some(head_text)
-                }
-            }
-            // file exists in the index, but is deleted in head
-            (Some(_), None) => {
-                return if stage {
-                    Some(buffer.as_rope().clone())
-                } else {
-                    None
+                    log::debug!("unstage all");
+                    return (
+                        head_text,
+                        vec![(
+                            0,
+                            PendingHunk {
+                                buffer_version: buffer.version().clone(),
+                                new_status: DiffHunkSecondaryStatus::SecondaryHunkAdditionPending,
+                            },
+                        )],
+                    );
                }
            }
        };

-        let mut secondary_cursor = secondary_diff.inner.hunks.cursor::<DiffHunkSummary>(buffer);
-        secondary_cursor.next(buffer);
+        let mut unstaged_hunk_cursor = unstaged_diff.hunks.cursor::<DiffHunkSummary>(buffer);
+        unstaged_hunk_cursor.next(buffer);
        let mut edits = Vec::new();
-        let mut prev_secondary_hunk_buffer_offset = 0;
-        let mut prev_secondary_hunk_base_text_offset = 0;
-        for (buffer_range, diff_base_byte_range) in hunks {
-            let skipped_hunks = secondary_cursor.slice(&buffer_range.start, Bias::Left, buffer);
+        let mut pending_hunks = Vec::new();
+        let mut prev_unstaged_hunk_buffer_offset = 0;
+        let mut prev_unstaged_hunk_base_text_offset = 0;
+        for DiffHunk {
+            buffer_range,
+            diff_base_byte_range,
+            secondary_status,
+            ..
+        } in hunks.iter().cloned()
+        {
+            if (stage && secondary_status == DiffHunkSecondaryStatus::None)
+                || (!stage && secondary_status == DiffHunkSecondaryStatus::HasSecondaryHunk)
+            {
+                continue;
+            }
+
+            let skipped_hunks = unstaged_hunk_cursor.slice(&buffer_range.start, Bias::Left, buffer);

            if let Some(secondary_hunk) = skipped_hunks.last() {
-                prev_secondary_hunk_base_text_offset = secondary_hunk.diff_base_byte_range.end;
-                prev_secondary_hunk_buffer_offset =
+                prev_unstaged_hunk_base_text_offset = secondary_hunk.diff_base_byte_range.end;
+                prev_unstaged_hunk_buffer_offset =
                    secondary_hunk.buffer_range.end.to_offset(buffer);
            }

            let mut buffer_offset_range = buffer_range.to_offset(buffer);
-            let start_overshoot = buffer_offset_range.start - prev_secondary_hunk_buffer_offset;
-            let mut secondary_base_text_start =
-                prev_secondary_hunk_base_text_offset + start_overshoot;
+            let start_overshoot = buffer_offset_range.start - prev_unstaged_hunk_buffer_offset;
+            let mut index_start = prev_unstaged_hunk_base_text_offset + start_overshoot;

-            while let Some(secondary_hunk) = secondary_cursor.item().filter(|item| {
+            while let Some(unstaged_hunk) = unstaged_hunk_cursor.item().filter(|item| {
                item.buffer_range
                    .start
                    .cmp(&buffer_range.end, buffer)
                    .is_le()
            }) {
-                let secondary_hunk_offset_range = secondary_hunk.buffer_range.to_offset(buffer);
-                prev_secondary_hunk_base_text_offset = secondary_hunk.diff_base_byte_range.end;
-                prev_secondary_hunk_buffer_offset = secondary_hunk_offset_range.end;
+                let unstaged_hunk_offset_range = unstaged_hunk.buffer_range.to_offset(buffer);
+                prev_unstaged_hunk_base_text_offset = unstaged_hunk.diff_base_byte_range.end;
+                prev_unstaged_hunk_buffer_offset = unstaged_hunk_offset_range.end;

-                secondary_base_text_start =
-                    secondary_base_text_start.min(secondary_hunk.diff_base_byte_range.start);
+                index_start = index_start.min(unstaged_hunk.diff_base_byte_range.start);
                buffer_offset_range.start = buffer_offset_range
                    .start
-                    .min(secondary_hunk_offset_range.start);
+                    .min(unstaged_hunk_offset_range.start);

-                secondary_cursor.next(buffer);
+                unstaged_hunk_cursor.next(buffer);
            }

            let end_overshoot = buffer_offset_range
                .end
-                .saturating_sub(prev_secondary_hunk_buffer_offset);
-            let secondary_base_text_end = prev_secondary_hunk_base_text_offset + end_overshoot;
+                .saturating_sub(prev_unstaged_hunk_buffer_offset);
+            let index_end = prev_unstaged_hunk_base_text_offset + end_overshoot;

-            let secondary_base_text_range = secondary_base_text_start..secondary_base_text_end;
+            let index_range = index_start..index_end;
            buffer_offset_range.end = buffer_offset_range
                .end
-                .max(prev_secondary_hunk_buffer_offset);
+                .max(prev_unstaged_hunk_buffer_offset);

            let replacement_text = if stage {
-                log::debug!("staging");
+                log::debug!("stage hunk {:?}", buffer_offset_range);
                buffer
                    .text_for_range(buffer_offset_range)
                    .collect::<String>()
            } else {
-                log::debug!("unstaging");
+                log::debug!("unstage hunk {:?}", buffer_offset_range);
                head_text
                    .chunks_in_range(diff_base_byte_range.clone())
                    .collect::<String>()
            };
-            edits.push((secondary_base_text_range, replacement_text));
+            pending_hunks.push((
+                diff_base_byte_range.start,
+                PendingHunk {
+                    buffer_version: buffer.version().clone(),
+                    new_status: if stage {
+                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
+                    } else {
+                        DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
+                    },
+                },
+            ));
+            edits.push((index_range, replacement_text));
        }

-        let buffer = cx.new(|cx| {
-            language::Buffer::local_normalized(index_text, text::LineEnding::default(), cx)
-        });
-        let new_text = buffer.update(cx, |buffer, cx| {
-            buffer.edit(edits, None, cx);
-            buffer.as_rope().clone()
-        });
-        Some(new_text)
+        let mut new_index_text = Rope::new();
+        let mut index_cursor = index_text.cursor(0);
+        for (old_range, replacement_text) in edits {
+            new_index_text.append(index_cursor.slice(old_range.start));
+            index_cursor.seek_forward(old_range.end);
+            new_index_text.push(&replacement_text);
+        }
+        new_index_text.append(index_cursor.suffix());
+        (Some(new_index_text), pending_hunks)
    }
-}

-impl BufferDiffInner {
    fn hunks_intersecting_range<'a>(
        &'a self,
        range: Range<Anchor>,
@@ -318,12 +353,16 @@ impl BufferDiffInner {
            ]
        });

-        let mut secondary_cursor = secondary.as_ref().map(|diff| {
-            let mut cursor = diff.hunks.cursor::<DiffHunkSummary>(buffer);
+        let mut secondary_cursor = None;
+        let mut pending_hunks = TreeMap::default();
+        if let Some(secondary) = secondary.as_ref() {
+            let mut cursor = secondary.hunks.cursor::<DiffHunkSummary>(buffer);
            cursor.next(buffer);
-            cursor
-        });
+            secondary_cursor = Some(cursor);
+            pending_hunks = secondary.pending_hunks.clone();
+        }

+        let max_point = buffer.max_point();
        let mut summaries = buffer.summaries_for_anchors_with_payload::<Point, _, _>(anchor_iter);
        iter::from_fn(move || loop {
            let (start_point, (start_anchor, start_base)) = summaries.next()?;
@@ -333,14 +372,26 @@ impl BufferDiffInner {
                continue;
            }

-            if end_point.column > 0 {
+            if end_point.column > 0 && end_point < max_point {
                end_point.row += 1;
                end_point.column = 0;
                end_anchor = buffer.anchor_before(end_point);
            }

            let mut secondary_status = DiffHunkSecondaryStatus::None;
-            if let Some(secondary_cursor) = secondary_cursor.as_mut() {
+
+            let mut has_pending = false;
+            if let Some(pending_hunk) = pending_hunks.get(&start_base) {
+                if !buffer.has_edits_since_in_range(
+                    &pending_hunk.buffer_version,
+                    start_anchor..end_anchor,
+                ) {
+                    has_pending = true;
+                    secondary_status = pending_hunk.new_status;
+                }
+            }
+
+            if let (Some(secondary_cursor), false) = (secondary_cursor.as_mut(), has_pending) {
                if start_anchor
                    .cmp(&secondary_cursor.start().buffer_range.start, buffer)
                    .is_gt()
@@ -354,18 +405,19 @@ impl BufferDiffInner {
                        secondary_range.end.row += 1;
                        secondary_range.end.column = 0;
                    }
-                    if secondary_range == (start_point..end_point) {
+                    if secondary_range.is_empty() && secondary_hunk.diff_base_byte_range.is_empty()
+                    {
+                        // ignore
+                    } else if secondary_range == (start_point..end_point) {
                        secondary_status = DiffHunkSecondaryStatus::HasSecondaryHunk;
                    } else if secondary_range.start <= end_point {
                        secondary_status = DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk;
                    }
                }
-            } else {
-                log::debug!("no secondary cursor!!");
            }

            return Some(DiffHunk {
-                row_range: start_point.row..end_point.row,
+                range: start_point..end_point,
                diff_base_byte_range: start_base..end_base,
                buffer_range: start_anchor..end_anchor,
                secondary_status,
@@ -391,14 +443,9 @@ impl BufferDiffInner {

            let hunk = cursor.item()?;
            let range = hunk.buffer_range.to_point(buffer);
-            let end_row = if range.end.column > 0 {
-                range.end.row + 1
-            } else {
-                range.end.row
-            };

            Some(DiffHunk {
-                row_range: range.start.row..end_row,
+                range,
                diff_base_byte_range: hunk.diff_base_byte_range.clone(),
                buffer_range: hunk.buffer_range.clone(),
                // The secondary status is not used by callers of this method.
@@ -518,6 +565,14 @@ fn compute_hunks(
                tree.push(hunk, &buffer);
            }
        }
+    } else {
+        tree.push(
+            InternalDiffHunk {
+                buffer_range: Anchor::MIN..Anchor::MAX,
+                diff_base_byte_range: 0..0,
+            },
+            &buffer,
+        );
    }

    tree
@@ -608,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 {}
@@ -631,95 +688,71 @@ impl BufferDiff {

    fn build(
        buffer: text::BufferSnapshot,
-        diff_base: Option<Arc<String>>,
+        base_text: Option<Arc<String>>,
        language: Option<Arc<Language>>,
        language_registry: Option<Arc<LanguageRegistry>>,
        cx: &mut App,
    ) -> impl Future<Output = BufferDiffInner> {
-        let diff_base =
-            diff_base.map(|diff_base| (diff_base.clone(), Rope::from(diff_base.as_str())));
-        let base_text_snapshot = diff_base.as_ref().map(|(_, diff_base)| {
-            language::Buffer::build_snapshot(
-                diff_base.clone(),
+        let base_text_pair;
+        let base_text_exists;
+        let base_text_snapshot;
+        if let Some(text) = &base_text {
+            let base_text_rope = Rope::from(text.as_str());
+            base_text_pair = Some((text.clone(), base_text_rope.clone()));
+            let snapshot = language::Buffer::build_snapshot(
+                base_text_rope,
                language.clone(),
                language_registry.clone(),
                cx,
-            )
-        });
-        let base_text_snapshot = cx.background_spawn(OptionFuture::from(base_text_snapshot));
+            );
+            base_text_snapshot = cx.background_spawn(snapshot);
+            base_text_exists = true;
+        } else {
+            base_text_pair = None;
+            base_text_snapshot = Task::ready(language::Buffer::build_empty_snapshot(cx));
+            base_text_exists = false;
+        };

        let hunks = cx.background_spawn({
            let buffer = buffer.clone();
-            async move { compute_hunks(diff_base, buffer) }
+            async move { compute_hunks(base_text_pair, buffer) }
        });

        async move {
            let (base_text, hunks) = futures::join!(base_text_snapshot, hunks);
-            BufferDiffInner { base_text, hunks }
+            BufferDiffInner {
+                base_text,
+                hunks,
+                base_text_exists,
+                pending_hunks: TreeMap::default(),
+            }
        }
    }

    fn build_with_base_buffer(
        buffer: text::BufferSnapshot,
-        diff_base: Option<Arc<String>>,
-        diff_base_buffer: Option<language::BufferSnapshot>,
+        base_text: Option<Arc<String>>,
+        base_text_snapshot: language::BufferSnapshot,
        cx: &App,
    ) -> impl Future<Output = BufferDiffInner> {
-        let diff_base = diff_base.clone().zip(
-            diff_base_buffer
-                .clone()
-                .map(|buffer| buffer.as_rope().clone()),
-        );
+        let base_text_exists = base_text.is_some();
+        let base_text_pair = base_text.map(|text| (text, base_text_snapshot.as_rope().clone()));
        cx.background_spawn(async move {
            BufferDiffInner {
-                hunks: compute_hunks(diff_base, buffer),
-                base_text: diff_base_buffer,
+                base_text: base_text_snapshot,
+                hunks: compute_hunks(base_text_pair, buffer),
+                pending_hunks: TreeMap::default(),
+                base_text_exists,
            }
        })
    }

-    fn build_empty(buffer: &text::BufferSnapshot) -> BufferDiffInner {
+    fn build_empty(buffer: &text::BufferSnapshot, cx: &mut App) -> BufferDiffInner {
        BufferDiffInner {
+            base_text: language::Buffer::build_empty_snapshot(cx),
            hunks: SumTree::new(buffer),
-            base_text: None,
-        }
-    }
-
-    pub fn build_with_single_insertion(
-        insertion_present_in_secondary_diff: bool,
-        buffer: language::BufferSnapshot,
-        cx: &mut App,
-    ) -> BufferDiffSnapshot {
-        let base_text = language::Buffer::build_empty_snapshot(cx);
-        let hunks = SumTree::from_item(
-            InternalDiffHunk {
-                buffer_range: Anchor::MIN..Anchor::MAX,
-                diff_base_byte_range: 0..0,
-            },
-            &base_text,
-        );
-        BufferDiffSnapshot {
-            inner: BufferDiffInner {
-                hunks: hunks.clone(),
-                base_text: Some(base_text.clone()),
-            },
-            secondary_diff: Some(Box::new(BufferDiffSnapshot {
-                inner: BufferDiffInner {
-                    hunks: if insertion_present_in_secondary_diff {
-                        hunks
-                    } else {
-                        SumTree::new(&buffer.text)
-                    },
-                    base_text: Some(if insertion_present_in_secondary_diff {
-                        base_text
-                    } else {
-                        buffer
-                    }),
-                },
-                secondary_diff: None,
-                is_single_insertion: true,
-            })),
-            is_single_insertion: true,
+            pending_hunks: TreeMap::default(),
+            base_text_exists: false,
        }
    }

@@ -728,7 +761,52 @@ impl BufferDiff {
    }

    pub fn secondary_diff(&self) -> Option<Entity<BufferDiff>> {
-        Some(self.secondary_diff.as_ref()?.clone())
+        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,
+        hunks: &[DiffHunk],
+        buffer: &text::BufferSnapshot,
+        file_exists: bool,
+        cx: &mut Context<Self>,
+    ) -> Option<Rope> {
+        let (new_index_text, pending_hunks) = self.inner.stage_or_unstage_hunks(
+            &self.secondary_diff.as_ref()?.read(cx).inner,
+            stage,
+            &hunks,
+            buffer,
+            file_exists,
+        );
+        if let Some(unstaged_diff) = &self.secondary_diff {
+            unstaged_diff.update(cx, |diff, _| {
+                for (offset, pending_hunk) in pending_hunks {
+                    diff.inner.pending_hunks.insert(offset, pending_hunk);
+                }
+            });
+        }
+        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 {
+                changed_range: Some(changed_range),
+            });
+        }
+        new_index_text
    }

    pub fn range_to_hunk_range(
@@ -777,7 +855,7 @@ impl BufferDiff {
                Self::build_with_base_buffer(
                    buffer.clone(),
                    base_text,
-                    this.base_text().cloned(),
+                    this.base_text().clone(),
                    cx,
                )
            })?
@@ -799,22 +877,33 @@ impl BufferDiff {

    fn set_state(
        &mut self,
-        inner: BufferDiffInner,
+        new_state: BufferDiffInner,
        buffer: &text::BufferSnapshot,
    ) -> Option<Range<Anchor>> {
-        let changed_range = match (self.inner.base_text.as_ref(), inner.base_text.as_ref()) {
-            (None, None) => None,
-            (Some(old), Some(new)) if old.remote_id() == new.remote_id() => {
-                inner.compare(&self.inner, buffer)
-            }
-            _ => Some(text::Anchor::MIN..text::Anchor::MAX),
-        };
-        self.inner = inner;
+        let (base_text_changed, changed_range) =
+            match (self.inner.base_text_exists, new_state.base_text_exists) {
+                (false, false) => (true, None),
+                (true, true)
+                    if self.inner.base_text.remote_id() == new_state.base_text.remote_id() =>
+                {
+                    (false, new_state.compare(&self.inner, buffer))
+                }
+                _ => (true, Some(text::Anchor::MIN..text::Anchor::MAX)),
+            };
+        let pending_hunks = mem::take(&mut self.inner.pending_hunks);
+        self.inner = new_state;
+        if !base_text_changed {
+            self.inner.pending_hunks = pending_hunks;
+        }
        changed_range
    }

-    pub fn base_text(&self) -> Option<&language::BufferSnapshot> {
-        self.inner.base_text.as_ref()
+    pub fn base_text(&self) -> &language::BufferSnapshot {
+        &self.inner.base_text
+    }
+
+    pub fn base_text_exists(&self) -> bool {
+        self.inner.base_text_exists
    }

    pub fn snapshot(&self, cx: &App) -> BufferDiffSnapshot {
@@ -824,10 +913,17 @@ impl BufferDiff {
                .secondary_diff
                .as_ref()
                .map(|diff| Box::new(diff.read(cx).snapshot(cx))),
-            is_single_insertion: false,
        }
    }

+    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>,
@@ -901,15 +997,16 @@ impl BufferDiff {
        rx
    }

-    #[cfg(any(test, feature = "test-support"))]
    pub fn base_text_string(&self) -> Option<String> {
-        self.inner.base_text.as_ref().map(|buffer| buffer.text())
+        self.inner
+            .base_text_exists
+            .then(|| self.inner.base_text.text())
    }

-    pub fn new(buffer: &text::BufferSnapshot) -> Self {
+    pub fn new(buffer: &text::BufferSnapshot, cx: &mut App) -> Self {
        BufferDiff {
            buffer_id: buffer.remote_id(),
-            inner: BufferDiff::build_empty(buffer),
+            inner: BufferDiff::build_empty(buffer, cx),
            secondary_diff: None,
        }
    }
@@ -939,14 +1036,10 @@ impl BufferDiff {

    #[cfg(any(test, feature = "test-support"))]
    pub fn recalculate_diff_sync(&mut self, buffer: text::BufferSnapshot, cx: &mut Context<Self>) {
-        let base_text = self
-            .inner
-            .base_text
-            .as_ref()
-            .map(|base_text| base_text.text());
+        let base_text = self.base_text_string().map(Arc::new);
        let snapshot = BufferDiff::build_with_base_buffer(
            buffer.clone(),
-            base_text.clone().map(Arc::new),
+            base_text,
            self.inner.base_text.clone(),
            cx,
        );
@@ -957,6 +1050,10 @@ impl BufferDiff {
 }

 impl DiffHunk {
+    pub fn is_created_file(&self) -> bool {
+        self.diff_base_byte_range == (0..0) && self.buffer_range == (Anchor::MIN..Anchor::MAX)
+    }
+
    pub fn status(&self) -> DiffHunkStatus {
        let kind = if self.buffer_range.start == self.buffer_range.end {
            DiffHunkStatusKind::Deleted
@@ -973,6 +1070,23 @@ impl DiffHunk {
 }

 impl DiffHunkStatus {
+    pub fn has_secondary_hunk(&self) -> bool {
+        matches!(
+            self.secondary,
+            DiffHunkSecondaryStatus::HasSecondaryHunk
+                | DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
+                | DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk
+        )
+    }
+
+    pub fn is_pending(&self) -> bool {
+        matches!(
+            self.secondary,
+            DiffHunkSecondaryStatus::SecondaryHunkAdditionPending
+                | DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
+        )
+    }
+
    pub fn is_deleted(&self) -> bool {
        self.kind == DiffHunkStatusKind::Deleted
    }
@@ -1006,7 +1120,6 @@ impl DiffHunkStatus {
        }
    }

-    #[cfg(any(test, feature = "test-support"))]
    pub fn deleted_none() -> Self {
        Self {
            kind: DiffHunkStatusKind::Deleted,
@@ -1014,7 +1127,6 @@ impl DiffHunkStatus {
        }
    }

-    #[cfg(any(test, feature = "test-support"))]
    pub fn added_none() -> Self {
        Self {
            kind: DiffHunkStatusKind::Added,
@@ -1022,7 +1134,6 @@ impl DiffHunkStatus {
        }
    }

-    #[cfg(any(test, feature = "test-support"))]
    pub fn modified_none() -> Self {
        Self {
            kind: DiffHunkStatusKind::Modified,
@@ -1045,12 +1156,10 @@ pub fn assert_hunks<Iter>(
    let actual_hunks = diff_hunks
        .map(|hunk| {
            (
-                hunk.row_range.clone(),
+                hunk.range.clone(),
                &diff_base[hunk.diff_base_byte_range.clone()],
                buffer
-                    .text_for_range(
-                        Point::new(hunk.row_range.start, 0)..Point::new(hunk.row_range.end, 0),
-                    )
+                    .text_for_range(hunk.range.clone())
                    .collect::<String>(),
                hunk.status(),
            )
@@ -1059,7 +1168,14 @@ pub fn assert_hunks<Iter>(

    let expected_hunks: Vec<_> = expected_hunks
        .iter()
-        .map(|(r, s, h, status)| (r.clone(), *s, h.to_string(), *status))
+        .map(|(r, old_text, new_text, status)| {
+            (
+                Point::new(r.start, 0)..Point::new(r.end, 0),
+                *old_text,
+                new_text.to_string(),
+                *status,
+            )
+        })
        .collect();

    assert_eq!(actual_hunks, expected_hunks);
@@ -1120,7 +1236,7 @@ mod tests {
            ],
        );

-        diff = BufferDiff::build_empty(&buffer);
+        diff = cx.update(|cx| BufferDiff::build_empty(&buffer, cx));
        assert_hunks(
            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, None),
            &buffer,
@@ -1435,43 +1551,55 @@ mod tests {
        for example in table {
            let (buffer_text, ranges) = marked_text_ranges(&example.buffer_marked_text, false);
            let buffer = Buffer::new(0, BufferId::new(1).unwrap(), buffer_text);
-            let uncommitted_diff =
-                BufferDiff::build_sync(buffer.clone(), example.head_text.clone(), cx);
-            let unstaged_diff =
-                BufferDiff::build_sync(buffer.clone(), example.index_text.clone(), cx);
-            let uncommitted_diff = BufferDiffSnapshot {
-                inner: uncommitted_diff,
-                secondary_diff: Some(Box::new(BufferDiffSnapshot {
-                    inner: unstaged_diff,
-                    is_single_insertion: false,
-                    secondary_diff: None,
-                })),
-                is_single_insertion: false,
-            };
+            let hunk_range =
+                buffer.anchor_before(ranges[0].start)..buffer.anchor_before(ranges[0].end);

-            let range = buffer.anchor_before(ranges[0].start)..buffer.anchor_before(ranges[0].end);
+            let unstaged = BufferDiff::build_sync(buffer.clone(), example.index_text.clone(), cx);
+            let uncommitted = BufferDiff::build_sync(buffer.clone(), example.head_text.clone(), cx);

-            let new_index_text = cx
-                .update(|cx| {
-                    uncommitted_diff.new_secondary_text_for_stage_or_unstage(
-                        true,
-                        uncommitted_diff
-                            .hunks_intersecting_range(range, &buffer)
-                            .map(|hunk| {
-                                (hunk.buffer_range.clone(), hunk.diff_base_byte_range.clone())
-                            }),
-                        &buffer,
-                        cx,
+            let unstaged_diff = cx.new(|cx| {
+                let mut diff = BufferDiff::new(&buffer, cx);
+                diff.set_state(unstaged, &buffer);
+                diff
+            });
+
+            let uncommitted_diff = cx.new(|cx| {
+                let mut diff = BufferDiff::new(&buffer, cx);
+                diff.set_state(uncommitted, &buffer);
+                diff.set_secondary_diff(unstaged_diff);
+                diff
+            });
+
+            uncommitted_diff.update(cx, |diff, cx| {
+                let hunks = diff
+                    .hunks_intersecting_range(hunk_range.clone(), &buffer, &cx)
+                    .collect::<Vec<_>>();
+                for hunk in &hunks {
+                    assert_ne!(hunk.secondary_status, DiffHunkSecondaryStatus::None)
+                }
+
+                let new_index_text = diff
+                    .stage_or_unstage_hunks(true, &hunks, &buffer, true, cx)
+                    .unwrap()
+                    .to_string();
+
+                let hunks = diff
+                    .hunks_intersecting_range(hunk_range.clone(), &buffer, &cx)
+                    .collect::<Vec<_>>();
+                for hunk in &hunks {
+                    assert_eq!(
+                        hunk.secondary_status,
+                        DiffHunkSecondaryStatus::SecondaryHunkRemovalPending
                    )
-                })
-                .unwrap()
-                .to_string();
-            pretty_assertions::assert_eq!(
-                new_index_text,
-                example.final_index_text,
-                "example: {}",
-                example.name
-            );
+                }
+
+                pretty_assertions::assert_eq!(
+                    new_index_text,
+                    example.final_index_text,
+                    "example: {}",
+                    example.name
+                );
+            });
        }
    }

@@ -1505,7 +1633,7 @@ mod tests {

        let mut buffer = Buffer::new(0, BufferId::new(1).unwrap(), buffer_text_1);

-        let empty_diff = BufferDiff::build_empty(&buffer);
+        let empty_diff = cx.update(|cx| BufferDiff::build_empty(&buffer, cx));
        let diff_1 = BufferDiff::build_sync(buffer.clone(), base_text.clone(), cx);
        let range = diff_1.compare(&empty_diff, &buffer).unwrap();
        assert_eq!(range.to_point(&buffer), Point::new(0, 0)..Point::new(8, 0));
@@ -1668,7 +1796,7 @@ mod tests {
            index_text: &Rope,
            head_text: String,
            cx: &mut TestAppContext,
-        ) -> BufferDiff {
+        ) -> Entity<BufferDiff> {
            let inner = BufferDiff::build_sync(working_copy.text.clone(), head_text, cx);
            let secondary = BufferDiff {
                buffer_id: working_copy.remote_id(),
@@ -1680,11 +1808,11 @@ mod tests {
                secondary_diff: None,
            };
            let secondary = cx.new(|_| secondary);
-            BufferDiff {
+            cx.new(|_| BufferDiff {
                buffer_id: working_copy.remote_id(),
                inner,
                secondary_diff: Some(secondary),
-            }
+            })
        }

        let operations = std::env::var("OPERATIONS")
@@ -1712,7 +1840,7 @@ mod tests {
        };

        let mut diff = uncommitted_diff(&working_copy, &index_text, head_text.clone(), cx);
-        let mut hunks = cx.update(|cx| {
+        let mut hunks = diff.update(cx, |diff, cx| {
            diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &working_copy, cx)
                .collect::<Vec<_>>()
        });
@@ -1723,6 +1851,7 @@ mod tests {
        for _ in 0..operations {
            let i = rng.gen_range(0..hunks.len());
            let hunk = &mut hunks[i];
+            let hunk_to_change = hunk.clone();
            let stage = match hunk.secondary_status {
                DiffHunkSecondaryStatus::HasSecondaryHunk => {
                    hunk.secondary_status = DiffHunkSecondaryStatus::None;
@@ -1735,21 +1864,13 @@ mod tests {
                _ => unreachable!(),
            };

-            let snapshot = cx.update(|cx| diff.snapshot(cx));
-            index_text = cx.update(|cx| {
-                snapshot
-                    .new_secondary_text_for_stage_or_unstage(
-                        stage,
-                        [(hunk.buffer_range.clone(), hunk.diff_base_byte_range.clone())]
-                            .into_iter(),
-                        &working_copy,
-                        cx,
-                    )
+            index_text = diff.update(cx, |diff, cx| {
+                diff.stage_or_unstage_hunks(stage, &[hunk_to_change], &working_copy, true, cx)
                    .unwrap()
            });

            diff = uncommitted_diff(&working_copy, &index_text, head_text.clone(), cx);
-            let found_hunks = cx.update(|cx| {
+            let found_hunks = diff.update(cx, |diff, cx| {
                diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &working_copy, cx)
                    .collect::<Vec<_>>()
            });
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -614,12 +614,19 @@ mod windows {
            let path = if let Some(path) = path {
                path.to_path_buf().canonicalize()?
            } else {
-                std::env::current_exe()?
-                    .parent()
-                    .context("no parent path for cli")?
-                    .parent()
-                    .context("no parent path for cli folder")?
-                    .join("Zed.exe")
+                let cli = std::env::current_exe()?;
+                let dir = cli.parent().context("no parent path for cli")?;
+
+                // ../Zed.exe is the standard, lib/zed is for MSYS2, ./zed.exe is for the target
+                // directory in development builds.
+                let possible_locations = ["../Zed.exe", "../lib/zed/zed-editor.exe", "./zed.exe"];
+                possible_locations
+                    .iter()
+                    .find_map(|p| dir.join(p).canonicalize().ok().filter(|path| path != &cli))
+                    .context(format!(
+                        "could not find any of: {}",
+                        possible_locations.join(", ")
+                    ))?
            };

            Ok(App(path))
--- 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/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -111,7 +111,7 @@ node_runtime.workspace = true
 notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
-prompt_library.workspace = true
+prompt_store.workspace = true
 recent_projects = { workspace = true }
 release_channel.workspace = true
 remote = { workspace = true, features = ["test-support"] }
--- 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(
@@ -328,6 +328,7 @@ impl Server {
            .add_request_handler(forward_mutating_project_request::<proto::PrepareRename>)
            .add_request_handler(forward_mutating_project_request::<proto::PerformRename>)
            .add_request_handler(forward_mutating_project_request::<proto::ReloadBuffers>)
+            .add_request_handler(forward_mutating_project_request::<proto::ApplyCodeActionKind>)
            .add_request_handler(forward_mutating_project_request::<proto::FormatBuffers>)
            .add_request_handler(forward_mutating_project_request::<proto::CreateProjectEntry>)
            .add_request_handler(forward_mutating_project_request::<proto::RenameProjectEntry>)
@@ -392,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>)
@@ -404,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/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -2027,6 +2027,15 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
        .unwrap()
        .downcast::<Editor>()
        .unwrap();
+    let buffer_id_b = editor_b.update(cx_b, |editor_b, cx| {
+        editor_b
+            .buffer()
+            .read(cx)
+            .as_singleton()
+            .unwrap()
+            .read(cx)
+            .remote_id()
+    });

    // client_b now requests git blame for the open buffer
    editor_b.update_in(cx_b, |editor_b, window, cx| {
@@ -2045,6 +2054,7 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
                    &(0..4)
                        .map(|row| RowInfo {
                            buffer_row: Some(row),
+                            buffer_id: Some(buffer_id_b),
                            ..Default::default()
                        })
                        .collect::<Vec<_>>(),
@@ -2092,6 +2102,7 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
                    &(0..4)
                        .map(|row| RowInfo {
                            buffer_row: Some(row),
+                            buffer_id: Some(buffer_id_b),
                            ..Default::default()
                        })
                        .collect::<Vec<_>>(),
@@ -2127,6 +2138,7 @@ async fn test_git_blame_is_forwarded(cx_a: &mut TestAppContext, cx_b: &mut TestA
                    &(0..4)
                        .map(|row| RowInfo {
                            buffer_row: Some(row),
+                            buffer_id: Some(buffer_id_b),
                            ..Default::default()
                        })
                        .collect::<Vec<_>>(),
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -14,7 +14,7 @@ use client::{User, RECEIVE_TIMEOUT};
 use collections::{HashMap, HashSet};
 use fs::{FakeFs, Fs as _, RemoveOptions};
 use futures::{channel::mpsc, StreamExt as _};
-use prompt_library::PromptBuilder;
+use prompt_store::PromptBuilder;

 use git::status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode};
 use gpui::{
@@ -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/collab_panel.rs
+++ b/crates/collab_ui/src/collab_panel.rs
@@ -17,7 +17,7 @@ use gpui::{
    ListState, MouseDownEvent, ParentElement, Pixels, Point, PromptLevel, Render, SharedString,
    Styled, Subscription, Task, TextStyle, WeakEntity, Window,
 };
-use menu::{Cancel, Confirm, SecondaryConfirm, SelectNext, SelectPrev};
+use menu::{Cancel, Confirm, SecondaryConfirm, SelectNext, SelectPrevious};
 use project::{Fs, Project};
 use rpc::{
    proto::{self, ChannelVisibility, PeerId},
@@ -1430,7 +1430,7 @@ impl CollabPanel {
        cx.notify();
    }

-    fn select_prev(&mut self, _: &SelectPrev, _: &mut Window, cx: &mut Context<Self>) {
+    fn select_previous(&mut self, _: &SelectPrevious, _: &mut Window, cx: &mut Context<Self>) {
        let ix = self.selection.take().unwrap_or(0);
        if ix > 0 {
            self.selection = Some(ix - 1);
@@ -2878,7 +2878,7 @@ impl Render for CollabPanel {
            .key_context("CollabPanel")
            .on_action(cx.listener(CollabPanel::cancel))
            .on_action(cx.listener(CollabPanel::select_next))
-            .on_action(cx.listener(CollabPanel::select_prev))
+            .on_action(cx.listener(CollabPanel::select_previous))
            .on_action(cx.listener(CollabPanel::confirm))
            .on_action(cx.listener(CollabPanel::insert_space))
            .on_action(cx.listener(CollabPanel::remove_selected_channel))
--- a/crates/collab_ui/src/notification_panel.rs
+++ b/crates/collab_ui/src/notification_panel.rs
@@ -22,7 +22,7 @@ use ui::{
    h_flex, prelude::*, v_flex, Avatar, Button, Icon, IconButton, IconName, Label, Tab, Tooltip,
 };
 use util::{ResultExt, TryFutureExt};
-use workspace::notifications::NotificationId;
+use workspace::notifications::{Notification as WorkspaceNotification, NotificationId};
 use workspace::{
    dock::{DockPosition, Panel, PanelEvent},
    Workspace,
@@ -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| {
@@ -570,11 +570,12 @@ impl NotificationPanel {
                workspace.dismiss_notification(&id, cx);
                workspace.show_notification(id, cx, |cx| {
                    let workspace = cx.entity().downgrade();
-                    cx.new(|_| NotificationToast {
+                    cx.new(|cx| NotificationToast {
                        notification_id,
                        actor,
                        text,
                        workspace,
+                        focus_handle: cx.focus_handle(),
                    })
                })
            })
@@ -771,8 +772,17 @@ pub struct NotificationToast {
    actor: Option<Arc<User>>,
    text: String,
    workspace: WeakEntity<Workspace>,
+    focus_handle: FocusHandle,
 }

+impl Focusable for NotificationToast {
+    fn focus_handle(&self, _cx: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl WorkspaceNotification for NotificationToast {}
+
 impl NotificationToast {
    fn focus_notification_panel(&self, window: &mut Window, cx: &mut Context<Self>) {
        let workspace = self.workspace.clone();
--- 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>()
    }
@@ -18,7 +19,7 @@ pub trait Component {
 }

 pub trait ComponentPreview: Component {
-    fn preview(_window: &mut Window, _cx: &App) -> AnyElement;
+    fn preview(_window: &mut Window, _cx: &mut App) -> AnyElement;
 }

 #[distributed_slice]
@@ -31,8 +32,8 @@ 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>)>,
-    previews: HashMap<&'static str, fn(&mut Window, &App) -> AnyElement>,
+    components: Vec<(Option<ComponentScope>, &'static str, Option<&'static str>)>,
+    previews: HashMap<&'static str, fn(&mut Window, &mut App) -> AnyElement>,
 }

 impl ComponentRegistry {
@@ -62,7 +63,10 @@ pub fn register_component<T: Component>() {
 }

 pub fn register_preview<T: ComponentPreview>() {
-    let preview_data = (T::name(), T::preview as fn(&mut Window, &App) -> AnyElement);
+    let preview_data = (
+        T::name(),
+        T::preview as fn(&mut Window, &mut App) -> AnyElement,
+    );
    COMPONENT_DATA
        .write()
        .previews
@@ -74,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, &App) -> AnyElement>,
+    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()
    }

@@ -93,7 +102,7 @@ impl ComponentMetadata {
        self.description.clone()
    }

-    pub fn preview(&self) -> Option<fn(&mut Window, &App) -> AnyElement> {
+    pub fn preview(&self) -> Option<fn(&mut Window, &mut App) -> AnyElement> {
        self.preview
    }
 }
@@ -149,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,
            },
@@ -166,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 {
@@ -174,8 +238,8 @@ pub enum ExampleLabelSide {
    /// Right side
    Right,
    /// Top side
-    Top,
    #[default]
+    Top,
    /// Bottom side
    Bottom,
 }
@@ -205,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()
@@ -235,6 +300,7 @@ pub struct ComponentExampleGroup {
    pub title: Option<SharedString>,
    pub examples: Vec<ComponentExample>,
    pub grow: bool,
+    pub vertical: bool,
 }

 impl RenderOnce for ComponentExampleGroup {
@@ -270,6 +336,7 @@ impl RenderOnce for ComponentExampleGroup {
            .child(
                div()
                    .flex()
+                    .when(self.vertical, |this| this.flex_col())
                    .items_start()
                    .w_full()
                    .gap_6()
@@ -287,6 +354,7 @@ impl ComponentExampleGroup {
            title: None,
            examples,
            grow: false,
+            vertical: false,
        }
    }

@@ -296,6 +364,7 @@ impl ComponentExampleGroup {
            title: Some(title.into()),
            examples,
            grow: false,
+            vertical: false,
        }
    }

@@ -304,6 +373,12 @@ impl ComponentExampleGroup {
        self.grow = true;
        self
    }
+
+    /// Lay the group out vertically.
+    pub fn vertical(mut self) -> Self {
+        self.vertical = true;
+        self
+    }
 }

 /// Create a single example
--- 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: &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,16 +522,86 @@ 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)) {
        f(*event)
    }
 }
+
+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/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -623,16 +623,21 @@ impl Copilot {

    pub fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
        self.update_sign_in_status(request::SignInStatus::NotSignedIn, cx);
-        if let CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) = &self.server {
-            let server = server.clone();
-            cx.background_spawn(async move {
-                server
-                    .request::<request::SignOut>(request::SignOutParams {})
-                    .await?;
+        match &self.server {
+            CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) => {
+                let server = server.clone();
+                cx.background_spawn(async move {
+                    server
+                        .request::<request::SignOut>(request::SignOutParams {})
+                        .await?;
+                    anyhow::Ok(())
+                })
+            }
+            CopilotServer::Disabled => cx.background_spawn(async move {
+                clear_copilot_config_dir().await;
                anyhow::Ok(())
-            })
-        } else {
-            Task::ready(Err(anyhow!("copilot hasn't started yet")))
+            }),
+            _ => Task::ready(Err(anyhow!("copilot hasn't started yet"))),
        }
    }

@@ -1016,6 +1021,10 @@ async fn clear_copilot_dir() {
    remove_matching(paths::copilot_dir(), |_| true).await
 }

+async fn clear_copilot_config_dir() {
+    remove_matching(copilot_chat::copilot_chat_config_dir(), |_| true).await
+}
+
 async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
    const SERVER_PATH: &str = "dist/language-server.js";

--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -4,13 +4,14 @@ use std::sync::OnceLock;

 use anyhow::{anyhow, Result};
 use chrono::DateTime;
+use collections::HashSet;
 use fs::Fs;
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, StreamExt};
 use gpui::{prelude::*, App, AsyncApp, Global};
 use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use paths::home_dir;
 use serde::{Deserialize, Serialize};
-use settings::watch_config_file;
+use settings::watch_config_dir;
 use strum::EnumIter;

 pub const COPILOT_CHAT_COMPLETION_URL: &str = "https://api.githubcopilot.com/chat/completions";
@@ -212,7 +213,7 @@ pub fn init(fs: Arc<dyn Fs>, client: Arc<dyn HttpClient>, cx: &mut App) {
    cx.set_global(GlobalCopilotChat(copilot_chat));
 }

-fn copilot_chat_config_dir() -> &'static PathBuf {
+pub fn copilot_chat_config_dir() -> &'static PathBuf {
    static COPILOT_CHAT_CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();

    COPILOT_CHAT_CONFIG_DIR.get_or_init(|| {
@@ -237,27 +238,18 @@ impl CopilotChat {
    }

    pub fn new(fs: Arc<dyn Fs>, client: Arc<dyn HttpClient>, cx: &App) -> Self {
-        let config_paths = copilot_chat_config_paths();
-
-        let resolve_config_path = {
-            let fs = fs.clone();
-            async move {
-                for config_path in config_paths.iter() {
-                    if fs.metadata(config_path).await.is_ok_and(|v| v.is_some()) {
-                        return config_path.clone();
-                    }
-                }
-                config_paths[0].clone()
-            }
-        };
+        let config_paths: HashSet<PathBuf> = copilot_chat_config_paths().into_iter().collect();
+        let dir_path = copilot_chat_config_dir();

        cx.spawn(|cx| async move {
-            let config_file = resolve_config_path.await;
-            let mut config_file_rx = watch_config_file(cx.background_executor(), fs, config_file);
-
-            while let Some(contents) = config_file_rx.next().await {
+            let mut parent_watch_rx = watch_config_dir(
+                cx.background_executor(),
+                fs.clone(),
+                dir_path.clone(),
+                config_paths,
+            );
+            while let Some(contents) = parent_watch_rx.next().await {
                let oauth_token = extract_oauth_token(contents);
-
                cx.update(|cx| {
                    if let Some(this) = Self::global(cx).as_ref() {
                        this.update(cx, |this, cx| {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-cloud"><path d="M17.5 19H9a7 7 0 1 1 6.71-9h1.79a4.5 4.5 0 1 1 0 9Z"/></svg>`