Some of :norm in vim mode

assistant2: Don't suggest thread context for inline assist without a ThreadStore (#23506 )
This PR makes it so we don't suggest threads as context in the inline assist when we don't have a `ThreadStore` to pull from. Release Notes: - N/A
2025-01-23 10:42:29 -07:00 · 2025-01-22 23:47:56 +00:00 · 2025-01-22 18:12:27 -05:00 · 2025-01-22 18:11:47 -05:00 · 2025-01-22 18:04:14 -05:00 · 2025-01-22 18:03:51 -05:00
492 changed files with 18536 additions and 14257 deletions
--- a/.cargo/ci-config.toml
+++ b/.cargo/ci-config.toml
@@ -0,0 +1,12 @@
+# This config is different from config.toml in this directory, as the latter is recognized by Cargo.
+# This file is placed in ./../.cargo/config.toml on CI runs. Cargo then merges Zeds .cargo/config.toml with ./../.cargo/config.toml
+# with preference for settings from Zeds config.toml.
+# TL;DR: If a value is set in both ci-config.toml and config.toml, config.toml value takes precedence.
+# Arrays are merged together though. See: https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure
+# The intent for this file is to configure CI build process with a divergance from Zed developers experience; for example, in this config file
+# we use `-D warnings` for rustflags (which makes compilation fail in presence of warnings during build process). Placing that in developers `config.toml`
+# would be incovenient.
+# The reason for not using the RUSTFLAGS environment variable is that doing so would override all the settings in the config.toml file, even if the contents of the latter are completely nonsensical. See: https://github.com/rust-lang/cargo/issues/5376
+# Here, we opted to use `[target.'cfg(all())']` instead of `[build]` because `[target.'**']` is guaranteed to be cumulative.
+[target.'cfg(all())']
+rustflags = ["-D", "warnings"]
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -19,6 +19,10 @@ rustflags = ["-C", "link-args=-Objc -all_load"]
 [target.x86_64-apple-darwin]
 rustflags = ["-C", "link-args=-Objc -all_load"]

-# This cfg will reduce the size of `windows::core::Error` from 16 bytes to 4 bytes
 [target.'cfg(target_os = "windows")']
-rustflags = ["--cfg", "windows_slim_errors"]
+rustflags = [
+    "--cfg",
+    "windows_slim_errors",        # This cfg will reduce the size of `windows::core::Error` from 16 bytes to 4 bytes
+    "-C",
+    "target-feature=+crt-static", # This fixes the linking issue when compiling livekit on Windows
+]
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
      - "v[0-9]+.[0-9]+.x"
    tags:
      - "v*"
+
  pull_request:
    branches:
      - "**"
@@ -20,7 +21,6 @@ env:
  CARGO_TERM_COLOR: always
  CARGO_INCREMENTAL: 0
  RUST_BACKTRACE: 1
-  RUSTFLAGS: "-D warnings"

 jobs:
  migration_checks:
@@ -77,7 +77,7 @@ jobs:
        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

      # To support writing comments that they will certainly be revisited.
-      - name: Check for todo! and FIXME comments
+      - name: Check for todo! and FIXME comments
        run: script/check-todos

      - name: Run style checks
@@ -101,6 +101,11 @@ jobs:
        with:
          clean: false

+      - name: Configure CI
+        run: |
+          mkdir -p ./../.cargo
+          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
+
      - name: cargo clippy
        run: ./script/clippy

@@ -132,6 +137,11 @@ jobs:
          cargo build -p remote_server
          script/check-rust-livekit-macos

+      # Since the macOS runners are stateful, so we need to remove the config file to prevent potential bug.
+      - name: Clean CI config file
+        if: always()
+        run: rm -rf ./../.cargo
+
  linux_tests:
    timeout-minutes: 60
    name: (Linux) Run Clippy and tests
@@ -156,6 +166,11 @@ jobs:
      - name: Install Linux dependencies
        run: ./script/linux

+      - name: Configure CI
+        run: |
+          mkdir -p ./../.cargo
+          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
+
      - name: cargo clippy
        run: ./script/clippy

@@ -167,6 +182,14 @@ jobs:
          cargo build -p zed
          cargo check -p workspace

+      # Even the Linux runner is not stateful, in theory there is no need to do this cleanup.
+      # But, to avoid potential issues in the future if we choose to use a stateful Linux runner and forget to add code
+      # to clean up the config file, I’ve included the cleanup code here as a precaution.
+      # While it’s not strictly necessary at this moment, I believe it’s better to err on the side of caution.
+      - name: Clean CI config file
+        if: always()
+        run: rm -rf ./../.cargo
+
  build_remote_server:
    timeout-minutes: 60
    name: (Linux) Build Remote Server
@@ -191,9 +214,18 @@ jobs:
      - name: Install Clang & Mold
        run: ./script/remote-server && ./script/install-mold 2.34.0

+      - name: Configure CI
+        run: |
+          mkdir -p ./../.cargo
+          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
+
      - name: Build Remote Server
        run: cargo build -p remote_server

+      - name: Clean CI config file
+        if: always()
+        run: rm -rf ./../.cargo
+
  # todo(windows): Actually run the tests
  windows_tests:
    timeout-minutes: 60
@@ -215,6 +247,11 @@ jobs:
          save-if: ${{ github.ref == 'refs/heads/main' }}
          cache-provider: "github"

+      - name: Configure CI
+        run: |
+          mkdir -p ./../.cargo
+          cp ./.cargo/ci-config.toml ./../.cargo/config.toml
+
      - name: cargo clippy
        # Windows can't run shell scripts, so we need to use `cargo xtask`.
        run: cargo xtask clippy
@@ -222,6 +259,11 @@ jobs:
      - name: Build Zed
        run: cargo build

+      # 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 "./../.cargo" -Recurse -Force
+
  bundle-mac:
    timeout-minutes: 120
    name: Create a macOS bundle
@@ -285,14 +327,14 @@ jobs:
          mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg

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

      - name: Upload app bundle (x86_64) to workflow run if main branch or specific label
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.dmg
@@ -343,7 +385,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-linux-gnu.tar.gz
@@ -391,7 +433,7 @@ jobs:
        run: script/bundle-linux

      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
        with:
          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz
--- a/.mailmap
+++ b/.mailmap
@@ -9,6 +9,8 @@
 # Keep these entries sorted alphabetically.
 # In Zed: `editor: sort lines case insensitive`

+Agus Zubiaga <agus@zed.dev>
+Agus Zubiaga <agus@zed.dev> <hi@aguz.me>
 Alex Viscreanu <alexviscreanu@gmail.com>
 Alex Viscreanu <alexviscreanu@gmail.com> <alexandru.viscreanu@kiwi.com>
 Alexander Mankuta <alex@pointless.one>
@@ -24,6 +26,7 @@ Bennet Bo Fenner <bennet@zed.dev> <53836821+bennetbo@users.noreply.github.com>
 Bennet Bo Fenner <bennet@zed.dev> <bennetbo@gmx.de>
 Boris Cherny <boris@anthropic.com>
 Boris Cherny <boris@anthropic.com> <boris@performancejs.com>
+Brian Tan <brian.tan88@gmail.com>
 Chris Hayes <chris+git@hayes.software>
 Christian Bergschneider <christian.bergschneider@gmx.de>
 Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
@@ -32,11 +35,16 @@ Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
 Dairon Medina <dairon.medina@gmail.com>
 Danilo Leal <danilo@zed.dev>
 Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
+Edwin Aronsson <75266237+4teapo@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrensen467@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com> <146845123+evrsen@users.noreply.github.com>
 Fernando Tagawa <tagawafernando@gmail.com>
 Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
+Finn Evers <dev@bahn.sh>
+Finn Evers <dev@bahn.sh> <75036051+MrSubidubi@users.noreply.github.com>
+Finn Evers <dev@bahn.sh> <finn.evers@outlook.de>
+Gowtham K <73059450+dovakin0007@users.noreply.github.com>
 Greg Morenz <greg-morenz@droid.cafe>
 Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
 Ihnat Aŭtuška <autushka.ihnat@gmail.com>
@@ -54,11 +62,14 @@ Kirill Bulatov <kirill@zed.dev>
 Kirill Bulatov <kirill@zed.dev> <mail4score@gmail.com>
 Kyle Caverly <kylebcaverly@gmail.com>
 Kyle Caverly <kylebcaverly@gmail.com> <kyle@zed.dev>
+Lilith Iris <itslirissama@gmail.com>
+Lilith Iris <itslirissama@gmail.com> <83819417+Irilith@users.noreply.github.com>
 LoganDark <contact@logandark.mozmail.com>
 LoganDark <contact@logandark.mozmail.com> <git@logandark.mozmail.com>
 LoganDark <contact@logandark.mozmail.com> <github@logandark.mozmail.com>
-Marshall Bowers <elliott.codes@gmail.com>
-Marshall Bowers <elliott.codes@gmail.com> <marshall@zed.dev>
+Marshall Bowers <git@maxdeviant.com>
+Marshall Bowers <git@maxdeviant.com> <elliott.codes@gmail.com>
+Marshall Bowers <git@maxdeviant.com> <marshall@zed.dev>
 Matt Fellenz <matt@felle.nz>
 Matt Fellenz <matt@felle.nz> <matt+github@felle.nz>
 Max Brunsfeld <maxbrunsfeld@gmail.com>
@@ -112,5 +123,7 @@ Uladzislau Kaminski <i@uladkaminski.com>
 Uladzislau Kaminski <i@uladkaminski.com> <uladzislau_kaminski@epam.com>
 Vitaly Slobodin <vitaliy.slobodin@gmail.com>
 Vitaly Slobodin <vitaliy.slobodin@gmail.com> <vitaly_slobodin@fastmail.com>
+Will Bradley <williambbradley@gmail.com>
+Will Bradley <williambbradley@gmail.com> <will@zed.dev>
 WindSoilder <WindSoilder@outlook.com>
 张小白 <364772080@qq.com>
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,11 +2,15 @@
 resolver = "2"
 members = [
    "crates/activity_indicator",
+    "crates/zed_predict_tos",
    "crates/anthropic",
    "crates/assets",
    "crates/assistant",
    "crates/assistant2",
+    "crates/assistant_context_editor",
+    "crates/assistant_settings",
    "crates/assistant_slash_command",
+    "crates/assistant_slash_commands",
    "crates/assistant_tool",
    "crates/assistant_tools",
    "crates/audio",
@@ -28,7 +32,6 @@ members = [
    "crates/copilot",
    "crates/db",
    "crates/diagnostics",
-    "crates/deepseek",
    "crates/docs_preprocessor",
    "crates/editor",
    "crates/evals",
@@ -89,6 +92,7 @@ members = [
    "crates/project",
    "crates/project_panel",
    "crates/project_symbols",
+    "crates/prompt_library",
    "crates/proto",
    "crates/recent_projects",
    "crates/refineable",
@@ -114,6 +118,7 @@ members = [
    "crates/sqlez_macros",
    "crates/story",
    "crates/storybook",
+    "crates/streaming_diff",
    "crates/sum_tree",
    "crates/supermaven",
    "crates/supermaven_api",
@@ -183,6 +188,10 @@ members = [
 ]
 default-members = ["crates/zed"]

+[workspace.package]
+publish = false
+edition = "2021"
+
 [workspace.dependencies]

 #
@@ -191,11 +200,15 @@ default-members = ["crates/zed"]

 activity_indicator = { path = "crates/activity_indicator" }
 ai = { path = "crates/ai" }
+zed_predict_tos = { path = "crates/zed_predict_tos" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
 assistant2 = { path = "crates/assistant2" }
+assistant_context_editor = { path = "crates/assistant_context_editor" }
+assistant_settings = { path = "crates/assistant_settings" }
 assistant_slash_command = { path = "crates/assistant_slash_command" }
+assistant_slash_commands = { path = "crates/assistant_slash_commands" }
 assistant_tool = { path = "crates/assistant_tool" }
 assistant_tools = { path = "crates/assistant_tools" }
 audio = { path = "crates/audio" }
@@ -216,7 +229,6 @@ context_server = { path = "crates/context_server" }
 context_server_settings = { path = "crates/context_server_settings" }
 copilot = { path = "crates/copilot" }
 db = { path = "crates/db" }
-deepseek = { path = "crates/deepseek" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
@@ -279,6 +291,7 @@ prettier = { path = "crates/prettier" }
 project = { path = "crates/project" }
 project_panel = { path = "crates/project_panel" }
 project_symbols = { path = "crates/project_symbols" }
+prompt_library = { path = "crates/prompt_library" }
 proto = { path = "crates/proto" }
 recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
@@ -303,6 +316,7 @@ sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
 storybook = { path = "crates/storybook" }
+streaming_diff = { path = "crates/streaming_diff" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
@@ -340,7 +354,8 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-alacritty_terminal = "0.24"
+# TODO(#18342): Update to version 0.25 from crates.io when it is released.
+alacritty_terminal = { git = "https://github.com/alacritty/alacritty.git", rev = "5e78d20c709cb1ab8d44ca7a8702cc26d779227c" }
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -357,7 +372,7 @@ async-tungstenite = "0.28"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 base64 = "0.22"
-bitflags = "2.6.0"
+bitflags = "2.8.0"
 blade-graphics = { git = "https://github.com/kvark/blade", rev = "091a8401033847bb9b6ace3fcf70448d069621c5" }
 blade-macros = { git = "https://github.com/kvark/blade", rev = "091a8401033847bb9b6ace3fcf70448d069621c5" }
 blade-util = { git = "https://github.com/kvark/blade", rev = "091a8401033847bb9b6ace3fcf70448d069621c5" }
@@ -405,12 +420,13 @@ libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
 livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev="060964da10574cd9bf06463a53bf6e0769c5c45e", features = ["dispatcher", "services-dispatcher", "rustls-tls-native-roots"], default-features = false }
-log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
+log = { version = "0.4.25", features = ["kv_unstable_serde", "serde"] }
 markup5ever_rcdom = "0.3.0"
 nanoid = "0.4"
 nbformat = { version = "0.10.0" }
 nix = "0.29"
 num-format = "0.4.4"
+once_cell = "1.20"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
@@ -474,6 +490,7 @@ strum = { version = "0.26.0", features = ["derive"] }
 subtle = "2.5.0"
 sys-locale = "0.3.1"
 sysinfo = "0.31.0"
+take-until = "0.2.0"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
 tiktoken-rs = "0.6.0"
@@ -492,7 +509,7 @@ tree-sitter = { version = "0.23", features = ["wasm"] }
 tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
-tree-sitter-css = "0.23"
+tree-sitter-css = "0.23.2"
 tree-sitter-elixir = "0.3"
 tree-sitter-embedded-template = "0.23.0"
 tree-sitter-go = "0.23"
--- a/assets/icons/ai_deep_seek.svg
+++ b/assets/icons/ai_deep_seek.svg
@@ -1 +0,0 @@
-<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>DeepSeek</title><path d="M23.748 4.482c-.254-.124-.364.113-.512.234-.051.039-.094.09-.137.136-.372.397-.806.657-1.373.626-.829-.046-1.537.214-2.163.848-.133-.782-.575-1.248-1.247-1.548-.352-.156-.708-.311-.955-.65-.172-.241-.219-.51-.305-.774-.055-.16-.11-.323-.293-.35-.2-.031-.278.136-.356.276-.313.572-.434 1.202-.422 1.84.027 1.436.633 2.58 1.838 3.393.137.093.172.187.129.323-.082.28-.18.552-.266.833-.055.179-.137.217-.329.14a5.526 5.526 0 01-1.736-1.18c-.857-.828-1.631-1.742-2.597-2.458a11.365 11.365 0 00-.689-.471c-.985-.957.13-1.743.388-1.836.27-.098.093-.432-.779-.428-.872.004-1.67.295-2.687.684a3.055 3.055 0 01-.465.137 9.597 9.597 0 00-2.883-.102c-1.885.21-3.39 1.102-4.497 2.623C.082 8.606-.231 10.684.152 12.85c.403 2.284 1.569 4.175 3.36 5.653 1.858 1.533 3.997 2.284 6.438 2.14 1.482-.085 3.133-.284 4.994-1.86.47.234.962.327 1.78.397.63.059 1.236-.03 1.705-.128.735-.156.684-.837.419-.961-2.155-1.004-1.682-.595-2.113-.926 1.096-1.296 2.746-2.642 3.392-7.003.05-.347.007-.565 0-.845-.004-.17.035-.237.23-.256a4.173 4.173 0 001.545-.475c1.396-.763 1.96-2.015 2.093-3.517.02-.23-.004-.467-.247-.588zM11.581 18c-2.089-1.642-3.102-2.183-3.52-2.16-.392.024-.321.471-.235.763.09.288.207.486.371.739.114.167.192.416-.113.603-.673.416-1.842-.14-1.897-.167-1.361-.802-2.5-1.86-3.301-3.307-.774-1.393-1.224-2.887-1.298-4.482-.02-.386.093-.522.477-.592a4.696 4.696 0 011.529-.039c2.132.312 3.946 1.265 5.468 2.774.868.86 1.525 1.887 2.202 2.891.72 1.066 1.494 2.082 2.48 2.914.348.292.625.514.891.677-.802.09-2.14.11-3.054-.614zm1-6.44a.306.306 0 01.415-.287.302.302 0 01.2.288.306.306 0 01-.31.307.303.303 0 01-.304-.308zm3.11 1.596c-.2.081-.399.151-.59.16a1.245 1.245 0 01-.798-.254c-.274-.23-.47-.358-.552-.758a1.73 1.73 0 01.016-.588c.07-.327-.008-.537-.239-.727-.187-.156-.426-.199-.688-.199a.559.559 0 01-.254-.078c-.11-.054-.2-.19-.114-.358.028-.054.16-.186.192-.21.356-.202.767-.136 1.146.016.352.144.618.408 1.001.782.391.451.462.576.685.914.176.265.336.537.445.848.067.195-.019.354-.25.452z" fill="black"></path></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -2,26 +2,27 @@
  // Standard Linux bindings
  {
    "bindings": {
-      "shift-tab": "menu::SelectPrev",
      "home": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
      "shift-pageup": "menu::SelectFirst",
-      "ctrl-p": "menu::SelectPrev",
-      "tab": "menu::SelectNext",
+      "pageup": "menu::SelectFirst",
      "end": "menu::SelectLast",
+      "shift-pagedown": "menu::SelectLast",
      "pagedown": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectFirst",
      "ctrl-n": "menu::SelectNext",
+      "tab": "menu::SelectNext",
+      "ctrl-p": "menu::SelectPrev",
+      "shift-tab": "menu::SelectPrev",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
-      "escape": "menu::Cancel",
      "ctrl-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
+      "escape": "menu::Cancel",
      "alt-shift-enter": "menu::Restart",
      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
      "ctrl-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
      "ctrl-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
+      "open": "workspace::Open",
      "ctrl-o": "workspace::Open",
      "ctrl-=": "zed::IncreaseBufferFontSize",
      "ctrl-+": "zed::IncreaseBufferFontSize",
@@ -29,7 +30,9 @@
      "ctrl-0": "zed::ResetBufferFontSize",
      "ctrl-,": "zed::OpenSettings",
      "ctrl-q": "zed::Quit",
-      "f11": "zed::ToggleFullScreen"
+      "f11": "zed::ToggleFullScreen",
+      "ctrl-alt-z": "zeta::RateCompletions",
+      "ctrl-shift-i": "inline_completion::ToggleMenu"
    }
  },
  {
@@ -50,8 +53,8 @@
    "context": "Editor",
    "bindings": {
      "escape": "editor::Cancel",
-      "backspace": "editor::Backspace",
      "shift-backspace": "editor::Backspace",
+      "backspace": "editor::Backspace",
      "delete": "editor::Delete",
      "tab": "editor::Tab",
      "shift-tab": "editor::TabPrev",
@@ -61,11 +64,19 @@
      "ctrl-k q": "editor::Rewrap",
      "ctrl-backspace": "editor::DeleteToPreviousWordStart",
      "ctrl-delete": "editor::DeleteToNextWordEnd",
+      "cut": "editor::Cut",
      "shift-delete": "editor::Cut",
+      "ctrl-x": "editor::Cut",
+      "copy": "editor::Copy",
      "ctrl-insert": "editor::Copy",
+      "ctrl-c": "editor::Copy",
+      "paste": "editor::Paste",
      "shift-insert": "editor::Paste",
-      "ctrl-y": "editor::Redo",
+      "ctrl-v": "editor::Paste",
+      "undo": "editor::Undo",
      "ctrl-z": "editor::Undo",
+      "redo": "editor::Redo",
+      "ctrl-y": "editor::Redo",
      "ctrl-shift-z": "editor::Redo",
      "up": "editor::MoveUp",
      "ctrl-up": "editor::LineUp",
@@ -97,11 +108,11 @@
      "ctrl-l": "editor::SelectLine",
      "ctrl-shift-i": "editor::Format",
      // "cmd-shift-left": ["editor::SelectToBeginningOfLine", {"stop_at_soft_wraps": true }],
-      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
      // "ctrl-shift-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
+      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": true }],
      // "cmd-shift-right": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
-      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      // "ctrl-shift-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
+      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": true }],
      // "alt-v": ["editor::MovePageUp", { "center_cursor": true }],
      "ctrl-alt-space": "editor::ShowCharacterPalette",
      "ctrl-;": "editor::ToggleLineNumbers",
@@ -114,24 +125,16 @@
      "shift-f10": "editor::OpenContextMenu"
    }
  },
-  {
-    // Separate block with same context so these display in context menus
-    "context": "Editor",
-    "bindings": {
-      "ctrl-x": "editor::Cut",
-      "ctrl-c": "editor::Copy",
-      "ctrl-v": "editor::Paste"
-    }
-  },
  {
    "context": "Editor && mode == full",
    "bindings": {
-      "enter": "editor::Newline",
      "shift-enter": "editor::Newline",
+      "enter": "editor::Newline",
      "ctrl-enter": "editor::NewlineAbove",
      "ctrl-shift-enter": "editor::NewlineBelow",
      "ctrl-k ctrl-z": "editor::ToggleSoftWrap",
      "ctrl-k z": "editor::ToggleSoftWrap",
+      "find": "buffer_search::Deploy",
      "ctrl-f": "buffer_search::Deploy",
      "ctrl-h": ["buffer_search::Deploy", { "replace_enabled": true }],
      // "cmd-e": ["buffer_search::Deploy", { "focus": false }],
@@ -165,6 +168,7 @@
  {
    "context": "Markdown",
    "bindings": {
+      "copy": "markdown::Copy",
      "ctrl-c": "markdown::Copy"
    }
  },
@@ -178,12 +182,14 @@
      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "ctrl-k h": "assistant::DeployHistory",
      "ctrl-k l": "assistant::DeployPromptLibrary",
+      "new": "assistant::NewContext",
      "ctrl-n": "assistant::NewContext"
    }
  },
  {
    "context": "PromptLibrary",
    "bindings": {
+      "new": "prompt_library::NewPrompt",
      "ctrl-n": "prompt_library::NewPrompt",
      "ctrl-shift-s": "prompt_library::ToggleDefaultPrompt"
    }
@@ -197,6 +203,7 @@
      "shift-enter": "search::SelectPrevMatch",
      "alt-enter": "search::SelectAllMatches",
      "ctrl-f": "search::FocusSearch",
+      "find": "search::FocusSearch",
      "ctrl-h": "search::ToggleReplace",
      "ctrl-l": "search::ToggleSelection"
    }
@@ -219,6 +226,7 @@
    "context": "ProjectSearchBar",
    "bindings": {
      "escape": "project_search::ToggleFocus",
+      "shift-find": "search::FocusSearch",
      "ctrl-shift-f": "search::FocusSearch",
      "ctrl-shift-h": "search::ToggleReplace",
      "alt-ctrl-g": "search::ToggleRegex",
@@ -251,32 +259,48 @@
  {
    "context": "Pane",
    "bindings": {
+      "alt-1": ["pane::ActivateItem", 0],
+      "alt-2": ["pane::ActivateItem", 1],
+      "alt-3": ["pane::ActivateItem", 2],
+      "alt-4": ["pane::ActivateItem", 3],
+      "alt-5": ["pane::ActivateItem", 4],
+      "alt-6": ["pane::ActivateItem", 5],
+      "alt-7": ["pane::ActivateItem", 6],
+      "alt-8": ["pane::ActivateItem", 7],
+      "alt-9": ["pane::ActivateItem", 8],
+      "alt-0": "pane::ActivateLastItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "back": "pane::GoBack",
-      "forward": "pane::GoForward",
-      "ctrl-w": "pane::CloseActiveItem",
      "ctrl-f4": "pane::CloseActiveItem",
+      "ctrl-w": "pane::CloseActiveItem",
      "alt-ctrl-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
      "alt-ctrl-shift-w": "workspace::CloseInactiveTabsAndPanes",
      "ctrl-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
      "ctrl-k t": ["pane::CloseItemsToTheRight", { "close_pinned": false }],
      "ctrl-k u": ["pane::CloseCleanItems", { "close_pinned": false }],
      "ctrl-k w": ["pane::CloseAllItems", { "close_pinned": false }],
-      "ctrl-shift-f": "pane::DeploySearch",
+      "back": "pane::GoBack",
+      "ctrl-alt--": "pane::GoBack",
+      "ctrl-alt-_": "pane::GoForward",
+      "forward": "pane::GoForward",
      "ctrl-alt-g": "search::SelectNextMatch",
+      "f3": "search::SelectNextMatch",
      "ctrl-alt-shift-g": "search::SelectPrevMatch",
+      "shift-f3": "search::SelectPrevMatch",
+      "ctrl-shift-f": "project_search::ToggleFocus",
+      "shift-find": "project_search::ToggleFocus",
      "ctrl-alt-shift-h": "search::ToggleReplace",
      "ctrl-alt-shift-l": "search::ToggleSelection",
      "alt-enter": "search::SelectAllMatches",
      "alt-c": "search::ToggleCaseSensitive",
      "alt-w": "search::ToggleWholeWord",
-      "alt-r": "search::ToggleRegex",
      "alt-ctrl-f": "project_search::ToggleFilters",
+      "alt-find": "project_search::ToggleFilters",
      "ctrl-alt-shift-r": "search::ToggleRegex",
      "ctrl-alt-shift-x": "search::ToggleRegex",
+      "alt-r": "search::ToggleRegex",
      "ctrl-k shift-enter": "pane::TogglePinTab"
    }
  },
@@ -351,40 +375,25 @@
      "ctrl-g": "go_to_line::Toggle"
    }
  },
-  {
-    "context": "Pane",
-    "bindings": {
-      "alt-1": ["pane::ActivateItem", 0],
-      "alt-2": ["pane::ActivateItem", 1],
-      "alt-3": ["pane::ActivateItem", 2],
-      "alt-4": ["pane::ActivateItem", 3],
-      "alt-5": ["pane::ActivateItem", 4],
-      "alt-6": ["pane::ActivateItem", 5],
-      "alt-7": ["pane::ActivateItem", 6],
-      "alt-8": ["pane::ActivateItem", 7],
-      "alt-9": ["pane::ActivateItem", 8],
-      "alt-0": "pane::ActivateLastItem",
-      "ctrl-alt--": "pane::GoBack",
-      "ctrl-alt-_": "pane::GoForward",
-      "ctrl-shift-t": "pane::ReopenClosedItem",
-      "f3": "search::SelectNextMatch",
-      "shift-f3": "search::SelectPrevMatch",
-      "ctrl-shift-f": "project_search::ToggleFocus"
-    }
-  },
  {
    "context": "Workspace",
    "bindings": {
      // Change the default action on `menu::Confirm` by setting the parameter
      // "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
+      "alt-open": "projects::OpenRecent",
      "alt-ctrl-o": "projects::OpenRecent",
+      "alt-shift-open": "projects::OpenRemote",
      "alt-ctrl-shift-o": "projects::OpenRemote",
      "alt-ctrl-shift-b": "branches::OpenRecent",
      "ctrl-~": "workspace::NewTerminal",
+      "save": "workspace::Save",
      "ctrl-s": "workspace::Save",
      "ctrl-k s": "workspace::SaveWithoutFormat",
+      "shift-save": "workspace::SaveAs",
      "ctrl-shift-s": "workspace::SaveAs",
+      "new": "workspace::NewFile",
      "ctrl-n": "workspace::NewFile",
+      "shift-new": "workspace::NewWindow",
      "ctrl-shift-n": "workspace::NewWindow",
      "ctrl-`": "terminal_panel::ToggleFocus",
      "alt-1": ["workspace::ActivatePane", 0],
@@ -400,8 +409,10 @@
      "ctrl-b": "workspace::ToggleLeftDock",
      "ctrl-j": "workspace::ToggleBottomDock",
      "ctrl-alt-y": "workspace::CloseAllDocks",
+      "shift-find": "pane::DeploySearch",
      "ctrl-shift-f": "pane::DeploySearch",
      "ctrl-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
+      "ctrl-shift-t": "pane::ReopenClosedItem",
      "ctrl-k ctrl-s": "zed::OpenKeymap",
      "ctrl-k ctrl-t": "theme_selector::Toggle",
      "ctrl-t": "project_symbols::Toggle",
@@ -409,12 +420,13 @@
      "ctrl-tab": "tab_switcher::Toggle",
      "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }],
      "ctrl-e": "file_finder::Toggle",
-      "ctrl-shift-p": "command_palette::Toggle",
      "f1": "command_palette::Toggle",
+      "ctrl-shift-p": "command_palette::Toggle",
      "ctrl-shift-m": "diagnostics::Deploy",
      "ctrl-shift-e": "project_panel::ToggleFocus",
      "ctrl-shift-b": "outline_panel::ToggleFocus",
      "ctrl-?": "assistant::ToggleFocus",
+      "alt-save": "workspace::SaveAll",
      "ctrl-alt-s": "workspace::SaveAll",
      "ctrl-k m": "language_selector::Toggle",
      "escape": "workspace::Unfollow",
@@ -447,7 +459,6 @@
  {
    "context": "Editor",
    "bindings": {
-      "ctrl-shift-k": "editor::DeleteLine",
      "ctrl-shift-d": "editor::DuplicateLineDown",
      "ctrl-shift-j": "editor::JoinLines",
      "ctrl-alt-backspace": "editor::DeleteToPreviousSubwordStart",
@@ -505,10 +516,10 @@
  {
    "context": "Editor && (showing_code_actions || showing_completions)",
    "bindings": {
-      "up": "editor::ContextMenuPrev",
      "ctrl-p": "editor::ContextMenuPrev",
-      "down": "editor::ContextMenuNext",
+      "up": "editor::ContextMenuPrev",
      "ctrl-n": "editor::ContextMenuNext",
+      "down": "editor::ContextMenuNext",
      "pageup": "editor::ContextMenuFirst",
      "pagedown": "editor::ContextMenuLast"
    }
@@ -559,6 +570,7 @@
      "ctrl-enter": "assistant::Assist",
      "ctrl-shift-enter": "assistant::Edit",
      "ctrl-s": "workspace::Save",
+      "save": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
      "shift-enter": "assistant::Split",
@@ -571,9 +583,11 @@
    "context": "AssistantPanel2",
    "bindings": {
      "ctrl-n": "assistant2::NewThread",
+      "new": "assistant2::NewThread",
      "ctrl-shift-h": "assistant2::OpenHistory",
      "ctrl-alt-/": "assistant2::ToggleModelSelector",
      "ctrl-shift-a": "assistant2::ToggleContextPicker",
+      "ctrl-e": "assistant2::ChatMode",
      "ctrl-alt-e": "assistant2::RemoveAllContext"
    }
  },
@@ -596,6 +610,12 @@
      "enter": "assistant2::AcceptSuggestedContext"
    }
  },
+  {
+    "context": "ThreadHistory",
+    "bindings": {
+      "backspace": "assistant2::RemoveSelectedThread"
+    }
+  },
  {
    "context": "PromptEditor",
    "bindings": {
@@ -616,7 +636,9 @@
      "escape": "menu::Cancel",
      "left": "outline_panel::CollapseSelectedEntry",
      "right": "outline_panel::ExpandSelectedEntry",
+      "alt-copy": "outline_panel::CopyPath",
      "ctrl-alt-c": "outline_panel::CopyPath",
+      "alt-shift-copy": "outline_panel::CopyRelativePath",
      "alt-ctrl-shift-c": "outline_panel::CopyRelativePath",
      "alt-ctrl-r": "outline_panel::RevealInFileManager",
      "space": "outline_panel::Open",
@@ -631,36 +653,38 @@
    "bindings": {
      "left": "project_panel::CollapseSelectedEntry",
      "right": "project_panel::ExpandSelectedEntry",
+      "new": "project_panel::NewFile",
      "ctrl-n": "project_panel::NewFile",
+      "alt-new": "project_panel::NewDirectory",
      "alt-ctrl-n": "project_panel::NewDirectory",
+      "cut": "project_panel::Cut",
+      "ctrl-x": "project_panel::Cut",
+      "copy": "project_panel::Copy",
      "ctrl-insert": "project_panel::Copy",
+      "ctrl-c": "project_panel::Copy",
+      "paste": "project_panel::Paste",
      "shift-insert": "project_panel::Paste",
+      "ctrl-v": "project_panel::Paste",
+      "alt-copy": "project_panel::CopyPath",
      "ctrl-alt-c": "project_panel::CopyPath",
+      "alt-shift-copy": "project_panel::CopyRelativePath",
      "alt-ctrl-shift-c": "project_panel::CopyRelativePath",
      "enter": "project_panel::Rename",
+      "f2": "project_panel::Rename",
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
+      "delete": ["project_panel::Trash", { "skip_prompt": false }],
      "shift-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFileManager",
      "ctrl-shift-enter": "project_panel::OpenWithSystem",
      "ctrl-shift-f": "project_panel::NewSearchInDirectory",
+      "shift-find": "project_panel::NewSearchInDirectory",
      "shift-down": "menu::SelectNext",
      "shift-up": "menu::SelectPrev",
      "escape": "menu::Cancel"
    }
  },
-  {
-    // Separate block with same context so these display in context menus
-    "context": "ProjectPanel",
-    "bindings": {
-      "f2": "project_panel::Rename",
-      "ctrl-c": "project_panel::Copy",
-      "ctrl-x": "project_panel::Cut",
-      "ctrl-v": "project_panel::Paste",
-      "delete": ["project_panel::Trash", { "skip_prompt": false }]
-    }
-  },
  {
    "context": "ProjectPanel && not_editing",
    "bindings": {
@@ -727,9 +751,9 @@
  {
    "context": "TabSwitcher",
    "bindings": {
+      "ctrl-shift-tab": "menu::SelectPrev",
      "ctrl-up": "menu::SelectPrev",
      "ctrl-down": "menu::SelectNext",
-      "ctrl-shift-tab": "menu::SelectPrev",
      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
    }
  },
@@ -737,12 +761,17 @@
    "context": "Terminal",
    "bindings": {
      "ctrl-alt-space": "terminal::ShowCharacterPalette",
+      "copy": "terminal::Copy",
      "ctrl-insert": "terminal::Copy",
+      "ctrl-shift-c": "terminal::Copy",
+      "paste": "terminal::Paste",
      "shift-insert": "terminal::Paste",
+      "ctrl-shift-v": "terminal::Paste",
      "ctrl-enter": "assistant::InlineAssist",
      // Overrides for conflicting keybindings
      "ctrl-w": ["terminal::SendKeystroke", "ctrl-w"],
      "ctrl-shift-a": "editor::SelectAll",
+      "find": "buffer_search::Deploy",
      "ctrl-shift-f": "buffer_search::Deploy",
      "ctrl-shift-l": "terminal::Clear",
      "ctrl-shift-w": "pane::CloseActiveItem",
@@ -762,13 +791,5 @@
      "shift-end": "terminal::ScrollToBottom",
      "ctrl-shift-space": "terminal::ToggleViMode"
    }
-  },
-  {
-    // Separate block with same context so these display in context menus
-    "context": "Terminal",
-    "bindings": {
-      "ctrl-shift-c": "terminal::Copy",
-      "ctrl-shift-v": "terminal::Paste"
-    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -3,27 +3,27 @@
  {
    "use_key_equivalents": true,
    "bindings": {
-      "up": "menu::SelectPrev",
-      "shift-tab": "menu::SelectPrev",
      "home": "menu::SelectFirst",
-      "pageup": "menu::SelectFirst",
      "shift-pageup": "menu::SelectFirst",
-      "ctrl-p": "menu::SelectPrev",
-      "down": "menu::SelectNext",
-      "tab": "menu::SelectNext",
-      "end": "menu::SelectLast",
-      "pagedown": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectFirst",
-      "ctrl-n": "menu::SelectNext",
+      "pageup": "menu::SelectFirst",
      "cmd-up": "menu::SelectFirst",
+      "end": "menu::SelectLast",
+      "shift-pagedown": "menu::SelectLast",
+      "pagedown": "menu::SelectLast",
      "cmd-down": "menu::SelectLast",
+      "tab": "menu::SelectNext",
+      "ctrl-n": "menu::SelectNext",
+      "down": "menu::SelectNext",
+      "shift-tab": "menu::SelectPrev",
+      "ctrl-p": "menu::SelectPrev",
+      "up": "menu::SelectPrev",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "cmd-enter": "menu::SecondaryConfirm",
-      "escape": "menu::Cancel",
-      "cmd-escape": "menu::Cancel",
      "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",
@@ -38,7 +38,9 @@
      "alt-cmd-h": "zed::HideOthers",
      "cmd-m": "zed::Minimize",
      "fn-f": "zed::ToggleFullScreen",
-      "ctrl-cmd-f": "zed::ToggleFullScreen"
+      "ctrl-cmd-f": "zed::ToggleFullScreen",
+      "ctrl-shift-z": "zeta::RateCompletions",
+      "ctrl-shift-i": "inline_completion::ToggleMenu"
    }
  },
  {
@@ -46,18 +48,18 @@
    "use_key_equivalents": true,
    "bindings": {
      "escape": "editor::Cancel",
-      "backspace": "editor::Backspace",
      "shift-backspace": "editor::Backspace",
      "ctrl-h": "editor::Backspace",
-      "delete": "editor::Delete",
+      "backspace": "editor::Backspace",
      "ctrl-d": "editor::Delete",
+      "delete": "editor::Delete",
      "tab": "editor::Tab",
      "shift-tab": "editor::TabPrev",
      "ctrl-t": "editor::Transpose",
      "ctrl-k": "editor::KillRingCut",
      "ctrl-y": "editor::KillRingYank",
-      "cmd-k q": "editor::Rewrap",
      "cmd-k cmd-q": "editor::Rewrap",
+      "cmd-k q": "editor::Rewrap",
      "cmd-backspace": "editor::DeleteToBeginningOfLine",
      "cmd-delete": "editor::DeleteToEndOfLine",
      "alt-backspace": "editor::DeleteToPreviousWordStart",
@@ -68,34 +70,33 @@
      "cmd-v": "editor::Paste",
      "cmd-z": "editor::Undo",
      "cmd-shift-z": "editor::Redo",
-      "ctrl-shift-z": "zeta::RateCompletions",
      "up": "editor::MoveUp",
      "ctrl-up": "editor::MoveToStartOfParagraph",
      "pageup": "editor::MovePageUp",
      "shift-pageup": "editor::SelectPageUp",
      "cmd-pageup": "editor::PageUp",
      "ctrl-pageup": "editor::LineUp",
-      "home": "editor::MoveToBeginningOfLine",
      "down": "editor::MoveDown",
      "ctrl-down": "editor::MoveToEndOfParagraph",
      "pagedown": "editor::MovePageDown",
      "shift-pagedown": "editor::SelectPageDown",
      "cmd-pagedown": "editor::PageDown",
      "ctrl-pagedown": "editor::LineDown",
-      "end": "editor::MoveToEndOfLine",
-      "left": "editor::MoveLeft",
-      "right": "editor::MoveRight",
      "ctrl-p": "editor::MoveUp",
      "ctrl-n": "editor::MoveDown",
      "ctrl-b": "editor::MoveLeft",
+      "left": "editor::MoveLeft",
      "ctrl-f": "editor::MoveRight",
+      "right": "editor::MoveRight",
      "ctrl-l": "editor::ScrollCursorCenter",
      "alt-left": "editor::MoveToPreviousWordStart",
      "alt-right": "editor::MoveToNextWordEnd",
      "cmd-left": "editor::MoveToBeginningOfLine",
      "ctrl-a": "editor::MoveToBeginningOfLine",
+      "home": "editor::MoveToBeginningOfLine",
      "cmd-right": "editor::MoveToEndOfLine",
      "ctrl-e": "editor::MoveToEndOfLine",
+      "end": "editor::MoveToEndOfLine",
      "cmd-up": "editor::MoveToBeginning",
      "cmd-down": "editor::MoveToEnd",
      "shift-up": "editor::SelectUp",
@@ -138,8 +139,8 @@
    "context": "Editor && mode == full",
    "use_key_equivalents": true,
    "bindings": {
-      "enter": "editor::Newline",
      "shift-enter": "editor::Newline",
+      "enter": "editor::Newline",
      "cmd-enter": "editor::NewlineBelow",
      "cmd-shift-enter": "editor::NewlineAbove",
      "cmd-k z": "editor::ToggleSoftWrap",
@@ -226,9 +227,11 @@
    "use_key_equivalents": true,
    "bindings": {
      "cmd-n": "assistant2::NewThread",
+      "cmd-alt-p": "assistant2::NewPromptEditor",
      "cmd-shift-h": "assistant2::OpenHistory",
      "cmd-alt-/": "assistant2::ToggleModelSelector",
      "cmd-shift-a": "assistant2::ToggleContextPicker",
+      "cmd-e": "assistant2::ChatMode",
      "cmd-alt-e": "assistant2::RemoveAllContext"
    }
  },
@@ -251,6 +254,12 @@
      "enter": "assistant2::AcceptSuggestedContext"
    }
  },
+  {
+    "context": "ThreadHistory",
+    "bindings": {
+      "backspace": "assistant2::RemoveSelectedThread"
+    }
+  },
  {
    "context": "PromptLibrary",
    "use_key_equivalents": true,
@@ -333,10 +342,10 @@
    "context": "Pane",
    "use_key_equivalents": true,
    "bindings": {
-      "cmd-{": "pane::ActivatePrevItem",
-      "cmd-}": "pane::ActivateNextItem",
      "alt-cmd-left": "pane::ActivatePrevItem",
+      "cmd-{": "pane::ActivatePrevItem",
      "alt-cmd-right": "pane::ActivateNextItem",
+      "cmd-}": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
      "cmd-w": "pane::CloseActiveItem",
@@ -366,10 +375,10 @@
    "bindings": {
      "cmd-[": "editor::Outdent",
      "cmd-]": "editor::Indent",
-      "cmd-alt-up": "editor::AddSelectionAbove", // Insert cursor above
-      "cmd-ctrl-p": "editor::AddSelectionAbove",
-      "cmd-alt-down": "editor::AddSelectionBelow", // Insert cursor below
-      "cmd-ctrl-n": "editor::AddSelectionBelow",
+      "cmd-ctrl-p": "editor::AddSelectionAbove", // Insert cursor above
+      "cmd-alt-up": "editor::AddSelectionAbove",
+      "cmd-ctrl-n": "editor::AddSelectionBelow", // Insert cursor below
+      "cmd-alt-down": "editor::AddSelectionBelow",
      "cmd-shift-k": "editor::DeleteLine",
      "alt-up": "editor::MoveLineUp",
      "alt-down": "editor::MoveLineDown",
@@ -396,8 +405,8 @@
      "shift-f12": "editor::GoToImplementation",
      "alt-cmd-f12": "editor::GoToTypeDefinitionSplit",
      "alt-shift-f12": "editor::FindAllReferences",
-      "ctrl-m": "editor::MoveToEnclosingBracket",
      "cmd-|": "editor::MoveToEnclosingBracket",
+      "ctrl-m": "editor::MoveToEnclosingBracket",
      "alt-cmd-[": "editor::Fold",
      "alt-cmd-]": "editor::UnfoldLines",
      "cmd-k cmd-l": "editor::ToggleFold",
@@ -414,6 +423,8 @@
      "cmd-k cmd-9": ["editor::FoldAtLevel", { "level": 9 }],
      "cmd-k cmd-0": "editor::FoldAll",
      "cmd-k cmd-j": "editor::UnfoldAll",
+      // Using `ctrl-space` in Zed requires disabling the macOS global shortcut.
+      // System Preferences->Keyboard->Keyboard Shortcuts->Input Sources->Select the previous input source (uncheck)
      "ctrl-space": "editor::ShowCompletions",
      "cmd-.": "editor::ToggleCodeActions",
      "cmd-k r": "editor::RevealInFileManager",
@@ -448,7 +459,6 @@
      "ctrl-0": "pane::ActivateLastItem",
      "ctrl--": "pane::GoBack",
      "ctrl-shift--": "pane::GoForward",
-      "cmd-shift-t": "pane::ReopenClosedItem",
      "cmd-shift-f": "pane::DeploySearch"
    }
  },
@@ -482,6 +492,7 @@
      "alt-cmd-y": "workspace::CloseAllDocks",
      "cmd-shift-f": "pane::DeploySearch",
      "cmd-shift-h": ["pane::DeploySearch", { "replace_enabled": true }],
+      "cmd-shift-t": "pane::ReopenClosedItem",
      "cmd-k cmd-s": "zed::OpenKeymap",
      "cmd-k cmd-t": "theme_selector::Toggle",
      "cmd-t": "project_symbols::Toggle",
@@ -797,9 +808,9 @@
    "context": "TabSwitcher",
    "use_key_equivalents": true,
    "bindings": {
+      "ctrl-shift-tab": "menu::SelectPrev",
      "ctrl-up": "menu::SelectPrev",
      "ctrl-down": "menu::SelectNext",
-      "ctrl-shift-tab": "menu::SelectPrev",
      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
    }
  },
@@ -830,16 +841,16 @@
      "escape": ["terminal::SendKeystroke", "escape"],
      "enter": ["terminal::SendKeystroke", "enter"],
      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
-      "cmd-up": "terminal::ScrollPageUp",
-      "cmd-down": "terminal::ScrollPageDown",
      "shift-pageup": "terminal::ScrollPageUp",
+      "cmd-up": "terminal::ScrollPageUp",
      "shift-pagedown": "terminal::ScrollPageDown",
+      "cmd-down": "terminal::ScrollPageDown",
      "shift-up": "terminal::ScrollLineUp",
      "shift-down": "terminal::ScrollLineDown",
-      "cmd-home": "terminal::ScrollToTop",
-      "cmd-end": "terminal::ScrollToBottom",
      "shift-home": "terminal::ScrollToTop",
+      "cmd-home": "terminal::ScrollToTop",
      "shift-end": "terminal::ScrollToBottom",
+      "cmd-end": "terminal::ScrollToBottom",
      "ctrl-shift-space": "terminal::ToggleViMode",
      "ctrl-k up": "pane::SplitUp",
      "ctrl-k down": "pane::SplitDown",
@@ -866,5 +877,12 @@
      "cmd-shift-enter": "zeta::ThumbsUpActiveCompletion",
      "cmd-shift-backspace": "zeta::ThumbsDownActiveCompletion"
    }
+  },
+  {
+    "context": "ZedPredictTos",
+    "use_key_equivalents": true,
+    "bindings": {
+      "escape": "menu::Cancel"
+    }
  }
 ]
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -15,7 +15,9 @@
      "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer
      "alt-g g": "go_to_line::Toggle", // goto-line
      "alt-g alt-g": "go_to_line::Toggle", // goto-line
-      //"ctrl-space": "editor::SetMark",
+      "ctrl-space": "editor::SetMark", // set-mark
+      "ctrl-@": "editor::SetMark", // set-mark
+      "ctrl-x ctrl-x": "editor::SwapSelectionEnds", // exchange-point-and-mark
      "ctrl-f": "editor::MoveRight", // forward-char
      "ctrl-b": "editor::MoveLeft", // backward-char
      "ctrl-n": "editor::MoveDown", // next-line
@@ -24,6 +26,8 @@
      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
+      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
+      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
      "alt-f": "editor::MoveToNextSubwordEnd", // forward-word
      "alt-b": "editor::MoveToPreviousSubwordStart", // backward-word
      "alt-u": "editor::ConvertToUpperCase", // upcase-word
@@ -55,6 +59,32 @@
      "alt-^": "editor::JoinLines" // join-line
    }
  },
+  {
+    "context": "Editor && selection_mode", // region selection
+    "bindings": {
+      "right": "editor::SelectRight",
+      "left": "editor::SelectLeft",
+      "down": "editor::SelectDown",
+      "up": "editor::SelectUp",
+      "alt-left": "editor::SelectToPreviousWordStart",
+      "alt-right": "editor::SelectToNextWordEnd",
+      "pagedown": "editor::SelectPageDown",
+      "pageup": "editor::SelectPageUp",
+      "ctrl-f": "editor::SelectRight",
+      "ctrl-b": "editor::SelectLeft",
+      "ctrl-n": "editor::SelectDown",
+      "ctrl-p": "editor::SelectUp",
+      "home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
+      "alt-f": "editor::SelectToNextWordEnd",
+      "alt-b": "editor::SelectToPreviousSubwordStart",
+      "alt-<": "editor::SelectToBeginning",
+      "alt->": "editor::SelectToEnd",
+      "ctrl-g": "editor::Cancel"
+    }
+  },
  {
    "context": "Workspace",
    "bindings": {
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -15,7 +15,9 @@
      "ctrl-x b": "tab_switcher::Toggle", // switch-to-buffer
      "alt-g g": "go_to_line::Toggle", // goto-line
      "alt-g alt-g": "go_to_line::Toggle", // goto-line
-      //"ctrl-space": "editor::SetMark",
+      "ctrl-space": "editor::SetMark", // set-mark
+      "ctrl-@": "editor::SetMark", // set-mark
+      "ctrl-x ctrl-x": "editor::SwapSelectionEnds", // exchange-point-and-mark
      "ctrl-f": "editor::MoveRight", // forward-char
      "ctrl-b": "editor::MoveLeft", // backward-char
      "ctrl-n": "editor::MoveDown", // next-line
@@ -24,6 +26,8 @@
      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
+      "shift-home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }], // move-beginning-of-line
+      "shift-end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }], // move-end-of-line
      "alt-f": "editor::MoveToNextSubwordEnd", // forward-word
      "alt-b": "editor::MoveToPreviousSubwordStart", // backward-word
      "alt-u": "editor::ConvertToUpperCase", // upcase-word
@@ -55,6 +59,32 @@
      "alt-^": "editor::JoinLines" // join-line
    }
  },
+  {
+    "context": "Editor && selection_mode", // region selection
+    "bindings": {
+      "right": "editor::SelectRight",
+      "left": "editor::SelectLeft",
+      "down": "editor::SelectDown",
+      "up": "editor::SelectUp",
+      "alt-left": "editor::SelectToPreviousWordStart",
+      "alt-right": "editor::SelectToNextWordEnd",
+      "pagedown": "editor::SelectPageDown",
+      "pageup": "editor::SelectPageUp",
+      "ctrl-f": "editor::SelectRight",
+      "ctrl-b": "editor::SelectLeft",
+      "ctrl-n": "editor::SelectDown",
+      "ctrl-p": "editor::SelectUp",
+      "home": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "end": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-a": ["editor::SelectToBeginningOfLine", { "stop_at_soft_wraps": false }],
+      "ctrl-e": ["editor::SelectToEndOfLine", { "stop_at_soft_wraps": false }],
+      "alt-f": "editor::SelectToNextWordEnd",
+      "alt-b": "editor::SelectToPreviousSubwordStart",
+      "alt-<": "editor::SelectToBeginning",
+      "alt->": "editor::SelectToEnd",
+      "ctrl-g": "editor::Cancel"
+    }
+  },
  {
    "context": "Workspace",
    "bindings": {
--- a/assets/keymaps/storybook.json
+++ b/assets/keymaps/storybook.json
@@ -2,21 +2,27 @@
  // Standard macOS bindings
  {
    "bindings": {
-      "up": "menu::SelectPrev",
-      "pageup": "menu::SelectFirst",
+      "home": "menu::SelectFirst",
      "shift-pageup": "menu::SelectFirst",
-      "ctrl-p": "menu::SelectPrev",
-      "down": "menu::SelectNext",
-      "pagedown": "menu::SelectLast",
-      "shift-pagedown": "menu::SelectFirst",
-      "ctrl-n": "menu::SelectNext",
+      "pageup": "menu::SelectFirst",
      "cmd-up": "menu::SelectFirst",
+      "end": "menu::SelectLast",
+      "shift-pagedown": "menu::SelectLast",
+      "pagedown": "menu::SelectLast",
      "cmd-down": "menu::SelectLast",
+      "tab": "menu::SelectNext",
+      "ctrl-n": "menu::SelectNext",
+      "down": "menu::SelectNext",
+      "shift-tab": "menu::SelectPrev",
+      "ctrl-p": "menu::SelectPrev",
+      "up": "menu::SelectPrev",
      "enter": "menu::Confirm",
      "ctrl-enter": "menu::SecondaryConfirm",
      "cmd-enter": "menu::SecondaryConfirm",
-      "escape": "menu::Cancel",
+      "ctrl-escape": "menu::Cancel",
+      "cmd-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
+      "escape": "menu::Cancel",
      "cmd-q": "storybook::Quit",
      "backspace": "editor::Backspace",
      "delete": "editor::Delete",
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -4,25 +4,25 @@
    "bindings": {
      "i": ["vim::PushOperator", { "Object": { "around": false } }],
      "a": ["vim::PushOperator", { "Object": { "around": true } }],
-      "h": "vim::Left",
      "left": "vim::Left",
+      "h": "vim::Left",
      "backspace": "vim::Backspace",
-      "j": "vim::Down",
      "down": "vim::Down",
      "ctrl-j": "vim::Down",
-      "enter": "vim::NextLineStart",
+      "j": "vim::Down",
      "ctrl-m": "vim::NextLineStart",
      "+": "vim::NextLineStart",
+      "enter": "vim::NextLineStart",
      "-": "vim::PreviousLineStart",
-      "tab": "vim::Tab",
      "shift-tab": "vim::Tab",
-      "k": "vim::Up",
+      "tab": "vim::Tab",
      "up": "vim::Up",
-      "l": "vim::Right",
+      "k": "vim::Up",
      "right": "vim::Right",
+      "l": "vim::Right",
      "space": "vim::Space",
-      "$": "vim::EndOfLine",
      "end": "vim::EndOfLine",
+      "$": "vim::EndOfLine",
      "^": "vim::FirstNonWhitespace",
      "_": "vim::StartOfLineDownward",
      "g _": "vim::EndOfLineDownward",
@@ -188,8 +188,8 @@
  {
    "context": "vim_mode == normal",
    "bindings": {
-      "escape": "editor::Cancel",
      "ctrl-[": "editor::Cancel",
+      "escape": "editor::Cancel",
      ":": "command_palette::Toggle",
      ".": "vim::Repeat",
      "c": ["vim::PushOperator", "Change"],
@@ -221,12 +221,13 @@
      ">": ["vim::PushOperator", "Indent"],
      "<": ["vim::PushOperator", "Outdent"],
      "=": ["vim::PushOperator", "AutoIndent"],
+      "!": ["vim::PushOperator", "ShellCommand"],
      "g u": ["vim::PushOperator", "Lowercase"],
      "g shift-u": ["vim::PushOperator", "Uppercase"],
      "g ~": ["vim::PushOperator", "OppositeCase"],
      "\"": ["vim::PushOperator", "Register"],
-      "g q": ["vim::PushOperator", "Rewrap"],
      "g w": ["vim::PushOperator", "Rewrap"],
+      "g q": ["vim::PushOperator", "Rewrap"],
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      "insert": "vim::InsertBefore",
@@ -253,8 +254,8 @@
      ":": "vim::VisualCommand",
      "u": "vim::ConvertToLowerCase",
      "shift-u": "vim::ConvertToUpperCase",
-      "o": "vim::OtherEnd",
      "shift-o": "vim::OtherEnd",
+      "o": "vim::OtherEnd",
      "d": "vim::VisualDelete",
      "x": "vim::VisualDelete",
      "shift-d": "vim::VisualDeleteLine",
@@ -263,10 +264,10 @@
      "shift-y": "vim::VisualYankLine",
      "p": "vim::Paste",
      "shift-p": ["vim::Paste", { "preserveClipboard": true }],
-      "s": "vim::Substitute",
-      "shift-s": "vim::SubstituteLine",
-      "shift-r": "vim::SubstituteLine",
      "c": "vim::Substitute",
+      "s": "vim::Substitute",
+      "shift-r": "vim::SubstituteLine",
+      "shift-s": "vim::SubstituteLine",
      "~": "vim::ChangeCase",
      "*": ["vim::MoveToNext", { "partialWord": true }],
      "#": ["vim::MoveToPrev", { "partialWord": true }],
@@ -282,11 +283,12 @@
      "g shift-j": "vim::JoinLinesNoWhitespace",
      "r": ["vim::PushOperator", "Replace"],
      "ctrl-c": ["vim::SwitchMode", "Normal"],
-      "escape": ["vim::SwitchMode", "Normal"],
      "ctrl-[": ["vim::SwitchMode", "Normal"],
+      "escape": ["vim::SwitchMode", "Normal"],
      ">": "vim::Indent",
      "<": "vim::Outdent",
      "=": "vim::AutoIndent",
+      "!": "vim::ShellCommand",
      "i": ["vim::PushOperator", { "Object": { "around": false } }],
      "a": ["vim::PushOperator", { "Object": { "around": true } }],
      "g c": "vim::ToggleComments",
@@ -300,9 +302,9 @@
  {
    "context": "vim_mode == insert",
    "bindings": {
-      "escape": "vim::NormalBefore",
      "ctrl-c": "vim::NormalBefore",
      "ctrl-[": "vim::NormalBefore",
+      "escape": "vim::NormalBefore",
      "ctrl-x": null,
      "ctrl-x ctrl-o": "editor::ShowCompletions",
      "ctrl-x ctrl-a": "assistant::InlineAssist", // zed specific
@@ -350,9 +352,9 @@
  {
    "context": "vim_mode == replace",
    "bindings": {
-      "escape": "vim::NormalBefore",
      "ctrl-c": "vim::NormalBefore",
      "ctrl-[": "vim::NormalBefore",
+      "escape": "vim::NormalBefore",
      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
@@ -369,9 +371,9 @@
    "bindings": {
      "tab": "vim::Tab",
      "enter": "vim::Enter",
-      "escape": "vim::ClearOperators",
      "ctrl-c": "vim::ClearOperators",
      "ctrl-[": "vim::ClearOperators",
+      "escape": "vim::ClearOperators",
      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
      "ctrl-q": ["vim::PushOperator", { "Literal": {} }]
@@ -380,9 +382,9 @@
  {
    "context": "vim_mode == operator",
    "bindings": {
-      "escape": "vim::ClearOperators",
      "ctrl-c": "vim::ClearOperators",
      "ctrl-[": "vim::ClearOperators",
+      "escape": "vim::ClearOperators",
      "g c": "vim::Comment"
    }
  },
@@ -498,6 +500,12 @@
      "=": "vim::CurrentLine"
    }
  },
+  {
+    "context": "vim_operator == sh",
+    "bindings": {
+      "!": "vim::CurrentLine"
+    }
+  },
  {
    "context": "vim_operator == gc",
    "bindings": {
@@ -563,14 +571,14 @@
      "ctrl-w right": ["workspace::ActivatePaneInDirection", "Right"],
      "ctrl-w up": ["workspace::ActivatePaneInDirection", "Up"],
      "ctrl-w down": ["workspace::ActivatePaneInDirection", "Down"],
-      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
      "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
      "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
      "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
      "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
+      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
+      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
+      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
+      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
      "ctrl-w shift-left": ["workspace::SwapPaneInDirection", "Left"],
      "ctrl-w shift-right": ["workspace::SwapPaneInDirection", "Right"],
      "ctrl-w shift-up": ["workspace::SwapPaneInDirection", "Up"],
@@ -595,19 +603,19 @@
      "ctrl-w ctrl-p": "workspace::ActivatePreviousPane",
      "ctrl-w shift-w": "workspace::ActivatePreviousPane",
      "ctrl-w ctrl-shift-w": "workspace::ActivatePreviousPane",
-      "ctrl-w v": "pane::SplitVertical",
      "ctrl-w ctrl-v": "pane::SplitVertical",
-      "ctrl-w s": "pane::SplitHorizontal",
+      "ctrl-w v": "pane::SplitVertical",
      "ctrl-w shift-s": "pane::SplitHorizontal",
      "ctrl-w ctrl-s": "pane::SplitHorizontal",
-      "ctrl-w c": "pane::CloseAllItems",
+      "ctrl-w s": "pane::SplitHorizontal",
      "ctrl-w ctrl-c": "pane::CloseAllItems",
-      "ctrl-w q": "pane::CloseAllItems",
+      "ctrl-w c": "pane::CloseAllItems",
      "ctrl-w ctrl-q": "pane::CloseAllItems",
-      "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
+      "ctrl-w q": "pane::CloseAllItems",
      "ctrl-w ctrl-o": "workspace::CloseInactiveTabsAndPanes",
-      "ctrl-w n": "workspace::NewFileSplitHorizontal",
-      "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal"
+      "ctrl-w o": "workspace::CloseInactiveTabsAndPanes",
+      "ctrl-w ctrl-n": "workspace::NewFileSplitHorizontal",
+      "ctrl-w n": "workspace::NewFileSplitHorizontal"
    }
  },
  {
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -908,6 +908,23 @@
      // The shell running in the terminal needs to be configured to emit the title.
      // Example: `echo -e "\e]2;New Title\007";`
      "breadcrumbs": true
+    },
+    /// Scrollbar-related settings
+    "scrollbar": {
+      /// When to show the scrollbar in the terminal.
+      /// This setting can take four values:
+      ///
+      /// 1. null (default): Inherit editor settings
+      /// 2. Show the scrollbar if there's important information or
+      ///    follow the system's configured behavior (default):
+      ///   "auto"
+      /// 3. Match the system's configured behavior:
+      ///    "system"
+      /// 4. Always show the scrollbar:
+      ///    "always"
+      /// 5. Never show the scrollbar:
+      ///    "never"
+      "show": null
    }
    // Set the terminal's font size. If this option is not included,
    // the terminal will default to matching the buffer's font size.
@@ -1149,9 +1166,6 @@
    },
    "lmstudio": {
      "api_url": "http://localhost:1234/api/v0"
-    },
-    "deepseek": {
-      "api_url": "https://api.deepseek.com"
    }
  },
  // Zed's Prettier integration settings.
--- a/assets/themes/andromeda/andromeda.json
+++ b/assets/themes/andromeda/andromeda.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#21242bff",
        "editor.active_line.background": "#21242bbf",
        "editor.highlighted_line.background": "#21242bff",
-        "editor.line_number": "#f7f7f859",
-        "editor.active_line_number": "#f7f7f8ff",
+        "editor.line_number": "#565960",
+        "editor.active_line_number": "#f8f8f9",
+        "editor.hover_line_number": "#cbcdd0",
        "editor.invisible": "#64646dff",
        "editor.wrap_guide": "#f7f7f80d",
        "editor.active_wrap_guide": "#f7f7f81a",
--- a/assets/themes/atelier/atelier.json
+++ b/assets/themes/atelier/atelier.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#221f26ff",
        "editor.active_line.background": "#221f26bf",
        "editor.highlighted_line.background": "#221f26ff",
-        "editor.line_number": "#efecf459",
-        "editor.active_line_number": "#efecf4ff",
+        "editor.line_number": "#656369",
+        "editor.active_line_number": "#d8d8da",
+        "editor.hover_line_number": "#b7b5ba",
        "editor.invisible": "#726c7aff",
        "editor.wrap_guide": "#efecf40d",
        "editor.active_wrap_guide": "#efecf41a",
@@ -444,8 +445,9 @@
        "editor.subheader.background": "#e6e3ebff",
        "editor.active_line.background": "#e6e3ebbf",
        "editor.highlighted_line.background": "#e6e3ebff",
-        "editor.line_number": "#19171c59",
-        "editor.active_line_number": "#19171cff",
+        "editor.line_number": "#a4a2a8",
+        "editor.active_line_number": "#323135",
+        "editor.hover_line_number": "#58565c",
        "editor.invisible": "#726c7aff",
        "editor.wrap_guide": "#19171c0d",
        "editor.active_wrap_guide": "#19171c1a",
@@ -829,8 +831,9 @@
        "editor.subheader.background": "#262622ff",
        "editor.active_line.background": "#262622bf",
        "editor.highlighted_line.background": "#262622ff",
-        "editor.line_number": "#fefbec59",
-        "editor.active_line_number": "#fefbecff",
+        "editor.line_number": "#6d6c66",
+        "editor.active_line_number": "#dadad7",
+        "editor.hover_line_number": "#bab9b5",
        "editor.invisible": "#8b8773ff",
        "editor.wrap_guide": "#fefbec0d",
        "editor.active_wrap_guide": "#fefbec1a",
@@ -1214,8 +1217,9 @@
        "editor.subheader.background": "#eeebd7ff",
        "editor.active_line.background": "#eeebd7bf",
        "editor.highlighted_line.background": "#eeebd7ff",
-        "editor.line_number": "#20201d59",
-        "editor.active_line_number": "#20201dff",
+        "editor.line_number": "#b1afa5",
+        "editor.active_line_number": "#292824",
+        "editor.hover_line_number": "#44433b",
        "editor.invisible": "#8b8773ff",
        "editor.wrap_guide": "#20201d0d",
        "editor.active_wrap_guide": "#20201d1a",
@@ -1599,8 +1603,9 @@
        "editor.subheader.background": "#2c2b23ff",
        "editor.active_line.background": "#2c2b23bf",
        "editor.highlighted_line.background": "#2c2b23ff",
-        "editor.line_number": "#f4f3ec59",
-        "editor.active_line_number": "#f4f3ecff",
+        "editor.line_number": "#6b6b65",
+        "editor.active_line_number": "#e6e6e5",
+        "editor.hover_line_number": "#babab6",
        "editor.invisible": "#7a7867ff",
        "editor.wrap_guide": "#f4f3ec0d",
        "editor.active_wrap_guide": "#f4f3ec1a",
@@ -1984,8 +1989,9 @@
        "editor.subheader.background": "#ebeae3ff",
        "editor.active_line.background": "#ebeae3bf",
        "editor.highlighted_line.background": "#ebeae3ff",
-        "editor.line_number": "#22221b59",
-        "editor.active_line_number": "#22221bff",
+        "editor.line_number": "#abaaa4",
+        "editor.active_line_number": "#282725",
+        "editor.hover_line_number": "#42423d",
        "editor.invisible": "#7a7867ff",
        "editor.wrap_guide": "#22221b0d",
        "editor.active_wrap_guide": "#22221b1a",
@@ -2369,8 +2375,9 @@
        "editor.subheader.background": "#27211eff",
        "editor.active_line.background": "#27211ebf",
        "editor.highlighted_line.background": "#27211eff",
-        "editor.line_number": "#f0eeed59",
-        "editor.active_line_number": "#f0eeedff",
+        "editor.line_number": "#656362k",
+        "editor.active_line_number": "#e6e5e5",
+        "editor.hover_line_number": "#b9b7b7",
        "editor.invisible": "#89817dff",
        "editor.wrap_guide": "#f0eeed0d",
        "editor.active_wrap_guide": "#f0eeed1a",
@@ -2754,8 +2761,9 @@
        "editor.subheader.background": "#e9e6e4ff",
        "editor.active_line.background": "#e9e6e4bf",
        "editor.highlighted_line.background": "#e9e6e4ff",
-        "editor.line_number": "#1b191859",
-        "editor.active_line_number": "#1b1918ff",
+        "editor.line_number": "#a3a19f",
+        "editor.active_line_number": "#272625",
+        "editor.hover_line_number": "#4e4d4b",
        "editor.invisible": "#89817dff",
        "editor.wrap_guide": "#1b19180d",
        "editor.active_wrap_guide": "#1b19181a",
@@ -3139,8 +3147,9 @@
        "editor.subheader.background": "#252025ff",
        "editor.active_line.background": "#252025bf",
        "editor.highlighted_line.background": "#252025ff",
-        "editor.line_number": "#f7f3f759",
-        "editor.active_line_number": "#f7f3f7ff",
+        "editor.line_number": "#555256",
+        "editor.active_line_number": "#e6e5e6",
+        "editor.hover_line_number": "#c0bec1",
        "editor.invisible": "#8b7b8bff",
        "editor.wrap_guide": "#f7f3f70d",
        "editor.active_wrap_guide": "#f7f3f71a",
@@ -3524,8 +3533,9 @@
        "editor.subheader.background": "#e0d5e0ff",
        "editor.active_line.background": "#e0d5e0bf",
        "editor.highlighted_line.background": "#e0d5e0ff",
-        "editor.line_number": "#1b181b59",
-        "editor.active_line_number": "#1b181bff",
+        "editor.line_number": "#a9a7aa",
+        "editor.active_line_number": "#262627",
+        "editor.hover_line_number": "#403f41",
        "editor.invisible": "#8b7b8bff",
        "editor.wrap_guide": "#1b181b0d",
        "editor.active_wrap_guide": "#1b181b1a",
@@ -3909,8 +3919,9 @@
        "editor.subheader.background": "#1c2529ff",
        "editor.active_line.background": "#1c2529bf",
        "editor.highlighted_line.background": "#1c2529ff",
-        "editor.line_number": "#ebf8ff59",
-        "editor.active_line_number": "#ebf8ffff",
+        "editor.line_number": "#61686ck",
+        "editor.active_line_number": "#eaebec",
+        "editor.hover_line_number": "#bcc0c3",
        "editor.invisible": "#66889aff",
        "editor.wrap_guide": "#ebf8ff0d",
        "editor.active_wrap_guide": "#ebf8ff1a",
@@ -4294,8 +4305,9 @@
        "editor.subheader.background": "#cdeaf9ff",
        "editor.active_line.background": "#cdeaf9bf",
        "editor.highlighted_line.background": "#cdeaf9ff",
-        "editor.line_number": "#161b1d59",
-        "editor.active_line_number": "#161b1dff",
+        "editor.line_number": "#a3abafk",
+        "editor.active_line_number": "#242729",
+        "editor.hover_line_number": "#3b4144",
        "editor.invisible": "#66889aff",
        "editor.wrap_guide": "#161b1d0d",
        "editor.active_wrap_guide": "#161b1d1a",
@@ -4679,8 +4691,9 @@
        "editor.subheader.background": "#252020ff",
        "editor.active_line.background": "#252020bf",
        "editor.highlighted_line.background": "#252020ff",
-        "editor.line_number": "#f4ecec59",
-        "editor.active_line_number": "#f4ececff",
+        "editor.line_number": "#666262",
+        "editor.active_line_number": "#e6e5e5",
+        "editor.hover_line_number": "#b9b6b6",
        "editor.invisible": "#726a6aff",
        "editor.wrap_guide": "#f4ecec0d",
        "editor.active_wrap_guide": "#f4ecec1a",
@@ -5064,8 +5077,9 @@
        "editor.subheader.background": "#ebe3e3ff",
        "editor.active_line.background": "#ebe3e3bf",
        "editor.highlighted_line.background": "#ebe3e3ff",
-        "editor.line_number": "#1b181859",
-        "editor.active_line_number": "#1b1818ff",
+        "editor.line_number": "#a7a2a2",
+        "editor.active_line_number": "#272525",
+        "editor.hover_line_number": "#3f3c3c",
        "editor.invisible": "#726a6aff",
        "editor.wrap_guide": "#1b18180d",
        "editor.active_wrap_guide": "#1b18181a",
@@ -5449,8 +5463,9 @@
        "editor.subheader.background": "#1f2621ff",
        "editor.active_line.background": "#1f2621bf",
        "editor.highlighted_line.background": "#1f2621ff",
-        "editor.line_number": "#ecf4ee59",
-        "editor.active_line_number": "#ecf4eeff",
+        "editor.line_number": "#626763",
+        "editor.active_line_number": "#e5e6e5",
+        "editor.hover_line_number": "#b6b9b7",
        "editor.invisible": "#6c7a71ff",
        "editor.wrap_guide": "#ecf4ee0d",
        "editor.active_wrap_guide": "#ecf4ee1a",
@@ -5834,8 +5849,9 @@
        "editor.subheader.background": "#e3ebe6ff",
        "editor.active_line.background": "#e3ebe6bf",
        "editor.highlighted_line.background": "#e3ebe6ff",
-        "editor.line_number": "#171c1959",
-        "editor.active_line_number": "#171c19ff",
+        "editor.line_number": "#a3a9a4",
+        "editor.active_line_number": "#252825",
+        "editor.hover_line_number": "#313532",
        "editor.invisible": "#6c7a71ff",
        "editor.wrap_guide": "#171c190d",
        "editor.active_wrap_guide": "#171c191a",
@@ -6219,8 +6235,9 @@
        "editor.subheader.background": "#1f231fff",
        "editor.active_line.background": "#1f231fbf",
        "editor.highlighted_line.background": "#1f231fff",
-        "editor.line_number": "#f3faf359",
-        "editor.active_line_number": "#f3faf3ff",
+        "editor.line_number": "#626561",
+        "editor.active_line_number": "#e5e6e5",
+        "editor.hover_line_number": "#b7b9b6",
        "editor.invisible": "#738b73ff",
        "editor.wrap_guide": "#f3faf30d",
        "editor.active_wrap_guide": "#f3faf31a",
@@ -6604,8 +6621,9 @@
        "editor.subheader.background": "#daeedaff",
        "editor.active_line.background": "#daeedabf",
        "editor.highlighted_line.background": "#daeedaff",
-        "editor.line_number": "#13151359",
-        "editor.active_line_number": "#131513ff",
+        "editor.line_number": "#a6aaa5",
+        "editor.active_line_number": "#262725",
+        "editor.hover_line_number": "#3f423e",
        "editor.invisible": "#738b73ff",
        "editor.wrap_guide": "#1315130d",
        "editor.active_wrap_guide": "#1315131a",
@@ -6989,8 +7007,9 @@
        "editor.subheader.background": "#262f51ff",
        "editor.active_line.background": "#262f51bf",
        "editor.highlighted_line.background": "#262f51ff",
-        "editor.line_number": "#f5f7ff59",
-        "editor.active_line_number": "#f5f7ffff",
+        "editor.line_number": "#6b6f85",
+        "editor.active_line_number": "#e3e4e8",
+        "editor.hover_line_number": "#b8bac6",
        "editor.invisible": "#7a819cff",
        "editor.wrap_guide": "#f5f7ff0d",
        "editor.active_wrap_guide": "#f5f7ff1a",
@@ -7374,8 +7393,9 @@
        "editor.subheader.background": "#e5e8f5ff",
        "editor.active_line.background": "#e5e8f5bf",
        "editor.highlighted_line.background": "#e5e8f5ff",
-        "editor.line_number": "#20264659",
-        "editor.active_line_number": "#202646ff",
+        "editor.line_number": "#abaebd",
+        "editor.active_line_number": "#22232b",
+        "editor.hover_line_number": "#434656",
        "editor.invisible": "#7a819cff",
        "editor.wrap_guide": "#2026460d",
        "editor.active_wrap_guide": "#2026461a",
--- a/assets/themes/ayu/ayu.json
+++ b/assets/themes/ayu/ayu.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#1f2127ff",
        "editor.active_line.background": "#1f2127bf",
        "editor.highlighted_line.background": "#1f2127ff",
-        "editor.line_number": "#bfbdb659",
-        "editor.active_line_number": "#bfbdb6ff",
+        "editor.line_number": "#4b4c4e",
+        "editor.active_line_number": "#cbcccd",
+        "editor.hover_line_number": "#a1a2a5",
        "editor.invisible": "#666767ff",
        "editor.wrap_guide": "#bfbdb60d",
        "editor.active_wrap_guide": "#bfbdb61a",
@@ -429,8 +430,9 @@
        "editor.subheader.background": "#ececedff",
        "editor.active_line.background": "#ececedbf",
        "editor.highlighted_line.background": "#ececedff",
-        "editor.line_number": "#5c616659",
-        "editor.active_line_number": "#5c6166ff",
+        "editor.line_number": "#b0b3b5",
+        "editor.active_line_number": "#313435",
+        "editor.hover_line_number": "#62686a",
        "editor.invisible": "#acafb1ff",
        "editor.wrap_guide": "#5c61660d",
        "editor.active_wrap_guide": "#5c61661a",
@@ -799,8 +801,9 @@
        "editor.subheader.background": "#353944ff",
        "editor.active_line.background": "#353944bf",
        "editor.highlighted_line.background": "#353944ff",
-        "editor.line_number": "#cccac259",
-        "editor.active_line_number": "#cccac2ff",
+        "editor.line_number": "#575c6b",
+        "editor.active_line_number": "#e1e3ea",
+        "editor.hover_line_number": "#b2b6c8",
        "editor.invisible": "#787a7cff",
        "editor.wrap_guide": "#cccac20d",
        "editor.active_wrap_guide": "#cccac21a",
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -68,8 +68,9 @@
        "editor.subheader.background": "#3a3735ff",
        "editor.active_line.background": "#3a3735bf",
        "editor.highlighted_line.background": "#3a3735ff",
-        "editor.line_number": "#fbf1c759",
-        "editor.active_line_number": "#fbf1c7ff",
+        "editor.line_number": "#6e6b5e",
+        "editor.active_line_number": "#dedcd3",
+        "editor.hover_line_number": "#c9c5b6",
        "editor.invisible": "#928474ff",
        "editor.wrap_guide": "#fbf1c70d",
        "editor.active_wrap_guide": "#fbf1c71a",
@@ -452,8 +453,9 @@
        "editor.subheader.background": "#393634ff",
        "editor.active_line.background": "#393634bf",
        "editor.highlighted_line.background": "#393634ff",
-        "editor.line_number": "#fbf1c759",
-        "editor.active_line_number": "#fbf1c7ff",
+        "editor.line_number": "#6e6b5e",
+        "editor.active_line_number": "#dedcd3",
+        "editor.hover_line_number": "#c9c5b6",
        "editor.invisible": "#928474ff",
        "editor.wrap_guide": "#fbf1c70d",
        "editor.active_wrap_guide": "#fbf1c71a",
@@ -836,8 +838,9 @@
        "editor.subheader.background": "#3b3735ff",
        "editor.active_line.background": "#3b3735bf",
        "editor.highlighted_line.background": "#3b3735ff",
-        "editor.line_number": "#fbf1c759",
-        "editor.active_line_number": "#fbf1c7ff",
+        "editor.line_number": "#6e6b5e",
+        "editor.active_line_number": "#dedcd3",
+        "editor.hover_line_number": "#c9c5b6",
        "editor.invisible": "#928474ff",
        "editor.wrap_guide": "#fbf1c70d",
        "editor.active_wrap_guide": "#fbf1c71a",
@@ -1220,8 +1223,9 @@
        "editor.subheader.background": "#ecddb4ff",
        "editor.active_line.background": "#ecddb4bf",
        "editor.highlighted_line.background": "#ecddb4ff",
-        "editor.line_number": "#28282859",
-        "editor.active_line_number": "#282828ff",
+        "editor.line_number": "#a9a389",
+        "editor.active_line_number": "#3b382b",
+        "editor.hover_line_number": "#5e5a45",
        "editor.invisible": "#928474ff",
        "editor.wrap_guide": "#2828280d",
        "editor.active_wrap_guide": "#2828281a",
@@ -1604,8 +1608,9 @@
        "editor.subheader.background": "#ecddb5ff",
        "editor.active_line.background": "#ecddb5bf",
        "editor.highlighted_line.background": "#ecddb5ff",
-        "editor.line_number": "#28282859",
-        "editor.active_line_number": "#282828ff",
+        "editor.line_number": "#a9a389",
+        "editor.active_line_number": "#3b382b",
+        "editor.hover_line_number": "#5e5a45",
        "editor.invisible": "#928474ff",
        "editor.wrap_guide": "#2828280d",
        "editor.active_wrap_guide": "#2828281a",
@@ -1988,8 +1993,9 @@
        "editor.subheader.background": "#ecdcb3ff",
        "editor.active_line.background": "#ecdcb3bf",
        "editor.highlighted_line.background": "#ecdcb3ff",
-        "editor.line_number": "#28282859",
-        "editor.active_line_number": "#282828ff",
+        "editor.line_number": "#a9a389",
+        "editor.active_line_number": "#3b382b",
+        "editor.hover_line_number": "#5e5a45",
        "editor.invisible": "#928474ff",
        "editor.wrap_guide": "#2828280d",
        "editor.active_wrap_guide": "#2828281a",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#2f343eff",
        "editor.active_line.background": "#2f343ebf",
        "editor.highlighted_line.background": "#2f343eff",
-        "editor.line_number": "#c8ccd459",
-        "editor.active_line_number": "#dce0e5ff",
+        "editor.line_number": "#4e5a5f",
+        "editor.active_line_number": "#d0d4da",
+        "editor.hover_line_number": "#acb0b4",
        "editor.invisible": "#878a98ff",
        "editor.wrap_guide": "#c8ccd40d",
        "editor.active_wrap_guide": "#c8ccd41a",
@@ -434,8 +435,9 @@
        "editor.subheader.background": "#ebebecff",
        "editor.active_line.background": "#ebebecbf",
        "editor.highlighted_line.background": "#ebebecff",
-        "editor.line_number": "#383a4159",
-        "editor.active_line_number": "#242529ff",
+        "editor.line_number": "#b4b4bb",
+        "editor.active_line_number": "#44454b",
+        "editor.hover_line_number": "#61616b",
        "editor.invisible": "#a3a3a4ff",
        "editor.wrap_guide": "#383a410d",
        "editor.active_wrap_guide": "#383a411a",
--- a/assets/themes/rose_pine/rose_pine.json
+++ b/assets/themes/rose_pine/rose_pine.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#1c1b2aff",
        "editor.active_line.background": "#1c1b2abf",
        "editor.highlighted_line.background": "#1c1b2aff",
-        "editor.line_number": "#e0def459",
-        "editor.active_line_number": "#e0def4ff",
+        "editor.line_number": "#605e6e",
+        "editor.active_line_number": "#c9c8d0",
+        "editor.hover_line_number": "#aeadb8",
        "editor.invisible": "#28253cff",
        "editor.wrap_guide": "#e0def40d",
        "editor.active_wrap_guide": "#e0def41a",
@@ -439,8 +440,9 @@
        "editor.subheader.background": "#fef9f2ff",
        "editor.active_line.background": "#fef9f2bf",
        "editor.highlighted_line.background": "#fef9f2ff",
-        "editor.line_number": "#57527959",
-        "editor.active_line_number": "#575279ff",
+        "editor.line_number": "#b4adb8",
+        "editor.active_line_number": "#4e4752",
+        "editor.hover_line_number": "#685f6d",
        "editor.invisible": "#9691a4ff",
        "editor.wrap_guide": "#5752790d",
        "editor.active_wrap_guide": "#5752791a",
@@ -819,8 +821,9 @@
        "editor.subheader.background": "#28253cff",
        "editor.active_line.background": "#28253cbf",
        "editor.highlighted_line.background": "#28253cff",
-        "editor.line_number": "#e0def459",
-        "editor.active_line_number": "#e0def4ff",
+        "editor.line_number": "#6b697d",
+        "editor.active_line_number": "#d6d5dc",
+        "editor.hover_line_number": "#bbbac5",
        "editor.invisible": "#595571ff",
        "editor.wrap_guide": "#e0def40d",
        "editor.active_wrap_guide": "#e0def41a",
--- a/assets/themes/sandcastle/sandcastle.json
+++ b/assets/themes/sandcastle/sandcastle.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#2b3038ff",
        "editor.active_line.background": "#2b3038bf",
        "editor.highlighted_line.background": "#2b3038ff",
-        "editor.line_number": "#fdf4c159",
-        "editor.active_line_number": "#fdf4c1ff",
+        "editor.line_number": "#6b6b61",
+        "editor.active_line_number": "#dbdbd7",
+        "editor.hover_line_number": "#b6b6af",
        "editor.invisible": "#7c6f64ff",
        "editor.wrap_guide": "#fdf4c10d",
        "editor.active_wrap_guide": "#fdf4c11a",
--- a/assets/themes/solarized/solarized.json
+++ b/assets/themes/solarized/solarized.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#04313bff",
        "editor.active_line.background": "#04313bbf",
        "editor.highlighted_line.background": "#04313bff",
-        "editor.line_number": "#fdf6e359",
-        "editor.active_line_number": "#fdf6e3ff",
+        "editor.line_number": "#5a6d6f",
+        "editor.active_line_number": "#e3e8e8",
+        "editor.hover_line_number": "#abb9ba",
        "editor.invisible": "#6c8287ff",
        "editor.wrap_guide": "#fdf6e30d",
        "editor.active_wrap_guide": "#fdf6e31a",
@@ -429,8 +430,9 @@
        "editor.subheader.background": "#f3eddaff",
        "editor.active_line.background": "#f3eddabf",
        "editor.highlighted_line.background": "#f3eddaff",
-        "editor.line_number": "#002a3559",
-        "editor.active_line_number": "#002a35ff",
+        "editor.line_number": "#a8ad9f",
+        "editor.active_line_number": "#272923",
+        "editor.hover_line_number": "#42453b",
        "editor.invisible": "#6c8287ff",
        "editor.wrap_guide": "#002a350d",
        "editor.active_wrap_guide": "#002a351a",
--- a/assets/themes/summercamp/summercamp.json
+++ b/assets/themes/summercamp/summercamp.json
@@ -59,8 +59,9 @@
        "editor.subheader.background": "#231f16ff",
        "editor.active_line.background": "#231f16bf",
        "editor.highlighted_line.background": "#231f16ff",
-        "editor.line_number": "#f8f5de59",
-        "editor.active_line_number": "#f8f5deff",
+        "editor.line_number": "#676559",
+        "editor.active_line_number": "#e3e2de",
+        "editor.hover_line_number": "#b8b6ad",
        "editor.invisible": "#494433ff",
        "editor.wrap_guide": "#f8f5de0d",
        "editor.active_wrap_guide": "#f8f5de1a",
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "activity_indicator"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "anthropic"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "AGPL-3.0-or-later"

 [features]
--- a/crates/assets/Cargo.toml
+++ b/crates/assets/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assets"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lib]
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assistant"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
@@ -21,76 +21,55 @@ test-support = [
 ]

 [dependencies]
-anthropic = { workspace = true, features = ["schemars"] }
 anyhow.workspace = true
-assets.workspace = true
+assistant_context_editor.workspace = true
+assistant_settings.workspace = true
 assistant_slash_command.workspace = true
+assistant_slash_commands.workspace = true
 assistant_tool.workspace = true
 async-watch.workspace = true
-cargo_toml.workspace = true
-chrono.workspace = true
 client.workspace = true
-clock.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 context_server.workspace = true
 db.workspace = true
-deepseek = { workspace = true, features = ["schemars"] }
 editor.workspace = true
 feature_flags.workspace = true
 fs.workspace = true
 futures.workspace = true
-fuzzy.workspace = true
-globset.workspace = true
 gpui.workspace = true
-handlebars.workspace = true
-heed.workspace = true
-html_to_markdown.workspace = true
-http_client.workspace = true
 indexed_docs.workspace = true
 indoc.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
 language_models.workspace = true
-lmstudio = { workspace = true, features = ["schemars"] }
 log.workspace = true
 lsp.workspace = true
-markdown.workspace = true
 menu.workspace = true
 multi_buffer.workspace = true
-ollama = { workspace = true, features = ["schemars"] }
-open_ai = { workspace = true, features = ["schemars"] }
-ordered-float.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
-picker.workspace = true
 project.workspace = true
+prompt_library.workspace = true
 proto.workspace = true
-regex.workspace = true
-release_channel.workspace = true
 rope.workspace = true
-rpc.workspace = true
 schemars.workspace = true
 search.workspace = true
 semantic_index.workspace = true
 serde.workspace = true
-serde_json.workspace = true
 settings.workspace = true
 similar.workspace = true
-smallvec.workspace = true
 smol.workspace = true
-strum.workspace = true
+streaming_diff.workspace = true
 telemetry.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
 terminal_view.workspace = true
 text.workspace = true
 theme.workspace = true
-toml.workspace = true
 ui.workspace = true
 util.workspace = true
-uuid.workspace = true
 workspace.workspace = true
 zed_actions.workspace = true

--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -1,98 +1,46 @@
 #![cfg_attr(target_os = "windows", allow(unused, dead_code))]

+mod assistant_configuration;
 pub mod assistant_panel;
-pub mod assistant_settings;
-mod context;
-pub mod context_store;
 mod inline_assistant;
-mod patch;
-mod prompt_library;
-mod prompts;
-mod slash_command;
-pub(crate) mod slash_command_picker;
 pub mod slash_command_settings;
-mod slash_command_working_set;
-mod streaming_diff;
 mod terminal_inline_assistant;

-use crate::slash_command::project_command::ProjectSlashCommandFeatureFlag;
-pub use crate::slash_command_working_set::{SlashCommandId, SlashCommandWorkingSet};
-pub use assistant_panel::{AssistantPanel, AssistantPanelEvent};
+use std::sync::Arc;
+
 use assistant_settings::AssistantSettings;
 use assistant_slash_command::SlashCommandRegistry;
-use client::{proto, Client};
+use assistant_slash_commands::{ProjectSlashCommandFeatureFlag, SearchSlashCommandFeatureFlag};
+use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
-pub use context::*;
-pub use context_store::*;
 use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
-use gpui::impl_internal_actions;
-use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
-pub(crate) use inline_assistant::*;
+use gpui::{actions, AppContext, Global, UpdateGlobal};
 use language_model::{
    LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
 };
-pub use patch::*;
-pub use prompts::PromptBuilder;
-use prompts::PromptLoadingParams;
+use prompt_library::PromptBuilder;
 use semantic_index::{CloudEmbeddingProvider, SemanticDb};
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use settings::{Settings, SettingsStore};
-use slash_command::search_command::SearchSlashCommandFeatureFlag;
-use slash_command::{
-    auto_command, cargo_workspace_command, default_command, delta_command, diagnostics_command,
-    docs_command, fetch_command, file_command, now_command, project_command, prompt_command,
-    search_command, selection_command, symbols_command, tab_command, terminal_command,
-};
-use std::path::PathBuf;
-use std::sync::Arc;
-pub(crate) use streaming_diff::*;
-use util::ResultExt;

-use crate::slash_command::streaming_example_command;
+pub use crate::assistant_panel::{AssistantPanel, AssistantPanelEvent};
+pub(crate) use crate::inline_assistant::*;
 use crate::slash_command_settings::SlashCommandSettings;

 actions!(
    assistant,
    [
-        Assist,
-        Edit,
-        Split,
-        CopyCode,
-        CycleMessageRole,
-        QuoteSelection,
-        InsertIntoEditor,
-        ToggleFocus,
        InsertActivePrompt,
        DeployHistory,
-        DeployPromptLibrary,
-        ConfirmCommand,
        NewContext,
-        ToggleModelSelector,
        CycleNextInlineAssist,
        CyclePreviousInlineAssist
    ]
 );

-#[derive(PartialEq, Clone)]
-pub enum InsertDraggedFiles {
-    ProjectPaths(Vec<PathBuf>),
-    ExternalFiles(Vec<PathBuf>),
-}
-
-impl_internal_actions!(assistant, [InsertDraggedFiles]);
-
 const DEFAULT_CONTEXT_LINES: usize = 50;

-#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-pub struct MessageId(clock::Lamport);
-
-impl MessageId {
-    pub fn as_u64(self) -> u64 {
-        self.0.as_u64()
-    }
-}
-
 #[derive(Deserialize, Debug)]
 pub struct LanguageModelUsage {
    pub prompt_tokens: u32,
@@ -107,55 +55,6 @@ pub struct LanguageModelChoiceDelta {
    pub finish_reason: Option<String>,
 }

-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub enum MessageStatus {
-    Pending,
-    Done,
-    Error(SharedString),
-    Canceled,
-}
-
-impl MessageStatus {
-    pub fn from_proto(status: proto::ContextMessageStatus) -> MessageStatus {
-        match status.variant {
-            Some(proto::context_message_status::Variant::Pending(_)) => MessageStatus::Pending,
-            Some(proto::context_message_status::Variant::Done(_)) => MessageStatus::Done,
-            Some(proto::context_message_status::Variant::Error(error)) => {
-                MessageStatus::Error(error.message.into())
-            }
-            Some(proto::context_message_status::Variant::Canceled(_)) => MessageStatus::Canceled,
-            None => MessageStatus::Pending,
-        }
-    }
-
-    pub fn to_proto(&self) -> proto::ContextMessageStatus {
-        match self {
-            MessageStatus::Pending => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Pending(
-                    proto::context_message_status::Pending {},
-                )),
-            },
-            MessageStatus::Done => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Done(
-                    proto::context_message_status::Done {},
-                )),
-            },
-            MessageStatus::Error(message) => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Error(
-                    proto::context_message_status::Error {
-                        message: message.to_string(),
-                    },
-                )),
-            },
-            MessageStatus::Canceled => proto::ContextMessageStatus {
-                variant: Some(proto::context_message_status::Variant::Canceled(
-                    proto::context_message_status::Canceled {},
-                )),
-            },
-        }
-    }
-}
-
 /// The state pertaining to the Assistant.
 #[derive(Default)]
 struct Assistant {
@@ -192,9 +91,9 @@ impl Assistant {
 pub fn init(
    fs: Arc<dyn Fs>,
    client: Arc<Client>,
-    stdout_is_a_pty: bool,
+    prompt_builder: Arc<PromptBuilder>,
    cx: &mut AppContext,
-) -> Arc<PromptBuilder> {
+) {
    cx.set_global(Assistant::default());
    AssistantSettings::register(cx);
    SlashCommandSettings::register(cx);
@@ -226,7 +125,7 @@ pub fn init(
    })
    .detach();

-    context_store::init(&client.clone().into());
+    assistant_context_editor::init(client.clone(), cx);
    prompt_library::init(cx);
    init_language_model_settings(cx);
    assistant_slash_command::init(cx);
@@ -234,16 +133,6 @@ pub fn init(
    assistant_panel::init(cx);
    context_server::init(cx);

-    let prompt_builder = prompts::PromptBuilder::new(Some(PromptLoadingParams {
-        fs: fs.clone(),
-        repo_path: stdout_is_a_pty
-            .then(|| std::env::current_dir().log_err())
-            .flatten(),
-        cx,
-    }))
-    .log_err()
-    .map(Arc::new)
-    .unwrap_or_else(|| Arc::new(prompts::PromptBuilder::new(None).unwrap()));
    register_slash_commands(Some(prompt_builder.clone()), cx);
    inline_assistant::init(
        fs.clone(),
@@ -274,8 +163,6 @@ pub fn init(
        });
    })
    .detach();
-
-    prompt_builder
 }

 fn init_language_model_settings(cx: &mut AppContext) {
@@ -320,27 +207,28 @@ fn update_active_language_model_from_settings(cx: &mut AppContext) {
 fn register_slash_commands(prompt_builder: Option<Arc<PromptBuilder>>, cx: &mut AppContext) {
    let slash_command_registry = SlashCommandRegistry::global(cx);

-    slash_command_registry.register_command(file_command::FileSlashCommand, true);
-    slash_command_registry.register_command(delta_command::DeltaSlashCommand, true);
-    slash_command_registry.register_command(symbols_command::OutlineSlashCommand, true);
-    slash_command_registry.register_command(tab_command::TabSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::FileSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::DeltaSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::OutlineSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::TabSlashCommand, true);
    slash_command_registry
-        .register_command(cargo_workspace_command::CargoWorkspaceSlashCommand, true);
-    slash_command_registry.register_command(prompt_command::PromptSlashCommand, true);
-    slash_command_registry.register_command(selection_command::SelectionCommand, true);
-    slash_command_registry.register_command(default_command::DefaultSlashCommand, false);
-    slash_command_registry.register_command(terminal_command::TerminalSlashCommand, true);
-    slash_command_registry.register_command(now_command::NowSlashCommand, false);
-    slash_command_registry.register_command(diagnostics_command::DiagnosticsSlashCommand, true);
-    slash_command_registry.register_command(fetch_command::FetchSlashCommand, true);
+        .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::PromptSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::SelectionCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::DefaultSlashCommand, false);
+    slash_command_registry.register_command(assistant_slash_commands::TerminalSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::NowSlashCommand, false);
+    slash_command_registry
+        .register_command(assistant_slash_commands::DiagnosticsSlashCommand, true);
+    slash_command_registry.register_command(assistant_slash_commands::FetchSlashCommand, true);

    if let Some(prompt_builder) = prompt_builder {
-        cx.observe_flag::<project_command::ProjectSlashCommandFeatureFlag, _>({
+        cx.observe_flag::<assistant_slash_commands::ProjectSlashCommandFeatureFlag, _>({
            let slash_command_registry = slash_command_registry.clone();
            move |is_enabled, _cx| {
                if is_enabled {
                    slash_command_registry.register_command(
-                        project_command::ProjectSlashCommand::new(prompt_builder.clone()),
+                        assistant_slash_commands::ProjectSlashCommand::new(prompt_builder.clone()),
                        true,
                    );
                }
@@ -349,23 +237,24 @@ fn register_slash_commands(prompt_builder: Option<Arc<PromptBuilder>>, cx: &mut
        .detach();
    }

-    cx.observe_flag::<auto_command::AutoSlashCommandFeatureFlag, _>({
+    cx.observe_flag::<assistant_slash_commands::AutoSlashCommandFeatureFlag, _>({
        let slash_command_registry = slash_command_registry.clone();
        move |is_enabled, _cx| {
            if is_enabled {
                // [#auto-staff-ship] TODO remove this when /auto is no longer staff-shipped
-                slash_command_registry.register_command(auto_command::AutoCommand, true);
+                slash_command_registry
+                    .register_command(assistant_slash_commands::AutoCommand, true);
            }
        }
    })
    .detach();

-    cx.observe_flag::<streaming_example_command::StreamingExampleSlashCommandFeatureFlag, _>({
+    cx.observe_flag::<assistant_slash_commands::StreamingExampleSlashCommandFeatureFlag, _>({
        let slash_command_registry = slash_command_registry.clone();
        move |is_enabled, _cx| {
            if is_enabled {
                slash_command_registry.register_command(
-                    streaming_example_command::StreamingExampleSlashCommand,
+                    assistant_slash_commands::StreamingExampleSlashCommand,
                    false,
                );
            }
@@ -377,11 +266,12 @@ fn register_slash_commands(prompt_builder: Option<Arc<PromptBuilder>>, cx: &mut
    cx.observe_global::<SettingsStore>(update_slash_commands_from_settings)
        .detach();

-    cx.observe_flag::<search_command::SearchSlashCommandFeatureFlag, _>({
+    cx.observe_flag::<assistant_slash_commands::SearchSlashCommandFeatureFlag, _>({
        let slash_command_registry = slash_command_registry.clone();
        move |is_enabled, _cx| {
            if is_enabled {
-                slash_command_registry.register_command(search_command::SearchSlashCommand, true);
+                slash_command_registry
+                    .register_command(assistant_slash_commands::SearchSlashCommand, true);
            }
        }
    })
@@ -393,35 +283,17 @@ fn update_slash_commands_from_settings(cx: &mut AppContext) {
    let settings = SlashCommandSettings::get_global(cx);

    if settings.docs.enabled {
-        slash_command_registry.register_command(docs_command::DocsSlashCommand, true);
+        slash_command_registry.register_command(assistant_slash_commands::DocsSlashCommand, true);
    } else {
-        slash_command_registry.unregister_command(docs_command::DocsSlashCommand);
+        slash_command_registry.unregister_command(assistant_slash_commands::DocsSlashCommand);
    }

    if settings.cargo_workspace.enabled {
        slash_command_registry
-            .register_command(cargo_workspace_command::CargoWorkspaceSlashCommand, true);
+            .register_command(assistant_slash_commands::CargoWorkspaceSlashCommand, true);
    } else {
        slash_command_registry
-            .unregister_command(cargo_workspace_command::CargoWorkspaceSlashCommand);
-    }
-}
-
-pub fn humanize_token_count(count: usize) -> String {
-    match count {
-        0..=999 => count.to_string(),
-        1000..=9999 => {
-            let thousands = count / 1000;
-            let hundreds = (count % 1000 + 50) / 100;
-            if hundreds == 0 {
-                format!("{}k", thousands)
-            } else if hundreds == 10 {
-                format!("{}k", thousands + 1)
-            } else {
-                format!("{}.{}k", thousands, hundreds)
-            }
-        }
-        _ => format!("{}k", (count + 500) / 1000),
+            .unregister_command(assistant_slash_commands::CargoWorkspaceSlashCommand);
    }
 }

--- a/crates/assistant/src/assistant_configuration.rs
+++ b/crates/assistant/src/assistant_configuration.rs
@@ -0,0 +1,197 @@
+use std::sync::Arc;
+
+use collections::HashMap;
+use gpui::{canvas, AnyView, AppContext, EventEmitter, FocusHandle, FocusableView, Subscription};
+use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
+use ui::{prelude::*, ElevationIndex};
+use workspace::Item;
+
+pub struct ConfigurationView {
+    focus_handle: FocusHandle,
+    configuration_views: HashMap<LanguageModelProviderId, AnyView>,
+    _registry_subscription: Subscription,
+}
+
+impl ConfigurationView {
+    pub fn new(cx: &mut ViewContext<Self>) -> Self {
+        let focus_handle = cx.focus_handle();
+
+        let registry_subscription = cx.subscribe(
+            &LanguageModelRegistry::global(cx),
+            |this, _, event: &language_model::Event, cx| match event {
+                language_model::Event::AddedProvider(provider_id) => {
+                    let provider = LanguageModelRegistry::read_global(cx).provider(provider_id);
+                    if let Some(provider) = provider {
+                        this.add_configuration_view(&provider, cx);
+                    }
+                }
+                language_model::Event::RemovedProvider(provider_id) => {
+                    this.remove_configuration_view(provider_id);
+                }
+                _ => {}
+            },
+        );
+
+        let mut this = Self {
+            focus_handle,
+            configuration_views: HashMap::default(),
+            _registry_subscription: registry_subscription,
+        };
+        this.build_configuration_views(cx);
+        this
+    }
+
+    fn build_configuration_views(&mut self, cx: &mut ViewContext<Self>) {
+        let providers = LanguageModelRegistry::read_global(cx).providers();
+        for provider in providers {
+            self.add_configuration_view(&provider, cx);
+        }
+    }
+
+    fn remove_configuration_view(&mut self, provider_id: &LanguageModelProviderId) {
+        self.configuration_views.remove(provider_id);
+    }
+
+    fn add_configuration_view(
+        &mut self,
+        provider: &Arc<dyn LanguageModelProvider>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let configuration_view = provider.configuration_view(cx);
+        self.configuration_views
+            .insert(provider.id(), configuration_view);
+    }
+
+    fn render_provider_view(
+        &mut self,
+        provider: &Arc<dyn LanguageModelProvider>,
+        cx: &mut ViewContext<Self>,
+    ) -> Div {
+        let provider_id = provider.id().0.clone();
+        let provider_name = provider.name().0.clone();
+        let configuration_view = self.configuration_views.get(&provider.id()).cloned();
+
+        let open_new_context = cx.listener({
+            let provider = provider.clone();
+            move |_, _, cx| {
+                cx.emit(ConfigurationViewEvent::NewProviderContextEditor(
+                    provider.clone(),
+                ))
+            }
+        });
+
+        v_flex()
+            .gap_2()
+            .child(
+                h_flex()
+                    .justify_between()
+                    .child(Headline::new(provider_name.clone()).size(HeadlineSize::Small))
+                    .when(provider.is_authenticated(cx), move |this| {
+                        this.child(
+                            h_flex().justify_end().child(
+                                Button::new(
+                                    SharedString::from(format!("new-context-{provider_id}")),
+                                    "Open New Chat",
+                                )
+                                .icon_position(IconPosition::Start)
+                                .icon(IconName::Plus)
+                                .style(ButtonStyle::Filled)
+                                .layer(ElevationIndex::ModalSurface)
+                                .on_click(open_new_context),
+                            ),
+                        )
+                    }),
+            )
+            .child(
+                div()
+                    .p(DynamicSpacing::Base08.rems(cx))
+                    .bg(cx.theme().colors().surface_background)
+                    .border_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .rounded_md()
+                    .when(configuration_view.is_none(), |this| {
+                        this.child(div().child(Label::new(format!(
+                            "No configuration view for {}",
+                            provider_name
+                        ))))
+                    })
+                    .when_some(configuration_view, |this, configuration_view| {
+                        this.child(configuration_view)
+                    }),
+            )
+    }
+}
+
+impl Render for ConfigurationView {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let providers = LanguageModelRegistry::read_global(cx).providers();
+        let provider_views = providers
+            .into_iter()
+            .map(|provider| self.render_provider_view(&provider, cx))
+            .collect::<Vec<_>>();
+
+        let mut element = v_flex()
+            .id("assistant-configuration-view")
+            .track_focus(&self.focus_handle(cx))
+            .bg(cx.theme().colors().editor_background)
+            .size_full()
+            .overflow_y_scroll()
+            .child(
+                v_flex()
+                    .p(DynamicSpacing::Base16.rems(cx))
+                    .border_b_1()
+                    .border_color(cx.theme().colors().border)
+                    .gap_1()
+                    .child(Headline::new("Configure your Assistant").size(HeadlineSize::Medium))
+                    .child(
+                        Label::new(
+                            "At least one LLM provider must be configured to use the Assistant.",
+                        )
+                        .color(Color::Muted),
+                    ),
+            )
+            .child(
+                v_flex()
+                    .p(DynamicSpacing::Base16.rems(cx))
+                    .mt_1()
+                    .gap_6()
+                    .flex_1()
+                    .children(provider_views),
+            )
+            .into_any();
+
+        // We use a canvas here to get scrolling to work in the ConfigurationView. It's a workaround
+        // because we couldn't the element to take up the size of the parent.
+        canvas(
+            move |bounds, cx| {
+                element.prepaint_as_root(bounds.origin, bounds.size.into(), cx);
+                element
+            },
+            |_, mut element, cx| {
+                element.paint(cx);
+            },
+        )
+        .flex_1()
+        .w_full()
+    }
+}
+
+pub enum ConfigurationViewEvent {
+    NewProviderContextEditor(Arc<dyn LanguageModelProvider>),
+}
+
+impl EventEmitter<ConfigurationViewEvent> for ConfigurationView {}
+
+impl FocusableView for ConfigurationView {
+    fn focus_handle(&self, _: &AppContext) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Item for ConfigurationView {
+    type Event = ConfigurationViewEvent;
+
+    fn tab_content_text(&self, _cx: &WindowContext) -> Option<SharedString> {
+        Some("Configuration".into())
+    }
+}
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
--- a/crates/assistant/src/assistant_settings.rs
+++ b/crates/assistant/src/assistant_settings.rs
@@ -1,558 +0,0 @@
-use std::sync::Arc;
-
-use ::open_ai::Model as OpenAiModel;
-use anthropic::Model as AnthropicModel;
-use deepseek::Model as DeepseekModel;
-use feature_flags::FeatureFlagAppExt;
-use gpui::{AppContext, Pixels};
-use language_model::{CloudModel, LanguageModel};
-use lmstudio::Model as LmStudioModel;
-use ollama::Model as OllamaModel;
-use schemars::{schema::Schema, JsonSchema};
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
-
-#[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum AssistantDockPosition {
-    Left,
-    #[default]
-    Right,
-    Bottom,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-#[serde(tag = "name", rename_all = "snake_case")]
-pub enum AssistantProviderContentV1 {
-    #[serde(rename = "zed.dev")]
-    ZedDotDev { default_model: Option<CloudModel> },
-    #[serde(rename = "openai")]
-    OpenAi {
-        default_model: Option<OpenAiModel>,
-        api_url: Option<String>,
-        available_models: Option<Vec<OpenAiModel>>,
-    },
-    #[serde(rename = "anthropic")]
-    Anthropic {
-        default_model: Option<AnthropicModel>,
-        api_url: Option<String>,
-    },
-    #[serde(rename = "ollama")]
-    Ollama {
-        default_model: Option<OllamaModel>,
-        api_url: Option<String>,
-    },
-    #[serde(rename = "lmstudio")]
-    LmStudio {
-        default_model: Option<LmStudioModel>,
-        api_url: Option<String>,
-    },
-    #[serde(rename = "deepseek")]
-    DeepSeek {
-        default_model: Option<DeepseekModel>,
-        api_url: Option<String>,
-    },
-}
-
-#[derive(Debug, Default)]
-pub struct AssistantSettings {
-    pub enabled: bool,
-    pub button: bool,
-    pub dock: AssistantDockPosition,
-    pub default_width: Pixels,
-    pub default_height: Pixels,
-    pub default_model: LanguageModelSelection,
-    pub inline_alternatives: Vec<LanguageModelSelection>,
-    pub using_outdated_settings_version: bool,
-    pub enable_experimental_live_diffs: bool,
-}
-
-impl AssistantSettings {
-    pub fn are_live_diffs_enabled(&self, cx: &AppContext) -> bool {
-        cx.is_staff() || self.enable_experimental_live_diffs
-    }
-}
-
-/// Assistant panel settings
-#[derive(Clone, Serialize, Deserialize, Debug)]
-#[serde(untagged)]
-pub enum AssistantSettingsContent {
-    Versioned(VersionedAssistantSettingsContent),
-    Legacy(LegacyAssistantSettingsContent),
-}
-
-impl JsonSchema for AssistantSettingsContent {
-    fn schema_name() -> String {
-        VersionedAssistantSettingsContent::schema_name()
-    }
-
-    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> Schema {
-        VersionedAssistantSettingsContent::json_schema(gen)
-    }
-
-    fn is_referenceable() -> bool {
-        VersionedAssistantSettingsContent::is_referenceable()
-    }
-}
-
-impl Default for AssistantSettingsContent {
-    fn default() -> Self {
-        Self::Versioned(VersionedAssistantSettingsContent::default())
-    }
-}
-
-impl AssistantSettingsContent {
-    pub fn is_version_outdated(&self) -> bool {
-        match self {
-            AssistantSettingsContent::Versioned(settings) => match settings {
-                VersionedAssistantSettingsContent::V1(_) => true,
-                VersionedAssistantSettingsContent::V2(_) => false,
-            },
-            AssistantSettingsContent::Legacy(_) => true,
-        }
-    }
-
-    fn upgrade(&self) -> AssistantSettingsContentV2 {
-        match self {
-            AssistantSettingsContent::Versioned(settings) => match settings {
-                VersionedAssistantSettingsContent::V1(settings) => AssistantSettingsContentV2 {
-                    enabled: settings.enabled,
-                    button: settings.button,
-                    dock: settings.dock,
-                    default_width: settings.default_width,
-                    default_height: settings.default_width,
-                    default_model: settings
-                        .provider
-                        .clone()
-                        .and_then(|provider| match provider {
-                            AssistantProviderContentV1::ZedDotDev { default_model } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "zed.dev".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
-                            AssistantProviderContentV1::OpenAi { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "openai".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
-                            AssistantProviderContentV1::Anthropic { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "anthropic".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
-                            AssistantProviderContentV1::Ollama { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "ollama".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
-                            AssistantProviderContentV1::LmStudio { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "lmstudio".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
-                            AssistantProviderContentV1::DeepSeek { default_model, .. } => {
-                                default_model.map(|model| LanguageModelSelection {
-                                    provider: "deepseek".to_string(),
-                                    model: model.id().to_string(),
-                                })
-                            }
-                        }),
-                    inline_alternatives: None,
-                    enable_experimental_live_diffs: None,
-                },
-                VersionedAssistantSettingsContent::V2(settings) => settings.clone(),
-            },
-            AssistantSettingsContent::Legacy(settings) => AssistantSettingsContentV2 {
-                enabled: None,
-                button: settings.button,
-                dock: settings.dock,
-                default_width: settings.default_width,
-                default_height: settings.default_height,
-                default_model: Some(LanguageModelSelection {
-                    provider: "openai".to_string(),
-                    model: settings
-                        .default_open_ai_model
-                        .clone()
-                        .unwrap_or_default()
-                        .id()
-                        .to_string(),
-                }),
-                inline_alternatives: None,
-                enable_experimental_live_diffs: None,
-            },
-        }
-    }
-
-    pub fn set_dock(&mut self, dock: AssistantDockPosition) {
-        match self {
-            AssistantSettingsContent::Versioned(settings) => match settings {
-                VersionedAssistantSettingsContent::V1(settings) => {
-                    settings.dock = Some(dock);
-                }
-                VersionedAssistantSettingsContent::V2(settings) => {
-                    settings.dock = Some(dock);
-                }
-            },
-            AssistantSettingsContent::Legacy(settings) => {
-                settings.dock = Some(dock);
-            }
-        }
-    }
-
-    pub fn set_model(&mut self, language_model: Arc<dyn LanguageModel>) {
-        let model = language_model.id().0.to_string();
-        let provider = language_model.provider_id().0.to_string();
-
-        match self {
-            AssistantSettingsContent::Versioned(settings) => match settings {
-                VersionedAssistantSettingsContent::V1(settings) => match provider.as_ref() {
-                    "zed.dev" => {
-                        log::warn!("attempted to set zed.dev model on outdated settings");
-                    }
-                    "anthropic" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::Anthropic { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::Anthropic {
-                            default_model: AnthropicModel::from_id(&model).ok(),
-                            api_url,
-                        });
-                    }
-                    "ollama" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::Ollama { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::Ollama {
-                            default_model: Some(ollama::Model::new(&model, None, None)),
-                            api_url,
-                        });
-                    }
-                    "lmstudio" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::LmStudio { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::LmStudio {
-                            default_model: Some(lmstudio::Model::new(&model, None, None)),
-                            api_url,
-                        });
-                    }
-                    "openai" => {
-                        let (api_url, available_models) = match &settings.provider {
-                            Some(AssistantProviderContentV1::OpenAi {
-                                api_url,
-                                available_models,
-                                ..
-                            }) => (api_url.clone(), available_models.clone()),
-                            _ => (None, None),
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::OpenAi {
-                            default_model: OpenAiModel::from_id(&model).ok(),
-                            api_url,
-                            available_models,
-                        });
-                    }
-                    "deepseek" => {
-                        let api_url = match &settings.provider {
-                            Some(AssistantProviderContentV1::DeepSeek { api_url, .. }) => {
-                                api_url.clone()
-                            }
-                            _ => None,
-                        };
-                        settings.provider = Some(AssistantProviderContentV1::DeepSeek {
-                            default_model: DeepseekModel::from_id(&model).ok(),
-                            api_url,
-                        });
-                    }
-                    _ => {}
-                },
-                VersionedAssistantSettingsContent::V2(settings) => {
-                    settings.default_model = Some(LanguageModelSelection { provider, model });
-                }
-            },
-            AssistantSettingsContent::Legacy(settings) => {
-                if let Ok(model) = OpenAiModel::from_id(&language_model.id().0) {
-                    settings.default_open_ai_model = Some(model);
-                }
-            }
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
-#[serde(tag = "version")]
-pub enum VersionedAssistantSettingsContent {
-    #[serde(rename = "1")]
-    V1(AssistantSettingsContentV1),
-    #[serde(rename = "2")]
-    V2(AssistantSettingsContentV2),
-}
-
-impl Default for VersionedAssistantSettingsContent {
-    fn default() -> Self {
-        Self::V2(AssistantSettingsContentV2 {
-            enabled: None,
-            button: None,
-            dock: None,
-            default_width: None,
-            default_height: None,
-            default_model: None,
-            inline_alternatives: None,
-            enable_experimental_live_diffs: None,
-        })
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
-pub struct AssistantSettingsContentV2 {
-    /// Whether the Assistant is enabled.
-    ///
-    /// Default: true
-    enabled: Option<bool>,
-    /// Whether to show the assistant panel button in the status bar.
-    ///
-    /// Default: true
-    button: Option<bool>,
-    /// Where to dock the assistant.
-    ///
-    /// Default: right
-    dock: Option<AssistantDockPosition>,
-    /// Default width in pixels when the assistant is docked to the left or right.
-    ///
-    /// Default: 640
-    default_width: Option<f32>,
-    /// Default height in pixels when the assistant is docked to the bottom.
-    ///
-    /// Default: 320
-    default_height: Option<f32>,
-    /// The default model to use when creating new chats.
-    default_model: Option<LanguageModelSelection>,
-    /// Additional models with which to generate alternatives when performing inline assists.
-    inline_alternatives: Option<Vec<LanguageModelSelection>>,
-    /// Enable experimental live diffs in the assistant panel.
-    ///
-    /// Default: false
-    enable_experimental_live_diffs: Option<bool>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub struct LanguageModelSelection {
-    #[schemars(schema_with = "providers_schema")]
-    pub provider: String,
-    pub model: String,
-}
-
-fn providers_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-    schemars::schema::SchemaObject {
-        enum_values: Some(vec![
-            "anthropic".into(),
-            "google".into(),
-            "lmstudio".into(),
-            "ollama".into(),
-            "openai".into(),
-            "zed.dev".into(),
-            "copilot_chat".into(),
-            "deepseek".into(),
-        ]),
-        ..Default::default()
-    }
-    .into()
-}
-
-impl Default for LanguageModelSelection {
-    fn default() -> Self {
-        Self {
-            provider: "openai".to_string(),
-            model: "gpt-4".to_string(),
-        }
-    }
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
-pub struct AssistantSettingsContentV1 {
-    /// Whether the Assistant is enabled.
-    ///
-    /// Default: true
-    enabled: Option<bool>,
-    /// Whether to show the assistant panel button in the status bar.
-    ///
-    /// Default: true
-    button: Option<bool>,
-    /// Where to dock the assistant.
-    ///
-    /// Default: right
-    dock: Option<AssistantDockPosition>,
-    /// Default width in pixels when the assistant is docked to the left or right.
-    ///
-    /// Default: 640
-    default_width: Option<f32>,
-    /// Default height in pixels when the assistant is docked to the bottom.
-    ///
-    /// Default: 320
-    default_height: Option<f32>,
-    /// The provider of the assistant service.
-    ///
-    /// This can be "openai", "anthropic", "ollama", "lmstudio", "deepseek", "zed.dev"
-    /// each with their respective default models and configurations.
-    provider: Option<AssistantProviderContentV1>,
-}
-
-#[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
-pub struct LegacyAssistantSettingsContent {
-    /// Whether to show the assistant panel button in the status bar.
-    ///
-    /// Default: true
-    pub button: Option<bool>,
-    /// Where to dock the assistant.
-    ///
-    /// Default: right
-    pub dock: Option<AssistantDockPosition>,
-    /// Default width in pixels when the assistant is docked to the left or right.
-    ///
-    /// Default: 640
-    pub default_width: Option<f32>,
-    /// Default height in pixels when the assistant is docked to the bottom.
-    ///
-    /// Default: 320
-    pub default_height: Option<f32>,
-    /// The default OpenAI model to use when creating new chats.
-    ///
-    /// Default: gpt-4-1106-preview
-    pub default_open_ai_model: Option<OpenAiModel>,
-    /// OpenAI API base URL to use when creating new chats.
-    ///
-    /// Default: https://api.openai.com/v1
-    pub openai_api_url: Option<String>,
-}
-
-impl Settings for AssistantSettings {
-    const KEY: Option<&'static str> = Some("assistant");
-
-    const PRESERVED_KEYS: Option<&'static [&'static str]> = Some(&["version"]);
-
-    type FileContent = AssistantSettingsContent;
-
-    fn load(
-        sources: SettingsSources<Self::FileContent>,
-        _: &mut gpui::AppContext,
-    ) -> anyhow::Result<Self> {
-        let mut settings = AssistantSettings::default();
-
-        for value in sources.defaults_and_customizations() {
-            if value.is_version_outdated() {
-                settings.using_outdated_settings_version = true;
-            }
-
-            let value = value.upgrade();
-            merge(&mut settings.enabled, value.enabled);
-            merge(&mut settings.button, value.button);
-            merge(&mut settings.dock, value.dock);
-            merge(
-                &mut settings.default_width,
-                value.default_width.map(Into::into),
-            );
-            merge(
-                &mut settings.default_height,
-                value.default_height.map(Into::into),
-            );
-            merge(&mut settings.default_model, value.default_model);
-            merge(&mut settings.inline_alternatives, value.inline_alternatives);
-            merge(
-                &mut settings.enable_experimental_live_diffs,
-                value.enable_experimental_live_diffs,
-            );
-        }
-
-        Ok(settings)
-    }
-}
-
-fn merge<T>(target: &mut T, value: Option<T>) {
-    if let Some(value) = value {
-        *target = value;
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use fs::Fs;
-    use gpui::{ReadGlobal, TestAppContext};
-
-    use super::*;
-
-    #[gpui::test]
-    async fn test_deserialize_assistant_settings_with_version(cx: &mut TestAppContext) {
-        let fs = fs::FakeFs::new(cx.executor().clone());
-        fs.create_dir(paths::settings_file().parent().unwrap())
-            .await
-            .unwrap();
-
-        cx.update(|cx| {
-            let test_settings = settings::SettingsStore::test(cx);
-            cx.set_global(test_settings);
-            AssistantSettings::register(cx);
-        });
-
-        cx.update(|cx| {
-            assert!(!AssistantSettings::get_global(cx).using_outdated_settings_version);
-            assert_eq!(
-                AssistantSettings::get_global(cx).default_model,
-                LanguageModelSelection {
-                    provider: "zed.dev".into(),
-                    model: "claude-3-5-sonnet".into(),
-                }
-            );
-        });
-
-        cx.update(|cx| {
-            settings::SettingsStore::global(cx).update_settings_file::<AssistantSettings>(
-                fs.clone(),
-                |settings, _| {
-                    *settings = AssistantSettingsContent::Versioned(
-                        VersionedAssistantSettingsContent::V2(AssistantSettingsContentV2 {
-                            default_model: Some(LanguageModelSelection {
-                                provider: "test-provider".into(),
-                                model: "gpt-99".into(),
-                            }),
-                            inline_alternatives: None,
-                            enabled: None,
-                            button: None,
-                            dock: None,
-                            default_width: None,
-                            default_height: None,
-                            enable_experimental_live_diffs: None,
-                        }),
-                    )
-                },
-            );
-        });
-
-        cx.run_until_parked();
-
-        let raw_settings_value = fs.load(paths::settings_file()).await.unwrap();
-        assert!(raw_settings_value.contains(r#""version": "2""#));
-
-        #[derive(Debug, Deserialize)]
-        struct AssistantSettingsTest {
-            assistant: AssistantSettingsContent,
-        }
-
-        let assistant_settings: AssistantSettingsTest =
-            serde_json_lenient::from_str(&raw_settings_value).unwrap();
-
-        assert!(!assistant_settings.assistant.is_version_outdated());
-    }
-}
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -1,9 +1,9 @@
 use crate::{
-    assistant_settings::AssistantSettings, humanize_token_count, prompts::PromptBuilder,
-    AssistantPanel, AssistantPanelEvent, CharOperation, CycleNextInlineAssist,
-    CyclePreviousInlineAssist, LineDiff, LineOperation, RequestType, StreamingDiff,
+    AssistantPanel, AssistantPanelEvent, CycleNextInlineAssist, CyclePreviousInlineAssist,
 };
 use anyhow::{anyhow, Context as _, Result};
+use assistant_context_editor::{humanize_token_count, RequestType};
+use assistant_settings::AssistantSettings;
 use client::{telemetry::Telemetry, ErrorExt};
 use collections::{hash_map, HashMap, HashSet, VecDeque};
 use editor::{
@@ -40,6 +40,7 @@ use language_models::report_assistant_event;
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
+use prompt_library::PromptBuilder;
 use rope::Rope;
 use settings::{update_settings_file, Settings, SettingsStore};
 use smol::future::FutureExt;
@@ -54,6 +55,7 @@ use std::{
    task::{self, Poll},
    time::{Duration, Instant},
 };
+use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::terminal_panel::TerminalPanel;
 use text::{OffsetRangeExt, ToPoint as _};
@@ -1726,7 +1728,7 @@ impl PromptEditor {
    }

    fn placeholder_text(codegen: &Codegen, cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::ToggleFocus, cx)
+        let context_keybinding = text_for_action(&zed_actions::assistant::ToggleFocus, cx)
            .map(|keybinding| format!(" • {keybinding} for context"))
            .unwrap_or_default();

--- a/crates/assistant/src/slash_command/selection_command.rs
+++ b/crates/assistant/src/slash_command/selection_command.rs
@@ -1,98 +0,0 @@
-use crate::assistant_panel::selections_creases;
-use anyhow::{anyhow, Result};
-use assistant_slash_command::{
-    ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
-    SlashCommandOutputSection, SlashCommandResult,
-};
-use futures::StreamExt;
-use gpui::{AppContext, Task, WeakView};
-use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use ui::{IconName, SharedString, WindowContext};
-use workspace::Workspace;
-
-pub(crate) struct SelectionCommand;
-
-impl SlashCommand for SelectionCommand {
-    fn name(&self) -> String {
-        "selection".into()
-    }
-
-    fn label(&self, _cx: &AppContext) -> CodeLabel {
-        CodeLabel::plain(self.name(), None)
-    }
-
-    fn description(&self) -> String {
-        "Insert editor selection".into()
-    }
-
-    fn icon(&self) -> IconName {
-        IconName::Quote
-    }
-
-    fn menu_text(&self) -> String {
-        self.description()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn accepts_arguments(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakView<Workspace>>,
-        _cx: &mut WindowContext,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        workspace: WeakView<Workspace>,
-        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
-        let mut events = vec![];
-
-        let Some(creases) = workspace
-            .update(cx, selections_creases)
-            .unwrap_or_else(|e| {
-                events.push(Err(e));
-                None
-            })
-        else {
-            return Task::ready(Err(anyhow!("no active selection")));
-        };
-
-        for (text, title) in creases {
-            events.push(Ok(SlashCommandEvent::StartSection {
-                icon: IconName::TextSnippet,
-                label: SharedString::from(title),
-                metadata: None,
-            }));
-            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                text,
-                run_commands_in_text: false,
-            })));
-            events.push(Ok(SlashCommandEvent::EndSection));
-            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
-                text: "\n".to_string(),
-                run_commands_in_text: false,
-            })));
-        }
-
-        let result = futures::stream::iter(events).boxed();
-
-        Task::ready(Ok(result))
-    }
-}
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -1,9 +1,7 @@
-use crate::assistant_settings::AssistantSettings;
-use crate::{
-    humanize_token_count, prompts::PromptBuilder, AssistantPanel, AssistantPanelEvent, RequestType,
-    DEFAULT_CONTEXT_LINES,
-};
+use crate::{AssistantPanel, AssistantPanelEvent, DEFAULT_CONTEXT_LINES};
 use anyhow::{Context as _, Result};
+use assistant_context_editor::{humanize_token_count, RequestType};
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{HashMap, VecDeque};
 use editor::{
@@ -22,6 +20,7 @@ use language_model::{
 };
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
 use language_models::report_assistant_event;
+use prompt_library::PromptBuilder;
 use settings::{update_settings_file, Settings};
 use std::{
    cmp,
@@ -741,7 +740,7 @@ impl PromptEditor {
    }

    fn placeholder_text(cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::ToggleFocus, cx)
+        let context_keybinding = text_for_action(&zed_actions::assistant::ToggleFocus, cx)
            .map(|keybinding| format!(" • {keybinding} for context"))
            .unwrap_or_default();

--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assistant2"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
@@ -12,10 +12,17 @@ workspace = true
 path = "src/assistant.rs"
 doctest = false

+[features]
+test-support = [
+    "gpui/test-support",
+    "language/test-support",
+]
+
 [dependencies]
-anthropic = { workspace = true, features = ["schemars"] }
 anyhow.workspace = true
-assets.workspace = true
+assistant_context_editor.workspace = true
+assistant_settings.workspace = true
+assistant_slash_command.workspace = true
 assistant_tool.workspace = true
 async-watch.workspace = true
 chrono.workspace = true
@@ -32,7 +39,6 @@ fs.workspace = true
 futures.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
-handlebars.workspace = true
 html_to_markdown.workspace = true
 http_client.workspace = true
 itertools.workspace = true
@@ -45,23 +51,18 @@ lsp.workspace = true
 markdown.workspace = true
 menu.workspace = true
 multi_buffer.workspace = true
-ollama = { workspace = true, features = ["schemars"] }
-lmstudio = { workspace = true, features = ["schemars"] }
-open_ai = { workspace = true, features = ["schemars"] }
-ordered-float.workspace = true
 parking_lot.workspace = true
-paths.workspace = true
 picker.workspace = true
 project.workspace = true
+prompt_library.workspace = true
 proto.workspace = true
 rope.workspace = true
-schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-serde_json_lenient.workspace = true
 settings.workspace = true
 similar.workspace = true
 smol.workspace = true
+streaming_diff.workspace = true
 telemetry_events.workspace = true
 terminal.workspace = true
 terminal_view.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -1,20 +1,18 @@
 use std::sync::Arc;
-use std::time::Duration;

 use assistant_tool::ToolWorkingSet;
 use collections::HashMap;
 use gpui::{
-    linear_color_stop, linear_gradient, list, percentage, AbsoluteLength, Animation, AnimationExt,
-    AnyElement, AppContext, DefiniteLength, EdgesRefinement, Empty, FocusHandle, Length,
+    list, AbsoluteLength, AnyElement, AppContext, DefiniteLength, EdgesRefinement, Empty, Length,
    ListAlignment, ListOffset, ListState, Model, StyleRefinement, Subscription,
-    TextStyleRefinement, Transformation, UnderlineStyle, View, WeakView,
+    TextStyleRefinement, UnderlineStyle, View, WeakView,
 };
 use language::LanguageRegistry;
 use language_model::Role;
 use markdown::{Markdown, MarkdownStyle};
 use settings::Settings as _;
 use theme::ThemeSettings;
-use ui::{prelude::*, Divider, KeyBinding};
+use ui::prelude::*;
 use workspace::Workspace;

 use crate::thread::{MessageId, Thread, ThreadError, ThreadEvent};
@@ -29,7 +27,6 @@ pub struct ActiveThread {
    list_state: ListState,
    rendered_messages_by_id: HashMap<MessageId, View<Markdown>>,
    last_error: Option<ThreadError>,
-    focus_handle: FocusHandle,
    _subscriptions: Vec<Subscription>,
 }

@@ -39,7 +36,6 @@ impl ActiveThread {
        workspace: WeakView<Workspace>,
        language_registry: Arc<LanguageRegistry>,
        tools: Arc<ToolWorkingSet>,
-        focus_handle: FocusHandle,
        cx: &mut ViewContext<Self>,
    ) -> Self {
        let subscriptions = vec![
@@ -62,7 +58,6 @@ impl ActiveThread {
                }
            }),
            last_error: None,
-            focus_handle,
            _subscriptions: subscriptions,
        };

@@ -264,7 +259,7 @@ impl ActiveThread {
                        h_flex().flex_wrap().gap_1().px_1p5().pb_1p5().children(
                            context
                                .into_iter()
-                                .map(|context| ContextPill::new_added(context, false, false, None)),
+                                .map(|context| ContextPill::added(context, false, false, None)),
                        ),
                    )
                } else {
@@ -280,12 +275,10 @@ impl ActiveThread {
                .child(
                    v_flex()
                        .bg(colors.editor_background)
-                        .ml_16()
-                        .rounded_t_lg()
-                        .rounded_bl_lg()
-                        .rounded_br_none()
+                        .rounded_lg()
                        .border_1()
                        .border_color(colors.border)
+                        .shadow_sm()
                        .child(
                            h_flex()
                                .py_1()
@@ -326,74 +319,10 @@ impl ActiveThread {
 }

 impl Render for ActiveThread {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let is_streaming_completion = self.thread.read(cx).is_streaming();
-        let panel_bg = cx.theme().colors().panel_background;
-        let focus_handle = self.focus_handle.clone();
-
+    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
        v_flex()
            .size_full()
            .pt_1p5()
            .child(list(self.list_state.clone()).flex_grow())
-            .when(is_streaming_completion, |parent| {
-                parent.child(
-                    h_flex()
-                        .w_full()
-                        .pb_2p5()
-                        .absolute()
-                        .bottom_0()
-                        .flex_shrink()
-                        .justify_center()
-                        .bg(linear_gradient(
-                            180.,
-                            linear_color_stop(panel_bg.opacity(0.0), 0.),
-                            linear_color_stop(panel_bg, 1.),
-                        ))
-                        .child(
-                            h_flex()
-                                .flex_none()
-                                .p_1p5()
-                                .bg(cx.theme().colors().editor_background)
-                                .border_1()
-                                .border_color(cx.theme().colors().border)
-                                .rounded_md()
-                                .shadow_lg()
-                                .gap_1()
-                                .child(
-                                    Icon::new(IconName::ArrowCircle)
-                                        .size(IconSize::Small)
-                                        .color(Color::Muted)
-                                        .with_animation(
-                                            "arrow-circle",
-                                            Animation::new(Duration::from_secs(2)).repeat(),
-                                            |icon, delta| {
-                                                icon.transform(Transformation::rotate(percentage(
-                                                    delta,
-                                                )))
-                                            },
-                                        ),
-                                )
-                                .child(
-                                    Label::new("Generating…")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Muted),
-                                )
-                                .child(Divider::vertical())
-                                .child(
-                                    Button::new("cancel-generation", "Cancel")
-                                        .label_size(LabelSize::Small)
-                                        .key_binding(KeyBinding::for_action_in(
-                                            &editor::actions::Cancel,
-                                            &self.focus_handle,
-                                            cx,
-                                        ))
-                                        .on_click(move |_event, cx| {
-                                            focus_handle
-                                                .dispatch_action(&editor::actions::Cancel, cx);
-                                        }),
-                                ),
-                        ),
-                )
-            })
    }
 }
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -1,7 +1,7 @@
 mod active_thread;
+mod assistant_configuration;
 mod assistant_model_selector;
 mod assistant_panel;
-mod assistant_settings;
 mod buffer_codegen;
 mod context;
 mod context_picker;
@@ -10,8 +10,6 @@ mod context_strip;
 mod inline_assistant;
 mod inline_prompt_editor;
 mod message_editor;
-mod prompts;
-mod streaming_diff;
 mod terminal_codegen;
 mod terminal_inline_assistant;
 mod thread;
@@ -21,29 +19,32 @@ mod ui;

 use std::sync::Arc;

+use assistant_settings::AssistantSettings;
 use client::Client;
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
 use gpui::{actions, AppContext};
-use prompts::PromptLoadingParams;
+use prompt_library::PromptBuilder;
 use settings::Settings as _;
-use util::ResultExt;

-pub use crate::assistant_panel::AssistantPanel;
-use crate::assistant_settings::AssistantSettings;
+pub use crate::assistant_panel::{AssistantPanel, ConcreteAssistantPanelDelegate};
 pub use crate::inline_assistant::InlineAssistant;

 actions!(
    assistant2,
    [
-        ToggleFocus,
        NewThread,
+        NewPromptEditor,
        ToggleContextPicker,
        ToggleModelSelector,
        RemoveAllContext,
        OpenHistory,
+        OpenPromptEditorHistory,
+        OpenConfiguration,
+        RemoveSelectedThread,
        Chat,
+        ChatMode,
        CycleNextInlineAssist,
        CyclePreviousInlineAssist,
        FocusUp,
@@ -58,20 +59,15 @@ actions!(
 const NAMESPACE: &str = "assistant2";

 /// Initializes the `assistant2` crate.
-pub fn init(fs: Arc<dyn Fs>, client: Arc<Client>, stdout_is_a_pty: bool, cx: &mut AppContext) {
+pub fn init(
+    fs: Arc<dyn Fs>,
+    client: Arc<Client>,
+    prompt_builder: Arc<PromptBuilder>,
+    cx: &mut AppContext,
+) {
    AssistantSettings::register(cx);
    assistant_panel::init(cx);

-    let prompt_builder = prompts::PromptBuilder::new(Some(PromptLoadingParams {
-        fs: fs.clone(),
-        repo_path: stdout_is_a_pty
-            .then(|| std::env::current_dir().log_err())
-            .flatten(),
-        cx,
-    }))
-    .log_err()
-    .map(Arc::new)
-    .unwrap_or_else(|| Arc::new(prompts::PromptBuilder::new(None).unwrap()));
    inline_assistant::init(
        fs.clone(),
        prompt_builder.clone(),
--- a/crates/assistant2/src/assistant_configuration.rs
+++ b/crates/assistant2/src/assistant_configuration.rs
@@ -0,0 +1,173 @@
+use std::sync::Arc;
+
+use collections::HashMap;
+use gpui::{Action, AnyView, AppContext, EventEmitter, FocusHandle, FocusableView, Subscription};
+use language_model::{LanguageModelProvider, LanguageModelProviderId, LanguageModelRegistry};
+use ui::{prelude::*, ElevationIndex};
+use zed_actions::assistant::DeployPromptLibrary;
+
+pub struct AssistantConfiguration {
+    focus_handle: FocusHandle,
+    configuration_views_by_provider: HashMap<LanguageModelProviderId, AnyView>,
+    _registry_subscription: Subscription,
+}
+
+impl AssistantConfiguration {
+    pub fn new(cx: &mut ViewContext<Self>) -> Self {
+        let focus_handle = cx.focus_handle();
+
+        let registry_subscription = cx.subscribe(
+            &LanguageModelRegistry::global(cx),
+            |this, _, event: &language_model::Event, cx| match event {
+                language_model::Event::AddedProvider(provider_id) => {
+                    let provider = LanguageModelRegistry::read_global(cx).provider(provider_id);
+                    if let Some(provider) = provider {
+                        this.add_provider_configuration_view(&provider, cx);
+                    }
+                }
+                language_model::Event::RemovedProvider(provider_id) => {
+                    this.remove_provider_configuration_view(provider_id);
+                }
+                _ => {}
+            },
+        );
+
+        let mut this = Self {
+            focus_handle,
+            configuration_views_by_provider: HashMap::default(),
+            _registry_subscription: registry_subscription,
+        };
+        this.build_provider_configuration_views(cx);
+        this
+    }
+
+    fn build_provider_configuration_views(&mut self, cx: &mut ViewContext<Self>) {
+        let providers = LanguageModelRegistry::read_global(cx).providers();
+        for provider in providers {
+            self.add_provider_configuration_view(&provider, cx);
+        }
+    }
+
+    fn remove_provider_configuration_view(&mut self, provider_id: &LanguageModelProviderId) {
+        self.configuration_views_by_provider.remove(provider_id);
+    }
+
+    fn add_provider_configuration_view(
+        &mut self,
+        provider: &Arc<dyn LanguageModelProvider>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let configuration_view = provider.configuration_view(cx);
+        self.configuration_views_by_provider
+            .insert(provider.id(), configuration_view);
+    }
+}
+
+impl FocusableView for AssistantConfiguration {
+    fn focus_handle(&self, _: &AppContext) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+pub enum AssistantConfigurationEvent {
+    NewThread(Arc<dyn LanguageModelProvider>),
+}
+
+impl EventEmitter<AssistantConfigurationEvent> for AssistantConfiguration {}
+
+impl AssistantConfiguration {
+    fn render_provider_configuration(
+        &mut self,
+        provider: &Arc<dyn LanguageModelProvider>,
+        cx: &mut ViewContext<Self>,
+    ) -> impl IntoElement {
+        let provider_id = provider.id().0.clone();
+        let provider_name = provider.name().0.clone();
+        let configuration_view = self
+            .configuration_views_by_provider
+            .get(&provider.id())
+            .cloned();
+
+        v_flex()
+            .gap_2()
+            .child(
+                h_flex()
+                    .justify_between()
+                    .child(Headline::new(provider_name.clone()).size(HeadlineSize::Small))
+                    .when(provider.is_authenticated(cx), |parent| {
+                        parent.child(
+                            h_flex().justify_end().child(
+                                Button::new(
+                                    SharedString::from(format!("new-thread-{provider_id}")),
+                                    "Open New Thread",
+                                )
+                                .icon_position(IconPosition::Start)
+                                .icon(IconName::Plus)
+                                .style(ButtonStyle::Filled)
+                                .layer(ElevationIndex::ModalSurface)
+                                .on_click(cx.listener({
+                                    let provider = provider.clone();
+                                    move |_this, _event, cx| {
+                                        cx.emit(AssistantConfigurationEvent::NewThread(
+                                            provider.clone(),
+                                        ))
+                                    }
+                                })),
+                            ),
+                        )
+                    }),
+            )
+            .child(
+                div()
+                    .p(DynamicSpacing::Base08.rems(cx))
+                    .bg(cx.theme().colors().surface_background)
+                    .border_1()
+                    .border_color(cx.theme().colors().border_variant)
+                    .rounded_md()
+                    .map(|parent| match configuration_view {
+                        Some(configuration_view) => parent.child(configuration_view),
+                        None => parent.child(div().child(Label::new(format!(
+                            "No configuration view for {provider_name}",
+                        )))),
+                    }),
+            )
+    }
+}
+
+impl Render for AssistantConfiguration {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let providers = LanguageModelRegistry::read_global(cx).providers();
+
+        v_flex()
+            .id("assistant-configuration")
+            .track_focus(&self.focus_handle(cx))
+            .bg(cx.theme().colors().editor_background)
+            .size_full()
+            .overflow_y_scroll()
+            .child(
+                h_flex().p(DynamicSpacing::Base16.rems(cx)).child(
+                    Button::new("open-prompt-library", "Open Prompt Library")
+                        .style(ButtonStyle::Filled)
+                        .full_width()
+                        .icon(IconName::Book)
+                        .icon_size(IconSize::Small)
+                        .icon_position(IconPosition::Start)
+                        .on_click(|_event, cx| {
+                            cx.dispatch_action(DeployPromptLibrary.boxed_clone())
+                        }),
+                ),
+            )
+            .child(
+                v_flex()
+                    .p(DynamicSpacing::Base16.rems(cx))
+                    .mt_1()
+                    .gap_6()
+                    .flex_1()
+                    .children(
+                        providers
+                            .into_iter()
+                            .map(|provider| self.render_provider_configuration(&provider, cx)),
+                    ),
+            )
+    }
+}
--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -1,3 +1,4 @@
+use assistant_settings::AssistantSettings;
 use fs::Fs;
 use gpui::{FocusHandle, View};
 use language_model::LanguageModelRegistry;
@@ -6,7 +7,7 @@ use settings::update_settings_file;
 use std::sync::Arc;
 use ui::{prelude::*, ButtonLike, PopoverMenuHandle, Tooltip};

-use crate::{assistant_settings::AssistantSettings, ToggleModelSelector};
+use crate::ToggleModelSelector;

 pub struct AssistantModelSelector {
    selector: View<LanguageModelSelector>,
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -1,36 +1,49 @@
+use std::path::PathBuf;
 use std::sync::Arc;

-use anyhow::Result;
+use anyhow::{anyhow, Result};
+use assistant_context_editor::{
+    make_lsp_adapter_delegate, AssistantPanelDelegate, ContextEditor, ContextHistory,
+    SlashCommandCompletionProvider,
+};
+use assistant_settings::{AssistantDockPosition, AssistantSettings};
+use assistant_slash_command::SlashCommandWorkingSet;
 use assistant_tool::ToolWorkingSet;
 use client::zed_urls;
+use editor::Editor;
 use fs::Fs;
 use gpui::{
-    prelude::*, px, svg, Action, AnyElement, AppContext, AsyncWindowContext, EventEmitter,
-    FocusHandle, FocusableView, FontWeight, Model, Pixels, Task, View, ViewContext, WeakView,
-    WindowContext,
+    prelude::*, px, svg, Action, AnyElement, AppContext, AsyncWindowContext, Corner, EventEmitter,
+    FocusHandle, FocusableView, FontWeight, Model, Pixels, Subscription, Task, UpdateGlobal, View,
+    ViewContext, WeakView, WindowContext,
 };
 use language::LanguageRegistry;
-use settings::Settings;
+use language_model::LanguageModelRegistry;
+use project::Project;
+use prompt_library::{open_prompt_library, PromptBuilder, PromptLibrary};
+use settings::{update_settings_file, Settings};
 use time::UtcOffset;
-use ui::{prelude::*, KeyBinding, Tab, Tooltip};
+use ui::{prelude::*, ContextMenu, KeyBinding, PopoverMenu, PopoverMenuHandle, Tab, Tooltip};
+use util::ResultExt as _;
 use workspace::dock::{DockPosition, Panel, PanelEvent};
 use workspace::Workspace;
+use zed_actions::assistant::{DeployPromptLibrary, ToggleFocus};

 use crate::active_thread::ActiveThread;
-use crate::assistant_settings::{AssistantDockPosition, AssistantSettings};
+use crate::assistant_configuration::{AssistantConfiguration, AssistantConfigurationEvent};
 use crate::message_editor::MessageEditor;
 use crate::thread::{Thread, ThreadError, ThreadId};
 use crate::thread_history::{PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
-use crate::{NewThread, OpenHistory, ToggleFocus};
+use crate::{
+    InlineAssistant, NewPromptEditor, NewThread, OpenConfiguration, OpenHistory,
+    OpenPromptEditorHistory,
+};

 pub fn init(cx: &mut AppContext) {
    cx.observe_new_views(
        |workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>| {
            workspace
-                .register_action(|workspace, _: &ToggleFocus, cx| {
-                    workspace.toggle_panel_focus::<AssistantPanel>(cx);
-                })
                .register_action(|workspace, _: &NewThread, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        panel.update(cx, |panel, cx| panel.new_thread(cx));
@@ -42,6 +55,24 @@ pub fn init(cx: &mut AppContext) {
                        workspace.focus_panel::<AssistantPanel>(cx);
                        panel.update(cx, |panel, cx| panel.open_history(cx));
                    }
+                })
+                .register_action(|workspace, _: &NewPromptEditor, cx| {
+                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+                        workspace.focus_panel::<AssistantPanel>(cx);
+                        panel.update(cx, |panel, cx| panel.new_prompt_editor(cx));
+                    }
+                })
+                .register_action(|workspace, _: &OpenPromptEditorHistory, cx| {
+                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+                        workspace.focus_panel::<AssistantPanel>(cx);
+                        panel.update(cx, |panel, cx| panel.open_prompt_editor_history(cx));
+                    }
+                })
+                .register_action(|workspace, _: &OpenConfiguration, cx| {
+                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
+                        workspace.focus_panel::<AssistantPanel>(cx);
+                        panel.update(cx, |panel, cx| panel.open_configuration(cx));
+                    }
                });
        },
    )
@@ -50,20 +81,31 @@ pub fn init(cx: &mut AppContext) {

 enum ActiveView {
    Thread,
+    PromptEditor,
    History,
+    PromptEditorHistory,
+    Configuration,
 }

 pub struct AssistantPanel {
    workspace: WeakView<Workspace>,
+    project: Model<Project>,
    fs: Arc<dyn Fs>,
    language_registry: Arc<LanguageRegistry>,
    thread_store: Model<ThreadStore>,
    thread: View<ActiveThread>,
    message_editor: View<MessageEditor>,
+    context_store: Model<assistant_context_editor::ContextStore>,
+    context_editor: Option<View<ContextEditor>>,
+    context_history: Option<View<ContextHistory>>,
+    configuration: Option<View<AssistantConfiguration>>,
+    configuration_subscription: Option<Subscription>,
    tools: Arc<ToolWorkingSet>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
    history: View<ThreadHistory>,
+    new_item_context_menu_handle: PopoverMenuHandle<ContextMenu>,
+    open_history_context_menu_handle: PopoverMenuHandle<ContextMenu>,
    width: Option<Pixels>,
    height: Option<Pixels>,
 }
@@ -71,6 +113,7 @@ pub struct AssistantPanel {
 impl AssistantPanel {
    pub fn load(
        workspace: WeakView<Workspace>,
+        prompt_builder: Arc<PromptBuilder>,
        cx: AsyncWindowContext,
    ) -> Task<Result<View<Self>>> {
        cx.spawn(|mut cx| async move {
@@ -82,8 +125,22 @@ impl AssistantPanel {
                })?
                .await?;

+            let slash_commands = Arc::new(SlashCommandWorkingSet::default());
+            let context_store = workspace
+                .update(&mut cx, |workspace, cx| {
+                    let project = workspace.project().clone();
+                    assistant_context_editor::ContextStore::new(
+                        project,
+                        prompt_builder.clone(),
+                        slash_commands,
+                        tools.clone(),
+                        cx,
+                    )
+                })?
+                .await?;
+
            workspace.update(&mut cx, |workspace, cx| {
-                cx.new_view(|cx| Self::new(workspace, thread_store, tools, cx))
+                cx.new_view(|cx| Self::new(workspace, thread_store, context_store, tools, cx))
            })
        })
    }
@@ -91,12 +148,14 @@ impl AssistantPanel {
    fn new(
        workspace: &Workspace,
        thread_store: Model<ThreadStore>,
+        context_store: Model<assistant_context_editor::ContextStore>,
        tools: Arc<ToolWorkingSet>,
        cx: &mut ViewContext<Self>,
    ) -> Self {
        let thread = thread_store.update(cx, |this, cx| this.create_thread(cx));
        let fs = workspace.app_state().fs.clone();
-        let language_registry = workspace.project().read(cx).languages().clone();
+        let project = workspace.project().clone();
+        let language_registry = project.read(cx).languages().clone();
        let workspace = workspace.weak_handle();
        let weak_self = cx.view().downgrade();

@@ -113,6 +172,7 @@ impl AssistantPanel {
        Self {
            active_view: ActiveView::Thread,
            workspace: workspace.clone(),
+            project,
            fs: fs.clone(),
            language_registry: language_registry.clone(),
            thread_store: thread_store.clone(),
@@ -122,22 +182,41 @@ impl AssistantPanel {
                    workspace,
                    language_registry,
                    tools.clone(),
-                    message_editor.focus_handle(cx),
                    cx,
                )
            }),
            message_editor,
+            context_store,
+            context_editor: None,
+            context_history: None,
+            configuration: None,
+            configuration_subscription: None,
            tools,
            local_timezone: UtcOffset::from_whole_seconds(
                chrono::Local::now().offset().local_minus_utc(),
            )
            .unwrap(),
            history: cx.new_view(|cx| ThreadHistory::new(weak_self, thread_store, cx)),
+            new_item_context_menu_handle: PopoverMenuHandle::default(),
+            open_history_context_menu_handle: PopoverMenuHandle::default(),
            width: None,
            height: None,
        }
    }

+    pub fn toggle_focus(
+        workspace: &mut Workspace,
+        _: &ToggleFocus,
+        cx: &mut ViewContext<Workspace>,
+    ) {
+        let settings = AssistantSettings::get_global(cx);
+        if !settings.enabled {
+            return;
+        }
+
+        workspace.toggle_panel_focus::<Self>(cx);
+    }
+
    pub(crate) fn local_timezone(&self) -> UtcOffset {
        self.local_timezone
    }
@@ -163,7 +242,6 @@ impl AssistantPanel {
                self.workspace.clone(),
                self.language_registry.clone(),
                self.tools.clone(),
-                self.focus_handle(cx),
                cx,
            )
        });
@@ -179,12 +257,110 @@ impl AssistantPanel {
        self.message_editor.focus_handle(cx).focus(cx);
    }

+    fn new_prompt_editor(&mut self, cx: &mut ViewContext<Self>) {
+        self.active_view = ActiveView::PromptEditor;
+
+        let context = self
+            .context_store
+            .update(cx, |context_store, cx| context_store.create(cx));
+        let lsp_adapter_delegate = make_lsp_adapter_delegate(&self.project, cx)
+            .log_err()
+            .flatten();
+
+        self.context_editor = Some(cx.new_view(|cx| {
+            let mut editor = ContextEditor::for_context(
+                context,
+                self.fs.clone(),
+                self.workspace.clone(),
+                self.project.clone(),
+                lsp_adapter_delegate,
+                cx,
+            );
+            editor.insert_default_prompt(cx);
+            editor
+        }));
+
+        if let Some(context_editor) = self.context_editor.as_ref() {
+            context_editor.focus_handle(cx).focus(cx);
+        }
+    }
+
+    fn deploy_prompt_library(&mut self, _: &DeployPromptLibrary, cx: &mut ViewContext<Self>) {
+        open_prompt_library(
+            self.language_registry.clone(),
+            Box::new(PromptLibraryInlineAssist::new(self.workspace.clone())),
+            Arc::new(|| {
+                Box::new(SlashCommandCompletionProvider::new(
+                    Arc::new(SlashCommandWorkingSet::default()),
+                    None,
+                    None,
+                ))
+            }),
+            cx,
+        )
+        .detach_and_log_err(cx);
+    }
+
    fn open_history(&mut self, cx: &mut ViewContext<Self>) {
        self.active_view = ActiveView::History;
        self.history.focus_handle(cx).focus(cx);
        cx.notify();
    }

+    fn open_prompt_editor_history(&mut self, cx: &mut ViewContext<Self>) {
+        self.active_view = ActiveView::PromptEditorHistory;
+        self.context_history = Some(cx.new_view(|cx| {
+            ContextHistory::new(
+                self.project.clone(),
+                self.context_store.clone(),
+                self.workspace.clone(),
+                cx,
+            )
+        }));
+
+        if let Some(context_history) = self.context_history.as_ref() {
+            context_history.focus_handle(cx).focus(cx);
+        }
+
+        cx.notify();
+    }
+
+    fn open_saved_prompt_editor(
+        &mut self,
+        path: PathBuf,
+        cx: &mut ViewContext<Self>,
+    ) -> Task<Result<()>> {
+        let context = self
+            .context_store
+            .update(cx, |store, cx| store.open_local_context(path.clone(), cx));
+        let fs = self.fs.clone();
+        let project = self.project.clone();
+        let workspace = self.workspace.clone();
+
+        let lsp_adapter_delegate = make_lsp_adapter_delegate(&project, cx).log_err().flatten();
+
+        cx.spawn(|this, mut cx| async move {
+            let context = context.await?;
+            this.update(&mut cx, |this, cx| {
+                let editor = cx.new_view(|cx| {
+                    ContextEditor::for_context(
+                        context,
+                        fs,
+                        workspace,
+                        project,
+                        lsp_adapter_delegate,
+                        cx,
+                    )
+                });
+                this.active_view = ActiveView::PromptEditor;
+                this.context_editor = Some(editor);
+
+                anyhow::Ok(())
+            })??;
+            Ok(())
+        })
+    }
+
    pub(crate) fn open_thread(&mut self, thread_id: &ThreadId, cx: &mut ViewContext<Self>) {
        let Some(thread) = self
            .thread_store
@@ -200,7 +376,6 @@ impl AssistantPanel {
                self.workspace.clone(),
                self.language_registry.clone(),
                self.tools.clone(),
-                self.focus_handle(cx),
                cx,
            )
        });
@@ -216,6 +391,46 @@ impl AssistantPanel {
        self.message_editor.focus_handle(cx).focus(cx);
    }

+    pub(crate) fn open_configuration(&mut self, cx: &mut ViewContext<Self>) {
+        self.active_view = ActiveView::Configuration;
+        self.configuration = Some(cx.new_view(AssistantConfiguration::new));
+
+        if let Some(configuration) = self.configuration.as_ref() {
+            self.configuration_subscription =
+                Some(cx.subscribe(configuration, Self::handle_assistant_configuration_event));
+
+            configuration.focus_handle(cx).focus(cx);
+        }
+    }
+
+    fn handle_assistant_configuration_event(
+        &mut self,
+        _view: View<AssistantConfiguration>,
+        event: &AssistantConfigurationEvent,
+        cx: &mut ViewContext<Self>,
+    ) {
+        match event {
+            AssistantConfigurationEvent::NewThread(provider) => {
+                if LanguageModelRegistry::read_global(cx)
+                    .active_provider()
+                    .map_or(true, |active_provider| {
+                        active_provider.id() != provider.id()
+                    })
+                {
+                    if let Some(model) = provider.provided_models(cx).first().cloned() {
+                        update_settings_file::<AssistantSettings>(
+                            self.fs.clone(),
+                            cx,
+                            move |settings, _| settings.set_model(model),
+                        );
+                    }
+                }
+
+                self.new_thread(cx);
+            }
+        }
+    }
+
    pub(crate) fn active_thread(&self, cx: &AppContext) -> Model<Thread> {
        self.thread.read(cx).thread.clone()
    }
@@ -231,6 +446,27 @@ impl FocusableView for AssistantPanel {
        match self.active_view {
            ActiveView::Thread => self.message_editor.focus_handle(cx),
            ActiveView::History => self.history.focus_handle(cx),
+            ActiveView::PromptEditor => {
+                if let Some(context_editor) = self.context_editor.as_ref() {
+                    context_editor.focus_handle(cx)
+                } else {
+                    cx.focus_handle()
+                }
+            }
+            ActiveView::PromptEditorHistory => {
+                if let Some(context_history) = self.context_history.as_ref() {
+                    context_history.focus_handle(cx)
+                } else {
+                    cx.focus_handle()
+                }
+            }
+            ActiveView::Configuration => {
+                if let Some(configuration) = self.configuration.as_ref() {
+                    configuration.focus_handle(cx)
+                } else {
+                    cx.focus_handle()
+                }
+            }
        }
    }
 }
@@ -242,8 +478,12 @@ impl Panel for AssistantPanel {
        "AssistantPanel2"
    }

-    fn position(&self, _cx: &WindowContext) -> DockPosition {
-        DockPosition::Right
+    fn position(&self, cx: &WindowContext) -> DockPosition {
+        match AssistantSettings::get_global(cx).dock {
+            AssistantDockPosition::Left => DockPosition::Left,
+            AssistantDockPosition::Bottom => DockPosition::Bottom,
+            AssistantDockPosition::Right => DockPosition::Right,
+        }
    }

    fn position_is_valid(&self, _: DockPosition) -> bool {
@@ -295,7 +535,7 @@ impl Panel for AssistantPanel {
            return None;
        }

-        Some(IconName::ZedAssistant2)
+        Some(IconName::ZedAssistant)
    }

    fn icon_tooltip(&self, _cx: &WindowContext) -> Option<&'static str> {
@@ -313,16 +553,28 @@ impl Panel for AssistantPanel {

 impl AssistantPanel {
    fn render_toolbar(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let focus_handle = self.focus_handle(cx);
-
        let thread = self.thread.read(cx);

-        let title = if thread.is_empty() {
-            thread.summary_or_default(cx)
-        } else {
-            thread
-                .summary(cx)
-                .unwrap_or_else(|| SharedString::from("Loading Summary…"))
+        let title = match self.active_view {
+            ActiveView::Thread => {
+                if thread.is_empty() {
+                    thread.summary_or_default(cx)
+                } else {
+                    thread
+                        .summary(cx)
+                        .unwrap_or_else(|| SharedString::from("Loading Summary…"))
+                }
+            }
+            ActiveView::PromptEditor => self
+                .context_editor
+                .as_ref()
+                .map(|context_editor| {
+                    SharedString::from(context_editor.read(cx).title(cx).to_string())
+                })
+                .unwrap_or_else(|| SharedString::from("Loading Summary…")),
+            ActiveView::History => "History / Thread".into(),
+            ActiveView::PromptEditorHistory => "History / Prompt Editor".into(),
+            ActiveView::Configuration => "Configuration".into(),
        };

        h_flex()
@@ -344,41 +596,40 @@ impl AssistantPanel {
                    .border_color(cx.theme().colors().border)
                    .gap(DynamicSpacing::Base02.rems(cx))
                    .child(
-                        IconButton::new("new-thread", IconName::Plus)
-                            .icon_size(IconSize::Small)
-                            .style(ButtonStyle::Subtle)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |cx| {
-                                    Tooltip::for_action_in(
-                                        "New Thread",
-                                        &NewThread,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click(move |_event, cx| {
-                                cx.dispatch_action(NewThread.boxed_clone());
+                        PopoverMenu::new("assistant-toolbar-new-popover-menu")
+                            .trigger(
+                                IconButton::new("new", IconName::Plus)
+                                    .icon_size(IconSize::Small)
+                                    .style(ButtonStyle::Subtle)
+                                    .tooltip(|cx| Tooltip::text("New…", cx)),
+                            )
+                            .anchor(Corner::TopRight)
+                            .with_handle(self.new_item_context_menu_handle.clone())
+                            .menu(move |cx| {
+                                Some(ContextMenu::build(cx, |menu, _| {
+                                    menu.action("New Thread", NewThread.boxed_clone())
+                                        .action("New Prompt Editor", NewPromptEditor.boxed_clone())
+                                }))
                            }),
                    )
                    .child(
-                        IconButton::new("open-history", IconName::HistoryRerun)
-                            .icon_size(IconSize::Small)
-                            .style(ButtonStyle::Subtle)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |cx| {
-                                    Tooltip::for_action_in(
-                                        "Open History",
-                                        &OpenHistory,
-                                        &focus_handle,
-                                        cx,
-                                    )
-                                }
-                            })
-                            .on_click(move |_event, cx| {
-                                cx.dispatch_action(OpenHistory.boxed_clone());
+                        PopoverMenu::new("assistant-toolbar-history-popover-menu")
+                            .trigger(
+                                IconButton::new("open-history", IconName::HistoryRerun)
+                                    .icon_size(IconSize::Small)
+                                    .style(ButtonStyle::Subtle)
+                                    .tooltip(|cx| Tooltip::text("History…", cx)),
+                            )
+                            .anchor(Corner::TopRight)
+                            .with_handle(self.open_history_context_menu_handle.clone())
+                            .menu(move |cx| {
+                                Some(ContextMenu::build(cx, |menu, _| {
+                                    menu.action("Thread History", OpenHistory.boxed_clone())
+                                        .action(
+                                            "Prompt Editor History",
+                                            OpenPromptEditorHistory.boxed_clone(),
+                                        )
+                                }))
                            }),
                    )
                    .child(
@@ -386,8 +637,8 @@ impl AssistantPanel {
                            .icon_size(IconSize::Small)
                            .style(ButtonStyle::Subtle)
                            .tooltip(move |cx| Tooltip::text("Configure Assistant", cx))
-                            .on_click(move |_event, _cx| {
-                                println!("Configure Assistant");
+                            .on_click(move |_event, cx| {
+                                cx.dispatch_action(OpenConfiguration.boxed_clone());
                            }),
                    ),
            )
@@ -428,13 +679,12 @@ impl AssistantPanel {
                                .color(Color::Muted),
                        ),
                    )
-                    .child(
-                        v_flex().mx_auto().w_4_5().gap_2().children(
-                            recent_threads
-                                .into_iter()
-                                .map(|thread| PastThread::new(thread, cx.view().downgrade())),
-                        ),
-                    )
+                    .child(v_flex().mx_auto().w_4_5().gap_2().children(
+                        recent_threads.into_iter().map(|thread| {
+                            // TODO: keyboard navigation
+                            PastThread::new(thread, cx.view().downgrade(), false)
+                        }),
+                    ))
                    .child(
                        h_flex().w_full().justify_center().child(
                            Button::new("view-all-past-threads", "View All Past Threads")
@@ -628,6 +878,7 @@ impl Render for AssistantPanel {
            .on_action(cx.listener(|this, _: &OpenHistory, cx| {
                this.open_history(cx);
            }))
+            .on_action(cx.listener(Self::deploy_prompt_library))
            .child(self.render_toolbar(cx))
            .map(|parent| match self.active_view {
                ActiveView::Thread => parent
@@ -640,6 +891,83 @@ impl Render for AssistantPanel {
                    )
                    .children(self.render_last_error(cx)),
                ActiveView::History => parent.child(self.history.clone()),
+                ActiveView::PromptEditor => parent.children(self.context_editor.clone()),
+                ActiveView::PromptEditorHistory => parent.children(self.context_history.clone()),
+                ActiveView::Configuration => parent.children(self.configuration.clone()),
            })
    }
 }
+
+struct PromptLibraryInlineAssist {
+    workspace: WeakView<Workspace>,
+}
+
+impl PromptLibraryInlineAssist {
+    pub fn new(workspace: WeakView<Workspace>) -> Self {
+        Self { workspace }
+    }
+}
+
+impl prompt_library::InlineAssistDelegate for PromptLibraryInlineAssist {
+    fn assist(
+        &self,
+        prompt_editor: &View<Editor>,
+        _initial_prompt: Option<String>,
+        cx: &mut ViewContext<PromptLibrary>,
+    ) {
+        InlineAssistant::update_global(cx, |assistant, cx| {
+            assistant.assist(&prompt_editor, self.workspace.clone(), None, cx)
+        })
+    }
+
+    fn focus_assistant_panel(
+        &self,
+        workspace: &mut Workspace,
+        cx: &mut ViewContext<Workspace>,
+    ) -> bool {
+        workspace.focus_panel::<AssistantPanel>(cx).is_some()
+    }
+}
+
+pub struct ConcreteAssistantPanelDelegate;
+
+impl AssistantPanelDelegate for ConcreteAssistantPanelDelegate {
+    fn active_context_editor(
+        &self,
+        workspace: &mut Workspace,
+        cx: &mut ViewContext<Workspace>,
+    ) -> Option<View<ContextEditor>> {
+        let panel = workspace.panel::<AssistantPanel>(cx)?;
+        panel.update(cx, |panel, _cx| panel.context_editor.clone())
+    }
+
+    fn open_saved_context(
+        &self,
+        workspace: &mut Workspace,
+        path: std::path::PathBuf,
+        cx: &mut ViewContext<Workspace>,
+    ) -> Task<Result<()>> {
+        let Some(panel) = workspace.panel::<AssistantPanel>(cx) else {
+            return Task::ready(Err(anyhow!("Assistant panel not found")));
+        };
+
+        panel.update(cx, |panel, cx| panel.open_saved_prompt_editor(path, cx))
+    }
+
+    fn open_remote_context(
+        &self,
+        _workspace: &mut Workspace,
+        _context_id: assistant_context_editor::ContextId,
+        _cx: &mut ViewContext<Workspace>,
+    ) -> Task<Result<View<ContextEditor>>> {
+        Task::ready(Err(anyhow!("opening remote context not implemented")))
+    }
+
+    fn quote_selection(
+        &self,
+        _workspace: &mut Workspace,
+        _creases: Vec<(String, String)>,
+        _cx: &mut ViewContext<Workspace>,
+    ) {
+    }
+}
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -1,10 +1,6 @@
 use crate::context::attach_context_to_message;
 use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::CodegenStatus;
-use crate::{
-    prompts::PromptBuilder,
-    streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff},
-};
 use anyhow::{Context as _, Result};
 use client::telemetry::Telemetry;
 use collections::HashSet;
@@ -19,6 +15,7 @@ use language_model::{
 use language_models::report_assistant_event;
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
+use prompt_library::PromptBuilder;
 use rope::Rope;
 use smol::future::FutureExt;
 use std::{
@@ -31,6 +28,7 @@ use std::{
    task::{self, Poll},
    time::Instant,
 };
+use streaming_diff::{CharOperation, LineDiff, LineOperation, StreamingDiff};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};

 pub struct BufferCodegen {
--- a/crates/assistant2/src/context.rs
+++ b/crates/assistant2/src/context.rs
@@ -43,15 +43,6 @@ pub enum ContextKind {
 }

 impl ContextKind {
-    pub fn all() -> &'static [ContextKind] {
-        &[
-            ContextKind::File,
-            ContextKind::Directory,
-            ContextKind::FetchedUrl,
-            ContextKind::Thread,
-        ]
-    }
-
    pub fn label(&self) -> &'static str {
        match self {
            ContextKind::File => "File",
--- a/crates/assistant2/src/context_picker.rs
+++ b/crates/assistant2/src/context_picker.rs
@@ -14,7 +14,7 @@ use gpui::{
 use project::ProjectPath;
 use thread_context_picker::{render_thread_context_entry, ThreadContextEntry};
 use ui::{prelude::*, ContextMenu, ContextMenuEntry, ContextMenuItem};
-use workspace::Workspace;
+use workspace::{notifications::NotifyResultExt, Workspace};

 use crate::context::ContextKind;
 use crate::context_picker::directory_context_picker::DirectoryContextPicker;
@@ -43,6 +43,7 @@ enum ContextPickerMode {
 pub(super) struct ContextPicker {
    mode: ContextPickerMode,
    workspace: WeakView<Workspace>,
+    editor: WeakView<Editor>,
    context_store: WeakModel<ContextStore>,
    thread_store: Option<WeakModel<ThreadStore>>,
    confirm_behavior: ConfirmBehavior,
@@ -53,6 +54,7 @@ impl ContextPicker {
        workspace: WeakView<Workspace>,
        thread_store: Option<WeakModel<ThreadStore>>,
        context_store: WeakModel<ContextStore>,
+        editor: WeakView<Editor>,
        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
    ) -> Self {
@@ -61,6 +63,7 @@ impl ContextPicker {
            workspace,
            context_store,
            thread_store,
+            editor,
            confirm_behavior,
        }
    }
@@ -74,16 +77,6 @@ impl ContextPicker {
        let context_picker = cx.view().clone();

        let menu = ContextMenu::build(cx, move |menu, cx| {
-            let kind_entry = |kind: &'static ContextKind| {
-                let context_picker = context_picker.clone();
-
-                ContextMenuEntry::new(kind.label())
-                    .icon(kind.icon())
-                    .handler(move |cx| {
-                        context_picker.update(cx, |this, cx| this.select_kind(*kind, cx))
-                    })
-            };
-
            let recent = self.recent_entries(cx);
            let has_recent = !recent.is_empty();
            let recent_entries = recent
@@ -91,11 +84,39 @@ impl ContextPicker {
                .enumerate()
                .map(|(ix, entry)| self.recent_menu_item(context_picker.clone(), ix, entry));

+            let mut context_kinds = vec![
+                ContextKind::File,
+                ContextKind::Directory,
+                ContextKind::FetchedUrl,
+            ];
+            if self.allow_threads() {
+                context_kinds.push(ContextKind::Thread);
+            }
+
            let menu = menu
-                .when(has_recent, |menu| menu.label("Recent"))
+                .when(has_recent, |menu| {
+                    menu.custom_row(|_| {
+                        div()
+                            .mb_1()
+                            .child(
+                                Label::new("Recent")
+                                    .color(Color::Muted)
+                                    .size(LabelSize::Small),
+                            )
+                            .into_any_element()
+                    })
+                })
                .extend(recent_entries)
                .when(has_recent, |menu| menu.separator())
-                .extend(ContextKind::all().into_iter().map(kind_entry));
+                .extend(context_kinds.into_iter().map(|kind| {
+                    let context_picker = context_picker.clone();
+
+                    ContextMenuEntry::new(kind.label())
+                        .icon(kind.icon())
+                        .handler(move |cx| {
+                            context_picker.update(cx, |this, cx| this.select_kind(kind, cx))
+                        })
+                }));

            match self.confirm_behavior {
                ConfirmBehavior::KeepOpen => menu.keep_open_on_confirm(),
@@ -111,6 +132,11 @@ impl ContextPicker {
        menu
    }

+    /// Whether threads are allowed as context.
+    pub fn allow_threads(&self) -> bool {
+        self.thread_store.is_some()
+    }
+
    fn select_kind(&mut self, kind: ContextKind, cx: &mut ViewContext<Self>) {
        let context_picker = cx.view().downgrade();

@@ -120,6 +146,7 @@ impl ContextPicker {
                    FileContextPicker::new(
                        context_picker.clone(),
                        self.workspace.clone(),
+                        self.editor.clone(),
                        self.context_store.clone(),
                        self.confirm_behavior,
                        cx,
@@ -227,25 +254,8 @@ impl ContextPicker {
            context_store.add_file_from_path(project_path.clone(), cx)
        });

-        let workspace = self.workspace.clone();
-
-        cx.spawn(|_, mut cx| async move {
-            match task.await {
-                Ok(_) => {
-                    return anyhow::Ok(());
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })
-                }
-            }
-        })
-        .detach_and_log_err(cx);
+        cx.spawn(|_, mut cx| async move { task.await.notify_async_err(&mut cx) })
+            .detach();

        cx.notify();
    }
--- a/crates/assistant2/src/context_picker/directory_context_picker.rs
+++ b/crates/assistant2/src/context_picker/directory_context_picker.rs
@@ -8,7 +8,7 @@ use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
 use ui::{prelude::*, ListItem};
 use util::ResultExt as _;
-use workspace::Workspace;
+use workspace::{notifications::NotifyResultExt, Workspace};

 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::ContextStore;
@@ -193,28 +193,15 @@ impl PickerDelegate for DirectoryContextPickerDelegate {
            return;
        };

-        let workspace = self.workspace.clone();
        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
-            match task.await {
-                Ok(()) => {
-                    this.update(&mut cx, |this, cx| match confirm_behavior {
-                        ConfirmBehavior::KeepOpen => {}
-                        ConfirmBehavior::Close => this.delegate.dismissed(cx),
-                    })?;
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })?;
-                }
+            match task.await.notify_async_err(&mut cx) {
+                None => anyhow::Ok(()),
+                Some(()) => this.update(&mut cx, |this, cx| match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
+                }),
            }
-
-            anyhow::Ok(())
        })
        .detach_and_log_err(cx);
    }
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -1,17 +1,27 @@
+use std::collections::BTreeSet;
+use std::ops::Range;
 use std::path::Path;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

+use editor::actions::FoldAt;
+use editor::display_map::{Crease, FoldId};
+use editor::scroll::Autoscroll;
+use editor::{Anchor, Editor, FoldPlaceholder, ToPoint};
 use file_icons::FileIcons;
 use fuzzy::PathMatch;
 use gpui::{
-    AppContext, DismissEvent, FocusHandle, FocusableView, Stateful, Task, View, WeakModel, WeakView,
+    AnyElement, AppContext, DismissEvent, Empty, FocusHandle, FocusableView, Stateful, Task, View,
+    WeakModel, WeakView,
 };
+use multi_buffer::{MultiBufferPoint, MultiBufferRow};
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
-use ui::{prelude::*, ListItem, Tooltip};
+use rope::Point;
+use text::SelectionGoal;
+use ui::{prelude::*, ButtonLike, Disclosure, ElevationIndex, ListItem, Tooltip};
 use util::ResultExt as _;
-use workspace::Workspace;
+use workspace::{notifications::NotifyResultExt, Workspace};

 use crate::context_picker::{ConfirmBehavior, ContextPicker};
 use crate::context_store::{ContextStore, FileInclusion};
@@ -24,6 +34,7 @@ impl FileContextPicker {
    pub fn new(
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
+        editor: WeakView<Editor>,
        context_store: WeakModel<ContextStore>,
        confirm_behavior: ConfirmBehavior,
        cx: &mut ViewContext<Self>,
@@ -31,6 +42,7 @@ impl FileContextPicker {
        let delegate = FileContextPickerDelegate::new(
            context_picker,
            workspace,
+            editor,
            context_store,
            confirm_behavior,
        );
@@ -55,6 +67,7 @@ impl Render for FileContextPicker {
 pub struct FileContextPickerDelegate {
    context_picker: WeakView<ContextPicker>,
    workspace: WeakView<Workspace>,
+    editor: WeakView<Editor>,
    context_store: WeakModel<ContextStore>,
    confirm_behavior: ConfirmBehavior,
    matches: Vec<PathMatch>,
@@ -65,12 +78,14 @@ impl FileContextPickerDelegate {
    pub fn new(
        context_picker: WeakView<ContextPicker>,
        workspace: WeakView<Workspace>,
+        editor: WeakView<Editor>,
        context_store: WeakModel<ContextStore>,
        confirm_behavior: ConfirmBehavior,
    ) -> Self {
        Self {
            context_picker,
            workspace,
+            editor,
            context_store,
            confirm_behavior,
            matches: Vec::new(),
@@ -196,11 +211,100 @@ impl PickerDelegate for FileContextPickerDelegate {
            return;
        };

+        let Some(file_name) = mat
+            .path
+            .file_name()
+            .map(|os_str| os_str.to_string_lossy().into_owned())
+        else {
+            return;
+        };
+
+        let full_path = mat.path.display().to_string();
+
        let project_path = ProjectPath {
            worktree_id: WorktreeId::from_usize(mat.worktree_id),
            path: mat.path.clone(),
        };

+        let Some(editor) = self.editor.upgrade() else {
+            return;
+        };
+
+        editor.update(cx, |editor, cx| {
+            editor.transact(cx, |editor, cx| {
+                // Move empty selections left by 1 column to select the `@`s, so they get overwritten when we insert.
+                {
+                    let mut selections = editor.selections.all::<MultiBufferPoint>(cx);
+
+                    for selection in selections.iter_mut() {
+                        if selection.is_empty() {
+                            let old_head = selection.head();
+                            let new_head = MultiBufferPoint::new(
+                                old_head.row,
+                                old_head.column.saturating_sub(1),
+                            );
+                            selection.set_head(new_head, SelectionGoal::None);
+                        }
+                    }
+
+                    editor.change_selections(Some(Autoscroll::fit()), cx, |s| s.select(selections));
+                }
+
+                let start_anchors = {
+                    let snapshot = editor.buffer().read(cx).snapshot(cx);
+                    editor
+                        .selections
+                        .all::<Point>(cx)
+                        .into_iter()
+                        .map(|selection| snapshot.anchor_before(selection.start))
+                        .collect::<Vec<_>>()
+                };
+
+                editor.insert(&full_path, cx);
+
+                let end_anchors = {
+                    let snapshot = editor.buffer().read(cx).snapshot(cx);
+                    editor
+                        .selections
+                        .all::<Point>(cx)
+                        .into_iter()
+                        .map(|selection| snapshot.anchor_after(selection.end))
+                        .collect::<Vec<_>>()
+                };
+
+                editor.insert("\n", cx); // Needed to end the fold
+
+                let placeholder = FoldPlaceholder {
+                    render: render_fold_icon_button(IconName::File, file_name.into()),
+                    ..Default::default()
+                };
+
+                let render_trailer = move |_row, _unfold, _cx: &mut WindowContext| Empty.into_any();
+
+                let buffer = editor.buffer().read(cx).snapshot(cx);
+                let mut rows_to_fold = BTreeSet::new();
+                let crease_iter = start_anchors
+                    .into_iter()
+                    .zip(end_anchors)
+                    .map(|(start, end)| {
+                        rows_to_fold.insert(MultiBufferRow(start.to_point(&buffer).row));
+
+                        Crease::inline(
+                            start..end,
+                            placeholder.clone(),
+                            fold_toggle("tool-use"),
+                            render_trailer,
+                        )
+                    });
+
+                editor.insert_creases(crease_iter, cx);
+
+                for buffer_row in rows_to_fold {
+                    editor.fold_at(&FoldAt { buffer_row }, cx);
+                }
+            });
+        });
+
        let Some(task) = self
            .context_store
            .update(cx, |context_store, cx| {
@@ -211,28 +315,15 @@ impl PickerDelegate for FileContextPickerDelegate {
            return;
        };

-        let workspace = self.workspace.clone();
        let confirm_behavior = self.confirm_behavior;
        cx.spawn(|this, mut cx| async move {
-            match task.await {
-                Ok(()) => {
-                    this.update(&mut cx, |this, cx| match confirm_behavior {
-                        ConfirmBehavior::KeepOpen => {}
-                        ConfirmBehavior::Close => this.delegate.dismissed(cx),
-                    })?;
-                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })?;
-                }
+            match task.await.notify_async_err(&mut cx) {
+                None => anyhow::Ok(()),
+                Some(()) => this.update(&mut cx, |this, cx| match confirm_behavior {
+                    ConfirmBehavior::KeepOpen => {}
+                    ConfirmBehavior::Close => this.delegate.dismissed(cx),
+                }),
            }
-
-            anyhow::Ok(())
        })
        .detach_and_log_err(cx);
    }
@@ -347,3 +438,33 @@ pub fn render_file_context_entry(
            }
        })
 }
+
+fn render_fold_icon_button(
+    icon: IconName,
+    label: SharedString,
+) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut WindowContext) -> AnyElement> {
+    Arc::new(move |fold_id, _fold_range, _cx| {
+        ButtonLike::new(fold_id)
+            .style(ButtonStyle::Filled)
+            .layer(ElevationIndex::ElevatedSurface)
+            .child(Icon::new(icon))
+            .child(Label::new(label.clone()).single_line())
+            .into_any_element()
+    })
+}
+
+fn fold_toggle(
+    name: &'static str,
+) -> impl Fn(
+    MultiBufferRow,
+    bool,
+    Arc<dyn Fn(bool, &mut WindowContext) + Send + Sync>,
+    &mut WindowContext,
+) -> AnyElement {
+    move |row, is_folded, fold, _cx| {
+        Disclosure::new((name, row.0 as u64), !is_folded)
+            .toggle_state(is_folded)
+            .on_click(move |_e, cx| fold(!is_folded, cx))
+            .into_any_element()
+    }
+}
--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -10,7 +10,7 @@ use gpui::{
 use itertools::Itertools;
 use language::Buffer;
 use ui::{prelude::*, KeyBinding, PopoverMenu, PopoverMenuHandle, Tooltip};
-use workspace::Workspace;
+use workspace::{notifications::NotifyResultExt, Workspace};

 use crate::context::ContextKind;
 use crate::context_picker::{ConfirmBehavior, ContextPicker};
@@ -39,6 +39,7 @@ impl ContextStrip {
    pub fn new(
        context_store: Model<ContextStore>,
        workspace: WeakView<Workspace>,
+        editor: WeakView<Editor>,
        thread_store: Option<WeakModel<ThreadStore>>,
        context_picker_menu_handle: PopoverMenuHandle<ContextPicker>,
        suggest_context_kind: SuggestContextKind,
@@ -49,6 +50,7 @@ impl ContextStrip {
                workspace.clone(),
                thread_store.clone(),
                context_store.downgrade(),
+                editor.clone(),
                ConfirmBehavior::KeepOpen,
                cx,
            )
@@ -116,6 +118,10 @@ impl ContextStrip {
    }

    fn suggested_thread(&self, cx: &ViewContext<Self>) -> Option<SuggestedContext> {
+        if !self.context_picker.read(cx).allow_threads() {
+            return None;
+        }
+
        let workspace = self.workspace.upgrade()?;
        let active_thread = workspace
            .read(cx)
@@ -311,24 +317,14 @@ impl ContextStrip {
            context_store.accept_suggested_context(&suggested, cx)
        });

-        let workspace = self.workspace.clone();
-
        cx.spawn(|this, mut cx| async move {
-            match task.await {
-                Ok(()) => {
+            match task.await.notify_async_err(&mut cx) {
+                None => {}
+                Some(()) => {
                    if let Some(this) = this.upgrade() {
                        this.update(&mut cx, |_, cx| cx.notify())?;
                    }
                }
-                Err(err) => {
-                    let Some(workspace) = workspace.upgrade() else {
-                        return anyhow::Ok(());
-                    };
-
-                    workspace.update(&mut cx, |workspace, cx| {
-                        workspace.show_error(&err, cx);
-                    })?;
-                }
            }
            anyhow::Ok(())
        })
@@ -440,7 +436,7 @@ impl Render for ContextStrip {
                }
            })
            .children(context.iter().enumerate().map(|(i, context)| {
-                ContextPill::new_added(
+                ContextPill::added(
                    context.clone(),
                    dupe_names.contains(&context.name),
                    self.focused_index == Some(i),
@@ -462,7 +458,7 @@ impl Render for ContextStrip {
            }))
            .when_some(suggested_context, |el, suggested| {
                el.child(
-                    ContextPill::new_suggested(
+                    ContextPill::suggested(
                        suggested.name().clone(),
                        suggested.icon_path(),
                        suggested.kind(),
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -1,13 +1,11 @@
-use crate::buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent};
-use crate::context_store::ContextStore;
-use crate::inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent};
-use crate::thread_store::ThreadStore;
-use crate::AssistantPanel;
-use crate::{
-    assistant_settings::AssistantSettings, prompts::PromptBuilder,
-    terminal_inline_assistant::TerminalInlineAssistant,
-};
+use std::cmp;
+use std::mem;
+use std::ops::Range;
+use std::rc::Rc;
+use std::sync::Arc;
+
 use anyhow::{Context as _, Result};
+use assistant_settings::AssistantSettings;
 use client::telemetry::Telemetry;
 use collections::{hash_map, HashMap, HashSet, VecDeque};
 use editor::{
@@ -21,8 +19,6 @@ use editor::{
 };
 use feature_flags::{Assistant2FeatureFlag, FeatureFlagViewExt as _};
 use fs::Fs;
-use util::ResultExt;
-
 use gpui::{
    point, AppContext, FocusableView, Global, HighlightStyle, Model, Subscription, Task,
    UpdateGlobal, View, ViewContext, WeakModel, WeakView, WindowContext,
@@ -33,16 +29,24 @@ use language_models::report_assistant_event;
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
+use prompt_library::PromptBuilder;
 use settings::{Settings, SettingsStore};
-use std::{cmp, mem, ops::Range, rc::Rc, sync::Arc};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
 use text::{OffsetRangeExt, ToPoint as _};
 use ui::prelude::*;
 use util::RangeExt;
+use util::ResultExt;
 use workspace::{dock::Panel, ShowConfiguration};
 use workspace::{notifications::NotificationId, ItemHandle, Toast, Workspace};

+use crate::buffer_codegen::{BufferCodegen, CodegenAlternative, CodegenEvent};
+use crate::context_store::ContextStore;
+use crate::inline_prompt_editor::{CodegenStatus, InlineAssistId, PromptEditor, PromptEditorEvent};
+use crate::terminal_inline_assistant::TerminalInlineAssistant;
+use crate::thread_store::ThreadStore;
+use crate::AssistantPanel;
+
 pub fn init(
    fs: Arc<dyn Fs>,
    prompt_builder: Arc<PromptBuilder>,
@@ -200,7 +204,7 @@ impl InlineAssistant {

    pub fn inline_assist(
        workspace: &mut Workspace,
-        _action: &zed_actions::InlineAssist,
+        _action: &zed_actions::assistant::InlineAssist,
        cx: &mut ViewContext<Workspace>,
    ) {
        let settings = AssistantSettings::get_global(cx);
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -270,9 +270,10 @@ impl<T: 'static> PromptEditor<T> {
            PromptEditorMode::Terminal { .. } => "Generate",
        };

-        let assistant_panel_keybinding = ui::text_for_action(&crate::ToggleFocus, cx)
-            .map(|keybinding| format!("{keybinding} to chat ― "))
-            .unwrap_or_default();
+        let assistant_panel_keybinding =
+            ui::text_for_action(&zed_actions::assistant::ToggleFocus, cx)
+                .map(|keybinding| format!("{keybinding} to chat ― "))
+                .unwrap_or_default();

        format!("{action}… ({assistant_panel_keybinding}↓↑ for history)")
    }
@@ -834,6 +835,7 @@ impl PromptEditor<BufferCodegen> {
            ContextStrip::new(
                context_store.clone(),
                workspace.clone(),
+                prompt_editor.downgrade(),
                thread_store.clone(),
                context_picker_menu_handle.clone(),
                SuggestContextKind::Thread,
@@ -985,6 +987,7 @@ impl PromptEditor<TerminalCodegen> {
            ContextStrip::new(
                context_store.clone(),
                workspace.clone(),
+                prompt_editor.downgrade(),
                thread_store.clone(),
                context_picker_menu_handle.clone(),
                SuggestContextKind::Thread,
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -4,18 +4,16 @@ use editor::actions::MoveUp;
 use editor::{Editor, EditorElement, EditorEvent, EditorStyle};
 use fs::Fs;
 use gpui::{
-    AppContext, DismissEvent, FocusableView, Model, Subscription, TextStyle, View, WeakModel,
-    WeakView,
+    pulsating_between, Animation, AnimationExt, AppContext, DismissEvent, FocusableView, Model,
+    Subscription, TextStyle, View, WeakModel, WeakView,
 };
 use language_model::{LanguageModelRegistry, LanguageModelRequestTool};
 use language_model_selector::LanguageModelSelector;
 use rope::Point;
 use settings::Settings;
-use theme::{get_ui_font_size, ThemeSettings};
-use ui::{
-    prelude::*, ButtonLike, ElevationIndex, KeyBinding, PopoverMenu, PopoverMenuHandle,
-    SwitchWithLabel,
-};
+use std::time::Duration;
+use theme::ThemeSettings;
+use ui::{prelude::*, ButtonLike, KeyBinding, PopoverMenu, PopoverMenuHandle, Switch, TintColor};
 use workspace::Workspace;

 use crate::assistant_model_selector::AssistantModelSelector;
@@ -24,7 +22,7 @@ use crate::context_store::{refresh_context_store_text, ContextStore};
 use crate::context_strip::{ContextStrip, ContextStripEvent, SuggestContextKind};
 use crate::thread::{RequestKind, Thread};
 use crate::thread_store::ThreadStore;
-use crate::{Chat, RemoveAllContext, ToggleContextPicker, ToggleModelSelector};
+use crate::{Chat, ChatMode, RemoveAllContext, ToggleContextPicker, ToggleModelSelector};

 pub struct MessageEditor {
    thread: Model<Thread>,
@@ -55,7 +53,7 @@ impl MessageEditor {

        let editor = cx.new_view(|cx| {
            let mut editor = Editor::auto_height(10, cx);
-            editor.set_placeholder_text("Ask anything…", cx);
+            editor.set_placeholder_text("Ask anything, @ to mention, ↑ to select", cx);
            editor.set_show_indent_guides(false, cx);

            editor
@@ -66,6 +64,7 @@ impl MessageEditor {
                workspace.clone(),
                Some(thread_store.clone()),
                context_store.downgrade(),
+                editor.downgrade(),
                ConfirmBehavior::Close,
                cx,
            )
@@ -75,6 +74,7 @@ impl MessageEditor {
            ContextStrip::new(
                context_store.clone(),
                workspace.clone(),
+                editor.downgrade(),
                Some(thread_store.clone()),
                context_picker_menu_handle.clone(),
                SuggestContextKind::File,
@@ -117,6 +117,11 @@ impl MessageEditor {
        self.model_selector_menu_handle.toggle(cx)
    }

+    fn toggle_chat_mode(&mut self, _: &ChatMode, cx: &mut ViewContext<Self>) {
+        self.use_tools = !self.use_tools;
+        cx.notify();
+    }
+
    fn toggle_context_picker(&mut self, _: &ToggleContextPicker, cx: &mut ViewContext<Self>) {
        self.context_picker_menu_handle.toggle(cx);
    }
@@ -236,7 +241,9 @@ impl MessageEditor {
    }

    fn move_up(&mut self, _: &MoveUp, cx: &mut ViewContext<Self>) {
-        if self.context_picker_menu_handle.is_deployed() {
+        if self.context_picker_menu_handle.is_deployed()
+            || self.inline_context_picker_menu_handle.is_deployed()
+        {
            cx.propagate();
        } else {
            cx.focus_view(&self.context_strip);
@@ -257,6 +264,8 @@ impl Render for MessageEditor {
        let focus_handle = self.editor.focus_handle(cx);
        let inline_context_picker = self.inline_context_picker.clone();
        let bg_color = cx.theme().colors().editor_background;
+        let is_streaming_completion = self.thread.read(cx).is_streaming();
+        let button_width = px(64.);

        v_flex()
            .key_context("MessageEditor")
@@ -265,6 +274,7 @@ impl Render for MessageEditor {
            .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()
@@ -308,41 +318,91 @@ impl Render for MessageEditor {
                            .anchor(gpui::Corner::BottomLeft)
                            .offset(gpui::Point {
                                x: px(0.0),
-                                y: (-get_ui_font_size(cx) * 2) - px(4.0),
+                                y: px(-ThemeSettings::clamp_font_size(
+                                    ThemeSettings::get_global(cx).ui_font_size,
+                                )
+                                .0 * 2.0)
+                                    - px(4.0),
                            })
                            .with_handle(self.inline_context_picker_menu_handle.clone()),
                    )
                    .child(
                        h_flex()
                            .justify_between()
-                            .child(SwitchWithLabel::new(
-                                "use-tools",
-                                Label::new("Tools").size(LabelSize::Small),
-                                self.use_tools.into(),
-                                cx.listener(|this, selection, _cx| {
-                                    this.use_tools = match selection {
-                                        ToggleState::Selected => true,
-                                        ToggleState::Unselected | ToggleState::Indeterminate => {
-                                            false
-                                        }
-                                    };
-                                }),
-                            ))
                            .child(
-                                h_flex().gap_1().child(self.model_selector.clone()).child(
-                                    ButtonLike::new("chat")
+                                Switch::new("use-tools", self.use_tools.into())
+                                    .label("Tools")
+                                    .on_click(cx.listener(|this, selection, _cx| {
+                                        this.use_tools = match selection {
+                                            ToggleState::Selected => true,
+                                            ToggleState::Unselected
+                                            | ToggleState::Indeterminate => false,
+                                        };
+                                    }))
+                                    .key_binding(KeyBinding::for_action_in(
+                                        &ChatMode,
+                                        &focus_handle,
+                                        cx,
+                                    )),
+                            )
+                            .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,
+                                                        cx,
+                                                    )
+                                                    .map(|binding| binding.into_any_element()),
+                                                ),
+                                        )
+                                        .on_click(move |_event, cx| {
+                                            focus_handle
+                                                .dispatch_action(&editor::actions::Cancel, cx);
+                                        })
+                                } else {
+                                    ButtonLike::new("submit-message")
+                                        .width(button_width.into())
                                        .style(ButtonStyle::Filled)
-                                        .layer(ElevationIndex::ModalSurface)
-                                        .child(Label::new("Submit").size(LabelSize::Small))
-                                        .children(
-                                            KeyBinding::for_action_in(&Chat, &focus_handle, cx)
-                                                .map(|binding| binding.into_any_element()),
+                                        .child(
+                                            h_flex()
+                                                .w_full()
+                                                .justify_between()
+                                                .child(Label::new("Submit").size(LabelSize::Small))
+                                                .children(
+                                                    KeyBinding::for_action_in(
+                                                        &Chat,
+                                                        &focus_handle,
+                                                        cx,
+                                                    )
+                                                    .map(|binding| binding.into_any_element()),
+                                                ),
                                        )
                                        .on_click(move |_event, cx| {
                                            focus_handle.dispatch_action(&Chat, cx);
-                                        }),
-                                ),
-                            ),
+                                        })
+                                },
+                            )),
                    ),
            )
    }
--- a/crates/assistant2/src/prompts.rs
+++ b/crates/assistant2/src/prompts.rs
@@ -1,312 +0,0 @@
-use anyhow::Result;
-use assets::Assets;
-use fs::Fs;
-use futures::StreamExt;
-use gpui::AssetSource;
-use handlebars::{Handlebars, RenderError};
-use language::{BufferSnapshot, LanguageName, Point};
-use parking_lot::Mutex;
-use serde::Serialize;
-use std::{ops::Range, path::PathBuf, sync::Arc, time::Duration};
-use text::LineEnding;
-use util::ResultExt;
-
-#[derive(Serialize)]
-pub struct ContentPromptDiagnosticContext {
-    pub line_number: usize,
-    pub error_message: String,
-    pub code_content: String,
-}
-
-#[derive(Serialize)]
-pub struct ContentPromptContext {
-    pub content_type: String,
-    pub language_name: Option<String>,
-    pub is_insert: bool,
-    pub is_truncated: bool,
-    pub document_content: String,
-    pub user_prompt: String,
-    pub rewrite_section: Option<String>,
-    pub diagnostic_errors: Vec<ContentPromptDiagnosticContext>,
-}
-
-#[derive(Serialize)]
-pub struct TerminalAssistantPromptContext {
-    pub os: String,
-    pub arch: String,
-    pub shell: Option<String>,
-    pub working_directory: Option<String>,
-    pub latest_output: Vec<String>,
-    pub user_prompt: String,
-}
-
-#[derive(Serialize)]
-pub struct ProjectSlashCommandPromptContext {
-    pub context_buffer: String,
-}
-
-pub struct PromptLoadingParams<'a> {
-    pub fs: Arc<dyn Fs>,
-    pub repo_path: Option<PathBuf>,
-    pub cx: &'a gpui::AppContext,
-}
-
-pub struct PromptBuilder {
-    handlebars: Arc<Mutex<Handlebars<'static>>>,
-}
-
-impl PromptBuilder {
-    pub fn new(loading_params: Option<PromptLoadingParams>) -> Result<Self> {
-        let mut handlebars = Handlebars::new();
-        Self::register_built_in_templates(&mut handlebars)?;
-
-        let handlebars = Arc::new(Mutex::new(handlebars));
-
-        if let Some(params) = loading_params {
-            Self::watch_fs_for_template_overrides(params, handlebars.clone());
-        }
-
-        Ok(Self { handlebars })
-    }
-
-    /// Watches the filesystem for changes to prompt template overrides.
-    ///
-    /// This function sets up a file watcher on the prompt templates directory. It performs
-    /// an initial scan of the directory and registers any existing template overrides.
-    /// Then it continuously monitors for changes, reloading templates as they are
-    /// modified or added.
-    ///
-    /// If the templates directory doesn't exist initially, it waits for it to be created.
-    /// If the directory is removed, it restores the built-in templates and waits for the
-    /// directory to be recreated.
-    ///
-    /// # Arguments
-    ///
-    /// * `params` - A `PromptLoadingParams` struct containing the filesystem, repository path,
-    ///   and application context.
-    /// * `handlebars` - An `Arc<Mutex<Handlebars>>` for registering and updating templates.
-    fn watch_fs_for_template_overrides(
-        params: PromptLoadingParams,
-        handlebars: Arc<Mutex<Handlebars<'static>>>,
-    ) {
-        let templates_dir = paths::prompt_overrides_dir(params.repo_path.as_deref());
-        params.cx.background_executor()
-            .spawn(async move {
-                let Some(parent_dir) = templates_dir.parent() else {
-                    return;
-                };
-
-                let mut found_dir_once = false;
-                loop {
-                    // Check if the templates directory exists and handle its status
-                    // If it exists, log its presence and check if it's a symlink
-                    // If it doesn't exist:
-                    //   - Log that we're using built-in prompts
-                    //   - Check if it's a broken symlink and log if so
-                    //   - Set up a watcher to detect when it's created
-                    // After the first check, set the `found_dir_once` flag
-                    // This allows us to avoid logging when looping back around after deleting the prompt overrides directory.
-                    let dir_status = params.fs.is_dir(&templates_dir).await;
-                    let symlink_status = params.fs.read_link(&templates_dir).await.ok();
-                    if dir_status {
-                        let mut log_message = format!("Prompt template overrides directory found at {}", templates_dir.display());
-                        if let Some(target) = symlink_status {
-                            log_message.push_str(" -> ");
-                            log_message.push_str(&target.display().to_string());
-                        }
-                        log::info!("{}.", log_message);
-                    } else {
-                        if !found_dir_once {
-                            log::info!("No prompt template overrides directory found at {}. Using built-in prompts.", templates_dir.display());
-                            if let Some(target) = symlink_status {
-                                log::info!("Symlink found pointing to {}, but target is invalid.", target.display());
-                            }
-                        }
-
-                        if params.fs.is_dir(parent_dir).await {
-                            let (mut changes, _watcher) = params.fs.watch(parent_dir, Duration::from_secs(1)).await;
-                            while let Some(changed_paths) = changes.next().await {
-                                if changed_paths.iter().any(|p| &p.path == &templates_dir) {
-                                    let mut log_message = format!("Prompt template overrides directory detected at {}", templates_dir.display());
-                                    if let Ok(target) = params.fs.read_link(&templates_dir).await {
-                                        log_message.push_str(" -> ");
-                                        log_message.push_str(&target.display().to_string());
-                                    }
-                                    log::info!("{}.", log_message);
-                                    break;
-                                }
-                            }
-                        } else {
-                            return;
-                        }
-                    }
-
-                    found_dir_once = true;
-
-                    // Initial scan of the prompt overrides directory
-                    if let Ok(mut entries) = params.fs.read_dir(&templates_dir).await {
-                        while let Some(Ok(file_path)) = entries.next().await {
-                            if file_path.to_string_lossy().ends_with(".hbs") {
-                                if let Ok(content) = params.fs.load(&file_path).await {
-                                    let file_name = file_path.file_stem().unwrap().to_string_lossy();
-                                    log::debug!("Registering prompt template override: {}", file_name);
-                                    handlebars.lock().register_template_string(&file_name, content).log_err();
-                                }
-                            }
-                        }
-                    }
-
-                    // Watch both the parent directory and the template overrides directory:
-                    // - Monitor the parent directory to detect if the template overrides directory is deleted.
-                    // - Monitor the template overrides directory to re-register templates when they change.
-                    // Combine both watch streams into a single stream.
-                    let (parent_changes, parent_watcher) = params.fs.watch(parent_dir, Duration::from_secs(1)).await;
-                    let (changes, watcher) = params.fs.watch(&templates_dir, Duration::from_secs(1)).await;
-                    let mut combined_changes = futures::stream::select(changes, parent_changes);
-
-                    while let Some(changed_paths) = combined_changes.next().await {
-                        if changed_paths.iter().any(|p| &p.path == &templates_dir) {
-                            if !params.fs.is_dir(&templates_dir).await {
-                                log::info!("Prompt template overrides directory removed. Restoring built-in prompt templates.");
-                                Self::register_built_in_templates(&mut handlebars.lock()).log_err();
-                                break;
-                            }
-                        }
-                        for event in changed_paths {
-                            if event.path.starts_with(&templates_dir) && event.path.extension().map_or(false, |ext| ext == "hbs") {
-                                log::info!("Reloading prompt template override: {}", event.path.display());
-                                if let Some(content) = params.fs.load(&event.path).await.log_err() {
-                                    let file_name = event.path.file_stem().unwrap().to_string_lossy();
-                                    handlebars.lock().register_template_string(&file_name, content).log_err();
-                                }
-                            }
-                        }
-                    }
-
-                    drop(watcher);
-                    drop(parent_watcher);
-                }
-            })
-            .detach();
-    }
-
-    fn register_built_in_templates(handlebars: &mut Handlebars) -> Result<()> {
-        for path in Assets.list("prompts")? {
-            if let Some(id) = path.split('/').last().and_then(|s| s.strip_suffix(".hbs")) {
-                if let Some(prompt) = Assets.load(path.as_ref()).log_err().flatten() {
-                    log::debug!("Registering built-in prompt template: {}", id);
-                    let prompt = String::from_utf8_lossy(prompt.as_ref());
-                    handlebars.register_template_string(id, LineEnding::normalize_cow(prompt))?
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn generate_inline_transformation_prompt(
-        &self,
-        user_prompt: String,
-        language_name: Option<&LanguageName>,
-        buffer: BufferSnapshot,
-        range: Range<usize>,
-    ) -> Result<String, RenderError> {
-        let content_type = match language_name.as_ref().map(|l| l.0.as_ref()) {
-            None | Some("Markdown" | "Plain Text") => "text",
-            Some(_) => "code",
-        };
-
-        const MAX_CTX: usize = 50000;
-        let is_insert = range.is_empty();
-        let mut is_truncated = false;
-
-        let before_range = 0..range.start;
-        let truncated_before = if before_range.len() > MAX_CTX {
-            is_truncated = true;
-            let start = buffer.clip_offset(range.start - MAX_CTX, text::Bias::Right);
-            start..range.start
-        } else {
-            before_range
-        };
-
-        let after_range = range.end..buffer.len();
-        let truncated_after = if after_range.len() > MAX_CTX {
-            is_truncated = true;
-            let end = buffer.clip_offset(range.end + MAX_CTX, text::Bias::Left);
-            range.end..end
-        } else {
-            after_range
-        };
-
-        let mut document_content = String::new();
-        for chunk in buffer.text_for_range(truncated_before) {
-            document_content.push_str(chunk);
-        }
-        if is_insert {
-            document_content.push_str("<insert_here></insert_here>");
-        } else {
-            document_content.push_str("<rewrite_this>\n");
-            for chunk in buffer.text_for_range(range.clone()) {
-                document_content.push_str(chunk);
-            }
-            document_content.push_str("\n</rewrite_this>");
-        }
-        for chunk in buffer.text_for_range(truncated_after) {
-            document_content.push_str(chunk);
-        }
-
-        let rewrite_section = if !is_insert {
-            let mut section = String::new();
-            for chunk in buffer.text_for_range(range.clone()) {
-                section.push_str(chunk);
-            }
-            Some(section)
-        } else {
-            None
-        };
-        let diagnostics = buffer.diagnostics_in_range::<_, Point>(range, false);
-        let diagnostic_errors: Vec<ContentPromptDiagnosticContext> = diagnostics
-            .map(|entry| {
-                let start = entry.range.start;
-                ContentPromptDiagnosticContext {
-                    line_number: (start.row + 1) as usize,
-                    error_message: entry.diagnostic.message.clone(),
-                    code_content: buffer.text_for_range(entry.range.clone()).collect(),
-                }
-            })
-            .collect();
-
-        let context = ContentPromptContext {
-            content_type: content_type.to_string(),
-            language_name: language_name.map(|s| s.to_string()),
-            is_insert,
-            is_truncated,
-            document_content,
-            user_prompt,
-            rewrite_section,
-            diagnostic_errors,
-        };
-        self.handlebars.lock().render("content_prompt", &context)
-    }
-
-    pub fn generate_terminal_assistant_prompt(
-        &self,
-        user_prompt: &str,
-        shell: Option<&str>,
-        working_directory: Option<&str>,
-        latest_output: &[String],
-    ) -> Result<String, RenderError> {
-        let context = TerminalAssistantPromptContext {
-            os: std::env::consts::OS.to_string(),
-            arch: std::env::consts::ARCH.to_string(),
-            shell: shell.map(|s| s.to_string()),
-            working_directory: working_directory.map(|s| s.to_string()),
-            latest_output: latest_output.to_vec(),
-            user_prompt: user_prompt.to_string(),
-        };
-
-        self.handlebars
-            .lock()
-            .render("terminal_assistant_prompt", &context)
-    }
-}
--- a/crates/assistant2/src/streaming_diff.rs
+++ b/crates/assistant2/src/streaming_diff.rs
--- a/crates/assistant2/src/terminal_inline_assistant.rs
+++ b/crates/assistant2/src/terminal_inline_assistant.rs
@@ -3,7 +3,6 @@ use crate::context_store::ContextStore;
 use crate::inline_prompt_editor::{
    CodegenStatus, PromptEditor, PromptEditorEvent, TerminalInlineAssistId,
 };
-use crate::prompts::PromptBuilder;
 use crate::terminal_codegen::{CodegenEvent, TerminalCodegen, CLEAR_INPUT};
 use crate::thread_store::ThreadStore;
 use anyhow::{Context as _, Result};
@@ -20,6 +19,7 @@ use language_model::{
    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
 use language_models::report_assistant_event;
+use prompt_library::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
@@ -308,6 +308,13 @@ impl Thread {
                                            last_message.id,
                                            chunk,
                                        ));
+                                    } 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);
                                    }
                                }
                            }
--- a/crates/assistant2/src/thread_history.rs
+++ b/crates/assistant2/src/thread_history.rs
@@ -1,18 +1,20 @@
 use gpui::{
-    uniform_list, AppContext, FocusHandle, FocusableView, Model, UniformListScrollHandle, WeakView,
+    uniform_list, AppContext, FocusHandle, FocusableView, Model, ScrollStrategy,
+    UniformListScrollHandle, WeakView,
 };
 use time::{OffsetDateTime, UtcOffset};
 use ui::{prelude::*, IconButtonShape, ListItem, ListItemSpacing, Tooltip};

 use crate::thread::Thread;
 use crate::thread_store::ThreadStore;
-use crate::AssistantPanel;
+use crate::{AssistantPanel, RemoveSelectedThread};

 pub struct ThreadHistory {
    focus_handle: FocusHandle,
    assistant_panel: WeakView<AssistantPanel>,
    thread_store: Model<ThreadStore>,
    scroll_handle: UniformListScrollHandle,
+    selected_index: usize,
 }

 impl ThreadHistory {
@@ -26,6 +28,82 @@ impl ThreadHistory {
            assistant_panel,
            thread_store,
            scroll_handle: UniformListScrollHandle::default(),
+            selected_index: 0,
+        }
+    }
+
+    pub fn select_prev(&mut self, _: &menu::SelectPrev, cx: &mut ViewContext<Self>) {
+        let count = self.thread_store.read(cx).non_empty_len(cx);
+
+        if count > 0 {
+            if self.selected_index == 0 {
+                self.set_selected_index(count - 1, cx);
+            } else {
+                self.set_selected_index(self.selected_index - 1, cx);
+            }
+        }
+    }
+
+    pub fn select_next(&mut self, _: &menu::SelectNext, cx: &mut ViewContext<Self>) {
+        let count = self.thread_store.read(cx).non_empty_len(cx);
+
+        if count > 0 {
+            if self.selected_index == count - 1 {
+                self.set_selected_index(0, cx);
+            } else {
+                self.set_selected_index(self.selected_index + 1, cx);
+            }
+        }
+    }
+
+    fn select_first(&mut self, _: &menu::SelectFirst, cx: &mut ViewContext<Self>) {
+        let count = self.thread_store.read(cx).non_empty_len(cx);
+        if count > 0 {
+            self.set_selected_index(0, cx);
+        }
+    }
+
+    fn select_last(&mut self, _: &menu::SelectLast, cx: &mut ViewContext<Self>) {
+        let count = self.thread_store.read(cx).non_empty_len(cx);
+        if count > 0 {
+            self.set_selected_index(count - 1, cx);
+        }
+    }
+
+    fn set_selected_index(&mut self, index: usize, cx: &mut ViewContext<Self>) {
+        self.selected_index = index;
+        self.scroll_handle
+            .scroll_to_item(index, ScrollStrategy::Top);
+        cx.notify();
+    }
+
+    fn confirm(&mut self, _: &menu::Confirm, cx: &mut ViewContext<Self>) {
+        let threads = self.thread_store.update(cx, |this, cx| this.threads(cx));
+
+        if let Some(thread) = threads.get(self.selected_index) {
+            self.assistant_panel
+                .update(cx, move |this, cx| {
+                    let thread_id = thread.read(cx).id().clone();
+                    this.open_thread(&thread_id, cx)
+                })
+                .ok();
+
+            cx.notify();
+        }
+    }
+
+    fn remove_selected_thread(&mut self, _: &RemoveSelectedThread, cx: &mut ViewContext<Self>) {
+        let threads = self.thread_store.update(cx, |this, cx| this.threads(cx));
+
+        if let Some(thread) = threads.get(self.selected_index) {
+            self.assistant_panel
+                .update(cx, |this, cx| {
+                    let thread_id = thread.read(cx).id().clone();
+                    this.delete_thread(&thread_id, cx);
+                })
+                .ok();
+
+            cx.notify();
        }
    }
 }
@@ -39,13 +117,21 @@ impl FocusableView for ThreadHistory {
 impl Render for ThreadHistory {
    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
        let threads = self.thread_store.update(cx, |this, cx| this.threads(cx));
+        let selected_index = self.selected_index;

        v_flex()
            .id("thread-history-container")
+            .key_context("ThreadHistory")
            .track_focus(&self.focus_handle)
            .overflow_y_scroll()
            .size_full()
            .p_1()
+            .on_action(cx.listener(Self::select_prev))
+            .on_action(cx.listener(Self::select_next))
+            .on_action(cx.listener(Self::select_first))
+            .on_action(cx.listener(Self::select_last))
+            .on_action(cx.listener(Self::confirm))
+            .on_action(cx.listener(Self::remove_selected_thread))
            .map(|history| {
                if threads.is_empty() {
                    history
@@ -65,10 +151,12 @@ impl Render for ThreadHistory {
                            move |history, range, _cx| {
                                threads[range]
                                    .iter()
-                                    .map(|thread| {
+                                    .enumerate()
+                                    .map(|(index, thread)| {
                                        h_flex().w_full().pb_1().child(PastThread::new(
                                            thread.clone(),
                                            history.assistant_panel.clone(),
+                                            selected_index == index,
                                        ))
                                    })
                                    .collect()
@@ -86,13 +174,19 @@ impl Render for ThreadHistory {
 pub struct PastThread {
    thread: Model<Thread>,
    assistant_panel: WeakView<AssistantPanel>,
+    selected: bool,
 }

 impl PastThread {
-    pub fn new(thread: Model<Thread>, assistant_panel: WeakView<AssistantPanel>) -> Self {
+    pub fn new(
+        thread: Model<Thread>,
+        assistant_panel: WeakView<AssistantPanel>,
+        selected: bool,
+    ) -> Self {
        Self {
            thread,
            assistant_panel,
+            selected,
        }
    }
 }
@@ -116,6 +210,7 @@ impl RenderOnce for PastThread {

        ListItem::new(("past-thread", self.thread.entity_id()))
            .outlined()
+            .toggle_state(self.selected)
            .start_slot(
                Icon::new(IconName::MessageCircle)
                    .size(IconSize::Small)
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -52,6 +52,14 @@ impl ThreadStore {
        })
    }

+    /// Returns the number of non-empty threads.
+    pub fn non_empty_len(&self, cx: &AppContext) -> usize {
+        self.threads
+            .iter()
+            .filter(|thread| !thread.read(cx).is_empty())
+            .count()
+    }
+
    pub fn threads(&self, cx: &ModelContext<Self>) -> Vec<Model<Thread>> {
        let mut threads = self
            .threads
--- a/crates/assistant2/src/ui/context_pill.rs
+++ b/crates/assistant2/src/ui/context_pill.rs
@@ -24,7 +24,7 @@ pub enum ContextPill {
 }

 impl ContextPill {
-    pub fn new_added(
+    pub fn added(
        context: ContextSnapshot,
        dupe_name: bool,
        focused: bool,
@@ -39,7 +39,7 @@ impl ContextPill {
        }
    }

-    pub fn new_suggested(
+    pub fn suggested(
        name: SharedString,
        icon_path: Option<SharedString>,
        kind: ContextKind,
--- a/crates/assistant_context_editor/Cargo.toml
+++ b/crates/assistant_context_editor/Cargo.toml
@@ -0,0 +1,68 @@
+[package]
+name = "assistant_context_editor"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant_context_editor.rs"
+
+[dependencies]
+anyhow.workspace = true
+assistant_settings.workspace = true
+assistant_slash_command.workspace = true
+assistant_slash_commands.workspace = true
+assistant_tool.workspace = true
+chrono.workspace = true
+client.workspace = true
+clock.workspace = true
+collections.workspace = true
+context_server.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+futures.workspace = true
+fuzzy.workspace = true
+gpui.workspace = true
+indexed_docs.workspace = true
+language.workspace = true
+language_model.workspace = true
+language_model_selector.workspace = true
+language_models.workspace = true
+log.workspace = true
+multi_buffer.workspace = true
+open_ai.workspace = true
+parking_lot.workspace = true
+paths.workspace = true
+picker.workspace = true
+project.workspace = true
+prompt_library.workspace = true
+regex.workspace = true
+rope.workspace = true
+rpc.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+settings.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+strum.workspace = true
+telemetry_events.workspace = true
+text.workspace = true
+theme.workspace = true
+ui.workspace = true
+util.workspace = true
+uuid.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+language_model = { workspace = true, features = ["test-support"] }
+languages = { workspace = true, features = ["test-support"] }
+pretty_assertions.workspace = true
+rand.workspace = true
+tree-sitter-md.workspace = true
+unindent.workspace = true
+workspace = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_context_editor/LICENSE-GPL
+++ b/crates/assistant_context_editor/LICENSE-GPL
--- a/crates/assistant_context_editor/src/assistant_context_editor.rs
+++ b/crates/assistant_context_editor/src/assistant_context_editor.rs
@@ -0,0 +1,23 @@
+mod context;
+mod context_editor;
+mod context_history;
+mod context_store;
+mod patch;
+mod slash_command;
+mod slash_command_picker;
+
+use std::sync::Arc;
+
+use client::Client;
+use gpui::AppContext;
+
+pub use crate::context::*;
+pub use crate::context_editor::*;
+pub use crate::context_history::*;
+pub use crate::context_store::*;
+pub use crate::patch::*;
+pub use crate::slash_command::*;
+
+pub fn init(client: Arc<Client>, _cx: &mut AppContext) {
+    context_store::init(&client.into());
+}
--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -1,16 +1,13 @@
 #[cfg(test)]
 mod context_tests;

-use crate::slash_command_working_set::SlashCommandWorkingSet;
-use crate::{
-    prompts::PromptBuilder,
-    slash_command::{file_command::FileCommandMetadata, SlashCommandLine},
-    AssistantEdit, AssistantPatch, AssistantPatchStatus, MessageId, MessageStatus,
-};
+use crate::patch::{AssistantEdit, AssistantPatch, AssistantPatchStatus};
 use anyhow::{anyhow, Context as _, Result};
 use assistant_slash_command::{
-    SlashCommandContent, SlashCommandEvent, SlashCommandOutputSection, SlashCommandResult,
+    SlashCommandContent, SlashCommandEvent, SlashCommandLine, SlashCommandOutputSection,
+    SlashCommandResult, SlashCommandWorkingSet,
 };
+use assistant_slash_commands::FileCommandMetadata;
 use assistant_tool::ToolWorkingSet;
 use client::{self, proto, telemetry::Telemetry};
 use clock::ReplicaId;
@@ -22,7 +19,6 @@ use gpui::{
    AppContext, Context as _, EventEmitter, Model, ModelContext, RenderImage, SharedString,
    Subscription, Task,
 };
-
 use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
 use language_model::{
    LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
@@ -37,6 +33,7 @@ use language_models::{
 use open_ai::Model as OpenAiModel;
 use paths::contexts_dir;
 use project::Project;
+use prompt_library::PromptBuilder;
 use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::{
@@ -51,9 +48,9 @@ use std::{
 };
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use text::{BufferSnapshot, ToPoint};
+use ui::IconName;
 use util::{post_inc, ResultExt, TryFutureExt};
 use uuid::Uuid;
-use workspace::ui::IconName;

 #[derive(Clone, Eq, PartialEq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
 pub struct ContextId(String);
@@ -72,6 +69,64 @@ impl ContextId {
    }
 }

+#[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct MessageId(pub clock::Lamport);
+
+impl MessageId {
+    pub fn as_u64(self) -> u64 {
+        self.0.as_u64()
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub enum MessageStatus {
+    Pending,
+    Done,
+    Error(SharedString),
+    Canceled,
+}
+
+impl MessageStatus {
+    pub fn from_proto(status: proto::ContextMessageStatus) -> MessageStatus {
+        match status.variant {
+            Some(proto::context_message_status::Variant::Pending(_)) => MessageStatus::Pending,
+            Some(proto::context_message_status::Variant::Done(_)) => MessageStatus::Done,
+            Some(proto::context_message_status::Variant::Error(error)) => {
+                MessageStatus::Error(error.message.into())
+            }
+            Some(proto::context_message_status::Variant::Canceled(_)) => MessageStatus::Canceled,
+            None => MessageStatus::Pending,
+        }
+    }
+
+    pub fn to_proto(&self) -> proto::ContextMessageStatus {
+        match self {
+            MessageStatus::Pending => proto::ContextMessageStatus {
+                variant: Some(proto::context_message_status::Variant::Pending(
+                    proto::context_message_status::Pending {},
+                )),
+            },
+            MessageStatus::Done => proto::ContextMessageStatus {
+                variant: Some(proto::context_message_status::Variant::Done(
+                    proto::context_message_status::Done {},
+                )),
+            },
+            MessageStatus::Error(message) => proto::ContextMessageStatus {
+                variant: Some(proto::context_message_status::Variant::Error(
+                    proto::context_message_status::Error {
+                        message: message.to_string(),
+                    },
+                )),
+            },
+            MessageStatus::Canceled => proto::ContextMessageStatus {
+                variant: Some(proto::context_message_status::Variant::Canceled(
+                    proto::context_message_status::Canceled {},
+                )),
+            },
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum RequestType {
    /// Request a normal chat response from the model.
@@ -422,7 +477,7 @@ pub struct MessageCacheMetadata {
 pub struct MessageMetadata {
    pub role: Role,
    pub status: MessageStatus,
-    pub(crate) timestamp: clock::Lamport,
+    pub timestamp: clock::Lamport,
    #[serde(skip)]
    pub cache: Option<MessageCacheMetadata>,
 }
@@ -543,8 +598,8 @@ pub struct Context {
    parsed_slash_commands: Vec<ParsedSlashCommand>,
    invoked_slash_commands: HashMap<InvokedSlashCommandId, InvokedSlashCommand>,
    edits_since_last_parse: language::Subscription,
-    pub(crate) slash_commands: Arc<SlashCommandWorkingSet>,
-    pub(crate) tools: Arc<ToolWorkingSet>,
+    slash_commands: Arc<SlashCommandWorkingSet>,
+    tools: Arc<ToolWorkingSet>,
    slash_command_output_sections: Vec<SlashCommandOutputSection<language::Anchor>>,
    pending_tool_uses_by_id: HashMap<LanguageModelToolUseId, PendingToolUse>,
    message_anchors: Vec<MessageAnchor>,
@@ -789,6 +844,14 @@ impl Context {
        }
    }

+    pub fn slash_commands(&self) -> &Arc<SlashCommandWorkingSet> {
+        &self.slash_commands
+    }
+
+    pub fn tools(&self) -> &Arc<ToolWorkingSet> {
+        &self.tools
+    }
+
    pub fn set_capability(
        &mut self,
        capability: language::Capability,
@@ -1047,11 +1110,7 @@ impl Context {
        self.summary.as_ref()
    }

-    pub(crate) fn patch_containing(
-        &self,
-        position: Point,
-        cx: &AppContext,
-    ) -> Option<&AssistantPatch> {
+    pub fn patch_containing(&self, position: Point, cx: &AppContext) -> Option<&AssistantPatch> {
        let buffer = self.buffer.read(cx);
        let index = self.patches.binary_search_by(|patch| {
            let patch_range = patch.range.to_point(&buffer);
@@ -1074,7 +1133,7 @@ impl Context {
        self.patches.iter().map(|patch| patch.range.clone())
    }

-    pub(crate) fn patch_for_range(
+    pub fn patch_for_range(
        &self,
        range: &Range<language::Anchor>,
        cx: &AppContext,
@@ -1164,7 +1223,7 @@ impl Context {
        }
    }

-    pub(crate) fn token_count(&self) -> Option<usize> {
+    pub fn token_count(&self) -> Option<usize> {
        self.token_count
    }

@@ -2245,7 +2304,10 @@ impl Context {

        let mut request = self.to_completion_request(request_type, cx);

-        if cx.has_flag::<ToolUseFeatureFlag>() {
+        // Don't attach tools for now; we'll be removing tool use from
+        // Assistant1 shortly.
+        #[allow(clippy::overly_complex_bool_expr)]
+        if false && cx.has_flag::<ToolUseFeatureFlag>() {
            request.tools = self
                .tools
                .tools(cx)
@@ -2878,7 +2940,7 @@ impl Context {
        self.message_anchors.insert(insertion_ix, new_anchor);
    }

-    pub(super) fn summarize(&mut self, replace_old: bool, cx: &mut ModelContext<Self>) {
+    pub fn summarize(&mut self, replace_old: bool, cx: &mut ModelContext<Self>) {
        let Some(provider) = LanguageModelRegistry::read_global(cx).active_provider() else {
            return;
        };
@@ -3117,7 +3179,7 @@ impl Context {
        });
    }

-    pub(crate) fn custom_summary(&mut self, custom_summary: String, cx: &mut ModelContext<Self>) {
+    pub fn custom_summary(&mut self, custom_summary: String, cx: &mut ModelContext<Self>) {
        let timestamp = self.next_timestamp();
        let summary = self.summary.get_or_insert(ContextSummary::default());
        summary.timestamp = timestamp;
--- a/crates/assistant_context_editor/src/context/context_tests.rs
+++ b/crates/assistant_context_editor/src/context/context_tests.rs
@@ -1,15 +1,13 @@
-use super::{AssistantEdit, MessageCacheMetadata};
-use crate::slash_command_working_set::SlashCommandWorkingSet;
 use crate::{
-    assistant_panel, prompt_library, slash_command::file_command, AssistantEditKind, CacheStatus,
-    Context, ContextEvent, ContextId, ContextOperation, InvokedSlashCommandId, MessageId,
-    MessageStatus, PromptBuilder,
+    AssistantEdit, AssistantEditKind, CacheStatus, Context, ContextEvent, ContextId,
+    ContextOperation, InvokedSlashCommandId, MessageCacheMetadata, MessageId, MessageStatus,
 };
 use anyhow::Result;
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent, SlashCommandOutput,
-    SlashCommandOutputSection, SlashCommandRegistry, SlashCommandResult,
+    SlashCommandOutputSection, SlashCommandRegistry, SlashCommandResult, SlashCommandWorkingSet,
 };
+use assistant_slash_commands::FileSlashCommand;
 use assistant_tool::ToolWorkingSet;
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
@@ -23,6 +21,7 @@ use language_model::{LanguageModelCacheConfiguration, LanguageModelRegistry, Rol
 use parking_lot::Mutex;
 use pretty_assertions::assert_eq;
 use project::Project;
+use prompt_library::PromptBuilder;
 use rand::prelude::*;
 use serde_json::json;
 use settings::SettingsStore;
@@ -48,7 +47,6 @@ fn test_inserting_and_removing_messages(cx: &mut AppContext) {
    let settings_store = SettingsStore::test(cx);
    LanguageModelRegistry::test(cx);
    cx.set_global(settings_store);
-    assistant_panel::init(cx);
    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    let context = cx.new_model(|cx| {
@@ -189,7 +187,6 @@ fn test_message_splitting(cx: &mut AppContext) {
    let settings_store = SettingsStore::test(cx);
    cx.set_global(settings_store);
    LanguageModelRegistry::test(cx);
-    assistant_panel::init(cx);
    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));

    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
@@ -294,7 +291,6 @@ fn test_messages_for_offsets(cx: &mut AppContext) {
    let settings_store = SettingsStore::test(cx);
    LanguageModelRegistry::test(cx);
    cx.set_global(settings_store);
-    assistant_panel::init(cx);
    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    let context = cx.new_model(|cx| {
@@ -390,7 +386,6 @@ async fn test_slash_commands(cx: &mut TestAppContext) {
    cx.set_global(settings_store);
    cx.update(LanguageModelRegistry::test);
    cx.update(Project::init_settings);
-    cx.update(assistant_panel::init);
    let fs = FakeFs::new(cx.background_executor.clone());

    fs.insert_tree(
@@ -408,7 +403,7 @@ async fn test_slash_commands(cx: &mut TestAppContext) {
    .await;

    let slash_command_registry = cx.update(SlashCommandRegistry::default_global);
-    slash_command_registry.register_command(file_command::FileSlashCommand, false);
+    slash_command_registry.register_command(FileSlashCommand, false);

    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
@@ -698,7 +693,6 @@ async fn test_workflow_step_parsing(cx: &mut TestAppContext) {
    let project = Project::test(fs, [Path::new("/root")], cx).await;
    cx.update(LanguageModelRegistry::test);

-    cx.update(assistant_panel::init);
    let registry = Arc::new(LanguageRegistry::test(cx.executor()));

    // Create a new context
@@ -1081,7 +1075,6 @@ async fn test_serialization(cx: &mut TestAppContext) {
    let settings_store = cx.update(SettingsStore::test);
    cx.set_global(settings_store);
    cx.update(LanguageModelRegistry::test);
-    cx.update(assistant_panel::init);
    let registry = Arc::new(LanguageRegistry::test(cx.executor()));
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    let context = cx.new_model(|cx| {
@@ -1173,7 +1166,6 @@ async fn test_random_context_collaboration(cx: &mut TestAppContext, mut rng: Std
    cx.set_global(settings_store);
    cx.update(LanguageModelRegistry::test);

-    cx.update(assistant_panel::init);
    let slash_commands = cx.update(SlashCommandRegistry::default_global);
    slash_commands.register_command(FakeSlashCommand("cmd-1".into()), false);
    slash_commands.register_command(FakeSlashCommand("cmd-2".into()), false);
@@ -1446,7 +1438,6 @@ fn test_mark_cache_anchors(cx: &mut AppContext) {
    let settings_store = SettingsStore::test(cx);
    LanguageModelRegistry::test(cx);
    cx.set_global(settings_store);
-    assistant_panel::init(cx);
    let registry = Arc::new(LanguageRegistry::test(cx.background_executor().clone()));
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    let context = cx.new_model(|cx| {
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
--- a/crates/assistant_context_editor/src/context_history.rs
+++ b/crates/assistant_context_editor/src/context_history.rs
@@ -0,0 +1,256 @@
+use std::sync::Arc;
+
+use gpui::{
+    AppContext, EventEmitter, FocusHandle, FocusableView, Model, Subscription, Task, View, WeakView,
+};
+use picker::{Picker, PickerDelegate};
+use project::Project;
+use ui::utils::{format_distance_from_now, DateTimeType};
+use ui::{prelude::*, Avatar, ListItem, ListItemSpacing};
+use workspace::{Item, Workspace};
+
+use crate::{
+    AssistantPanelDelegate, ContextStore, RemoteContextMetadata, SavedContextMetadata,
+    DEFAULT_TAB_TITLE,
+};
+
+#[derive(Clone)]
+pub enum ContextMetadata {
+    Remote(RemoteContextMetadata),
+    Saved(SavedContextMetadata),
+}
+
+enum SavedContextPickerEvent {
+    Confirmed(ContextMetadata),
+}
+
+pub struct ContextHistory {
+    picker: View<Picker<SavedContextPickerDelegate>>,
+    _subscriptions: Vec<Subscription>,
+    workspace: WeakView<Workspace>,
+}
+
+impl ContextHistory {
+    pub fn new(
+        project: Model<Project>,
+        context_store: Model<ContextStore>,
+        workspace: WeakView<Workspace>,
+        cx: &mut ViewContext<Self>,
+    ) -> Self {
+        let picker = cx.new_view(|cx| {
+            Picker::uniform_list(
+                SavedContextPickerDelegate::new(project, context_store.clone()),
+                cx,
+            )
+            .modal(false)
+            .max_height(None)
+        });
+
+        let subscriptions = vec![
+            cx.observe(&context_store, |this, _, cx| {
+                this.picker.update(cx, |picker, cx| picker.refresh(cx));
+            }),
+            cx.subscribe(&picker, Self::handle_picker_event),
+        ];
+
+        Self {
+            picker,
+            _subscriptions: subscriptions,
+            workspace,
+        }
+    }
+
+    fn handle_picker_event(
+        &mut self,
+        _: View<Picker<SavedContextPickerDelegate>>,
+        event: &SavedContextPickerEvent,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let SavedContextPickerEvent::Confirmed(context) = event;
+
+        let Some(assistant_panel_delegate) = <dyn AssistantPanelDelegate>::try_global(cx) else {
+            return;
+        };
+
+        self.workspace
+            .update(cx, |workspace, cx| match context {
+                ContextMetadata::Remote(metadata) => {
+                    assistant_panel_delegate
+                        .open_remote_context(workspace, metadata.id.clone(), cx)
+                        .detach_and_log_err(cx);
+                }
+                ContextMetadata::Saved(metadata) => {
+                    assistant_panel_delegate
+                        .open_saved_context(workspace, metadata.path.clone(), cx)
+                        .detach_and_log_err(cx);
+                }
+            })
+            .ok();
+    }
+}
+
+impl Render for ContextHistory {
+    fn render(&mut self, _: &mut ViewContext<Self>) -> impl IntoElement {
+        div().size_full().child(self.picker.clone())
+    }
+}
+
+impl FocusableView for ContextHistory {
+    fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
+        self.picker.focus_handle(cx)
+    }
+}
+
+impl EventEmitter<()> for ContextHistory {}
+
+impl Item for ContextHistory {
+    type Event = ();
+
+    fn tab_content_text(&self, _cx: &WindowContext) -> Option<SharedString> {
+        Some("History".into())
+    }
+}
+
+struct SavedContextPickerDelegate {
+    store: Model<ContextStore>,
+    project: Model<Project>,
+    matches: Vec<ContextMetadata>,
+    selected_index: usize,
+}
+
+impl EventEmitter<SavedContextPickerEvent> for Picker<SavedContextPickerDelegate> {}
+
+impl SavedContextPickerDelegate {
+    fn new(project: Model<Project>, store: Model<ContextStore>) -> Self {
+        Self {
+            project,
+            store,
+            matches: Vec::new(),
+            selected_index: 0,
+        }
+    }
+}
+
+impl PickerDelegate for SavedContextPickerDelegate {
+    type ListItem = ListItem;
+
+    fn match_count(&self) -> usize {
+        self.matches.len()
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(&mut self, ix: usize, _cx: &mut ViewContext<Picker<Self>>) {
+        self.selected_index = ix;
+    }
+
+    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
+        "Search...".into()
+    }
+
+    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
+        let search = self.store.read(cx).search(query, cx);
+        cx.spawn(|this, mut cx| async move {
+            let matches = search.await;
+            this.update(&mut cx, |this, cx| {
+                let host_contexts = this.delegate.store.read(cx).host_contexts();
+                this.delegate.matches = host_contexts
+                    .iter()
+                    .cloned()
+                    .map(ContextMetadata::Remote)
+                    .chain(matches.into_iter().map(ContextMetadata::Saved))
+                    .collect();
+                this.delegate.selected_index = 0;
+                cx.notify();
+            })
+            .ok();
+        })
+    }
+
+    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
+        if let Some(metadata) = self.matches.get(self.selected_index) {
+            cx.emit(SavedContextPickerEvent::Confirmed(metadata.clone()));
+        }
+    }
+
+    fn dismissed(&mut self, _cx: &mut ViewContext<Picker<Self>>) {}
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        cx: &mut ViewContext<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        let context = self.matches.get(ix)?;
+        let item = match context {
+            ContextMetadata::Remote(context) => {
+                let host_user = self.project.read(cx).host().and_then(|collaborator| {
+                    self.project
+                        .read(cx)
+                        .user_store()
+                        .read(cx)
+                        .get_cached_user(collaborator.user_id)
+                });
+                div()
+                    .flex()
+                    .w_full()
+                    .justify_between()
+                    .gap_2()
+                    .child(
+                        h_flex().flex_1().overflow_x_hidden().child(
+                            Label::new(context.summary.clone().unwrap_or(DEFAULT_TAB_TITLE.into()))
+                                .size(LabelSize::Small),
+                        ),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .children(if let Some(host_user) = host_user {
+                                vec![
+                                    Avatar::new(host_user.avatar_uri.clone()).into_any_element(),
+                                    Label::new(format!("Shared by @{}", host_user.github_login))
+                                        .color(Color::Muted)
+                                        .size(LabelSize::Small)
+                                        .into_any_element(),
+                                ]
+                            } else {
+                                vec![Label::new("Shared by host")
+                                    .color(Color::Muted)
+                                    .size(LabelSize::Small)
+                                    .into_any_element()]
+                            }),
+                    )
+            }
+            ContextMetadata::Saved(context) => div()
+                .flex()
+                .w_full()
+                .justify_between()
+                .gap_2()
+                .child(
+                    h_flex()
+                        .flex_1()
+                        .child(Label::new(context.title.clone()).size(LabelSize::Small))
+                        .overflow_x_hidden(),
+                )
+                .child(
+                    Label::new(format_distance_from_now(
+                        DateTimeType::Local(context.mtime),
+                        false,
+                        true,
+                        true,
+                    ))
+                    .color(Color::Muted)
+                    .size(LabelSize::Small),
+                ),
+        };
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .spacing(ListItemSpacing::Sparse)
+                .toggle_state(selected)
+                .child(item),
+        )
+    }
+}
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -1,10 +1,9 @@
-use crate::slash_command::context_server_command;
-use crate::SlashCommandId;
 use crate::{
-    prompts::PromptBuilder, slash_command_working_set::SlashCommandWorkingSet, Context,
-    ContextEvent, ContextId, ContextOperation, ContextVersion, SavedContext, SavedContextMetadata,
+    Context, ContextEvent, ContextId, ContextOperation, ContextVersion, SavedContext,
+    SavedContextMetadata,
 };
 use anyhow::{anyhow, Context as _, Result};
+use assistant_slash_command::{SlashCommandId, SlashCommandWorkingSet};
 use assistant_tool::{ToolId, ToolWorkingSet};
 use client::{proto, telemetry::Telemetry, Client, TypedEnvelope};
 use clock::ReplicaId;
@@ -20,6 +19,7 @@ use gpui::{
 use language::LanguageRegistry;
 use paths::contexts_dir;
 use project::Project;
+use prompt_library::PromptBuilder;
 use regex::Regex;
 use rpc::AnyProtoClient;
 use std::sync::LazyLock;
@@ -33,7 +33,7 @@ use std::{
 };
 use util::{ResultExt, TryFutureExt};

-pub fn init(client: &AnyProtoClient) {
+pub(crate) fn init(client: &AnyProtoClient) {
    client.add_model_message_handler(ContextStore::handle_advertise_contexts);
    client.add_model_request_handler(ContextStore::handle_open_context);
    client.add_model_request_handler(ContextStore::handle_create_context);
@@ -497,11 +497,7 @@ impl ContextStore {
        })
    }

-    pub(super) fn loaded_context_for_id(
-        &self,
-        id: &ContextId,
-        cx: &AppContext,
-    ) -> Option<Model<Context>> {
+    pub fn loaded_context_for_id(&self, id: &ContextId, cx: &AppContext) -> Option<Model<Context>> {
        self.contexts.iter().find_map(|context| {
            let context = context.upgrade()?;
            if context.read(cx).id() == id {
@@ -835,14 +831,14 @@ impl ContextStore {
                                if let Some(prompts) = protocol.list_prompts().await.log_err() {
                                    let slash_command_ids = prompts
                                        .into_iter()
-                                        .filter(context_server_command::acceptable_prompt)
+                                        .filter(assistant_slash_commands::acceptable_prompt)
                                        .map(|prompt| {
                                            log::info!(
                                                "registering context server command: {:?}",
                                                prompt.name
                                            );
                                            slash_command_working_set.insert(Arc::new(
-                                                context_server_command::ContextServerSlashCommand::new(
+                                                assistant_slash_commands::ContextServerSlashCommand::new(
                                                    context_server_manager.clone(),
                                                    &server,
                                                    prompt,
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -9,7 +9,7 @@ use std::{cmp, ops::Range, path::Path, sync::Arc};
 use text::{AnchorRangeExt as _, Bias, OffsetRangeExt as _, Point};

 #[derive(Clone, Debug)]
-pub(crate) struct AssistantPatch {
+pub struct AssistantPatch {
    pub range: Range<language::Anchor>,
    pub title: SharedString,
    pub edits: Arc<[Result<AssistantEdit>]>,
@@ -17,13 +17,13 @@ pub(crate) struct AssistantPatch {
 }

 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub(crate) enum AssistantPatchStatus {
+pub enum AssistantPatchStatus {
    Pending,
    Ready,
 }

 #[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct AssistantEdit {
+pub struct AssistantEdit {
    pub path: String,
    pub kind: AssistantEditKind,
 }
@@ -55,7 +55,7 @@ pub enum AssistantEditKind {
 }

 #[derive(Clone, Debug, Eq, PartialEq)]
-pub(crate) struct ResolvedPatch {
+pub struct ResolvedPatch {
    pub edit_groups: HashMap<Model<Buffer>, Vec<ResolvedEditGroup>>,
    pub errors: Vec<AssistantPatchResolutionError>,
 }
@@ -74,7 +74,7 @@ pub struct ResolvedEdit {
 }

 #[derive(Clone, Debug, Eq, PartialEq)]
-pub(crate) struct AssistantPatchResolutionError {
+pub struct AssistantPatchResolutionError {
    pub edit_ix: usize,
    pub message: String,
 }
@@ -425,7 +425,7 @@ impl AssistantEditKind {
 }

 impl AssistantPatch {
-    pub(crate) async fn resolve(
+    pub async fn resolve(
        &self,
        project: Model<Project>,
        cx: &mut AsyncAppContext,
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -1,12 +1,11 @@
-use crate::assistant_panel::ContextEditor;
-use crate::SlashCommandWorkingSet;
+use crate::context_editor::ContextEditor;
 use anyhow::Result;
-use assistant_slash_command::AfterCompletion;
-pub use assistant_slash_command::{SlashCommand, SlashCommandOutput};
+pub use assistant_slash_command::SlashCommand;
+use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWorkingSet};
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
-use gpui::{AppContext, Model, Task, ViewContext, WeakView, WindowContext};
-use language::{Anchor, Buffer, CodeLabel, Documentation, HighlightId, LanguageServerId, ToPoint};
+use gpui::{Model, Task, ViewContext, WeakView, WindowContext};
+use language::{Anchor, Buffer, Documentation, LanguageServerId, ToPoint};
 use parking_lot::Mutex;
 use project::CompletionIntent;
 use rope::Point;
@@ -19,41 +18,15 @@ use std::{
        Arc,
    },
 };
-use ui::ActiveTheme;
 use workspace::Workspace;
-pub mod auto_command;
-pub mod cargo_workspace_command;
-pub mod context_server_command;
-pub mod default_command;
-pub mod delta_command;
-pub mod diagnostics_command;
-pub mod docs_command;
-pub mod fetch_command;
-pub mod file_command;
-pub mod now_command;
-pub mod project_command;
-pub mod prompt_command;
-pub mod search_command;
-pub mod selection_command;
-pub mod streaming_example_command;
-pub mod symbols_command;
-pub mod tab_command;
-pub mod terminal_command;

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

-pub(crate) struct SlashCommandLine {
-    /// The range within the line containing the command name.
-    pub name: Range<usize>,
-    /// Ranges within the line containing the command arguments.
-    pub arguments: Vec<Range<usize>>,
-}
-
 impl SlashCommandCompletionProvider {
    pub fn new(
        slash_commands: Arc<SlashCommandWorkingSet>,
@@ -355,73 +328,3 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        false
    }
 }
-
-impl SlashCommandLine {
-    pub(crate) fn parse(line: &str) -> Option<Self> {
-        let mut call: Option<Self> = None;
-        let mut ix = 0;
-        for c in line.chars() {
-            let next_ix = ix + c.len_utf8();
-            if let Some(call) = &mut call {
-                // The command arguments start at the first non-whitespace character
-                // after the command name, and continue until the end of the line.
-                if let Some(argument) = call.arguments.last_mut() {
-                    if c.is_whitespace() {
-                        if (*argument).is_empty() {
-                            argument.start = next_ix;
-                            argument.end = next_ix;
-                        } else {
-                            argument.end = ix;
-                            call.arguments.push(next_ix..next_ix);
-                        }
-                    } else {
-                        argument.end = next_ix;
-                    }
-                }
-                // The command name ends at the first whitespace character.
-                else if !call.name.is_empty() {
-                    if c.is_whitespace() {
-                        call.arguments = vec![next_ix..next_ix];
-                    } else {
-                        call.name.end = next_ix;
-                    }
-                }
-                // The command name must begin with a letter.
-                else if c.is_alphabetic() {
-                    call.name.end = next_ix;
-                } else {
-                    return None;
-                }
-            }
-            // Commands start with a slash.
-            else if c == '/' {
-                call = Some(SlashCommandLine {
-                    name: next_ix..next_ix,
-                    arguments: Vec::new(),
-                });
-            }
-            // The line can't contain anything before the slash except for whitespace.
-            else if !c.is_whitespace() {
-                return None;
-            }
-            ix = next_ix;
-        }
-        call
-    }
-}
-
-pub fn create_label_for_command(
-    command_name: &str,
-    arguments: &[&str],
-    cx: &AppContext,
-) -> CodeLabel {
-    let mut label = CodeLabel::default();
-    label.push_str(command_name, None);
-    label.push_str(" ", None);
-    label.push_str(
-        &arguments.join(" "),
-        cx.theme().syntax().highlight_id("comment").map(HighlightId),
-    );
-    label.filter_range = 0..command_name.len();
-    label
-}
--- a/crates/assistant_context_editor/src/slash_command_picker.rs
+++ b/crates/assistant_context_editor/src/slash_command_picker.rs
@@ -1,11 +1,11 @@
 use std::sync::Arc;

+use assistant_slash_command::SlashCommandWorkingSet;
 use gpui::{AnyElement, DismissEvent, SharedString, Task, WeakView};
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip};

-use crate::assistant_panel::ContextEditor;
-use crate::SlashCommandWorkingSet;
+use crate::context_editor::ContextEditor;

 #[derive(IntoElement)]
 pub(super) struct SlashCommandSelector<T: PopoverTrigger> {
--- a/crates/assistant_settings/Cargo.toml
+++ b/crates/assistant_settings/Cargo.toml
@@ -0,0 +1,33 @@
+[package]
+name = "assistant_settings"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant_settings.rs"
+
+[dependencies]
+anthropic = { workspace = true, features = ["schemars"] }
+anyhow.workspace = true
+feature_flags.workspace = true
+gpui.workspace = true
+language_model.workspace = true
+lmstudio = { workspace = true, features = ["schemars"] }
+log.workspace = true
+ollama = { workspace = true, features = ["schemars"] }
+open_ai = { workspace = true, features = ["schemars"] }
+schemars.workspace = true
+serde.workspace = true
+settings.workspace = true
+
+[dev-dependencies]
+fs.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
+paths.workspace = true
+serde_json_lenient.workspace = true
+settings = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_settings/LICENSE-GPL
+++ b/crates/assistant_settings/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
--- a/crates/assistant_settings/src/assistant_settings.rs
+++ b/crates/assistant_settings/src/assistant_settings.rs
@@ -2,7 +2,8 @@ use std::sync::Arc;

 use ::open_ai::Model as OpenAiModel;
 use anthropic::Model as AnthropicModel;
-use gpui::Pixels;
+use feature_flags::FeatureFlagAppExt;
+use gpui::{AppContext, Pixels};
 use language_model::{CloudModel, LanguageModel};
 use lmstudio::Model as LmStudioModel;
 use ollama::Model as OllamaModel;
@@ -60,6 +61,12 @@ pub struct AssistantSettings {
    pub enable_experimental_live_diffs: bool,
 }

+impl AssistantSettings {
+    pub fn are_live_diffs_enabled(&self, cx: &AppContext) -> bool {
+        cx.is_staff() || self.enable_experimental_live_diffs
+    }
+}
+
 /// Assistant panel settings
 #[derive(Clone, Serialize, Deserialize, Debug)]
 #[serde(untagged)]
@@ -373,7 +380,7 @@ pub struct AssistantSettingsContentV1 {
    default_height: Option<f32>,
    /// The provider of the assistant service.
    ///
-    /// This can be "openai", "anthropic", "ollama", "zed.dev"
+    /// This can be "openai", "anthropic", "ollama", "lmstudio", "zed.dev"
    /// each with their respective default models and configurations.
    provider: Option<AssistantProviderContentV1>,
 }
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assistant_slash_command"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -1,12 +1,14 @@
 mod extension_slash_command;
 mod slash_command_registry;
+mod slash_command_working_set;

 pub use crate::extension_slash_command::*;
 pub use crate::slash_command_registry::*;
+pub use crate::slash_command_working_set::*;
 use anyhow::Result;
 use futures::stream::{self, BoxStream};
 use futures::StreamExt;
-use gpui::{AnyElement, AppContext, ElementId, SharedString, Task, WeakView, WindowContext};
+use gpui::{AppContext, SharedString, Task, WeakView, WindowContext};
 use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate, OffsetRangeExt};
 pub use language_model::Role;
 use serde::{Deserialize, Serialize};
@@ -101,12 +103,6 @@ pub trait SlashCommand: 'static + Send + Sync {
    ) -> Task<SlashCommandResult>;
 }

-pub type RenderFoldPlaceholder = Arc<
-    dyn Send
-        + Sync
-        + Fn(ElementId, Arc<dyn Fn(&mut WindowContext)>, &mut WindowContext) -> AnyElement,
->;
-
 #[derive(Debug, PartialEq)]
 pub enum SlashCommandContent {
    Text {
@@ -266,6 +262,67 @@ impl SlashCommandOutputSection<language::Anchor> {
    }
 }

+pub struct SlashCommandLine {
+    /// The range within the line containing the command name.
+    pub name: Range<usize>,
+    /// Ranges within the line containing the command arguments.
+    pub arguments: Vec<Range<usize>>,
+}
+
+impl SlashCommandLine {
+    pub fn parse(line: &str) -> Option<Self> {
+        let mut call: Option<Self> = None;
+        let mut ix = 0;
+        for c in line.chars() {
+            let next_ix = ix + c.len_utf8();
+            if let Some(call) = &mut call {
+                // The command arguments start at the first non-whitespace character
+                // after the command name, and continue until the end of the line.
+                if let Some(argument) = call.arguments.last_mut() {
+                    if c.is_whitespace() {
+                        if (*argument).is_empty() {
+                            argument.start = next_ix;
+                            argument.end = next_ix;
+                        } else {
+                            argument.end = ix;
+                            call.arguments.push(next_ix..next_ix);
+                        }
+                    } else {
+                        argument.end = next_ix;
+                    }
+                }
+                // The command name ends at the first whitespace character.
+                else if !call.name.is_empty() {
+                    if c.is_whitespace() {
+                        call.arguments = vec![next_ix..next_ix];
+                    } else {
+                        call.name.end = next_ix;
+                    }
+                }
+                // The command name must begin with a letter.
+                else if c.is_alphabetic() {
+                    call.name.end = next_ix;
+                } else {
+                    return None;
+                }
+            }
+            // Commands start with a slash.
+            else if c == '/' {
+                call = Some(SlashCommandLine {
+                    name: next_ix..next_ix,
+                    arguments: Vec::new(),
+                });
+            }
+            // The line can't contain anything before the slash except for whitespace.
+            else if !c.is_whitespace() {
+                return None;
+            }
+            ix = next_ix;
+        }
+        call
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use pretty_assertions::assert_eq;
--- a/crates/assistant_slash_command/src/slash_command_working_set.rs
+++ b/crates/assistant_slash_command/src/slash_command_working_set.rs
@@ -1,8 +1,10 @@
-use assistant_slash_command::{SlashCommand, SlashCommandRegistry};
+use std::sync::Arc;
+
 use collections::HashMap;
 use gpui::AppContext;
 use parking_lot::Mutex;
-use std::sync::Arc;
+
+use crate::{SlashCommand, SlashCommandRegistry};

 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Default)]
 pub struct SlashCommandId(usize);
--- a/crates/assistant_slash_commands/Cargo.toml
+++ b/crates/assistant_slash_commands/Cargo.toml
@@ -0,0 +1,52 @@
+[package]
+name = "assistant_slash_commands"
+version = "0.1.0"
+edition.workspace = true
+publish.workspace = true
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant_slash_commands.rs"
+
+[dependencies]
+anyhow.workspace = true
+assistant_slash_command.workspace = true
+cargo_toml.workspace = true
+chrono.workspace = true
+collections.workspace = true
+context_server.workspace = true
+editor.workspace = true
+feature_flags.workspace = true
+fs.workspace = true
+futures.workspace = true
+fuzzy.workspace = true
+globset.workspace = true
+gpui.workspace = true
+html_to_markdown.workspace = true
+http_client.workspace = true
+indexed_docs.workspace = true
+language.workspace = true
+language_model.workspace = true
+log.workspace = true
+project.workspace = true
+prompt_library.workspace = true
+rope.workspace = true
+schemars.workspace = true
+semantic_index.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+smol.workspace = true
+terminal_view.workspace = true
+text.workspace = true
+toml.workspace = true
+ui.workspace = true
+util.workspace = true
+workspace.workspace = true
+
+[dev-dependencies]
+env_logger.workspace = true
+pretty_assertions.workspace = true
+settings.workspace = true
--- a/crates/assistant_slash_commands/LICENSE-GPL
+++ b/crates/assistant_slash_commands/LICENSE-GPL
@@ -0,0 +1 @@
+../../LICENSE-GPL
--- a/crates/assistant_slash_commands/src/assistant_slash_commands.rs
+++ b/crates/assistant_slash_commands/src/assistant_slash_commands.rs
@@ -0,0 +1,57 @@
+mod auto_command;
+mod cargo_workspace_command;
+mod context_server_command;
+mod default_command;
+mod delta_command;
+mod diagnostics_command;
+mod docs_command;
+mod fetch_command;
+mod file_command;
+mod now_command;
+mod project_command;
+mod prompt_command;
+mod search_command;
+mod selection_command;
+mod streaming_example_command;
+mod symbols_command;
+mod tab_command;
+mod terminal_command;
+
+use gpui::AppContext;
+use language::{CodeLabel, HighlightId};
+use ui::ActiveTheme as _;
+
+pub use crate::auto_command::*;
+pub use crate::cargo_workspace_command::*;
+pub use crate::context_server_command::*;
+pub use crate::default_command::*;
+pub use crate::delta_command::*;
+pub use crate::diagnostics_command::*;
+pub use crate::docs_command::*;
+pub use crate::fetch_command::*;
+pub use crate::file_command::*;
+pub use crate::now_command::*;
+pub use crate::project_command::*;
+pub use crate::prompt_command::*;
+pub use crate::search_command::*;
+pub use crate::selection_command::*;
+pub use crate::streaming_example_command::*;
+pub use crate::symbols_command::*;
+pub use crate::tab_command::*;
+pub use crate::terminal_command::*;
+
+pub fn create_label_for_command(
+    command_name: &str,
+    arguments: &[&str],
+    cx: &AppContext,
+) -> CodeLabel {
+    let mut label = CodeLabel::default();
+    label.push_str(command_name, None);
+    label.push_str(" ", None);
+    label.push_str(
+        &arguments.join(" "),
+        cx.theme().syntax().highlight_id("comment").map(HighlightId),
+    );
+    label.filter_range = 0..command_name.len();
+    label
+}
--- a/crates/assistant_slash_commands/src/auto_command.rs
+++ b/crates/assistant_slash_commands/src/auto_command.rs
@@ -18,7 +18,7 @@ use ui::{prelude::*, BorrowAppContext};
 use util::ResultExt;
 use workspace::Workspace;

-use crate::slash_command::create_label_for_command;
+use crate::create_label_for_command;

 pub struct AutoSlashCommandFeatureFlag;

@@ -26,7 +26,7 @@ impl FeatureFlag for AutoSlashCommandFeatureFlag {
    const NAME: &'static str = "auto-slash-command";
 }

-pub(crate) struct AutoCommand;
+pub struct AutoCommand;

 impl SlashCommand for AutoCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/cargo_workspace_command.rs
+++ b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
@@ -15,7 +15,7 @@ use std::{
 use ui::prelude::*;
 use workspace::Workspace;

-pub(crate) struct CargoWorkspaceSlashCommand;
+pub struct CargoWorkspaceSlashCommand;

 impl CargoWorkspaceSlashCommand {
    async fn build_message(fs: Arc<dyn Fs>, path_to_cargo_toml: &Path) -> Result<String> {
--- a/crates/assistant_slash_commands/src/context_server_command.rs
+++ b/crates/assistant_slash_commands/src/context_server_command.rs
@@ -16,7 +16,7 @@ use text::LineEnding;
 use ui::{IconName, SharedString};
 use workspace::Workspace;

-use crate::slash_command::create_label_for_command;
+use crate::create_label_for_command;

 pub struct ContextServerSlashCommand {
    server_manager: Model<ContextServerManager>,
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ b/crates/assistant_slash_commands/src/default_command.rs
@@ -1,4 +1,3 @@
-use crate::prompt_library::PromptStore;
 use anyhow::{anyhow, Result};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
@@ -6,6 +5,7 @@ use assistant_slash_command::{
 };
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
+use prompt_library::PromptStore;
 use std::{
    fmt::Write,
    sync::{atomic::AtomicBool, Arc},
@@ -13,7 +13,7 @@ use std::{
 use ui::prelude::*;
 use workspace::Workspace;

-pub(crate) struct DefaultSlashCommand;
+pub struct DefaultSlashCommand;

 impl SlashCommand for DefaultSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -1,4 +1,4 @@
-use crate::slash_command::file_command::{FileCommandMetadata, FileSlashCommand};
+use crate::file_command::{FileCommandMetadata, FileSlashCommand};
 use anyhow::{anyhow, Result};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
@@ -13,7 +13,7 @@ use text::OffsetRangeExt;
 use ui::prelude::*;
 use workspace::Workspace;

-pub(crate) struct DeltaSlashCommand;
+pub struct DeltaSlashCommand;

 impl SlashCommand for DeltaSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -21,9 +21,9 @@ use util::paths::PathMatcher;
 use util::ResultExt;
 use workspace::Workspace;

-use crate::slash_command::create_label_for_command;
+use crate::create_label_for_command;

-pub(crate) struct DiagnosticsSlashCommand;
+pub struct DiagnosticsSlashCommand;

 impl DiagnosticsSlashCommand {
    fn search_paths(
--- a/crates/assistant_slash_commands/src/docs_command.rs
+++ b/crates/assistant_slash_commands/src/docs_command.rs
@@ -19,7 +19,7 @@ use ui::prelude::*;
 use util::{maybe, ResultExt};
 use workspace::Workspace;

-pub(crate) struct DocsSlashCommand;
+pub struct DocsSlashCommand;

 impl DocsSlashCommand {
    pub const NAME: &'static str = "docs";
@@ -367,7 +367,7 @@ fn is_item_path_delimiter(char: char) -> bool {
 }

 #[derive(Debug, PartialEq, Clone)]
-pub(crate) enum DocsSlashCommandArgs {
+pub enum DocsSlashCommandArgs {
    NoProvider,
    SearchPackageDocs {
        provider: ProviderId,
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ b/crates/assistant_slash_commands/src/fetch_command.rs
@@ -23,7 +23,7 @@ enum ContentType {
    Json,
 }

-pub(crate) struct FetchSlashCommand;
+pub struct FetchSlashCommand;

 impl FetchSlashCommand {
    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<String> {
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -21,7 +21,7 @@ use ui::prelude::*;
 use util::ResultExt;
 use workspace::Workspace;

-pub(crate) struct FileSlashCommand;
+pub struct FileSlashCommand;

 impl FileSlashCommand {
    fn search_paths(
@@ -561,7 +561,7 @@ mod test {
    use settings::SettingsStore;
    use smol::stream::StreamExt;

-    use crate::slash_command::file_command::collect_files;
+    use super::collect_files;

    pub fn init_test(cx: &mut gpui::TestAppContext) {
        if std::env::var("RUST_LOG").is_ok() {
--- a/crates/assistant_slash_commands/src/now_command.rs
+++ b/crates/assistant_slash_commands/src/now_command.rs
@@ -12,7 +12,7 @@ use language::{BufferSnapshot, LspAdapterDelegate};
 use ui::prelude::*;
 use workspace::Workspace;

-pub(crate) struct NowSlashCommand;
+pub struct NowSlashCommand;

 impl SlashCommand for NowSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/project_command.rs
+++ b/crates/assistant_slash_commands/src/project_command.rs
@@ -1,33 +1,33 @@
-use super::{
-    create_label_for_command, search_command::add_search_result_section, SlashCommand,
-    SlashCommandOutput,
-};
-use crate::PromptBuilder;
-use anyhow::{anyhow, Result};
-use assistant_slash_command::{ArgumentCompletion, SlashCommandOutputSection, SlashCommandResult};
-use feature_flags::FeatureFlag;
-use gpui::{AppContext, Task, WeakView, WindowContext};
-use language::{Anchor, CodeLabel, LspAdapterDelegate};
-use language_model::{LanguageModelRegistry, LanguageModelTool};
-use schemars::JsonSchema;
-use semantic_index::SemanticDb;
-use serde::Deserialize;
-
-pub struct ProjectSlashCommandFeatureFlag;
-
-impl FeatureFlag for ProjectSlashCommandFeatureFlag {
-    const NAME: &'static str = "project-slash-command";
-}
-
 use std::{
    fmt::Write as _,
    ops::DerefMut,
    sync::{atomic::AtomicBool, Arc},
 };

+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
+    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
+    SlashCommandResult,
+};
+use feature_flags::FeatureFlag;
+use gpui::{AppContext, Task, WeakView, WindowContext};
+use language::{Anchor, CodeLabel, LspAdapterDelegate};
+use language_model::{LanguageModelRegistry, LanguageModelTool};
+use prompt_library::PromptBuilder;
+use schemars::JsonSchema;
+use semantic_index::SemanticDb;
+use serde::Deserialize;
 use ui::prelude::*;
 use workspace::Workspace;

+use super::{create_label_for_command, search_command::add_search_result_section};
+
+pub struct ProjectSlashCommandFeatureFlag;
+
+impl FeatureFlag for ProjectSlashCommandFeatureFlag {
+    const NAME: &'static str = "project-slash-command";
+}
+
 pub struct ProjectSlashCommand {
    prompt_builder: Arc<PromptBuilder>,
 }
--- a/crates/assistant_slash_commands/src/prompt_after_summary.txt
+++ b/crates/assistant_slash_commands/src/prompt_after_summary.txt
--- a/crates/assistant_slash_commands/src/prompt_before_summary.txt
+++ b/crates/assistant_slash_commands/src/prompt_before_summary.txt
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -1,4 +1,3 @@
-use crate::prompt_library::PromptStore;
 use anyhow::{anyhow, Context, Result};
 use assistant_slash_command::{
    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
@@ -6,11 +5,12 @@ use assistant_slash_command::{
 };
 use gpui::{Task, WeakView};
 use language::{BufferSnapshot, LspAdapterDelegate};
+use prompt_library::PromptStore;
 use std::sync::{atomic::AtomicBool, Arc};
 use ui::prelude::*;
 use workspace::Workspace;

-pub(crate) struct PromptSlashCommand;
+pub struct PromptSlashCommand;

 impl SlashCommand for PromptSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/search_command.rs
+++ b/crates/assistant_slash_commands/src/search_command.rs
@@ -14,10 +14,10 @@ use std::{
 use ui::{prelude::*, IconName};
 use workspace::Workspace;

-use crate::slash_command::create_label_for_command;
-use crate::slash_command::file_command::{build_entry_output_section, codeblock_fence_for_path};
+use crate::create_label_for_command;
+use crate::file_command::{build_entry_output_section, codeblock_fence_for_path};

-pub(crate) struct SearchSlashCommandFeatureFlag;
+pub struct SearchSlashCommandFeatureFlag;

 impl FeatureFlag for SearchSlashCommandFeatureFlag {
    const NAME: &'static str = "search-slash-command";
@@ -27,7 +27,7 @@ impl FeatureFlag for SearchSlashCommandFeatureFlag {
    }
 }

-pub(crate) struct SearchSlashCommand;
+pub struct SearchSlashCommand;

 impl SlashCommand for SearchSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/selection_command.rs
+++ b/crates/assistant_slash_commands/src/selection_command.rs
@@ -0,0 +1,194 @@
+use anyhow::{anyhow, Result};
+use assistant_slash_command::{
+    ArgumentCompletion, SlashCommand, SlashCommandContent, SlashCommandEvent,
+    SlashCommandOutputSection, SlashCommandResult,
+};
+use editor::Editor;
+use futures::StreamExt;
+use gpui::{AppContext, Task, WeakView};
+use gpui::{SharedString, ViewContext, WindowContext};
+use language::{BufferSnapshot, CodeLabel, LspAdapterDelegate};
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+use ui::IconName;
+use workspace::Workspace;
+
+use crate::file_command::codeblock_fence_for_path;
+
+pub struct SelectionCommand;
+
+impl SlashCommand for SelectionCommand {
+    fn name(&self) -> String {
+        "selection".into()
+    }
+
+    fn label(&self, _cx: &AppContext) -> CodeLabel {
+        CodeLabel::plain(self.name(), None)
+    }
+
+    fn description(&self) -> String {
+        "Insert editor selection".into()
+    }
+
+    fn icon(&self) -> IconName {
+        IconName::Quote
+    }
+
+    fn menu_text(&self) -> String {
+        self.description()
+    }
+
+    fn requires_argument(&self) -> bool {
+        false
+    }
+
+    fn accepts_arguments(&self) -> bool {
+        true
+    }
+
+    fn complete_argument(
+        self: Arc<Self>,
+        _arguments: &[String],
+        _cancel: Arc<AtomicBool>,
+        _workspace: Option<WeakView<Workspace>>,
+        _cx: &mut WindowContext,
+    ) -> Task<Result<Vec<ArgumentCompletion>>> {
+        Task::ready(Err(anyhow!("this command does not require argument")))
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _arguments: &[String],
+        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
+        _context_buffer: BufferSnapshot,
+        workspace: WeakView<Workspace>,
+        _delegate: Option<Arc<dyn LspAdapterDelegate>>,
+        cx: &mut WindowContext,
+    ) -> Task<SlashCommandResult> {
+        let mut events = vec![];
+
+        let Some(creases) = workspace
+            .update(cx, selections_creases)
+            .unwrap_or_else(|e| {
+                events.push(Err(e));
+                None
+            })
+        else {
+            return Task::ready(Err(anyhow!("no active selection")));
+        };
+
+        for (text, title) in creases {
+            events.push(Ok(SlashCommandEvent::StartSection {
+                icon: IconName::TextSnippet,
+                label: SharedString::from(title),
+                metadata: None,
+            }));
+            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
+                text,
+                run_commands_in_text: false,
+            })));
+            events.push(Ok(SlashCommandEvent::EndSection));
+            events.push(Ok(SlashCommandEvent::Content(SlashCommandContent::Text {
+                text: "\n".to_string(),
+                run_commands_in_text: false,
+            })));
+        }
+
+        let result = futures::stream::iter(events).boxed();
+
+        Task::ready(Ok(result))
+    }
+}
+
+pub fn selections_creases(
+    workspace: &mut workspace::Workspace,
+    cx: &mut ViewContext<Workspace>,
+) -> Option<Vec<(String, String)>> {
+    let editor = workspace
+        .active_item(cx)
+        .and_then(|item| item.act_as::<Editor>(cx))?;
+
+    let mut creases = vec![];
+    editor.update(cx, |editor, cx| {
+        let selections = editor.selections.all_adjusted(cx);
+        let buffer = editor.buffer().read(cx).snapshot(cx);
+        for selection in selections {
+            let range = editor::ToOffset::to_offset(&selection.start, &buffer)
+                ..editor::ToOffset::to_offset(&selection.end, &buffer);
+            let selected_text = buffer.text_for_range(range.clone()).collect::<String>();
+            if selected_text.is_empty() {
+                continue;
+            }
+            let start_language = buffer.language_at(range.start);
+            let end_language = buffer.language_at(range.end);
+            let language_name = if start_language == end_language {
+                start_language.map(|language| language.code_fence_block_name())
+            } else {
+                None
+            };
+            let language_name = language_name.as_deref().unwrap_or("");
+            let filename = buffer
+                .file_at(selection.start)
+                .map(|file| file.full_path(cx));
+            let text = if language_name == "markdown" {
+                selected_text
+                    .lines()
+                    .map(|line| format!("> {}", line))
+                    .collect::<Vec<_>>()
+                    .join("\n")
+            } else {
+                let start_symbols = buffer
+                    .symbols_containing(selection.start, None)
+                    .map(|(_, symbols)| symbols);
+                let end_symbols = buffer
+                    .symbols_containing(selection.end, None)
+                    .map(|(_, symbols)| symbols);
+
+                let outline_text =
+                    if let Some((start_symbols, end_symbols)) = start_symbols.zip(end_symbols) {
+                        Some(
+                            start_symbols
+                                .into_iter()
+                                .zip(end_symbols)
+                                .take_while(|(a, b)| a == b)
+                                .map(|(a, _)| a.text)
+                                .collect::<Vec<_>>()
+                                .join(" > "),
+                        )
+                    } else {
+                        None
+                    };
+
+                let line_comment_prefix = start_language
+                    .and_then(|l| l.default_scope().line_comment_prefixes().first().cloned());
+
+                let fence = codeblock_fence_for_path(
+                    filename.as_deref(),
+                    Some(selection.start.row..=selection.end.row),
+                );
+
+                if let Some((line_comment_prefix, outline_text)) =
+                    line_comment_prefix.zip(outline_text)
+                {
+                    let breadcrumb = format!("{line_comment_prefix}Excerpt from: {outline_text}\n");
+                    format!("{fence}{breadcrumb}{selected_text}\n```")
+                } else {
+                    format!("{fence}{selected_text}\n```")
+                }
+            };
+            let crease_title = if let Some(path) = filename {
+                let start_line = selection.start.row + 1;
+                let end_line = selection.end.row + 1;
+                if start_line == end_line {
+                    format!("{}, Line {}", path.display(), start_line)
+                } else {
+                    format!("{}, Lines {} to {}", path.display(), start_line, end_line)
+                }
+            } else {
+                "Quoted selection".to_string()
+            };
+            creases.push((text, crease_title));
+        }
+    });
+    Some(creases)
+}
--- a/crates/assistant_slash_commands/src/streaming_example_command.rs
+++ b/crates/assistant_slash_commands/src/streaming_example_command.rs
@@ -22,7 +22,7 @@ impl FeatureFlag for StreamingExampleSlashCommandFeatureFlag {
    const NAME: &'static str = "streaming-example-slash-command";
 }

-pub(crate) struct StreamingExampleSlashCommand;
+pub struct StreamingExampleSlashCommand;

 impl SlashCommand for StreamingExampleSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/symbols_command.rs
+++ b/crates/assistant_slash_commands/src/symbols_command.rs
@@ -11,7 +11,7 @@ use std::{path::Path, sync::atomic::AtomicBool};
 use ui::{IconName, WindowContext};
 use workspace::Workspace;

-pub(crate) struct OutlineSlashCommand;
+pub struct OutlineSlashCommand;

 impl SlashCommand for OutlineSlashCommand {
    fn name(&self) -> String {
--- a/crates/assistant_slash_commands/src/tab_command.rs
+++ b/crates/assistant_slash_commands/src/tab_command.rs
@@ -16,9 +16,9 @@ use ui::{prelude::*, ActiveTheme, WindowContext};
 use util::ResultExt;
 use workspace::Workspace;

-use crate::slash_command::file_command::append_buffer_to_output;
+use crate::file_command::append_buffer_to_output;

-pub(crate) struct TabSlashCommand;
+pub struct TabSlashCommand;

 const ALL_TABS_COMPLETION_ITEM: &str = "all";

--- a/crates/assistant_slash_commands/src/terminal_command.rs
+++ b/crates/assistant_slash_commands/src/terminal_command.rs
@@ -12,14 +12,14 @@ use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
 use ui::prelude::*;
 use workspace::{dock::Panel, Workspace};

-use crate::DEFAULT_CONTEXT_LINES;
-
 use super::create_label_for_command;

-pub(crate) struct TerminalSlashCommand;
+pub struct TerminalSlashCommand;

 const LINE_COUNT_ARG: &str = "--line-count";

+const DEFAULT_CONTEXT_LINES: usize = 50;
+
 impl SlashCommand for TerminalSlashCommand {
    fn name(&self) -> String {
        "terminal".into()
--- a/crates/assistant_tool/Cargo.toml
+++ b/crates/assistant_tool/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assistant_tool"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
--- a/crates/assistant_tools/Cargo.toml
+++ b/crates/assistant_tools/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "assistant_tools"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
--- a/crates/audio/Cargo.toml
+++ b/crates/audio/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "audio"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "auto_update"
 version = "0.1.0"
-edition = "2021"
-publish = false
+edition.workspace = true
+publish.workspace = true
 license = "GPL-3.0-or-later"

 [lints]
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>DeepSeek</title><path d="M23.748 4.482c-.254-.124-.364.113-.512.234-.051.039-.094.09-.137.136-.372.397-.806.657-1.373.626-.829-.046-1.537.214-2.163.848-.133-.782-.575-1.248-1.247-1.548-.352-.156-.708-.311-.955-.65-.172-.241-.219-.51-.305-.774-.055-.16-.11-.323-.293-.35-.2-.031-.278.136-.356.276-.313.572-.434 1.202-.422 1.84.027 1.436.633 2.58 1.838 3.393.137.093.172.187.129.323-.082.28-.18.552-.266.833-.055.179-.137.217-.329.14a5.526 5.526 0 01-1.736-1.18c-.857-.828-1.631-1.742-2.597-2.458a11.365 11.365 0 00-.689-.471c-.985-.957.13-1.743.388-1.836.27-.098.093-.432-.779-.428-.872.004-1.67.295-2.687.684a3.055 3.055 0 01-.465.137 9.597 9.597 0 00-2.883-.102c-1.885.21-3.39 1.102-4.497 2.623C.082 8.606-.231 10.684.152 12.85c.403 2.284 1.569 4.175 3.36 5.653 1.858 1.533 3.997 2.284 6.438 2.14 1.482-.085 3.133-.284 4.994-1.86.47.234.962.327 1.78.397.63.059 1.236-.03 1.705-.128.735-.156.684-.837.419-.961-2.155-1.004-1.682-.595-2.113-.926 1.096-1.296 2.746-2.642 3.392-7.003.05-.347.007-.565 0-.845-.004-.17.035-.237.23-.256a4.173 4.173 0 001.545-.475c1.396-.763 1.96-2.015 2.093-3.517.02-.23-.004-.467-.247-.588zM11.581 18c-2.089-1.642-3.102-2.183-3.52-2.16-.392.024-.321.471-.235.763.09.288.207.486.371.739.114.167.192.416-.113.603-.673.416-1.842-.14-1.897-.167-1.361-.802-2.5-1.86-3.301-3.307-.774-1.393-1.224-2.887-1.298-4.482-.02-.386.093-.522.477-.592a4.696 4.696 0 011.529-.039c2.132.312 3.946 1.265 5.468 2.774.868.86 1.525 1.887 2.202 2.891.72 1.066 1.494 2.082 2.48 2.914.348.292.625.514.891.677-.802.09-2.14.11-3.054-.614zm1-6.44a.306.306 0 01.415-.287.302.302 0 01.2.288.306.306 0 01-.31.307.303.303 0 01-.304-.308zm3.11 1.596c-.2.081-.399.151-.59.16a1.245 1.245 0 01-.798-.254c-.274-.23-.47-.358-.552-.758a1.73 1.73 0 01.016-.588c.07-.327-.008-.537-.239-.727-.187-.156-.426-.199-.688-.199a.559.559 0 01-.254-.078c-.11-.054-.2-.19-.114-.358.028-.054.16-.186.192-.21.356-.202.767-.136 1.146.016.352.144.618.408 1.001.782.391.451.462.576.685.914.176.265.336.537.445.848.067.195-.019.354-.25.452z" fill="black"></path></svg>