AHHHHHHH

Simplify and improve concurrency of git status updates (#12513 )
The quest for responsiveness in large git repos continues. This is a follow-up to https://github.com/zed-industries/zed/pull/12444 Release Notes: - N/A
2024-05-31 11:16:48 -07:00 · 2024-05-31 09:10:09 -07:00 · 2024-05-31 12:02:59 -04:00 · 2024-05-31 11:36:42 -04:00 · 2024-05-31 11:34:16 -04:00 · 2024-05-31 11:31:22 -04:00
656 changed files with 38942 additions and 22704 deletions
--- a/.cloudflare/README.md
+++ b/.cloudflare/README.md
@@ -0,0 +1,15 @@
+We have two cloudflare workers that let us serve some assets of this repo
+from Cloudflare.
+
+* `open-source-website-assets` is used for `install.sh`
+* `docs-proxy` is used for `https://zed.dev/docs`
+
+On push to `main`, both of these (and the files they depend on) are uploaded to Cloudflare.
+
+### Deployment
+
+These functions are deployed on push to main by the deploy_cloudflare.yml workflow. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
+
+### Testing
+
+You can use [wrangler](https://developers.cloudflare.com/workers/cli-wrangler/install-update) to test these workers locally, or to deploy custom versions.
--- a/.cloudflare/docs-proxy/src/worker.js
+++ b/.cloudflare/docs-proxy/src/worker.js
@@ -0,0 +1,14 @@
+export default {
+  async fetch(request, _env, _ctx) {
+    const url = new URL(request.url);
+    url.hostname = "docs-anw.pages.dev";
+
+    let res = await fetch(url, request);
+
+    if (res.status === 404) {
+      res = await fetch("https://zed.dev/404");
+    }
+
+    return res;
+  },
+};
--- a/.cloudflare/docs-proxy/wrangler.toml
+++ b/.cloudflare/docs-proxy/wrangler.toml
@@ -0,0 +1,8 @@
+name = "docs-proxy"
+main = "src/worker.js"
+compatibility_date = "2024-05-03"
+workers_dev = true
+
+[[routes]]
+pattern = "zed.dev/docs*"
+zone_name = "zed.dev"
--- a/.cloudflare/open-source-website-assets/src/worker.js
+++ b/.cloudflare/open-source-website-assets/src/worker.js
@@ -0,0 +1,19 @@
+export default {
+  async fetch(request, env) {
+    const url = new URL(request.url);
+    const key = url.pathname.slice(1);
+
+    const object = await env.OPEN_SOURCE_WEBSITE_ASSETS_BUCKET.get(key);
+    if (!object) {
+      return await fetch("https://zed.dev/404");
+    }
+
+    const headers = new Headers();
+    object.writeHttpMetadata(headers);
+    headers.set("etag", object.httpEtag);
+
+    return new Response(object.body, {
+      headers,
+    });
+  },
+};
--- a/.cloudflare/open-source-website-assets/wrangler.toml
+++ b/.cloudflare/open-source-website-assets/wrangler.toml
@@ -0,0 +1,8 @@
+name = "open-source-website-assets"
+main = "src/worker.js"
+compatibility_date = "2024-05-15"
+workers_dev = true
+
+[[r2_buckets]]
+binding = 'OPEN_SOURCE_WEBSITE_ASSETS_BUCKET'
+bucket_name = 'zed-open-source-website-assets'
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,6 +23,7 @@ env:

 jobs:
  style:
+    timeout-minutes: 60
    name: Check formatting and spelling
    runs-on:
      - self-hosted
@@ -32,7 +33,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"
          fetch-depth: 0

      - name: Remove untracked files
@@ -78,6 +78,7 @@ jobs:
          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/rpc/proto/"

  macos_tests:
+    timeout-minutes: 60
    name: (macOS) Run Clippy and tests
    runs-on:
      - self-hosted
@@ -87,7 +88,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: cargo clippy
        run: cargo xtask clippy
@@ -103,23 +103,19 @@ jobs:

  # todo(linux): Actually run the tests
  linux_tests:
+    timeout-minutes: 60
    name: (Linux) Run Clippy and tests
-    runs-on: ubuntu-latest
+    runs-on:
+      - self-hosted
+      - deploy
    steps:
+      - name: Add Rust to the PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
      - name: Checkout repo
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"
-
-      - name: Cache dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-
-      - name: configure linux
-        shell: bash -euxo pipefail {0}
-        run: script/linux

      - name: cargo clippy
        run: cargo xtask clippy
@@ -129,6 +125,7 @@ jobs:

  # todo(windows): Actually run the tests
  windows_tests:
+    timeout-minutes: 60
    name: (Windows) Run Clippy and tests
    runs-on: hosted-windows-1
    steps:
@@ -136,7 +133,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: Cache dependencies
        uses: swatinem/rust-cache@v2
@@ -150,6 +146,7 @@ jobs:
        run: cargo build -p zed

  bundle-mac:
+    timeout-minutes: 60
    name: Create a macOS bundle
    runs-on:
      - self-hosted
@@ -179,7 +176,6 @@ jobs:
          # 25 was chosen arbitrarily.
          fetch-depth: 25
          clean: false
-          submodules: "recursive"

      - name: Limit target directory size
        run: script/clear-target-dir-if-larger-than 100
@@ -261,27 +257,26 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  bundle-linux:
+    timeout-minutes: 60
    name: Create a Linux bundle
-    runs-on: ubuntu-22.04 # keep the version fixed to avoid libc and dynamic linked library issues
+    runs-on:
+      - self-hosted
+      - deploy
    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
    needs: [linux_tests]
    env:
      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
    steps:
+      - name: Add Rust to the PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH
+
      - name: Checkout repo
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

-      - name: Cache dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-
-      - name: Configure linux
-        shell: bash -euxo pipefail {0}
-        run: script/linux
+      - name: Limit target directory size
+        run: script/clear-target-dir-if-larger-than 100

      - name: Determine version and release channel
        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
--- a/.github/workflows/deploy_cloudflare.yml
+++ b/.github/workflows/deploy_cloudflare.yml
@@ -0,0 +1,56 @@
+name: Deploy Docs
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy-docs:
+    name: Deploy Docs
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v2
+        with:
+          mdbook-version: "0.4.37"
+
+      - name: Build book
+        run: |
+          set -euo pipefail
+          mkdir -p target/deploy
+          mdbook build ./docs --dest-dir=../target/deploy/docs/
+
+      - name: Deploy Docs
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy target/deploy --project-name=docs
+
+      - name: Deploy Install
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh
+
+      - name: Deploy Docs Workers
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy .cloudflare/docs-proxy/src/worker.js
+
+      - name: Deploy Install Workers
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: deploy .cloudflare/docs-proxy/src/worker.js
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -21,7 +21,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"
          fetch-depth: 0

      - name: Run style checks
@@ -41,7 +40,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"
          fetch-depth: 0

      - name: Install cargo nextest
@@ -76,7 +74,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: Build docker image
        run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA
--- a/.github/workflows/deploy_docs.yml
+++ b/.github/workflows/deploy_docs.yml
@@ -1,35 +0,0 @@
-name: Deploy Docs
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy-docs:
-    name: Deploy Docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-
-      - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v2
-        with:
-          mdbook-version: "0.4.37"
-
-      - name: Build book
-        run: |
-          set -euo pipefail
-          mkdir -p target/deploy
-          mdbook build ./docs --dest-dir=../target/deploy/docs/
-
-      - name: Deploy
-        uses: cloudflare/wrangler-action@v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy target/deploy --project-name=docs
--- a/.github/workflows/publish_extension_cli.yml
+++ b/.github/workflows/publish_extension_cli.yml
@@ -19,7 +19,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: Cache dependencies
        uses: swatinem/rust-cache@v2
--- a/.github/workflows/randomized_tests.yml
+++ b/.github/workflows/randomized_tests.yml
@@ -31,7 +31,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: Run randomized tests
        run: script/randomized-test-ci
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -15,6 +15,7 @@ env:

 jobs:
  style:
+    timeout-minutes: 60
    name: Check formatting and Clippy lints
    if: github.repository_owner == 'zed-industries'
    runs-on:
@@ -25,7 +26,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"
          fetch-depth: 0

      - name: Run style checks
@@ -34,6 +34,7 @@ jobs:
      - name: Run clippy
        run: cargo xtask clippy
  tests:
+    timeout-minutes: 60
    name: Run tests
    if: github.repository_owner == 'zed-industries'
    runs-on:
@@ -45,12 +46,12 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: Run tests
        uses: ./.github/actions/run_tests

  bundle-mac:
+    timeout-minutes: 60
    name: Create a macOS bundle
    if: github.repository_owner == 'zed-industries'
    runs-on:
@@ -75,7 +76,6 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

      - name: Set release channel to nightly
        run: |
@@ -94,9 +94,12 @@ jobs:
        run: script/upload-nightly macos

  bundle-deb:
+    timeout-minutes: 60
    name: Create a Linux *.tar.gz bundle
    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-22.04 # keep the version fixed to avoid libc and dynamic linked library issues
+    runs-on:
+      - self-hosted
+      - deploy
    needs: tests
    env:
      DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
@@ -107,16 +110,9 @@ jobs:
        uses: actions/checkout@v4
        with:
          clean: false
-          submodules: "recursive"

-      - name: Cache dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          save-if: ${{ github.ref == 'refs/heads/main' }}
-
-      - name: Configure linux
-        shell: bash -euxo pipefail {0}
-        run: script/linux
+      - name: Add Rust to the PATH
+        run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH

      - name: Set release channel to nightly
        run: |
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 /script/node_modules
 /crates/theme/schemas/theme.json
 /crates/collab/seed.json
+/crates/zed/resources/flatpak/flatpak-cargo-sources.json
+/dev.zed.Zed*.json
 /assets/*licenses.md
 **/venv
 .build
@@ -24,3 +26,5 @@ DerivedData/
 .venv
 .blob_store
 .vscode
+.wrangler
+.flatpak-builder
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "crates/live_kit_server/protocol"]
-	path = crates/live_kit_server/protocol
-	url = https://github.com/livekit/protocol
--- a/.mailmap
+++ b/.mailmap
@@ -15,8 +15,12 @@ Christian Bergschneider <christian.bergschneider@gmx.de>
 Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
 Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
+Fernando Tagawa <tagawafernando@gmail.com>
+Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
 Greg Morenz <greg-morenz@droid.cafe>
 Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
+Ivan Žužak <izuzak@gmail.com>
+Ivan Žužak <izuzak@gmail.com> <ivan.zuzak@github.com>
 Joseph T. Lyons <JosephTLyons@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
 Julia <floc@unpromptedtirade.com>
@@ -29,6 +33,9 @@ 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>
+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>
 Max Brunsfeld <maxbrunsfeld@gmail.com>
@@ -41,6 +48,8 @@ Nate Butler <iamnbutler@gmail.com> <nate@zed.dev>
 Nathan Sobo <nathan@zed.dev>
 Nathan Sobo <nathan@zed.dev> <nathan@warp.dev>
 Nathan Sobo <nathan@zed.dev> <nathansobo@gmail.com>
+Petros Amoiridis <petros@hey.com>
+Petros Amoiridis <petros@hey.com> <petros@zed.dev>
 Piotr Osiewicz <piotr@zed.dev>
 Piotr Osiewicz <piotr@zed.dev> <24362066+osiewicz@users.noreply.github.com>
 Robert Clover <git@clo4.net>
--- a/.zed/tasks.json
+++ b/.zed/tasks.json
@@ -3,10 +3,5 @@
    "label": "clippy",
    "command": "cargo",
    "args": ["xtask", "clippy"]
-  },
-  {
-    "label": "assistant2",
-    "command": "cargo",
-    "args": ["run", "-p", "assistant2", "--example", "assistant_example"]
  }
 ]
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,8 +4,8 @@ members = [
    "crates/anthropic",
    "crates/assets",
    "crates/assistant",
+    "crates/assistant_slash_command",
    "crates/assistant_tooling",
-    "crates/assistant2",
    "crates/audio",
    "crates/auto_update",
    "crates/breadcrumbs",
@@ -35,13 +35,13 @@ members = [
    "crates/fsevent",
    "crates/fuzzy",
    "crates/git",
-    "crates/git_ui",
    "crates/git_hosting_providers",
    "crates/go_to_line",
    "crates/google_ai",
    "crates/gpui",
    "crates/gpui_macros",
    "crates/headless",
+    "crates/http",
    "crates/image_viewer",
    "crates/inline_completion_button",
    "crates/install_cli",
@@ -53,6 +53,7 @@ members = [
    "crates/live_kit_client",
    "crates/live_kit_server",
    "crates/lsp",
+    "crates/markdown",
    "crates/markdown_preview",
    "crates/media",
    "crates/menu",
@@ -75,6 +76,7 @@ members = [
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
+    "crates/rustdoc_to_markdown",
    "crates/task",
    "crates/tasks_ui",
    "crates/search",
@@ -127,6 +129,7 @@ members = [
    "extensions/php",
    "extensions/prisma",
    "extensions/purescript",
+    "extensions/ruby",
    "extensions/svelte",
    "extensions/terraform",
    "extensions/toml",
@@ -145,7 +148,7 @@ ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
-assistant2 = { path = "crates/assistant2" }
+assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_tooling = { path = "crates/assistant_tooling" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
@@ -182,6 +185,7 @@ google_ai = { path = "crates/google_ai" }
 gpui = { path = "crates/gpui" }
 gpui_macros = { path = "crates/gpui_macros" }
 headless = { path = "crates/headless" }
+http = { path = "crates/http" }
 install_cli = { path = "crates/install_cli" }
 image_viewer = { path = "crates/image_viewer" }
 inline_completion_button = { path = "crates/inline_completion_button" }
@@ -193,6 +197,7 @@ languages = { path = "crates/languages" }
 live_kit_client = { path = "crates/live_kit_client" }
 live_kit_server = { path = "crates/live_kit_server" }
 lsp = { path = "crates/lsp" }
+markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
 media = { path = "crates/media" }
 menu = { path = "crates/menu" }
@@ -216,6 +221,7 @@ dev_server_projects = { path = "crates/dev_server_projects" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
+rustdoc_to_markdown = { path = "crates/rustdoc_to_markdown" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
 search = { path = "crates/search" }
@@ -226,7 +232,7 @@ snippet = { path = "crates/snippet" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 supermaven = { path = "crates/supermaven" }
-supermaven_api = { path = "crates/supermaven_api"}
+supermaven_api = { path = "crates/supermaven_api" }
 story = { path = "crates/story" }
 storybook = { path = "crates/storybook" }
 sum_tree = { path = "crates/sum_tree" }
@@ -251,34 +257,39 @@ zed_actions = { path = "crates/zed_actions" }

 anyhow = "1.0.57"
 any_vec = "0.13"
+ashpd = "0.8.0"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-fs = "1.6"
 async-recursion = "1.0.0"
 async-tar = "0.4.2"
 async-trait = "0.1"
+async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 bitflags = "2.4.2"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
 cap-std = "3.0"
+cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
 clickhouse = { version = "0.11.6" }
 ctor = "0.2.6"
-ctrlc = "3.4.4"
+signal-hook = "0.3.17"
 core-foundation = { version = "0.9.3" }
 core-foundation-sys = "0.8.6"
 derive_more = "0.99.17"
 emojis = "0.6.1"
 env_logger = "0.9"
+exec = "0.3.1"
+fork = "0.1.23"
 futures = "0.3"
 futures-batch = "0.6.1"
 futures-lite = "1.13"
 git2 = { version = "0.18", default-features = false }
 globset = "0.4"
-heed = { git = "https://github.com/meilisearch/heed", rev = "036ac23f73a021894974b9adc815bc95b3e0482a", features = [
-    "read-txn-no-tls",
-] }
+heed = { version = "0.20.1", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
+html5ever = "0.27.0"
 ignore = "0.4.22"
 indoc = "1"
 # We explicitly disable http2 support in isahc.
@@ -288,13 +299,17 @@ isahc = { version = "1.7.2", default-features = false, features = [
 ] }
 itertools = "0.11.0"
 lazy_static = "1.4.0"
+libc = "0.2"
 linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde"] }
+markup5ever_rcdom = "0.3.0"
 nanoid = "0.4"
 nix = "0.28"
+once_cell = "1.19.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
+pathdiff = "0.2"
 profiling = "1"
 postage = { version = "0.5", features = ["futures-traits"] }
 pretty_assertions = "1.3.0"
@@ -305,8 +320,9 @@ pulldown-cmark = { version = "0.10.0", default-features = false }
 rand = "0.8.5"
 refineable = { path = "./crates/refineable" }
 regex = "1.5"
+repair_json = "0.1.0"
 rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
-rust-embed = { version = "8.0", features = ["include-exclude"] }
+rust-embed = { version = "8.4", features = ["include-exclude"] }
 schemars = "0.8"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -319,6 +335,7 @@ serde_json_lenient = { version = "0.1", features = [
 serde_repr = "0.1"
 sha2 = "0.10"
 shellexpand = "2.1.0"
+shlex = "1.3.0"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
 strum = { version = "0.25.0", features = ["derive"] }
@@ -326,7 +343,7 @@ subtle = "2.5.0"
 sysinfo = "0.30.7"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
-tiktoken-rs = "0.5.7"
+tiktoken-rs = "0.5.9"
 time = { version = "0.3", features = [
    "macros",
    "parsing",
@@ -338,33 +355,33 @@ toml = "0.8"
 tokio = { version = "1", features = ["full"] }
 tower-http = "0.4.4"
 tree-sitter = { version = "0.20", features = ["wasm"] }
-tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
+tree-sitter-bash = "0.20.5"
 tree-sitter-c = "0.20.1"
-tree-sitter-cpp = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "f44509141e7e483323d2ec178f2d2e6c0fc041c1" }
-tree-sitter-css = { git = "https://github.com/tree-sitter/tree-sitter-css", rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51" }
-tree-sitter-elixir = { git = "https://github.com/elixir-lang/tree-sitter-elixir", rev = "a2861e88a730287a60c11ea9299c033c7d076e30" }
+tree-sitter-cpp = "0.20.5"
+tree-sitter-css = "0.20"
+tree-sitter-elixir = "0.1.1"
 tree-sitter-embedded-template = "0.20.0"
-tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "aeb2f33b366fd78d5789ff104956ce23508b85db" }
-tree-sitter-gomod = { git = "https://github.com/camdencheek/tree-sitter-go-mod" }
+tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "b82ab803d887002a0af11f6ce63d72884580bf33" }
+tree-sitter-gomod = "1.0.1"
 tree-sitter-gowork = { git = "https://github.com/d1y/tree-sitter-go-work" }
 rustc-demangle = "0.1.23"
 tree-sitter-heex = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a" }
 tree-sitter-html = "0.19.0"
 tree-sitter-jsdoc = { git = "https://github.com/tree-sitter/tree-sitter-jsdoc", rev = "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55" }
-tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
+tree-sitter-json = "0.20.2"
 tree-sitter-markdown = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "330ecab87a3e3a7211ac69bbadc19eabecdb1cca" }
 tree-sitter-proto = { git = "https://github.com/rewinfrey/tree-sitter-proto", rev = "36d54f288aee112f13a67b550ad32634d0c2cb52" }
 tree-sitter-python = "0.20.2"
 tree-sitter-regex = "0.20.0"
 tree-sitter-ruby = "0.20.0"
 tree-sitter-rust = "0.20.3"
-tree-sitter-typescript = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev = "5d20856f34315b068c41edaee2ac8a100081d259" }
-tree-sitter-yaml = { git = "https://github.com/zed-industries/tree-sitter-yaml", rev = "f545a41f57502e1b5ddf2a6668896c1b0620f930" }
+tree-sitter-typescript = "0.20.5"
+tree-sitter-yaml = "0.0.1"
 unindent = "0.1.7"
 unicase = "2.6"
 unicode-segmentation = "1.10"
 url = "2.2"
-uuid = { version = "1.1.2", features = ["v4", "v5"] }
+uuid = { version = "1.1.2", features = ["v4", "v5", "serde"] }
 wasmparser = "0.201"
 wasm-encoder = "0.201"
 wasmtime = { version = "19.0.0", default-features = false, features = [
@@ -380,20 +397,22 @@ wit-component = "0.201"
 sys-locale = "0.3.1"

 [workspace.dependencies.windows]
-version = "0.53.0"
+version = "0.56.0"
 features = [
    "implement",
    "Foundation_Numerics",
+    "System",
+    "System_Threading",
    "Wdk_System_SystemServices",
    "Win32_Globalization",
    "Win32_Graphics_Direct2D",
    "Win32_Graphics_Direct2D_Common",
    "Win32_Graphics_DirectWrite",
+    "Win32_Graphics_Dwm",
    "Win32_Graphics_Dxgi_Common",
    "Win32_Graphics_Gdi",
    "Win32_Graphics_Imaging",
    "Win32_Graphics_Imaging_D2D",
-    "Win32_Media",
    "Win32_Security",
    "Win32_Security_Credentials",
    "Win32_Storage_FileSystem",
@@ -407,6 +426,7 @@ features = [
    "Win32_System_SystemServices",
    "Win32_System_Threading",
    "Win32_System_Time",
+    "Win32_System_WinRT",
    "Win32_UI_Controls",
    "Win32_UI_HiDpi",
    "Win32_UI_Input_Ime",
@@ -474,5 +494,10 @@ non_canonical_partial_ord_impl = "allow"
 reversed_empty_ranges = "allow"
 type_complexity = "allow"

+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(gles)', # used in gpui
+] }
+
 [workspace.metadata.cargo-machete]
 ignored = ["bindgen", "cbindgen", "prost_build", "serde"]
--- a/assets/icons/arrow_down_from_line.svg
+++ b/assets/icons/arrow_down_from_line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down-from-line"><path d="M19 3H5"/><path d="M12 21V7"/><path d="m6 15 6 6 6-6"/></svg>
--- a/assets/icons/arrow_up_from_line.svg
+++ b/assets/icons/arrow_up_from_line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-line"><path d="m18 9-6-6-6 6"/><path d="M12 3v14"/><path d="M5 21h14"/></svg>
--- a/assets/icons/countdown_timer.svg
+++ b/assets/icons/countdown_timer.svg
@@ -0,0 +1 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M13.15 7.49998C13.15 4.66458 10.9402 1.84998 7.50002 1.84998C4.7217 1.84998 3.34851 3.90636 2.76336 4.99997H4.5C4.77614 4.99997 5 5.22383 5 5.49997C5 5.77611 4.77614 5.99997 4.5 5.99997H1.5C1.22386 5.99997 1 5.77611 1 5.49997V2.49997C1 2.22383 1.22386 1.99997 1.5 1.99997C1.77614 1.99997 2 2.22383 2 2.49997V4.31318C2.70453 3.07126 4.33406 0.849976 7.50002 0.849976C11.5628 0.849976 14.15 4.18537 14.15 7.49998C14.15 10.8146 11.5628 14.15 7.50002 14.15C5.55618 14.15 3.93778 13.3808 2.78548 12.2084C2.16852 11.5806 1.68668 10.839 1.35816 10.0407C1.25306 9.78536 1.37488 9.49315 1.63024 9.38806C1.8856 9.28296 2.17781 9.40478 2.2829 9.66014C2.56374 10.3425 2.97495 10.9745 3.4987 11.5074C4.47052 12.4963 5.83496 13.15 7.50002 13.15C10.9402 13.15 13.15 10.3354 13.15 7.49998ZM7 10V5.00001H8V10H7Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -1,15 +1,15 @@
 {
  "stems": {
+    "Dockerfile": "docker",
    "Podfile": "ruby",
-    "Procfile": "heroku",
-    "Dockerfile": "docker"
+    "Procfile": "heroku"
  },
  "suffixes": {
-    "astro": "astro",
    "Emakefile": "erlang",
    "aac": "audio",
    "accdb": "storage",
    "app.src": "erlang",
+    "astro": "astro",
    "avi": "video",
    "avif": "image",
    "bak": "backup",
@@ -22,12 +22,12 @@
    "c": "c",
    "cc": "cpp",
    "cjs": "javascript",
+    "coffee": "coffeescript",
    "conf": "settings",
    "cpp": "cpp",
    "css": "css",
    "csv": "storage",
    "cts": "typescript",
-    "coffee": "coffeescript",
    "dart": "dart",
    "dat": "storage",
    "db": "storage",
@@ -57,14 +57,16 @@
    "gitkeep": "vcs",
    "gitmodules": "vcs",
    "go": "go",
+    "gql": "graphql",
    "graphql": "graphql",
+    "graphqls": "graphql",
    "h": "c",
-    "hpp": "cpp",
    "handlebars": "code",
    "hbs": "template",
    "heex": "elixir",
-    "heif": "image",
    "heic": "image",
+    "heif": "image",
+    "hpp": "cpp",
    "hrl": "erlang",
    "hs": "haskell",
    "htm": "template",
@@ -79,9 +81,9 @@
    "jpeg": "image",
    "jpg": "image",
    "js": "javascript",
-    "jsx": "react",
    "json": "storage",
    "jsonc": "storage",
+    "jsx": "react",
    "jxl": "image",
    "kt": "kotlin",
    "ldf": "storage",
@@ -96,9 +98,9 @@
    "mdf": "storage",
    "mdx": "document",
    "metadata": "code",
-    "mkv": "video",
    "mjs": "javascript",
    "mka": "audio",
+    "mkv": "video",
    "ml": "ocaml",
    "mli": "ocaml",
    "mov": "video",
@@ -107,8 +109,8 @@
    "mts": "typescript",
    "myd": "storage",
    "myi": "storage",
-    "nu": "terminal",
    "nim": "nim",
+    "nu": "terminal",
    "odp": "document",
    "ods": "document",
    "odt": "document",
@@ -130,33 +132,33 @@
    "psd": "image",
    "py": "python",
    "qoi": "image",
+    "r": "r",
    "rb": "ruby",
    "rebar.config": "erlang",
    "rkt": "code",
    "rs": "rust",
-    "r": "r",
    "rtf": "document",
    "sav": "storage",
+    "sc": "scala",
+    "scala": "scala",
    "scm": "code",
    "sdf": "storage",
    "sh": "terminal",
+    "sql": "storage",
    "sqlite": "storage",
    "svelte": "template",
    "svg": "image",
-    "sc": "scala",
-    "scala": "scala",
-    "sql": "storage",
    "swift": "swift",
+    "tcl": "tcl",
    "tf": "terraform",
    "tfvars": "terraform",
    "tiff": "image",
    "toml": "toml",
    "ts": "typescript",
    "tsv": "storage",
-    "ttf": "font",
    "tsx": "react",
+    "ttf": "font",
    "txt": "document",
-    "tcl": "tcl",
    "vue": "vue",
    "wav": "audio",
    "webm": "video",
@@ -188,27 +190,30 @@
    "audio": {
      "icon": "icons/file_icons/audio.svg"
    },
+    "bun": {
+      "icon": "icons/file_icons/bun.svg"
+    },
+    "c": {
+      "icon": "icons/file_icons/c.svg"
+    },
    "code": {
      "icon": "icons/file_icons/code.svg"
    },
+    "coffeescript": {
+      "icon": "icons/file_icons/coffeescript.svg"
+    },
    "collapsed_chevron": {
      "icon": "icons/file_icons/chevron_right.svg"
    },
    "collapsed_folder": {
      "icon": "icons/file_icons/folder.svg"
    },
-    "c": {
-      "icon": "icons/file_icons/c.svg"
-    },
    "cpp": {
      "icon": "icons/file_icons/cpp.svg"
    },
    "css": {
      "icon": "icons/file_icons/css.svg"
    },
-    "coffeescript": {
-      "icon": "icons/file_icons/coffeescript.svg"
-    },
    "dart": {
      "icon": "icons/file_icons/dart.svg"
    },
@@ -245,18 +250,18 @@
    "fsharp": {
      "icon": "icons/file_icons/fsharp.svg"
    },
-    "haskell": {
-      "icon": "icons/file_icons/haskell.svg"
-    },
-    "heroku": {
-      "icon": "icons/file_icons/heroku.svg"
-    },
    "go": {
      "icon": "icons/file_icons/go.svg"
    },
    "graphql": {
      "icon": "icons/file_icons/graphql.svg"
    },
+    "haskell": {
+      "icon": "icons/file_icons/haskell.svg"
+    },
+    "heroku": {
+      "icon": "icons/file_icons/heroku.svg"
+    },
    "image": {
      "icon": "icons/file_icons/image.svg"
    },
@@ -272,21 +277,18 @@
    "lock": {
      "icon": "icons/file_icons/lock.svg"
    },
-    "bun": {
-      "icon": "icons/file_icons/bun.svg"
-    },
    "log": {
      "icon": "icons/file_icons/info.svg"
    },
    "lua": {
      "icon": "icons/file_icons/lua.svg"
    },
-    "ocaml": {
-      "icon": "icons/file_icons/ocaml.svg"
-    },
    "nim": {
      "icon": "icons/file_icons/nim.svg"
    },
+    "ocaml": {
+      "icon": "icons/file_icons/ocaml.svg"
+    },
    "phoenix": {
      "icon": "icons/file_icons/phoenix.svg"
    },
@@ -314,36 +316,36 @@
    "rust": {
      "icon": "icons/file_icons/rust.svg"
    },
+    "scala": {
+      "icon": "icons/file_icons/scala.svg"
+    },
    "settings": {
      "icon": "icons/file_icons/settings.svg"
    },
    "storage": {
      "icon": "icons/file_icons/database.svg"
    },
-    "scala": {
-      "icon": "icons/file_icons/scala.svg"
-    },
    "swift": {
      "icon": "icons/file_icons/swift.svg"
    },
+    "tcl": {
+      "icon": "icons/file_icons/tcl.svg"
+    },
    "template": {
      "icon": "icons/file_icons/html.svg"
    },
-    "terraform": {
-      "icon": "icons/file_icons/terraform.svg"
-    },
    "terminal": {
      "icon": "icons/file_icons/terminal.svg"
    },
+    "terraform": {
+      "icon": "icons/file_icons/terraform.svg"
+    },
    "toml": {
      "icon": "icons/file_icons/toml.svg"
    },
    "typescript": {
      "icon": "icons/file_icons/typescript.svg"
    },
-    "tcl": {
-      "icon": "icons/file_icons/tcl.svg"
-    },
    "vcs": {
      "icon": "icons/file_icons/git.svg"
    },
--- a/assets/icons/history_rerun.svg
+++ b/assets/icons/history_rerun.svg
@@ -0,0 +1,5 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 6C1.5 6.89002 1.76392 7.76004 2.25839 8.50007C2.75285 9.24009 3.45566 9.81686 4.27792 10.1575C5.10019 10.4981 6.00499 10.5872 6.87791 10.4135C7.75082 10.2399 8.55264 9.81132 9.18198 9.18198C9.81132 8.55264 10.2399 7.75082 10.4135 6.87791C10.5872 6.00499 10.4981 5.10019 10.1575 4.27792C9.81686 3.45566 9.24009 2.75285 8.50007 2.25839C7.76004 1.76392 6.89002 1.5 6 1.5C4.74198 1.50473 3.53448 1.99561 2.63 2.87L1.5 4" stroke="#919081" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M1.5 1.5V4H4" stroke="#919081" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6 3.5V6L8 7" stroke="#919081" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/library.svg
+++ b/assets/icons/library.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-library"><path d="m16 6 4 14"/><path d="M12 6v14"/><path d="M8 8v12"/><path d="M4 4v16"/></svg>
--- a/assets/icons/rerun.svg
+++ b/assets/icons/rerun.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 12C3 9.61305 3.94821 7.32387 5.63604 5.63604C7.32387 3.94821 9.61305 3 12 3C14.516 3.00947 16.931 3.99122 18.74 5.74L21 8" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 3V8H16" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M21 12C21 14.3869 20.0518 16.6761 18.364 18.364C16.6761 20.0518 14.3869 21 12 21C9.48395 20.9905 7.06897 20.0088 5.26 18.26L3 16" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 16H3V21" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 9.37052C10 8.98462 10.4186 8.74419 10.7519 8.93863L15.2596 11.5681C15.5904 11.761 15.5904 12.2389 15.2596 12.4319L10.7519 15.0614C10.4186 15.2558 10 15.0154 10 14.6295V9.37052Z" fill="black"/>
+</svg>
--- a/assets/icons/reveal.svg
+++ b/assets/icons/reveal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-folder-search"><circle cx="17" cy="17" r="3"/><path d="M10.7 20H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h3.9a2 2 0 0 1 1.69.9l.81 1.2a2 2 0 0 0 1.67.9H20a2 2 0 0 1 2 2v4.1"/><path d="m21 21-1.5-1.5"/></svg>
--- a/assets/icons/save.svg
+++ b/assets/icons/save.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-save"><path d="M15.2 3a2 2 0 0 1 1.4.6l3.8 3.8a2 2 0 0 1 .6 1.4V19a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2z"/><path d="M17 21v-7a1 1 0 0 0-1-1H8a1 1 0 0 0-1 1v7"/><path d="M7 3v4a1 1 0 0 0 1 1h7"/></svg>
--- a/assets/icons/triangle_right.svg
+++ b/assets/icons/triangle_right.svg
@@ -0,0 +1 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6 11L6 4L10.5 7.5L6 11Z" fill="currentColor"></path></svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -53,7 +53,9 @@
      // "alt-d": "editor::DeleteToNextWordEnd",
      "ctrl-x": "editor::Cut",
      "ctrl-c": "editor::Copy",
+      "ctrl-insert": "editor::Copy",
      "ctrl-v": "editor::Paste",
+      "shift-insert": "editor::Paste",
      "ctrl-z": "editor::Undo",
      "ctrl-shift-z": "editor::Redo",
      "up": "editor::MoveUp",
@@ -189,11 +191,18 @@
      "ctrl-shift-enter": "editor::NewlineBelow"
    }
  },
+  {
+    "context": "Markdown",
+    "bindings": {
+      "ctrl-c": "markdown::Copy"
+    }
+  },
  {
    "context": "AssistantPanel",
    "bindings": {
      "ctrl-g": "search::SelectNextMatch",
-      "ctrl-shift-g": "search::SelectPrevMatch"
+      "ctrl-shift-g": "search::SelectPrevMatch",
+      "alt-m": "assistant::ToggleModelSelector"
    }
  },
  {
@@ -203,7 +212,9 @@
      "ctrl-s": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole"
+      "ctrl-r": "assistant::CycleMessageRole",
+      "enter": "assistant::ConfirmCommand",
+      "alt-enter": "editor::Newline"
    }
  },
  {
@@ -493,6 +504,12 @@
      "tab": "editor::ConfirmCompletion"
    }
  },
+  {
+    "context": "Editor && inline_completion && !showing_completions",
+    "bindings": {
+      "tab": "editor::AcceptInlineCompletion"
+    }
+  },
  {
    "context": "Editor && showing_code_actions",
    "bindings": {
@@ -546,15 +563,17 @@
      "alt-ctrl-n": "project_panel::NewDirectory",
      "ctrl-x": "project_panel::Cut",
      "ctrl-c": "project_panel::Copy",
+      "ctrl-insert": "project_panel::Copy",
      "ctrl-v": "project_panel::Paste",
+      "shift-insert": "project_panel::Paste",
      "ctrl-alt-c": "project_panel::CopyPath",
      "alt-ctrl-shift-c": "project_panel::CopyRelativePath",
      "f2": "project_panel::Rename",
      "enter": "project_panel::Rename",
      "backspace": "project_panel::Trash",
      "delete": "project_panel::Trash",
-      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": true }],
-      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": true }],
+      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
+      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFinder",
      "alt-shift-f": "project_panel::NewSearchInDirectory"
    }
@@ -608,7 +627,9 @@
    "bindings": {
      "ctrl-alt-space": "terminal::ShowCharacterPalette",
      "shift-ctrl-c": "terminal::Copy",
+      "ctrl-insert": "terminal::Copy",
      "shift-ctrl-v": "terminal::Paste",
+      "shift-insert": "terminal::Paste",
      "up": ["terminal::SendKeystroke", "up"],
      "pageup": ["terminal::SendKeystroke", "pageup"],
      "down": ["terminal::SendKeystroke", "down"],
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -19,9 +19,6 @@
      "cmd-escape": "menu::Cancel",
      "ctrl-escape": "menu::Cancel",
      "ctrl-c": "menu::Cancel",
-      "shift-enter": "picker::UseSelectedQuery",
-      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
-      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }],
      "cmd-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
      "cmd-o": "workspace::Open",
@@ -211,18 +208,17 @@
    }
  },
  {
-    "context": "AssistantChat > Editor", // Used in the assistant2 crate
+    "context": "Markdown",
    "bindings": {
-      "enter": ["assistant2::Submit", "Simple"],
-      "cmd-enter": ["assistant2::Submit", "Codebase"],
-      "escape": "assistant2::Cancel"
+      "cmd-c": "markdown::Copy"
    }
  },
  {
-    "context": "AssistantPanel", // Used in the assistant crate, which we're replacing
+    "context": "AssistantPanel",
    "bindings": {
      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPrevMatch"
+      "cmd-shift-g": "search::SelectPrevMatch",
+      "alt-m": "assistant::ToggleModelSelector"
    }
  },
  {
@@ -232,7 +228,9 @@
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole"
+      "ctrl-r": "assistant::CycleMessageRole",
+      "enter": "assistant::ConfirmCommand",
+      "alt-enter": "editor::Newline"
    }
  },
  {
@@ -520,6 +518,12 @@
      "tab": "editor::ConfirmCompletion"
    }
  },
+  {
+    "context": "Editor && inline_completion && !showing_completions",
+    "bindings": {
+      "tab": "editor::AcceptInlineCompletion"
+    }
+  },
  {
    "context": "Editor && showing_code_actions",
    "bindings": {
@@ -576,14 +580,16 @@
      "cmd-v": "project_panel::Paste",
      "cmd-alt-c": "project_panel::CopyPath",
      "alt-cmd-shift-c": "project_panel::CopyRelativePath",
-      "f2": "project_panel::Rename",
      "enter": "project_panel::Rename",
-      "backspace": "project_panel::Trash",
-      "delete": "project_panel::Trash",
-      "cmd-backspace": ["project_panel::Delete", { "skip_prompt": true }],
-      "cmd-delete": ["project_panel::Delete", { "skip_prompt": true }],
+      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
+      "delete": ["project_panel::Trash", { "skip_prompt": false }],
+      "cmd-backspace": ["project_panel::Delete", { "skip_prompt": false }],
+      "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-cmd-r": "project_panel::RevealInFinder",
-      "alt-shift-f": "project_panel::NewSearchInDirectory"
+      "alt-shift-f": "project_panel::NewSearchInDirectory",
+      "shift-down": "menu::SelectNext",
+      "shift-up": "menu::SelectPrev",
+      "escape": "menu::Cancel"
    }
  },
  {
@@ -630,6 +636,14 @@
      "ctrl-backspace": "tab_switcher::CloseSelectedItem"
    }
  },
+  {
+    "context": "Picker",
+    "bindings": {
+      "alt-e": "picker::UseSelectedQuery",
+      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
+      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
+    }
+  },
  {
    "context": "Terminal",
    "bindings": {
--- a/assets/keymaps/jetbrains.json
+++ b/assets/keymaps/jetbrains.json
@@ -53,7 +53,6 @@
      "cmd-alt-b": "editor::GoToDefinitionSplit",
      "cmd-shift-b": "editor::GoToTypeDefinition",
      "cmd-alt-shift-b": "editor::GoToTypeDefinitionSplit",
-      "alt-enter": "editor::ToggleCodeActions",
      "f2": "editor::GoToDiagnostic",
      "cmd-f2": "editor::GoToPrevDiagnostic",
      "ctrl-alt-shift-down": "editor::GoToHunk",
@@ -70,7 +69,8 @@
      "cmd-f12": "outline::Toggle",
      "cmd-7": "outline::Toggle",
      "cmd-shift-o": "file_finder::Toggle",
-      "cmd-l": "go_to_line::Toggle"
+      "cmd-l": "go_to_line::Toggle",
+      "alt-enter": "editor::ToggleCodeActions"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -1,4 +1,10 @@
 [
+  {
+    "context": "ProjectPanel || Editor",
+    "bindings": {
+      "ctrl-6": "pane::AlternateFile"
+    }
+  },
  {
    "context": "Editor && VimControl && !VimWaiting && !menu",
    "bindings": {
@@ -117,6 +123,9 @@
          }
        }
      ],
+      "m": ["vim::PushOperator", "Mark"],
+      "'": ["vim::PushOperator", { "Jump": { "line": true } }],
+      "`": ["vim::PushOperator", { "Jump": { "line": false } }],
      ";": "vim::RepeatFind",
      ",": "vim::RepeatFindReversed",
      "ctrl-o": "pane::GoBack",
@@ -146,6 +155,7 @@
      "g shift-t": "pane::ActivatePrevItem",
      "g d": "editor::GoToDefinition",
      "g shift-d": "editor::GoToTypeDefinition",
+      "g cmd-d": "editor::GoToImplementation",
      "g x": "editor::OpenUrl",
      "g n": "vim::SelectNextMatch",
      "g shift-n": "vim::SelectPreviousMatch",
@@ -237,6 +247,9 @@
      ],
      "g ]": "editor::GoToDiagnostic",
      "g [": "editor::GoToPrevDiagnostic",
+      "g i": ["workspace::SendKeystrokes", "` ^ i"],
+      "g ,": "vim::ChangeListNewer",
+      "g ;": "vim::ChangeListOlder",
      "shift-h": "vim::WindowTop",
      "shift-m": "vim::WindowMiddle",
      "shift-l": "vim::WindowBottom",
@@ -372,7 +385,11 @@
      "ctrl-pageup": "pane::ActivatePrevItem",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode"
+      "] x": "editor::SelectSmallerSyntaxNode",
+      "] d": "editor::GoToDiagnostic",
+      "[ d": "editor::GoToPrevDiagnostic",
+      "] c": "editor::GoToHunk",
+      "[ c": "editor::GoToPrevHunk"
    }
  },
  {
@@ -481,8 +498,8 @@
      "shift-o": "vim::OtherEnd",
      "d": "vim::VisualDelete",
      "x": "vim::VisualDelete",
-      "shift-d": "vim::VisualDelete",
-      "shift-x": "vim::VisualDelete",
+      "shift-d": "vim::VisualDeleteLine",
+      "shift-x": "vim::VisualDeleteLine",
      "y": "vim::VisualYank",
      "shift-y": "vim::VisualYank",
      "p": "vim::Paste",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1,5 +1,18 @@
 {
-  // The name of the Zed theme to use for the UI
+  // The name of the Zed theme to use for the UI.
+  //
+  // The theme can also be set to follow system preferences:
+  //
+  // "theme": {
+  //   "mode": "system",
+  //   "light": "One Light",
+  //   "dark": "One Dark"
+  // }
+  //
+  // Where `mode` is one of:
+  // - "system": Use the theme that corresponds to the system's appearance
+  // - "light": Use the theme indicated by the "light" field
+  // - "dark": Use the theme indicated by the "dark" field
  "theme": "One Dark",
  // The name of a base set of key bindings to use.
  // This setting can take four values, each named after another
@@ -24,6 +37,8 @@
  },
  // The default font size for text in the editor
  "buffer_font_size": 15,
+  // The weight of the editor font in standard CSS units from 100 to 900.
+  "buffer_font_weight": 400,
  // Set the buffer's line height.
  // May take 3 values:
  //  1. Use a line height that's comfortable for reading (1.618)
@@ -42,6 +57,8 @@
    // Disable ligatures:
    "calt": false
  },
+  // The weight of the UI font in standard CSS units from 100 to 900.
+  "ui_font_weight": 400,
  // The default font size for text in the UI
  "ui_font_size": 16,
  // The factor to grow the active pane by. Defaults to 1.0
@@ -71,8 +88,28 @@
  "restore_on_startup": "last_workspace",
  // Size of the drop target in the editor.
  "drop_target_size": 0.2,
+  // Whether the window should be closed when using 'close active item' on a window with no tabs.
+  // May take 3 values:
+  //  1. Use the current platform's convention
+  //         "when_closing_with_no_tabs": "platform_default"
+  //  2. Always close the window:
+  //         "when_closing_with_no_tabs": "close_window",
+  //  3. Never close the window
+  //         "when_closing_with_no_tabs": "keep_window_open",
+  "when_closing_with_no_tabs": "platform_default",
  // Whether the cursor blinks in the editor.
  "cursor_blink": true,
+  // How to highlight the current line in the editor.
+  //
+  // 1. Don't highlight the current line:
+  //    "none"
+  // 2. Highlight the gutter area:
+  //    "gutter"
+  // 3. Highlight the editor area:
+  //    "line"
+  // 4. Highlight the full line (default):
+  //    "all"
+  "current_line_highlight": "all",
  // Whether to pop the completions menu while typing in an editor without
  // explicitly requesting it.
  "show_completions_on_input": true,
@@ -91,6 +128,8 @@
  "wrap_guides": [],
  // Hide the values of in variables from visual display in private files
  "redact_private_values": false,
+  // The default number of lines to expand excerpts in the multibuffer by.
+  "expand_excerpt_lines": 3,
  // Globs to match against file paths to determine if a file is private.
  "private_files": [
    "**/.env*",
@@ -131,7 +170,7 @@
    // Join calls with the microphone live by default
    "mute_on_join": false,
    // Share your project when you are the first to join a channel
-    "share_on_join": true
+    "share_on_join": false
  },
  // Toolbar related settings
  "toolbar": {
@@ -183,6 +222,25 @@
    // Whether to show fold buttons in the gutter.
    "folds": true
  },
+  "indent_guides": {
+    /// Whether to show indent guides in the editor.
+    "enabled": true,
+    /// The width of the indent guides in pixels, between 1 and 10.
+    "line_width": 1,
+    /// Determines how indent guides are colored.
+    /// This setting can take the following three values:
+    ///
+    /// 1. "disabled"
+    /// 2. "fixed"
+    /// 3. "indent_aware"
+    "coloring": "fixed",
+    /// Determines how indent guide backgrounds are colored.
+    /// This setting can take the following two values:
+    ///
+    /// 1. "disabled"
+    /// 2. "indent_aware"
+    "background_coloring": "disabled"
+  },
  // The number of lines to keep above/below the cursor when scrolling.
  "vertical_scroll_margin": 3,
  // Scroll sensitivity multiplier. This multiplier is applied
@@ -283,13 +341,14 @@
    // AI provider.
    "provider": {
      "name": "openai",
-      // The default model to use when starting new conversations. This
+      // The default model to use when creating new contexts. This
      // setting can take three values:
      //
      // 1. "gpt-3.5-turbo"
      // 2. "gpt-4"
      // 3. "gpt-4-turbo-preview"
-      "default_model": "gpt-4-turbo-preview"
+      // 4. "gpt-4o"
+      "default_model": "gpt-4o"
    }
  },
  // Whether the screen sharing icon is shown in the os status bar.
@@ -299,9 +358,7 @@
  // The list of language servers to use (or disable) for all languages.
  //
  // This is typically customized on a per-language basis.
-  "language_servers": [
-    "..."
-  ],
+  "language_servers": ["..."],
  // When to automatically save edited buffers. This setting can
  // take four values.
  //
@@ -349,6 +406,8 @@
  // when saving it.
  "ensure_final_newline_on_save": true,
  // Whether or not to perform a buffer format before saving
+  //
+  // Keep in mind, if the autosave with delay is enabled, format_on_save will be ignored
  "format_on_save": "on",
  // How to perform a buffer format. This setting can take 4 values:
  //
@@ -434,9 +493,7 @@
  "copilot": {
    // The set of glob patterns for which copilot should be disabled
    // in any matching file.
-    "disabled_globs": [
-      ".env"
-    ]
+    "disabled_globs": [".env"]
  },
  // Settings specific to journaling
  "journal": {
@@ -465,7 +522,7 @@
    //         }
    //     }
    "shell": "system",
-    // Where to dock terminals panel. Can be 'left', 'right', 'bottom'.
+    // Where to dock terminals panel. Can be `left`, `right`, `bottom`.
    "dock": "bottom",
    // Default width when the terminal is docked to the left or right.
    "default_width": 640,
@@ -547,13 +604,8 @@
        // Default directories to search for virtual environments, relative
        // to the current working directory. We recommend overriding this
        // in your project's settings, rather than globally.
-        "directories": [
-          ".env",
-          "env",
-          ".venv",
-          "venv"
-        ],
-        // Can also be 'csh', 'fish', and `nushell`
+        "directories": [".env", "env", ".venv", "venv"],
+        // Can also be `csh`, `fish`, and `nushell`
        "activate_script": "default"
      }
    },
@@ -578,7 +630,7 @@
  // use those languages.
  //
  // For example, to treat files like `foo.notjs` as JavaScript,
-  // and 'Embargo.lock' as TOML:
+  // and `Embargo.lock` as TOML:
  //
  // {
  //   "JavaScript": ["notjs"],
@@ -595,19 +647,30 @@
  },
  // Different settings for specific languages.
  "languages": {
-    "C++": {
-      "format_on_save": "off"
+    "Astro": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["prettier-plugin-astro"]
+      }
+    },
+    "Blade": {
+      "prettier": {
+        "allowed": true
+      }
    },
    "C": {
      "format_on_save": "off"
    },
+    "C++": {
+      "format_on_save": "off"
+    },
+    "CSS": {
+      "prettier": {
+        "allowed": true
+      }
+    },
    "Elixir": {
-      "language_servers": [
-        "elixir-ls",
-        "!next-ls",
-        "!lexical",
-        "..."
-      ]
+      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
    },
    "Gleam": {
      "tab_size": 2
@@ -617,29 +680,120 @@
        "source.organizeImports": true
      }
    },
+    "GraphQL": {
+      "prettier": {
+        "allowed": true
+      }
+    },
    "HEEX": {
-      "language_servers": [
-        "elixir-ls",
-        "!next-ls",
-        "!lexical",
-        "..."
-      ]
+      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
+    },
+    "HTML": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "Java": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["prettier-plugin-java"]
+      }
+    },
+    "JavaScript": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "JSON": {
+      "prettier": {
+        "allowed": true
+      }
    },
    "Make": {
      "hard_tabs": true
    },
    "Markdown": {
-      "format_on_save": "off"
+      "format_on_save": "off",
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "PHP": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["@prettier/plugin-php"]
+      }
    },
    "Prisma": {
      "tab_size": 2
+    },
+    "Ruby": {
+      "language_servers": ["solargraph", "!ruby-lsp", "..."]
+    },
+    "SCSS": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "SQL": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["prettier-plugin-sql"]
+      }
+    },
+    "Svelte": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["prettier-plugin-svelte"]
+      }
+    },
+    "TSX": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "Twig": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "TypeScript": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "Vue.js": {
+      "prettier": {
+        "allowed": true
+      }
+    },
+    "XML": {
+      "prettier": {
+        "allowed": true,
+        "plugins": ["@prettier/plugin-xml"]
+      }
+    },
+    "YAML": {
+      "prettier": {
+        "allowed": true
+      }
    }
  },
  // Zed's Prettier integration settings.
-  // If Prettier is enabled, Zed will use this for its Prettier instance for any applicable file, if
-  // project has no other Prettier installed.
+  // Allows to enable/disable formatting with Prettier
+  // and configure default Prettier, used when no project-level Prettier installation is found.
  "prettier": {
-    // Use regular Prettier json configuration:
+    // // Whether to consider prettier formatter or not when attempting to format a file.
+    // "allowed": false,
+    //
+    // // Use regular Prettier json configuration.
+    // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
+    // // the project has no other Prettier installed.
+    // "plugins": [],
+    //
+    // // Use regular Prettier json configuration.
+    // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
+    // // the project has no other Prettier installed.
    // "trailingComma": "es5",
    // "tabWidth": 4,
    // "semi": false,
@@ -697,5 +851,17 @@
  //   - `short`: "2 s, 15 l, 32 c"
  //   - `long`: "2 selections, 15 lines, 32 characters"
  // Default: long
-  "line_indicator_format": "long"
+  "line_indicator_format": "long",
+  // Set a proxy to use. The proxy protocol is specified by the URI scheme.
+  //
+  // Supported URI scheme: `http`, `https`, `socks4`, `socks4a`, `socks5`,
+  // `socks5h`. `http` will be used when no scheme is specified.
+  //
+  // By default no proxy will be used, or Zed will try get proxy settings from
+  // environment variables.
+  //
+  // Examples:
+  //   - "proxy": "socks5://localhost:10808"
+  //   - "proxy": "http://127.0.0.1:10809"
+  "proxy": null
 }
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -5,6 +5,15 @@
    {
      "name": "Gruvbox Dark",
      "appearance": "dark",
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
      "style": {
        "border": "#5b534dff",
        "border.variant": "#494340ff",
@@ -379,6 +388,15 @@
    {
      "name": "Gruvbox Dark Hard",
      "appearance": "dark",
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
      "style": {
        "border": "#5b534dff",
        "border.variant": "#494340ff",
@@ -753,6 +771,15 @@
    {
      "name": "Gruvbox Dark Soft",
      "appearance": "dark",
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
      "style": {
        "border": "#5b534dff",
        "border.variant": "#494340ff",
@@ -1127,6 +1154,15 @@
    {
      "name": "Gruvbox Light",
      "appearance": "light",
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
      "style": {
        "border": "#c8b899ff",
        "border.variant": "#ddcca7ff",
@@ -1501,6 +1537,15 @@
    {
      "name": "Gruvbox Light Hard",
      "appearance": "light",
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
      "style": {
        "border": "#c8b899ff",
        "border.variant": "#ddcca7ff",
@@ -1875,6 +1920,15 @@
    {
      "name": "Gruvbox Light Soft",
      "appearance": "light",
+      "accents": [
+        "#cc241dff",
+        "#98971aff",
+        "#d79921ff",
+        "#458588ff",
+        "#b16286ff",
+        "#689d6aff",
+        "#d65d0eff"
+      ],
      "style": {
        "border": "#c8b899ff",
        "border.variant": "#ddcca7ff",
--- a/crates/anthropic/Cargo.toml
+++ b/crates/anthropic/Cargo.toml
@@ -5,6 +5,10 @@ edition = "2021"
 publish = false
 license = "AGPL-3.0-or-later"

+[features]
+default = []
+schemars = ["dep:schemars"]
+
 [lints]
 workspace = true

@@ -14,9 +18,12 @@ path = "src/anthropic.rs"
 [dependencies]
 anyhow.workspace = true
 futures.workspace = true
+http.workspace = true
+isahc.workspace = true
+schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
-util.workspace = true
+strum.workspace = true

 [dev-dependencies]
 tokio.workspace = true
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -1,17 +1,22 @@
 use anyhow::{anyhow, Result};
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, StreamExt};
+use http::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use isahc::config::Configurable;
 use serde::{Deserialize, Serialize};
-use std::{convert::TryFrom, sync::Arc};
-use util::http::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use std::{convert::TryFrom, time::Duration};
+use strum::EnumIter;

-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
+pub const ANTHROPIC_API_URL: &'static str = "https://api.anthropic.com";
+
+#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
 pub enum Model {
    #[default]
-    #[serde(rename = "claude-3-opus-20240229")]
+    #[serde(alias = "claude-3-opus", rename = "claude-3-opus-20240229")]
    Claude3Opus,
-    #[serde(rename = "claude-3-sonnet-20240229")]
+    #[serde(alias = "claude-3-sonnet", rename = "claude-3-sonnet-20240229")]
    Claude3Sonnet,
-    #[serde(rename = "claude-3-haiku-20240307")]
+    #[serde(alias = "claude-3-haiku", rename = "claude-3-haiku-20240307")]
    Claude3Haiku,
 }

@@ -28,6 +33,14 @@ impl Model {
        }
    }

+    pub fn id(&self) -> &'static str {
+        match self {
+            Model::Claude3Opus => "claude-3-opus-20240229",
+            Model::Claude3Sonnet => "claude-3-sonnet-20240229",
+            Model::Claude3Haiku => "claude-3-opus-20240307",
+        }
+    }
+
    pub fn display_name(&self) -> &'static str {
        match self {
            Self::Claude3Opus => "Claude 3 Opus",
@@ -141,20 +154,24 @@ pub enum TextDelta {
 }

 pub async fn stream_completion(
-    client: Arc<dyn HttpClient>,
+    client: &dyn HttpClient,
    api_url: &str,
    api_key: &str,
    request: Request,
+    low_speed_timeout: Option<Duration>,
 ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
    let uri = format!("{api_url}/v1/messages");
-    let request = HttpRequest::builder()
+    let mut request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
        .header("Anthropic-Version", "2023-06-01")
-        .header("Anthropic-Beta", "messages-2023-12-15")
+        .header("Anthropic-Beta", "tools-2024-04-04")
        .header("X-Api-Key", api_key)
-        .header("Content-Type", "application/json")
-        .body(AsyncBody::from(serde_json::to_string(&request)?))?;
+        .header("Content-Type", "application/json");
+    if let Some(low_speed_timeout) = low_speed_timeout {
+        request_builder = request_builder.low_speed_timeout(100, low_speed_timeout);
+    }
+    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
    let mut response = client.send(request).await?;
    if response.status().is_success() {
        let reader = BufReader::new(response.into_body());
@@ -196,7 +213,7 @@ pub async fn stream_completion(
 // #[cfg(test)]
 // mod tests {
 //     use super::*;
-//     use util::http::IsahcHttpClient;
+//     use http::IsahcHttpClient;

 //     #[tokio::test]
 //     async fn stream_completion_success() {
--- a/crates/assets/src/assets.rs
+++ b/crates/assets/src/assets.rs
@@ -16,9 +16,9 @@ use rust_embed::RustEmbed;
 pub struct Assets;

 impl AssetSource for Assets {
-    fn load(&self, path: &str) -> Result<std::borrow::Cow<'static, [u8]>> {
+    fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
        Self::get(path)
-            .map(|f| f.data)
+            .map(|f| Some(f.data))
            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
    }

@@ -42,7 +42,10 @@ impl Assets {
        let mut embedded_fonts = Vec::new();
        for font_path in font_paths {
            if font_path.ends_with(".ttf") {
-                let font_bytes = cx.asset_source().load(&font_path)?;
+                let font_bytes = cx
+                    .asset_source()
+                    .load(&font_path)?
+                    .expect("Assets should never return None");
                embedded_fonts.push(font_bytes);
            }
        }
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -5,21 +5,30 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"

+[lints]
+workspace = true
+
 [lib]
 path = "src/assistant.rs"
 doctest = false

 [dependencies]
 anyhow.workspace = true
+anthropic = { workspace = true, features = ["schemars"] }
+assistant_slash_command.workspace = true
+cargo_toml.workspace = true
 chrono.workspace = true
 client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 editor.workspace = true
+feature_flags.workspace = true
 file_icons.workspace = true
 fs.workspace = true
 futures.workspace = true
+fuzzy.workspace = true
 gpui.workspace = true
+http.workspace = true
 indoc.workspace = true
 language.workspace = true
 log.workspace = true
@@ -30,19 +39,27 @@ ordered-float.workspace = true
 parking_lot.workspace = true
 project.workspace = true
 regex.workspace = true
+rope.workspace = true
+rustdoc_to_markdown.workspace = true
 schemars.workspace = true
 search.workspace = true
+semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
+strsim = "0.11"
+strum.workspace = true
 telemetry_events.workspace = true
 theme.workspace = true
 tiktoken-rs.workspace = true
+toml.workspace = true
 ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
+picker.workspace = true
+gray_matter = "0.2.7"

 [dev-dependencies]
 ctor.workspace = true
@@ -51,3 +68,4 @@ env_logger.workspace = true
 log.workspace = true
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
+unindent.workspace = true
--- a/crates/assistant/features.zmd
+++ b/crates/assistant/features.zmd
@@ -1,3 +0,0 @@
-Push content to a deeper layer.
-A context can have multiple sublayers.
-You can enable or disable arbitrary sublayers at arbitrary nesting depths when viewing the document.
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -2,31 +2,34 @@ pub mod assistant_panel;
 pub mod assistant_settings;
 mod codegen;
 mod completion_provider;
+mod model_selector;
 mod prompts;
 mod saved_conversation;
+mod search;
+mod slash_command;
 mod streaming_diff;

-mod embedded_scope;
-
 pub use assistant_panel::AssistantPanel;
-use assistant_settings::{AssistantSettings, OpenAiModel, ZedDotDevModel};
-use chrono::{DateTime, Local};
+
+use assistant_settings::{AnthropicModel, AssistantSettings, OpenAiModel, ZedDotDevModel};
 use client::{proto, Client};
 use command_palette_hooks::CommandPaletteFilter;
 pub(crate) use completion_provider::*;
-use gpui::{actions, AppContext, BorrowAppContext, Global, SharedString};
+use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
+pub(crate) use model_selector::*;
 pub(crate) use saved_conversation::*;
+use semantic_index::{CloudEmbeddingProvider, SemanticIndex};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore};
 use std::{
    fmt::{self, Display},
    sync::Arc,
 };
+use util::paths::EMBEDDINGS_DIR;

 actions!(
    assistant,
    [
-        NewConversation,
        Assist,
        Split,
        CycleMessageRole,
@@ -34,7 +37,11 @@ actions!(
        ToggleFocus,
        ResetKey,
        InlineAssist,
-        ToggleIncludeConversation,
+        InsertActivePrompt,
+        ToggleHistory,
+        ApplyEdit,
+        ConfirmCommand,
+        ToggleModelSelector
    ]
 );

@@ -75,6 +82,7 @@ impl Display for Role {
 pub enum LanguageModel {
    ZedDotDev(ZedDotDevModel),
    OpenAi(OpenAiModel),
+    Anthropic(AnthropicModel),
 }

 impl Default for LanguageModel {
@@ -87,20 +95,23 @@ impl LanguageModel {
    pub fn telemetry_id(&self) -> String {
        match self {
            LanguageModel::OpenAi(model) => format!("openai/{}", model.id()),
+            LanguageModel::Anthropic(model) => format!("anthropic/{}", model.id()),
            LanguageModel::ZedDotDev(model) => format!("zed.dev/{}", model.id()),
        }
    }

    pub fn display_name(&self) -> String {
        match self {
-            LanguageModel::OpenAi(model) => format!("openai/{}", model.display_name()),
-            LanguageModel::ZedDotDev(model) => format!("zed.dev/{}", model.display_name()),
+            LanguageModel::OpenAi(model) => model.display_name().into(),
+            LanguageModel::Anthropic(model) => model.display_name().into(),
+            LanguageModel::ZedDotDev(model) => model.display_name().into(),
        }
    }

    pub fn max_token_count(&self) -> usize {
        match self {
            LanguageModel::OpenAi(model) => model.max_token_count(),
+            LanguageModel::Anthropic(model) => model.max_token_count(),
            LanguageModel::ZedDotDev(model) => model.max_token_count(),
        }
    }
@@ -108,6 +119,7 @@ impl LanguageModel {
    pub fn id(&self) -> &str {
        match self {
            LanguageModel::OpenAi(model) => model.id(),
+            LanguageModel::Anthropic(model) => model.id(),
            LanguageModel::ZedDotDev(model) => model.id(),
        }
    }
@@ -178,7 +190,6 @@ pub struct LanguageModelChoiceDelta {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 struct MessageMetadata {
    role: Role,
-    sent_at: DateTime<Local>,
    status: MessageStatus,
 }

@@ -225,19 +236,35 @@ impl Assistant {
 pub fn init(client: Arc<Client>, cx: &mut AppContext) {
    cx.set_global(Assistant::default());
    AssistantSettings::register(cx);
+
+    cx.spawn(|mut cx| {
+        let client = client.clone();
+        async move {
+            let embedding_provider = CloudEmbeddingProvider::new(client.clone());
+            let semantic_index = SemanticIndex::new(
+                EMBEDDINGS_DIR.join("semantic-index-db.0.mdb"),
+                Arc::new(embedding_provider),
+                &mut cx,
+            )
+            .await?;
+            cx.update(|cx| cx.set_global(semantic_index))
+        }
+    })
+    .detach();
    completion_provider::init(client, cx);
+    assistant_slash_command::init(cx);
    assistant_panel::init(cx);

    CommandPaletteFilter::update_global(cx, |filter, _cx| {
        filter.hide_namespace(Assistant::NAMESPACE);
    });
-    cx.update_global(|assistant: &mut Assistant, cx: &mut AppContext| {
+    Assistant::update_global(cx, |assistant, cx| {
        let settings = AssistantSettings::get_global(cx);

        assistant.set_enabled(settings.enabled, cx);
    });
    cx.observe_global::<SettingsStore>(|cx| {
-        cx.update_global(|assistant: &mut Assistant, cx: &mut AppContext| {
+        Assistant::update_global(cx, |assistant, cx| {
            let settings = AssistantSettings::get_global(cx);

            assistant.set_enabled(settings.enabled, cx);
--- 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,5 +1,6 @@
 use std::fmt;

+pub use anthropic::Model as AnthropicModel;
 use gpui::Pixels;
 pub use open_ai::Model as OpenAiModel;
 use schemars::{
@@ -11,13 +12,17 @@ use serde::{
    Deserialize, Deserializer, Serialize, Serializer,
 };
 use settings::{Settings, SettingsSources};
+use strum::{EnumIter, IntoEnumIterator};

-#[derive(Clone, Debug, Default, PartialEq)]
+use crate::LanguageModel;
+
+#[derive(Clone, Debug, Default, PartialEq, EnumIter)]
 pub enum ZedDotDevModel {
    Gpt3Point5Turbo,
    Gpt4,
-    #[default]
    Gpt4Turbo,
+    #[default]
+    Gpt4Omni,
    Claude3Opus,
    Claude3Sonnet,
    Claude3Haiku,
@@ -51,12 +56,10 @@ impl<'de> Deserialize<'de> for ZedDotDevModel {
            where
                E: de::Error,
            {
-                match value {
-                    "gpt-3.5-turbo" => Ok(ZedDotDevModel::Gpt3Point5Turbo),
-                    "gpt-4" => Ok(ZedDotDevModel::Gpt4),
-                    "gpt-4-turbo-preview" => Ok(ZedDotDevModel::Gpt4Turbo),
-                    _ => Ok(ZedDotDevModel::Custom(value.to_owned())),
-                }
+                let model = ZedDotDevModel::iter()
+                    .find(|model| model.id() == value)
+                    .unwrap_or_else(|| ZedDotDevModel::Custom(value.to_string()));
+                Ok(model)
            }
        }

@@ -70,23 +73,23 @@ impl JsonSchema for ZedDotDevModel {
    }

    fn json_schema(_generator: &mut schemars::gen::SchemaGenerator) -> Schema {
-        let variants = vec![
-            "gpt-3.5-turbo".to_owned(),
-            "gpt-4".to_owned(),
-            "gpt-4-turbo-preview".to_owned(),
-        ];
+        let variants = ZedDotDevModel::iter()
+            .filter_map(|model| {
+                let id = model.id();
+                if id.is_empty() {
+                    None
+                } else {
+                    Some(id.to_string())
+                }
+            })
+            .collect::<Vec<_>>();
        Schema::Object(SchemaObject {
            instance_type: Some(InstanceType::String.into()),
-            enum_values: Some(variants.into_iter().map(|s| s.into()).collect()),
+            enum_values: Some(variants.iter().map(|s| s.clone().into()).collect()),
            metadata: Some(Box::new(Metadata {
                title: Some("ZedDotDevModel".to_owned()),
-                default: Some(serde_json::json!("gpt-4-turbo-preview")),
-                examples: vec![
-                    serde_json::json!("gpt-3.5-turbo"),
-                    serde_json::json!("gpt-4"),
-                    serde_json::json!("gpt-4-turbo-preview"),
-                    serde_json::json!("custom-model-name"),
-                ],
+                default: Some(ZedDotDevModel::default().id().into()),
+                examples: variants.into_iter().map(Into::into).collect(),
                ..Default::default()
            })),
            ..Default::default()
@@ -100,6 +103,7 @@ impl ZedDotDevModel {
            Self::Gpt3Point5Turbo => "gpt-3.5-turbo",
            Self::Gpt4 => "gpt-4",
            Self::Gpt4Turbo => "gpt-4-turbo-preview",
+            Self::Gpt4Omni => "gpt-4o",
            Self::Claude3Opus => "claude-3-opus",
            Self::Claude3Sonnet => "claude-3-sonnet",
            Self::Claude3Haiku => "claude-3-haiku",
@@ -112,6 +116,7 @@ impl ZedDotDevModel {
            Self::Gpt3Point5Turbo => "GPT 3.5 Turbo",
            Self::Gpt4 => "GPT 4",
            Self::Gpt4Turbo => "GPT 4 Turbo",
+            Self::Gpt4Omni => "GPT 4 Omni",
            Self::Claude3Opus => "Claude 3 Opus",
            Self::Claude3Sonnet => "Claude 3 Sonnet",
            Self::Claude3Haiku => "Claude 3 Haiku",
@@ -123,7 +128,7 @@ impl ZedDotDevModel {
        match self {
            Self::Gpt3Point5Turbo => 2048,
            Self::Gpt4 => 4096,
-            Self::Gpt4Turbo => 128000,
+            Self::Gpt4Turbo | Self::Gpt4Omni => 128000,
            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => 200000,
            Self::Custom(_) => 4096, // TODO: Make this configurable
        }
@@ -139,36 +144,55 @@ pub enum AssistantDockPosition {
    Bottom,
 }

-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
-#[serde(tag = "name", rename_all = "snake_case")]
+#[derive(Debug, PartialEq)]
 pub enum AssistantProvider {
-    #[serde(rename = "zed.dev")]
    ZedDotDev {
-        #[serde(default)]
-        default_model: ZedDotDevModel,
+        model: ZedDotDevModel,
    },
-    #[serde(rename = "openai")]
    OpenAi {
-        #[serde(default)]
-        default_model: OpenAiModel,
-        #[serde(default = "open_ai_url")]
+        model: OpenAiModel,
        api_url: String,
+        low_speed_timeout_in_seconds: Option<u64>,
+    },
+    Anthropic {
+        model: AnthropicModel,
+        api_url: String,
+        low_speed_timeout_in_seconds: Option<u64>,
    },
 }

 impl Default for AssistantProvider {
    fn default() -> Self {
-        Self::ZedDotDev {
-            default_model: ZedDotDevModel::default(),
+        Self::OpenAi {
+            model: OpenAiModel::default(),
+            api_url: open_ai::OPEN_AI_API_URL.into(),
+            low_speed_timeout_in_seconds: None,
        }
    }
 }

-fn open_ai_url() -> String {
-    "https://api.openai.com/v1".into()
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq)]
+#[serde(tag = "name", rename_all = "snake_case")]
+pub enum AssistantProviderContent {
+    #[serde(rename = "zed.dev")]
+    ZedDotDev {
+        default_model: Option<ZedDotDevModel>,
+    },
+    #[serde(rename = "openai")]
+    OpenAi {
+        default_model: Option<OpenAiModel>,
+        api_url: Option<String>,
+        low_speed_timeout_in_seconds: Option<u64>,
+    },
+    #[serde(rename = "anthropic")]
+    Anthropic {
+        default_model: Option<AnthropicModel>,
+        api_url: Option<String>,
+        low_speed_timeout_in_seconds: Option<u64>,
+    },
 }

-#[derive(Default, Debug, Deserialize, Serialize)]
+#[derive(Debug, Default)]
 pub struct AssistantSettings {
    pub enabled: bool,
    pub button: bool,
@@ -219,15 +243,17 @@ impl AssistantSettingsContent {
                default_width: settings.default_width,
                default_height: settings.default_height,
                provider: if let Some(open_ai_api_url) = settings.openai_api_url.as_ref() {
-                    Some(AssistantProvider::OpenAi {
-                        default_model: settings.default_open_ai_model.clone().unwrap_or_default(),
-                        api_url: open_ai_api_url.clone(),
+                    Some(AssistantProviderContent::OpenAi {
+                        default_model: settings.default_open_ai_model.clone(),
+                        api_url: Some(open_ai_api_url.clone()),
+                        low_speed_timeout_in_seconds: None,
                    })
                } else {
                    settings.default_open_ai_model.clone().map(|open_ai_model| {
-                        AssistantProvider::OpenAi {
-                            default_model: open_ai_model,
-                            api_url: open_ai_url(),
+                        AssistantProviderContent::OpenAi {
+                            default_model: Some(open_ai_model),
+                            api_url: None,
+                            low_speed_timeout_in_seconds: None,
                        }
                    })
                },
@@ -247,6 +273,64 @@ impl AssistantSettingsContent {
            }
        }
    }
+
+    pub fn set_model(&mut self, new_model: LanguageModel) {
+        match self {
+            AssistantSettingsContent::Versioned(settings) => match settings {
+                VersionedAssistantSettingsContent::V1(settings) => match &mut settings.provider {
+                    Some(AssistantProviderContent::ZedDotDev {
+                        default_model: model,
+                    }) => {
+                        if let LanguageModel::ZedDotDev(new_model) = new_model {
+                            *model = Some(new_model);
+                        }
+                    }
+                    Some(AssistantProviderContent::OpenAi {
+                        default_model: model,
+                        ..
+                    }) => {
+                        if let LanguageModel::OpenAi(new_model) = new_model {
+                            *model = Some(new_model);
+                        }
+                    }
+                    Some(AssistantProviderContent::Anthropic {
+                        default_model: model,
+                        ..
+                    }) => {
+                        if let LanguageModel::Anthropic(new_model) = new_model {
+                            *model = Some(new_model);
+                        }
+                    }
+                    provider => match new_model {
+                        LanguageModel::ZedDotDev(model) => {
+                            *provider = Some(AssistantProviderContent::ZedDotDev {
+                                default_model: Some(model),
+                            })
+                        }
+                        LanguageModel::OpenAi(model) => {
+                            *provider = Some(AssistantProviderContent::OpenAi {
+                                default_model: Some(model),
+                                api_url: None,
+                                low_speed_timeout_in_seconds: None,
+                            })
+                        }
+                        LanguageModel::Anthropic(model) => {
+                            *provider = Some(AssistantProviderContent::Anthropic {
+                                default_model: Some(model),
+                                api_url: None,
+                                low_speed_timeout_in_seconds: None,
+                            })
+                        }
+                    },
+                },
+            },
+            AssistantSettingsContent::Legacy(settings) => {
+                if let LanguageModel::OpenAi(model) = new_model {
+                    settings.default_open_ai_model = Some(model);
+                }
+            }
+        }
+    }
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
@@ -295,7 +379,7 @@ pub struct AssistantSettingsContentV1 {
    ///
    /// This can either be the internal `zed.dev` service or an external `openai` service,
    /// each with their respective default models and configurations.
-    provider: Option<AssistantProvider>,
+    provider: Option<AssistantProviderContent>,
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
@@ -316,11 +400,11 @@ pub struct LegacyAssistantSettingsContent {
    ///
    /// Default: 320
    pub default_height: Option<f32>,
-    /// The default OpenAI model to use when starting new conversations.
+    /// The default OpenAI model to use when creating new contexts.
    ///
    /// Default: gpt-4-1106-preview
    pub default_open_ai_model: Option<OpenAiModel>,
-    /// OpenAI API base URL to use when starting new conversations.
+    /// OpenAI API base URL to use when creating new contexts.
    ///
    /// Default: https://api.openai.com/v1
    pub openai_api_url: Option<String>,
@@ -353,28 +437,82 @@ impl Settings for AssistantSettings {
            if let Some(provider) = value.provider.clone() {
                match (&mut settings.provider, provider) {
                    (
-                        AssistantProvider::ZedDotDev { default_model },
-                        AssistantProvider::ZedDotDev {
-                            default_model: default_model_override,
+                        AssistantProvider::ZedDotDev { model },
+                        AssistantProviderContent::ZedDotDev {
+                            default_model: model_override,
                        },
                    ) => {
-                        *default_model = default_model_override;
+                        merge(model, model_override);
                    }
                    (
                        AssistantProvider::OpenAi {
-                            default_model,
+                            model,
                            api_url,
+                            low_speed_timeout_in_seconds,
                        },
-                        AssistantProvider::OpenAi {
-                            default_model: default_model_override,
+                        AssistantProviderContent::OpenAi {
+                            default_model: model_override,
                            api_url: api_url_override,
+                            low_speed_timeout_in_seconds: low_speed_timeout_in_seconds_override,
                        },
                    ) => {
-                        *default_model = default_model_override;
-                        *api_url = api_url_override;
+                        merge(model, model_override);
+                        merge(api_url, api_url_override);
+                        if let Some(low_speed_timeout_in_seconds_override) =
+                            low_speed_timeout_in_seconds_override
+                        {
+                            *low_speed_timeout_in_seconds =
+                                Some(low_speed_timeout_in_seconds_override);
+                        }
                    }
-                    (merged, provider_override) => {
-                        *merged = provider_override;
+                    (
+                        AssistantProvider::Anthropic {
+                            model,
+                            api_url,
+                            low_speed_timeout_in_seconds,
+                        },
+                        AssistantProviderContent::Anthropic {
+                            default_model: model_override,
+                            api_url: api_url_override,
+                            low_speed_timeout_in_seconds: low_speed_timeout_in_seconds_override,
+                        },
+                    ) => {
+                        merge(model, model_override);
+                        merge(api_url, api_url_override);
+                        if let Some(low_speed_timeout_in_seconds_override) =
+                            low_speed_timeout_in_seconds_override
+                        {
+                            *low_speed_timeout_in_seconds =
+                                Some(low_speed_timeout_in_seconds_override);
+                        }
+                    }
+                    (provider, provider_override) => {
+                        *provider = match provider_override {
+                            AssistantProviderContent::ZedDotDev {
+                                default_model: model,
+                            } => AssistantProvider::ZedDotDev {
+                                model: model.unwrap_or_default(),
+                            },
+                            AssistantProviderContent::OpenAi {
+                                default_model: model,
+                                api_url,
+                                low_speed_timeout_in_seconds,
+                            } => AssistantProvider::OpenAi {
+                                model: model.unwrap_or_default(),
+                                api_url: api_url.unwrap_or_else(|| open_ai::OPEN_AI_API_URL.into()),
+                                low_speed_timeout_in_seconds,
+                            },
+                            AssistantProviderContent::Anthropic {
+                                default_model: model,
+                                api_url,
+                                low_speed_timeout_in_seconds,
+                            } => AssistantProvider::Anthropic {
+                                model: model.unwrap_or_default(),
+                                api_url: api_url
+                                    .unwrap_or_else(|| anthropic::ANTHROPIC_API_URL.into()),
+                                low_speed_timeout_in_seconds,
+                            },
+                        };
                    }
                }
            }
@@ -384,7 +522,7 @@ impl Settings for AssistantSettings {
    }
 }

-fn merge<T: Copy>(target: &mut T, value: Option<T>) {
+fn merge<T>(target: &mut T, value: Option<T>) {
    if let Some(value) = value {
        *target = value;
    }
@@ -392,7 +530,7 @@ fn merge<T: Copy>(target: &mut T, value: Option<T>) {

 #[cfg(test)]
 mod tests {
-    use gpui::{AppContext, BorrowAppContext};
+    use gpui::{AppContext, UpdateGlobal};
    use settings::SettingsStore;

    use super::*;
@@ -407,13 +545,14 @@ mod tests {
        assert_eq!(
            AssistantSettings::get_global(cx).provider,
            AssistantProvider::OpenAi {
-                default_model: OpenAiModel::FourTurbo,
-                api_url: open_ai_url()
+                model: OpenAiModel::FourOmni,
+                api_url: open_ai::OPEN_AI_API_URL.into(),
+                low_speed_timeout_in_seconds: None,
            }
        );

        // Ensure backward-compatibility.
-        cx.update_global::<SettingsStore, _>(|store, cx| {
+        SettingsStore::update_global(cx, |store, cx| {
            store
                .set_user_settings(
                    r#"{
@@ -428,11 +567,12 @@ mod tests {
        assert_eq!(
            AssistantSettings::get_global(cx).provider,
            AssistantProvider::OpenAi {
-                default_model: OpenAiModel::FourTurbo,
-                api_url: "test-url".into()
+                model: OpenAiModel::FourOmni,
+                api_url: "test-url".into(),
+                low_speed_timeout_in_seconds: None,
            }
        );
-        cx.update_global::<SettingsStore, _>(|store, cx| {
+        SettingsStore::update_global(cx, |store, cx| {
            store
                .set_user_settings(
                    r#"{
@@ -447,13 +587,14 @@ mod tests {
        assert_eq!(
            AssistantSettings::get_global(cx).provider,
            AssistantProvider::OpenAi {
-                default_model: OpenAiModel::Four,
-                api_url: open_ai_url()
+                model: OpenAiModel::Four,
+                api_url: open_ai::OPEN_AI_API_URL.into(),
+                low_speed_timeout_in_seconds: None,
            }
        );

        // The new version supports setting a custom model when using zed.dev.
-        cx.update_global::<SettingsStore, _>(|store, cx| {
+        SettingsStore::update_global(cx, |store, cx| {
            store
                .set_user_settings(
                    r#"{
@@ -472,7 +613,7 @@ mod tests {
        assert_eq!(
            AssistantSettings::get_global(cx).provider,
            AssistantProvider::ZedDotDev {
-                default_model: ZedDotDevModel::Custom("custom".into())
+                model: ZedDotDevModel::Custom("custom".into())
            }
        );
    }
--- a/crates/assistant/src/codegen.rs
+++ b/crates/assistant/src/codegen.rs
@@ -3,11 +3,13 @@ use crate::{
    CompletionProvider, LanguageModelRequest,
 };
 use anyhow::Result;
+use client::telemetry::Telemetry;
 use editor::{Anchor, MultiBuffer, MultiBufferSnapshot, ToOffset, ToPoint};
 use futures::{channel::mpsc, SinkExt, Stream, StreamExt};
 use gpui::{EventEmitter, Model, ModelContext, Task};
 use language::{Rope, TransactionId};
-use std::{cmp, future, ops::Range};
+use multi_buffer::MultiBufferRow;
+use std::{cmp, future, ops::Range, sync::Arc, time::Instant};

 pub enum Event {
    Finished,
@@ -29,13 +31,19 @@ pub struct Codegen {
    error: Option<anyhow::Error>,
    generation: Task<()>,
    idle: bool,
+    telemetry: Option<Arc<Telemetry>>,
    _subscription: gpui::Subscription,
 }

 impl EventEmitter<Event> for Codegen {}

 impl Codegen {
-    pub fn new(buffer: Model<MultiBuffer>, kind: CodegenKind, cx: &mut ModelContext<Self>) -> Self {
+    pub fn new(
+        buffer: Model<MultiBuffer>,
+        kind: CodegenKind,
+        telemetry: Option<Arc<Telemetry>>,
+        cx: &mut ModelContext<Self>,
+    ) -> Self {
        let snapshot = buffer.read(cx).snapshot(cx);
        Self {
            buffer: buffer.clone(),
@@ -46,6 +54,7 @@ impl Codegen {
            error: Default::default(),
            idle: true,
            generation: Task::ready(()),
+            telemetry,
            _subscription: cx.subscribe(&buffer, Self::handle_buffer_event),
        }
    }
@@ -100,9 +109,11 @@ impl Codegen {
            .suggested_indents(selection_start.row..selection_start.row + 1, cx)
            .into_values()
            .next()
-            .unwrap_or_else(|| snapshot.indent_size_for_line(selection_start.row));
+            .unwrap_or_else(|| snapshot.indent_size_for_line(MultiBufferRow(selection_start.row)));

+        let model_telemetry_id = prompt.model.telemetry_id();
        let response = CompletionProvider::global(cx).complete(prompt);
+        let telemetry = self.telemetry.clone();
        self.generation = cx.spawn(|this, mut cx| {
            async move {
                let generate = async {
@@ -110,68 +121,89 @@ impl Codegen {

                    let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);
                    let diff = cx.background_executor().spawn(async move {
-                        let chunks = strip_invalid_spans_from_codeblock(response.await?);
-                        futures::pin_mut!(chunks);
-                        let mut diff = StreamingDiff::new(selected_text.to_string());
+                        let mut response_latency = None;
+                        let request_start = Instant::now();
+                        let diff = async {
+                            let chunks = strip_invalid_spans_from_codeblock(response.await?);
+                            futures::pin_mut!(chunks);
+                            let mut diff = StreamingDiff::new(selected_text.to_string());

-                        let mut new_text = String::new();
-                        let mut base_indent = None;
-                        let mut line_indent = None;
-                        let mut first_line = true;
+                            let mut new_text = String::new();
+                            let mut base_indent = None;
+                            let mut line_indent = None;
+                            let mut first_line = true;

-                        while let Some(chunk) = chunks.next().await {
-                            let chunk = chunk?;
+                            while let Some(chunk) = chunks.next().await {
+                                if response_latency.is_none() {
+                                    response_latency = Some(request_start.elapsed());
+                                }
+                                let chunk = chunk?;

-                            let mut lines = chunk.split('\n').peekable();
-                            while let Some(line) = lines.next() {
-                                new_text.push_str(line);
-                                if line_indent.is_none() {
-                                    if let Some(non_whitespace_ch_ix) =
-                                        new_text.find(|ch: char| !ch.is_whitespace())
-                                    {
-                                        line_indent = Some(non_whitespace_ch_ix);
-                                        base_indent = base_indent.or(line_indent);
+                                let mut lines = chunk.split('\n').peekable();
+                                while let Some(line) = lines.next() {
+                                    new_text.push_str(line);
+                                    if line_indent.is_none() {
+                                        if let Some(non_whitespace_ch_ix) =
+                                            new_text.find(|ch: char| !ch.is_whitespace())
+                                        {
+                                            line_indent = Some(non_whitespace_ch_ix);
+                                            base_indent = base_indent.or(line_indent);

-                                        let line_indent = line_indent.unwrap();
-                                        let base_indent = base_indent.unwrap();
-                                        let indent_delta = line_indent as i32 - base_indent as i32;
-                                        let mut corrected_indent_len = cmp::max(
-                                            0,
-                                            suggested_line_indent.len as i32 + indent_delta,
-                                        )
-                                            as usize;
-                                        if first_line {
-                                            corrected_indent_len = corrected_indent_len
-                                                .saturating_sub(selection_start.column as usize);
+                                            let line_indent = line_indent.unwrap();
+                                            let base_indent = base_indent.unwrap();
+                                            let indent_delta =
+                                                line_indent as i32 - base_indent as i32;
+                                            let mut corrected_indent_len = cmp::max(
+                                                0,
+                                                suggested_line_indent.len as i32 + indent_delta,
+                                            )
+                                                as usize;
+                                            if first_line {
+                                                corrected_indent_len = corrected_indent_len
+                                                    .saturating_sub(
+                                                        selection_start.column as usize,
+                                                    );
+                                            }
+
+                                            let indent_char = suggested_line_indent.char();
+                                            let mut indent_buffer = [0; 4];
+                                            let indent_str =
+                                                indent_char.encode_utf8(&mut indent_buffer);
+                                            new_text.replace_range(
+                                                ..line_indent,
+                                                &indent_str.repeat(corrected_indent_len),
+                                            );
                                        }
+                                    }

-                                        let indent_char = suggested_line_indent.char();
-                                        let mut indent_buffer = [0; 4];
-                                        let indent_str =
-                                            indent_char.encode_utf8(&mut indent_buffer);
-                                        new_text.replace_range(
-                                            ..line_indent,
-                                            &indent_str.repeat(corrected_indent_len),
-                                        );
+                                    if line_indent.is_some() {
+                                        hunks_tx.send(diff.push_new(&new_text)).await?;
+                                        new_text.clear();
+                                    }
+
+                                    if lines.peek().is_some() {
+                                        hunks_tx.send(diff.push_new("\n")).await?;
+                                        line_indent = None;
+                                        first_line = false;
                                    }
                                }
-
-                                if line_indent.is_some() {
-                                    hunks_tx.send(diff.push_new(&new_text)).await?;
-                                    new_text.clear();
-                                }
-
-                                if lines.peek().is_some() {
-                                    hunks_tx.send(diff.push_new("\n")).await?;
-                                    line_indent = None;
-                                    first_line = false;
-                                }
                            }
-                        }
-                        hunks_tx.send(diff.push_new(&new_text)).await?;
-                        hunks_tx.send(diff.finish()).await?;
+                            hunks_tx.send(diff.push_new(&new_text)).await?;
+                            hunks_tx.send(diff.finish()).await?;

-                        anyhow::Ok(())
+                            anyhow::Ok(())
+                        };
+
+                        let error_message = diff.await.err().map(|error| error.to_string());
+                        if let Some(telemetry) = telemetry {
+                            telemetry.report_assistant_event(
+                                None,
+                                telemetry_events::AssistantKind::Inline,
+                                model_telemetry_id,
+                                response_latency,
+                                error_message,
+                            );
+                        }
                    });

                    while let Some(hunks) = hunks_rx.next().await {
@@ -234,7 +266,8 @@ impl Codegen {
                        })?;
                    }

-                    diff.await?;
+                    diff.await;
+
                    anyhow::Ok(())
                };

@@ -395,8 +428,9 @@ mod tests {
            let snapshot = buffer.snapshot(cx);
            snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(4, 5))
        });
-        let codegen =
-            cx.new_model(|cx| Codegen::new(buffer.clone(), CodegenKind::Transform { range }, cx));
+        let codegen = cx.new_model(|cx| {
+            Codegen::new(buffer.clone(), CodegenKind::Transform { range }, None, cx)
+        });

        let request = LanguageModelRequest::default();
        codegen.update(cx, |codegen, cx| codegen.start(request, cx));
@@ -453,8 +487,9 @@ mod tests {
            let snapshot = buffer.snapshot(cx);
            snapshot.anchor_before(Point::new(1, 6))
        });
-        let codegen =
-            cx.new_model(|cx| Codegen::new(buffer.clone(), CodegenKind::Generate { position }, cx));
+        let codegen = cx.new_model(|cx| {
+            Codegen::new(buffer.clone(), CodegenKind::Generate { position }, None, cx)
+        });

        let request = LanguageModelRequest::default();
        codegen.update(cx, |codegen, cx| codegen.start(request, cx));
@@ -511,8 +546,9 @@ mod tests {
            let snapshot = buffer.snapshot(cx);
            snapshot.anchor_before(Point::new(1, 2))
        });
-        let codegen =
-            cx.new_model(|cx| Codegen::new(buffer.clone(), CodegenKind::Generate { position }, cx));
+        let codegen = cx.new_model(|cx| {
+            Codegen::new(buffer.clone(), CodegenKind::Generate { position }, None, cx)
+        });

        let request = LanguageModelRequest::default();
        codegen.update(cx, |codegen, cx| codegen.start(request, cx));
--- a/crates/assistant/src/completion_provider.rs
+++ b/crates/assistant/src/completion_provider.rs
@@ -1,8 +1,10 @@
+mod anthropic;
 #[cfg(test)]
 mod fake;
 mod open_ai;
 mod zed;

+pub use anthropic::*;
 #[cfg(test)]
 pub use fake::*;
 pub use open_ai::*;
@@ -18,25 +20,34 @@ use futures::{future::BoxFuture, stream::BoxStream};
 use gpui::{AnyView, AppContext, BorrowAppContext, Task, WindowContext};
 use settings::{Settings, SettingsStore};
 use std::sync::Arc;
+use std::time::Duration;

 pub fn init(client: Arc<Client>, cx: &mut AppContext) {
    let mut settings_version = 0;
    let provider = match &AssistantSettings::get_global(cx).provider {
-        AssistantProvider::ZedDotDev { default_model } => {
-            CompletionProvider::ZedDotDev(ZedDotDevCompletionProvider::new(
-                default_model.clone(),
-                client.clone(),
-                settings_version,
-                cx,
-            ))
-        }
+        AssistantProvider::ZedDotDev { model } => CompletionProvider::ZedDotDev(
+            ZedDotDevCompletionProvider::new(model.clone(), client.clone(), settings_version, cx),
+        ),
        AssistantProvider::OpenAi {
-            default_model,
+            model,
            api_url,
+            low_speed_timeout_in_seconds,
        } => CompletionProvider::OpenAi(OpenAiCompletionProvider::new(
-            default_model.clone(),
+            model.clone(),
            api_url.clone(),
            client.http_client(),
+            low_speed_timeout_in_seconds.map(Duration::from_secs),
+            settings_version,
+        )),
+        AssistantProvider::Anthropic {
+            model,
+            api_url,
+            low_speed_timeout_in_seconds,
+        } => CompletionProvider::Anthropic(AnthropicCompletionProvider::new(
+            model.clone(),
+            api_url.clone(),
+            client.http_client(),
+            low_speed_timeout_in_seconds.map(Duration::from_secs),
            settings_version,
        )),
    };
@@ -49,42 +60,79 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                (
                    CompletionProvider::OpenAi(provider),
                    AssistantProvider::OpenAi {
-                        default_model,
+                        model,
                        api_url,
+                        low_speed_timeout_in_seconds,
                    },
                ) => {
-                    provider.update(default_model.clone(), api_url.clone(), settings_version);
+                    provider.update(
+                        model.clone(),
+                        api_url.clone(),
+                        low_speed_timeout_in_seconds.map(Duration::from_secs),
+                        settings_version,
+                    );
+                }
+                (
+                    CompletionProvider::Anthropic(provider),
+                    AssistantProvider::Anthropic {
+                        model,
+                        api_url,
+                        low_speed_timeout_in_seconds,
+                    },
+                ) => {
+                    provider.update(
+                        model.clone(),
+                        api_url.clone(),
+                        low_speed_timeout_in_seconds.map(Duration::from_secs),
+                        settings_version,
+                    );
                }
                (
                    CompletionProvider::ZedDotDev(provider),
-                    AssistantProvider::ZedDotDev { default_model },
+                    AssistantProvider::ZedDotDev { model },
                ) => {
-                    provider.update(default_model.clone(), settings_version);
+                    provider.update(model.clone(), settings_version);
                }
-                (CompletionProvider::OpenAi(_), AssistantProvider::ZedDotDev { default_model }) => {
+                (_, AssistantProvider::ZedDotDev { model }) => {
                    *provider = CompletionProvider::ZedDotDev(ZedDotDevCompletionProvider::new(
-                        default_model.clone(),
+                        model.clone(),
                        client.clone(),
                        settings_version,
                        cx,
                    ));
                }
                (
-                    CompletionProvider::ZedDotDev(_),
+                    _,
                    AssistantProvider::OpenAi {
-                        default_model,
+                        model,
                        api_url,
+                        low_speed_timeout_in_seconds,
                    },
                ) => {
                    *provider = CompletionProvider::OpenAi(OpenAiCompletionProvider::new(
-                        default_model.clone(),
+                        model.clone(),
                        api_url.clone(),
                        client.http_client(),
+                        low_speed_timeout_in_seconds.map(Duration::from_secs),
+                        settings_version,
+                    ));
+                }
+                (
+                    _,
+                    AssistantProvider::Anthropic {
+                        model,
+                        api_url,
+                        low_speed_timeout_in_seconds,
+                    },
+                ) => {
+                    *provider = CompletionProvider::Anthropic(AnthropicCompletionProvider::new(
+                        model.clone(),
+                        api_url.clone(),
+                        client.http_client(),
+                        low_speed_timeout_in_seconds.map(Duration::from_secs),
                        settings_version,
                    ));
                }
-                #[cfg(test)]
-                (CompletionProvider::Fake(_), _) => unimplemented!(),
            }
        })
    })
@@ -93,6 +141,7 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {

 pub enum CompletionProvider {
    OpenAi(OpenAiCompletionProvider),
+    Anthropic(AnthropicCompletionProvider),
    ZedDotDev(ZedDotDevCompletionProvider),
    #[cfg(test)]
    Fake(FakeCompletionProvider),
@@ -105,9 +154,29 @@ impl CompletionProvider {
        cx.global::<Self>()
    }

+    pub fn available_models(&self) -> Vec<LanguageModel> {
+        match self {
+            CompletionProvider::OpenAi(provider) => provider
+                .available_models()
+                .map(LanguageModel::OpenAi)
+                .collect(),
+            CompletionProvider::Anthropic(provider) => provider
+                .available_models()
+                .map(LanguageModel::Anthropic)
+                .collect(),
+            CompletionProvider::ZedDotDev(provider) => provider
+                .available_models()
+                .map(LanguageModel::ZedDotDev)
+                .collect(),
+            #[cfg(test)]
+            CompletionProvider::Fake(_) => unimplemented!(),
+        }
+    }
+
    pub fn settings_version(&self) -> usize {
        match self {
            CompletionProvider::OpenAi(provider) => provider.settings_version(),
+            CompletionProvider::Anthropic(provider) => provider.settings_version(),
            CompletionProvider::ZedDotDev(provider) => provider.settings_version(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
@@ -117,6 +186,7 @@ impl CompletionProvider {
    pub fn is_authenticated(&self) -> bool {
        match self {
            CompletionProvider::OpenAi(provider) => provider.is_authenticated(),
+            CompletionProvider::Anthropic(provider) => provider.is_authenticated(),
            CompletionProvider::ZedDotDev(provider) => provider.is_authenticated(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => true,
@@ -126,6 +196,7 @@ impl CompletionProvider {
    pub fn authenticate(&self, cx: &AppContext) -> Task<Result<()>> {
        match self {
            CompletionProvider::OpenAi(provider) => provider.authenticate(cx),
+            CompletionProvider::Anthropic(provider) => provider.authenticate(cx),
            CompletionProvider::ZedDotDev(provider) => provider.authenticate(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => Task::ready(Ok(())),
@@ -135,6 +206,7 @@ impl CompletionProvider {
    pub fn authentication_prompt(&self, cx: &mut WindowContext) -> AnyView {
        match self {
            CompletionProvider::OpenAi(provider) => provider.authentication_prompt(cx),
+            CompletionProvider::Anthropic(provider) => provider.authentication_prompt(cx),
            CompletionProvider::ZedDotDev(provider) => provider.authentication_prompt(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
@@ -144,20 +216,20 @@ impl CompletionProvider {
    pub fn reset_credentials(&self, cx: &AppContext) -> Task<Result<()>> {
        match self {
            CompletionProvider::OpenAi(provider) => provider.reset_credentials(cx),
+            CompletionProvider::Anthropic(provider) => provider.reset_credentials(cx),
            CompletionProvider::ZedDotDev(_) => Task::ready(Ok(())),
            #[cfg(test)]
            CompletionProvider::Fake(_) => Task::ready(Ok(())),
        }
    }

-    pub fn default_model(&self) -> LanguageModel {
+    pub fn model(&self) -> LanguageModel {
        match self {
-            CompletionProvider::OpenAi(provider) => LanguageModel::OpenAi(provider.default_model()),
-            CompletionProvider::ZedDotDev(provider) => {
-                LanguageModel::ZedDotDev(provider.default_model())
-            }
+            CompletionProvider::OpenAi(provider) => LanguageModel::OpenAi(provider.model()),
+            CompletionProvider::Anthropic(provider) => LanguageModel::Anthropic(provider.model()),
+            CompletionProvider::ZedDotDev(provider) => LanguageModel::ZedDotDev(provider.model()),
            #[cfg(test)]
-            CompletionProvider::Fake(_) => unimplemented!(),
+            CompletionProvider::Fake(_) => LanguageModel::default(),
        }
    }

@@ -168,9 +240,10 @@ impl CompletionProvider {
    ) -> BoxFuture<'static, Result<usize>> {
        match self {
            CompletionProvider::OpenAi(provider) => provider.count_tokens(request, cx),
+            CompletionProvider::Anthropic(provider) => provider.count_tokens(request, cx),
            CompletionProvider::ZedDotDev(provider) => provider.count_tokens(request, cx),
            #[cfg(test)]
-            CompletionProvider::Fake(_) => unimplemented!(),
+            CompletionProvider::Fake(_) => futures::FutureExt::boxed(futures::future::ready(Ok(0))),
        }
    }

@@ -180,6 +253,7 @@ impl CompletionProvider {
    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {
        match self {
            CompletionProvider::OpenAi(provider) => provider.complete(request),
+            CompletionProvider::Anthropic(provider) => provider.complete(request),
            CompletionProvider::ZedDotDev(provider) => provider.complete(request),
            #[cfg(test)]
            CompletionProvider::Fake(provider) => provider.complete(),
--- a/crates/assistant/src/completion_provider/anthropic.rs
+++ b/crates/assistant/src/completion_provider/anthropic.rs
@@ -0,0 +1,332 @@
+use crate::count_open_ai_tokens;
+use crate::{
+    assistant_settings::AnthropicModel, CompletionProvider, LanguageModel, LanguageModelRequest,
+    Role,
+};
+use anthropic::{stream_completion, Request, RequestMessage, Role as AnthropicRole};
+use anyhow::{anyhow, Result};
+use editor::{Editor, EditorElement, EditorStyle};
+use futures::{future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
+use gpui::{AnyView, AppContext, FontStyle, Task, TextStyle, View, WhiteSpace};
+use http::HttpClient;
+use settings::Settings;
+use std::time::Duration;
+use std::{env, sync::Arc};
+use strum::IntoEnumIterator;
+use theme::ThemeSettings;
+use ui::prelude::*;
+use util::ResultExt;
+
+pub struct AnthropicCompletionProvider {
+    api_key: Option<String>,
+    api_url: String,
+    model: AnthropicModel,
+    http_client: Arc<dyn HttpClient>,
+    low_speed_timeout: Option<Duration>,
+    settings_version: usize,
+}
+
+impl AnthropicCompletionProvider {
+    pub fn new(
+        model: AnthropicModel,
+        api_url: String,
+        http_client: Arc<dyn HttpClient>,
+        low_speed_timeout: Option<Duration>,
+        settings_version: usize,
+    ) -> Self {
+        Self {
+            api_key: None,
+            api_url,
+            model,
+            http_client,
+            low_speed_timeout,
+            settings_version,
+        }
+    }
+
+    pub fn update(
+        &mut self,
+        model: AnthropicModel,
+        api_url: String,
+        low_speed_timeout: Option<Duration>,
+        settings_version: usize,
+    ) {
+        self.model = model;
+        self.api_url = api_url;
+        self.low_speed_timeout = low_speed_timeout;
+        self.settings_version = settings_version;
+    }
+
+    pub fn available_models(&self) -> impl Iterator<Item = AnthropicModel> {
+        AnthropicModel::iter()
+    }
+
+    pub fn settings_version(&self) -> usize {
+        self.settings_version
+    }
+
+    pub fn is_authenticated(&self) -> bool {
+        self.api_key.is_some()
+    }
+
+    pub fn authenticate(&self, cx: &AppContext) -> Task<Result<()>> {
+        if self.is_authenticated() {
+            Task::ready(Ok(()))
+        } else {
+            let api_url = self.api_url.clone();
+            cx.spawn(|mut cx| async move {
+                let api_key = if let Ok(api_key) = env::var("ANTHROPIC_API_KEY") {
+                    api_key
+                } else {
+                    let (_, api_key) = cx
+                        .update(|cx| cx.read_credentials(&api_url))?
+                        .await?
+                        .ok_or_else(|| anyhow!("credentials not found"))?;
+                    String::from_utf8(api_key)?
+                };
+                cx.update_global::<CompletionProvider, _>(|provider, _cx| {
+                    if let CompletionProvider::Anthropic(provider) = provider {
+                        provider.api_key = Some(api_key);
+                    }
+                })
+            })
+        }
+    }
+
+    pub fn reset_credentials(&self, cx: &AppContext) -> Task<Result<()>> {
+        let delete_credentials = cx.delete_credentials(&self.api_url);
+        cx.spawn(|mut cx| async move {
+            delete_credentials.await.log_err();
+            cx.update_global::<CompletionProvider, _>(|provider, _cx| {
+                if let CompletionProvider::Anthropic(provider) = provider {
+                    provider.api_key = None;
+                }
+            })
+        })
+    }
+
+    pub fn authentication_prompt(&self, cx: &mut WindowContext) -> AnyView {
+        cx.new_view(|cx| AuthenticationPrompt::new(self.api_url.clone(), cx))
+            .into()
+    }
+
+    pub fn model(&self) -> AnthropicModel {
+        self.model.clone()
+    }
+
+    pub fn count_tokens(
+        &self,
+        request: LanguageModelRequest,
+        cx: &AppContext,
+    ) -> BoxFuture<'static, Result<usize>> {
+        count_open_ai_tokens(request, cx.background_executor())
+    }
+
+    pub fn complete(
+        &self,
+        request: LanguageModelRequest,
+    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {
+        let request = self.to_anthropic_request(request);
+
+        let http_client = self.http_client.clone();
+        let api_key = self.api_key.clone();
+        let api_url = self.api_url.clone();
+        let low_speed_timeout = self.low_speed_timeout;
+        async move {
+            let api_key = api_key.ok_or_else(|| anyhow!("missing api key"))?;
+            let request = stream_completion(
+                http_client.as_ref(),
+                &api_url,
+                &api_key,
+                request,
+                low_speed_timeout,
+            );
+            let response = request.await?;
+            let stream = response
+                .filter_map(|response| async move {
+                    match response {
+                        Ok(response) => match response {
+                            anthropic::ResponseEvent::ContentBlockStart {
+                                content_block, ..
+                            } => match content_block {
+                                anthropic::ContentBlock::Text { text } => Some(Ok(text)),
+                            },
+                            anthropic::ResponseEvent::ContentBlockDelta { delta, .. } => {
+                                match delta {
+                                    anthropic::TextDelta::TextDelta { text } => Some(Ok(text)),
+                                }
+                            }
+                            _ => None,
+                        },
+                        Err(error) => Some(Err(error)),
+                    }
+                })
+                .boxed();
+            Ok(stream)
+        }
+        .boxed()
+    }
+
+    fn to_anthropic_request(&self, request: LanguageModelRequest) -> Request {
+        let model = match request.model {
+            LanguageModel::Anthropic(model) => model,
+            _ => self.model(),
+        };
+
+        let mut system_message = String::new();
+
+        let mut messages: Vec<RequestMessage> = Vec::new();
+        for message in request.messages {
+            if message.content.is_empty() {
+                continue;
+            }
+
+            match message.role {
+                Role::User | Role::Assistant => {
+                    let role = match message.role {
+                        Role::User => AnthropicRole::User,
+                        Role::Assistant => AnthropicRole::Assistant,
+                        _ => unreachable!(),
+                    };
+
+                    if let Some(last_message) = messages.last_mut() {
+                        if last_message.role == role {
+                            last_message.content.push_str("\n\n");
+                            last_message.content.push_str(&message.content);
+                            continue;
+                        }
+                    }
+
+                    messages.push(RequestMessage {
+                        role,
+                        content: message.content,
+                    });
+                }
+                Role::System => {
+                    if !system_message.is_empty() {
+                        system_message.push_str("\n\n");
+                    }
+                    system_message.push_str(&message.content);
+                }
+            }
+        }
+
+        Request {
+            model,
+            messages,
+            stream: true,
+            system: system_message,
+            max_tokens: 4092,
+        }
+    }
+}
+
+struct AuthenticationPrompt {
+    api_key: View<Editor>,
+    api_url: String,
+}
+
+impl AuthenticationPrompt {
+    fn new(api_url: String, cx: &mut WindowContext) -> Self {
+        Self {
+            api_key: cx.new_view(|cx| {
+                let mut editor = Editor::single_line(cx);
+                editor.set_placeholder_text(
+                    "sk-000000000000000000000000000000000000000000000000",
+                    cx,
+                );
+                editor
+            }),
+            api_url,
+        }
+    }
+
+    fn save_api_key(&mut self, _: &menu::Confirm, cx: &mut ViewContext<Self>) {
+        let api_key = self.api_key.read(cx).text(cx);
+        if api_key.is_empty() {
+            return;
+        }
+
+        let write_credentials = cx.write_credentials(&self.api_url, "Bearer", api_key.as_bytes());
+        cx.spawn(|_, mut cx| async move {
+            write_credentials.await?;
+            cx.update_global::<CompletionProvider, _>(|provider, _cx| {
+                if let CompletionProvider::Anthropic(provider) = provider {
+                    provider.api_key = Some(api_key);
+                }
+            })
+        })
+        .detach_and_log_err(cx);
+    }
+
+    fn render_api_key_editor(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let settings = ThemeSettings::get_global(cx);
+        let text_style = TextStyle {
+            color: cx.theme().colors().text,
+            font_family: settings.ui_font.family.clone(),
+            font_features: settings.ui_font.features.clone(),
+            font_size: rems(0.875).into(),
+            font_weight: settings.ui_font.weight,
+            font_style: FontStyle::Normal,
+            line_height: relative(1.3),
+            background_color: None,
+            underline: None,
+            strikethrough: None,
+            white_space: WhiteSpace::Normal,
+        };
+        EditorElement::new(
+            &self.api_key,
+            EditorStyle {
+                background: cx.theme().colors().editor_background,
+                local_player: cx.theme().players().local(),
+                text: text_style,
+                ..Default::default()
+            },
+        )
+    }
+}
+
+impl Render for AuthenticationPrompt {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        const INSTRUCTIONS: [&str; 4] = [
+            "To use the assistant panel or inline assistant, you need to add your Anthropic API key.",
+            "You can create an API key at: https://console.anthropic.com/settings/keys",
+            "",
+            "Paste your Anthropic API key below and hit enter to use the assistant:",
+        ];
+
+        v_flex()
+            .p_4()
+            .size_full()
+            .on_action(cx.listener(Self::save_api_key))
+            .children(
+                INSTRUCTIONS.map(|instruction| Label::new(instruction).size(LabelSize::Small)),
+            )
+            .child(
+                h_flex()
+                    .w_full()
+                    .my_2()
+                    .px_2()
+                    .py_1()
+                    .bg(cx.theme().colors().editor_background)
+                    .rounded_md()
+                    .child(self.render_api_key_editor(cx)),
+            )
+            .child(
+                Label::new(
+                    "You can also assign the ANTHROPIC_API_KEY environment variable and restart Zed.",
+                )
+                .size(LabelSize::Small),
+            )
+            .child(
+                h_flex()
+                    .gap_2()
+                    .child(Label::new("Click on").size(LabelSize::Small))
+                    .child(Icon::new(IconName::Ai).size(IconSize::XSmall))
+                    .child(
+                        Label::new("in the status bar to close this panel.").size(LabelSize::Small),
+                    ),
+            )
+            .into_any()
+    }
+}
--- a/crates/assistant/src/completion_provider/open_ai.rs
+++ b/crates/assistant/src/completion_provider/open_ai.rs
@@ -1,47 +1,65 @@
+use crate::assistant_settings::ZedDotDevModel;
 use crate::{
    assistant_settings::OpenAiModel, CompletionProvider, LanguageModel, LanguageModelRequest, Role,
 };
 use anyhow::{anyhow, Result};
 use editor::{Editor, EditorElement, EditorStyle};
 use futures::{future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
-use gpui::{AnyView, AppContext, FontStyle, FontWeight, Task, TextStyle, View, WhiteSpace};
+use gpui::{AnyView, AppContext, FontStyle, Task, TextStyle, View, WhiteSpace};
+use http::HttpClient;
 use open_ai::{stream_completion, Request, RequestMessage, Role as OpenAiRole};
 use settings::Settings;
+use std::time::Duration;
 use std::{env, sync::Arc};
+use strum::IntoEnumIterator;
 use theme::ThemeSettings;
 use ui::prelude::*;
-use util::{http::HttpClient, ResultExt};
+use util::ResultExt;

 pub struct OpenAiCompletionProvider {
    api_key: Option<String>,
    api_url: String,
-    default_model: OpenAiModel,
+    model: OpenAiModel,
    http_client: Arc<dyn HttpClient>,
+    low_speed_timeout: Option<Duration>,
    settings_version: usize,
 }

 impl OpenAiCompletionProvider {
    pub fn new(
-        default_model: OpenAiModel,
+        model: OpenAiModel,
        api_url: String,
        http_client: Arc<dyn HttpClient>,
+        low_speed_timeout: Option<Duration>,
        settings_version: usize,
    ) -> Self {
        Self {
            api_key: None,
            api_url,
-            default_model,
+            model,
            http_client,
+            low_speed_timeout,
            settings_version,
        }
    }

-    pub fn update(&mut self, default_model: OpenAiModel, api_url: String, settings_version: usize) {
-        self.default_model = default_model;
+    pub fn update(
+        &mut self,
+        model: OpenAiModel,
+        api_url: String,
+        low_speed_timeout: Option<Duration>,
+        settings_version: usize,
+    ) {
+        self.model = model;
        self.api_url = api_url;
+        self.low_speed_timeout = low_speed_timeout;
        self.settings_version = settings_version;
    }

+    pub fn available_models(&self) -> impl Iterator<Item = OpenAiModel> {
+        OpenAiModel::iter()
+    }
+
    pub fn settings_version(&self) -> usize {
        self.settings_version
    }
@@ -91,8 +109,8 @@ impl OpenAiCompletionProvider {
            .into()
    }

-    pub fn default_model(&self) -> OpenAiModel {
-        self.default_model.clone()
+    pub fn model(&self) -> OpenAiModel {
+        self.model.clone()
    }

    pub fn count_tokens(
@@ -112,9 +130,16 @@ impl OpenAiCompletionProvider {
        let http_client = self.http_client.clone();
        let api_key = self.api_key.clone();
        let api_url = self.api_url.clone();
+        let low_speed_timeout = self.low_speed_timeout;
        async move {
            let api_key = api_key.ok_or_else(|| anyhow!("missing api key"))?;
-            let request = stream_completion(http_client.as_ref(), &api_url, &api_key, request);
+            let request = stream_completion(
+                http_client.as_ref(),
+                &api_url,
+                &api_key,
+                request,
+                low_speed_timeout,
+            );
            let response = request.await?;
            let stream = response
                .filter_map(|response| async move {
@@ -131,8 +156,8 @@ impl OpenAiCompletionProvider {

    fn to_open_ai_request(&self, request: LanguageModelRequest) -> Request {
        let model = match request.model {
-            LanguageModel::ZedDotDev(_) => self.default_model(),
            LanguageModel::OpenAi(model) => model,
+            _ => self.model(),
        };

        Request {
@@ -183,7 +208,17 @@ pub fn count_open_ai_tokens(
                })
                .collect::<Vec<_>>();

-            tiktoken_rs::num_tokens_from_messages(request.model.id(), &messages)
+            match request.model {
+                LanguageModel::Anthropic(_)
+                | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Opus)
+                | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Sonnet)
+                | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Haiku) => {
+                    // Tiktoken doesn't yet support these models, so we manually use the
+                    // same tokenizer as GPT-4.
+                    tiktoken_rs::num_tokens_from_messages("gpt-4", &messages)
+                }
+                _ => tiktoken_rs::num_tokens_from_messages(request.model.id(), &messages),
+            }
        })
        .boxed()
 }
@@ -243,7 +278,7 @@ impl AuthenticationPrompt {
            font_family: settings.ui_font.family.clone(),
            font_features: settings.ui_font.features.clone(),
            font_size: rems(0.875).into(),
-            font_weight: FontWeight::NORMAL,
+            font_weight: settings.ui_font.weight,
            font_style: FontStyle::Normal,
            line_height: relative(1.3),
            background_color: None,
--- a/crates/assistant/src/completion_provider/zed.rs
+++ b/crates/assistant/src/completion_provider/zed.rs
@@ -7,11 +7,12 @@ use client::{proto, Client};
 use futures::{future::BoxFuture, stream::BoxStream, FutureExt, StreamExt, TryFutureExt};
 use gpui::{AnyView, AppContext, Task};
 use std::{future, sync::Arc};
+use strum::IntoEnumIterator;
 use ui::prelude::*;

 pub struct ZedDotDevCompletionProvider {
    client: Arc<Client>,
-    default_model: ZedDotDevModel,
+    model: ZedDotDevModel,
    settings_version: usize,
    status: client::Status,
    _maintain_client_status: Task<()>,
@@ -19,7 +20,7 @@ pub struct ZedDotDevCompletionProvider {

 impl ZedDotDevCompletionProvider {
    pub fn new(
-        default_model: ZedDotDevModel,
+        model: ZedDotDevModel,
        client: Arc<Client>,
        settings_version: usize,
        cx: &mut AppContext,
@@ -39,24 +40,39 @@ impl ZedDotDevCompletionProvider {
        });
        Self {
            client,
-            default_model,
+            model,
            settings_version,
            status,
            _maintain_client_status: maintain_client_status,
        }
    }

-    pub fn update(&mut self, default_model: ZedDotDevModel, settings_version: usize) {
-        self.default_model = default_model;
+    pub fn update(&mut self, model: ZedDotDevModel, settings_version: usize) {
+        self.model = model;
        self.settings_version = settings_version;
    }

+    pub fn available_models(&self) -> impl Iterator<Item = ZedDotDevModel> {
+        let mut custom_model = if let ZedDotDevModel::Custom(custom_model) = self.model.clone() {
+            Some(custom_model)
+        } else {
+            None
+        };
+        ZedDotDevModel::iter().filter_map(move |model| {
+            if let ZedDotDevModel::Custom(_) = model {
+                Some(ZedDotDevModel::Custom(custom_model.take()?))
+            } else {
+                Some(model)
+            }
+        })
+    }
+
    pub fn settings_version(&self) -> usize {
        self.settings_version
    }

-    pub fn default_model(&self) -> ZedDotDevModel {
-        self.default_model.clone()
+    pub fn model(&self) -> ZedDotDevModel {
+        self.model.clone()
    }

    pub fn is_authenticated(&self) -> bool {
@@ -78,9 +94,9 @@ impl ZedDotDevCompletionProvider {
        cx: &AppContext,
    ) -> BoxFuture<'static, Result<usize>> {
        match request.model {
-            LanguageModel::OpenAi(_) => future::ready(Err(anyhow!("invalid model"))).boxed(),
            LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4)
            | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4Turbo)
+            | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4Omni)
            | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt3Point5Turbo) => {
                count_open_ai_tokens(request, cx.background_executor())
            }
@@ -107,6 +123,7 @@ impl ZedDotDevCompletionProvider {
                }
                .boxed()
            }
+            _ => future::ready(Err(anyhow!("invalid model"))).boxed(),
        }
    }

--- a/crates/assistant/src/embedded_scope.rs
+++ b/crates/assistant/src/embedded_scope.rs
@@ -1,91 +0,0 @@
-use editor::MultiBuffer;
-use gpui::{AppContext, Model, ModelContext, Subscription};
-
-use crate::{assistant_panel::Conversation, LanguageModelRequestMessage, Role};
-
-#[derive(Default)]
-pub struct EmbeddedScope {
-    active_buffer: Option<Model<MultiBuffer>>,
-    active_buffer_enabled: bool,
-    active_buffer_subscription: Option<Subscription>,
-}
-
-impl EmbeddedScope {
-    pub fn new() -> Self {
-        Self {
-            active_buffer: None,
-            active_buffer_enabled: true,
-            active_buffer_subscription: None,
-        }
-    }
-
-    pub fn set_active_buffer(
-        &mut self,
-        buffer: Option<Model<MultiBuffer>>,
-        cx: &mut ModelContext<Conversation>,
-    ) {
-        self.active_buffer_subscription.take();
-
-        if let Some(active_buffer) = buffer.clone() {
-            self.active_buffer_subscription =
-                Some(cx.subscribe(&active_buffer, |conversation, _, e, cx| {
-                    if let multi_buffer::Event::Edited { .. } = e {
-                        conversation.count_remaining_tokens(cx)
-                    }
-                }));
-        }
-
-        self.active_buffer = buffer;
-    }
-
-    pub fn active_buffer(&self) -> Option<&Model<MultiBuffer>> {
-        self.active_buffer.as_ref()
-    }
-
-    pub fn active_buffer_enabled(&self) -> bool {
-        self.active_buffer_enabled
-    }
-
-    pub fn set_active_buffer_enabled(&mut self, enabled: bool) {
-        self.active_buffer_enabled = enabled;
-    }
-
-    /// Provide a message for the language model based on the active buffer.
-    pub fn message(&self, cx: &AppContext) -> Option<LanguageModelRequestMessage> {
-        if !self.active_buffer_enabled {
-            return None;
-        }
-
-        let active_buffer = self.active_buffer.as_ref()?;
-        let buffer = active_buffer.read(cx);
-
-        if let Some(singleton) = buffer.as_singleton() {
-            let singleton = singleton.read(cx);
-
-            let filename = singleton
-                .file()
-                .map(|file| file.path().to_string_lossy())
-                .unwrap_or("Untitled".into());
-
-            let text = singleton.text();
-
-            let language = singleton
-                .language()
-                .map(|l| {
-                    let name = l.code_fence_block_name();
-                    name.to_string()
-                })
-                .unwrap_or_default();
-
-            let markdown =
-                format!("User's active file `{filename}`:\n\n```{language}\n{text}```\n\n");
-
-            return Some(LanguageModelRequestMessage {
-                role: Role::System,
-                content: markdown,
-            });
-        }
-
-        None
-    }
-}
--- a/crates/assistant/src/model_selector.rs
+++ b/crates/assistant/src/model_selector.rs
@@ -0,0 +1,84 @@
+use std::sync::Arc;
+
+use crate::{assistant_settings::AssistantSettings, CompletionProvider, ToggleModelSelector};
+use fs::Fs;
+use settings::update_settings_file;
+use ui::{popover_menu, prelude::*, ButtonLike, ContextMenu, PopoverMenuHandle, Tooltip};
+
+#[derive(IntoElement)]
+pub struct ModelSelector {
+    handle: PopoverMenuHandle<ContextMenu>,
+    fs: Arc<dyn Fs>,
+}
+
+impl ModelSelector {
+    pub fn new(handle: PopoverMenuHandle<ContextMenu>, fs: Arc<dyn Fs>) -> Self {
+        ModelSelector { handle, fs }
+    }
+}
+
+impl RenderOnce for ModelSelector {
+    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
+        popover_menu("model-switcher")
+            .with_handle(self.handle)
+            .menu(move |cx| {
+                ContextMenu::build(cx, |mut menu, cx| {
+                    for model in CompletionProvider::global(cx).available_models() {
+                        menu = menu.custom_entry(
+                            {
+                                let model = model.clone();
+                                move |_| Label::new(model.display_name()).into_any_element()
+                            },
+                            {
+                                let fs = self.fs.clone();
+                                let model = model.clone();
+                                move |cx| {
+                                    let model = model.clone();
+                                    update_settings_file::<AssistantSettings>(
+                                        fs.clone(),
+                                        cx,
+                                        move |settings| settings.set_model(model),
+                                    );
+                                }
+                            },
+                        );
+                    }
+                    menu
+                })
+                .into()
+            })
+            .trigger(
+                ButtonLike::new("active-model")
+                    .child(
+                        h_flex()
+                            .w_full()
+                            .gap_0p5()
+                            .child(
+                                div()
+                                    .overflow_x_hidden()
+                                    .flex_grow()
+                                    .whitespace_nowrap()
+                                    .child(
+                                        Label::new(
+                                            CompletionProvider::global(cx).model().display_name(),
+                                        )
+                                        .size(LabelSize::Small)
+                                        .color(Color::Muted),
+                                    ),
+                            )
+                            .child(
+                                div().child(
+                                    Icon::new(IconName::ChevronDown)
+                                        .color(Color::Muted)
+                                        .size(IconSize::XSmall),
+                                ),
+                            ),
+                    )
+                    .style(ButtonStyle::Subtle)
+                    .tooltip(move |cx| {
+                        Tooltip::for_action("Change Model", &ToggleModelSelector, cx)
+                    }),
+            )
+            .anchor(gpui::AnchorCorner::BottomRight)
+    }
+}
--- a/crates/assistant/src/prompts.rs
+++ b/crates/assistant/src/prompts.rs
@@ -1,95 +1,7 @@
-use language::BufferSnapshot;
-use std::{fmt::Write, ops::Range};
+mod prompt;
+mod prompt_library;
+mod prompt_manager;

-pub fn generate_content_prompt(
-    user_prompt: String,
-    language_name: Option<&str>,
-    buffer: BufferSnapshot,
-    range: Range<usize>,
-    project_name: Option<String>,
-) -> anyhow::Result<String> {
-    let mut prompt = String::new();
-
-    let content_type = match language_name {
-        None | Some("Markdown" | "Plain Text") => {
-            writeln!(prompt, "You are an expert engineer.")?;
-            "Text"
-        }
-        Some(language_name) => {
-            writeln!(prompt, "You are an expert {language_name} engineer.")?;
-            writeln!(
-                prompt,
-                "Your answer MUST always and only be valid {}.",
-                language_name
-            )?;
-            "Code"
-        }
-    };
-
-    if let Some(project_name) = project_name {
-        writeln!(
-            prompt,
-            "You are currently working inside the '{project_name}' project in code editor Zed."
-        )?;
-    }
-
-    // Include file content.
-    for chunk in buffer.text_for_range(0..range.start) {
-        prompt.push_str(chunk);
-    }
-
-    if range.is_empty() {
-        prompt.push_str("<|START|>");
-    } else {
-        prompt.push_str("<|START|");
-    }
-
-    for chunk in buffer.text_for_range(range.clone()) {
-        prompt.push_str(chunk);
-    }
-
-    if !range.is_empty() {
-        prompt.push_str("|END|>");
-    }
-
-    for chunk in buffer.text_for_range(range.end..buffer.len()) {
-        prompt.push_str(chunk);
-    }
-
-    prompt.push('\n');
-
-    if range.is_empty() {
-        writeln!(
-            prompt,
-            "Assume the cursor is located where the `<|START|>` span is."
-        )
-        .unwrap();
-        writeln!(
-            prompt,
-            "{content_type} can't be replaced, so assume your answer will be inserted at the cursor.",
-        )
-        .unwrap();
-        writeln!(
-            prompt,
-            "Generate {content_type} based on the users prompt: {user_prompt}",
-        )
-        .unwrap();
-    } else {
-        writeln!(prompt, "Modify the user's selected {content_type} based upon the users prompt: '{user_prompt}'").unwrap();
-        writeln!(prompt, "You must reply with only the adjusted {content_type} (within the '<|START|' and '|END|>' spans) not the entire file.").unwrap();
-        writeln!(
-            prompt,
-            "Double check that you only return code and not the '<|START|' and '|END|'> spans"
-        )
-        .unwrap();
-    }
-
-    writeln!(prompt, "Never make remarks about the output.").unwrap();
-    writeln!(
-        prompt,
-        "Do not return anything else, except the generated {content_type}."
-    )
-    .unwrap();
-
-    Ok(prompt)
-}
+pub use prompt::*;
+pub use prompt_library::*;
+pub use prompt_manager::*;
--- a/crates/assistant/src/prompts/prompt.rs
+++ b/crates/assistant/src/prompts/prompt.rs
@@ -0,0 +1,360 @@
+use fs::Fs;
+use language::BufferSnapshot;
+use std::{fmt::Write, ops::Range, path::PathBuf, sync::Arc};
+use ui::SharedString;
+use util::paths::PROMPTS_DIR;
+
+use gray_matter::{engine::YAML, Matter};
+use serde::{Deserialize, Serialize};
+
+use super::prompt_library::PromptId;
+
+pub const PROMPT_DEFAULT_TITLE: &str = "Untitled Prompt";
+
+fn standardize_value(value: String) -> String {
+    value.replace(['\n', '\r', '"', '\''], "")
+}
+
+fn slugify(input: String) -> String {
+    let mut slug = String::new();
+    for c in input.chars() {
+        if c.is_alphanumeric() {
+            slug.push(c.to_ascii_lowercase());
+        } else if c.is_whitespace() {
+            slug.push('-');
+        } else {
+            slug.push('_');
+        }
+    }
+    slug
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub struct StaticPromptFrontmatter {
+    title: String,
+    version: String,
+    author: String,
+    #[serde(default)]
+    languages: Vec<String>,
+    #[serde(default)]
+    dependencies: Vec<String>,
+}
+
+impl Default for StaticPromptFrontmatter {
+    fn default() -> Self {
+        Self {
+            title: PROMPT_DEFAULT_TITLE.to_string(),
+            version: "1.0".to_string(),
+            author: "You <you@email.com>".to_string(),
+            languages: vec![],
+            dependencies: vec![],
+        }
+    }
+}
+
+impl StaticPromptFrontmatter {
+    /// Returns the frontmatter as a markdown frontmatter string
+    pub fn frontmatter_string(&self) -> String {
+        let mut frontmatter = format!(
+            "---\ntitle: \"{}\"\nversion: \"{}\"\nauthor: \"{}\"\n",
+            standardize_value(self.title.clone()),
+            standardize_value(self.version.clone()),
+            standardize_value(self.author.clone()),
+        );
+
+        if !self.languages.is_empty() {
+            let languages = self
+                .languages
+                .iter()
+                .map(|l| standardize_value(l.clone()))
+                .collect::<Vec<String>>()
+                .join(", ");
+            writeln!(frontmatter, "languages: [{}]", languages).unwrap();
+        }
+
+        if !self.dependencies.is_empty() {
+            let dependencies = self
+                .dependencies
+                .iter()
+                .map(|d| standardize_value(d.clone()))
+                .collect::<Vec<String>>()
+                .join(", ");
+            writeln!(frontmatter, "dependencies: [{}]", dependencies).unwrap();
+        }
+
+        frontmatter.push_str("---\n");
+
+        frontmatter
+    }
+}
+
+/// A static prompt that can be loaded into the prompt library
+/// from Markdown with a frontmatter header
+///
+/// Examples:
+///
+/// ### Globally available prompt
+///
+/// ```markdown
+/// ---
+/// title: Foo
+/// version: 1.0
+/// author: Jane Kim <jane@kim.com
+/// languages: ["*"]
+/// dependencies: []
+/// ---
+///
+/// Foo and bar are terms used in programming to describe generic concepts.
+/// ```
+///
+/// ### Language-specific prompt
+///
+/// ```markdown
+/// ---
+/// title: UI with GPUI
+/// version: 1.0
+/// author: Nate Butler <iamnbutler@gmail.com>
+/// languages: ["rust"]
+/// dependencies: ["gpui"]
+/// ---
+///
+/// When building a UI with GPUI, ensure you...
+/// ```
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub struct StaticPrompt {
+    #[serde(skip_deserializing)]
+    id: PromptId,
+    #[serde(skip)]
+    metadata: StaticPromptFrontmatter,
+    content: String,
+    file_name: Option<SharedString>,
+}
+
+impl Default for StaticPrompt {
+    fn default() -> Self {
+        let metadata = StaticPromptFrontmatter::default();
+
+        let content = metadata.clone().frontmatter_string();
+
+        Self {
+            id: PromptId::new(),
+            metadata,
+            content,
+            file_name: None,
+        }
+    }
+}
+
+impl StaticPrompt {
+    pub fn new(content: String, file_name: Option<String>) -> Self {
+        let matter = Matter::<YAML>::new();
+        let result = matter.parse(&content);
+        let file_name = if let Some(file_name) = file_name {
+            let shared_filename: SharedString = file_name.into();
+            Some(shared_filename)
+        } else {
+            None
+        };
+
+        let metadata = result
+            .data
+            .map_or_else(
+                || Err(anyhow::anyhow!("Failed to parse frontmatter")),
+                |data| {
+                    let front_matter: StaticPromptFrontmatter = data.deserialize()?;
+                    Ok(front_matter)
+                },
+            )
+            .unwrap_or_else(|e| {
+                if let Some(file_name) = &file_name {
+                    log::error!("Failed to parse frontmatter for {}: {}", file_name, e);
+                } else {
+                    log::error!("Failed to parse frontmatter: {}", e);
+                }
+                StaticPromptFrontmatter::default()
+            });
+
+        let id = if let Some(file_name) = &file_name {
+            PromptId::from_str(file_name).unwrap_or_default()
+        } else {
+            PromptId::new()
+        };
+
+        StaticPrompt {
+            id,
+            content,
+            file_name,
+            metadata,
+        }
+    }
+
+    pub fn update(&mut self, id: PromptId, content: String) {
+        let mut updated_prompt =
+            StaticPrompt::new(content, self.file_name.clone().map(|s| s.to_string()));
+        updated_prompt.id = id;
+        *self = updated_prompt;
+    }
+}
+
+impl StaticPrompt {
+    /// Returns the prompt's id
+    pub fn id(&self) -> &PromptId {
+        &self.id
+    }
+
+    pub fn file_name(&self) -> Option<&SharedString> {
+        self.file_name.as_ref()
+    }
+
+    /// Sets the file name of the prompt
+    pub fn new_file_name(&self) -> String {
+        let in_name = format!(
+            "{}_{}_{}",
+            standardize_value(self.metadata.title.clone()),
+            standardize_value(self.metadata.version.clone()),
+            standardize_value(self.id.0.to_string())
+        );
+        let out_name = slugify(in_name);
+        out_name
+    }
+
+    /// Returns the prompt's content
+    pub fn content(&self) -> &String {
+        &self.content
+    }
+
+    /// Returns the prompt's metadata
+    pub fn _metadata(&self) -> &StaticPromptFrontmatter {
+        &self.metadata
+    }
+
+    /// Returns the prompt's title
+    pub fn title(&self) -> SharedString {
+        self.metadata.title.clone().into()
+    }
+
+    pub fn body(&self) -> String {
+        let matter = Matter::<YAML>::new();
+        let result = matter.parse(self.content.as_str());
+        result.content.clone()
+    }
+
+    pub fn path(&self) -> Option<PathBuf> {
+        if let Some(file_name) = self.file_name() {
+            let path_str = format!("{}", file_name);
+            Some(PROMPTS_DIR.join(path_str))
+        } else {
+            None
+        }
+    }
+
+    pub async fn save(&self, fs: Arc<dyn Fs>) -> anyhow::Result<()> {
+        let file_name = self.file_name();
+        let new_file_name = self.new_file_name();
+
+        let out_name = if let Some(file_name) = file_name {
+            file_name.to_owned().to_string()
+        } else {
+            format!("{}.md", new_file_name)
+        };
+        let path = PROMPTS_DIR.join(&out_name);
+        let json = self.content.clone();
+
+        fs.atomic_write(path, json).await?;
+
+        Ok(())
+    }
+}
+
+pub fn generate_content_prompt(
+    user_prompt: String,
+    language_name: Option<&str>,
+    buffer: BufferSnapshot,
+    range: Range<usize>,
+    project_name: Option<String>,
+) -> anyhow::Result<String> {
+    let mut prompt = String::new();
+
+    let content_type = match language_name {
+        None | Some("Markdown" | "Plain Text") => {
+            writeln!(prompt, "You are an expert engineer.")?;
+            "Text"
+        }
+        Some(language_name) => {
+            writeln!(prompt, "You are an expert {language_name} engineer.")?;
+            writeln!(
+                prompt,
+                "Your answer MUST always and only be valid {}.",
+                language_name
+            )?;
+            "Code"
+        }
+    };
+
+    if let Some(project_name) = project_name {
+        writeln!(
+            prompt,
+            "You are currently working inside the '{project_name}' project in code editor Zed."
+        )?;
+    }
+
+    // Include file content.
+    for chunk in buffer.text_for_range(0..range.start) {
+        prompt.push_str(chunk);
+    }
+
+    if range.is_empty() {
+        prompt.push_str("<|START|>");
+    } else {
+        prompt.push_str("<|START|");
+    }
+
+    for chunk in buffer.text_for_range(range.clone()) {
+        prompt.push_str(chunk);
+    }
+
+    if !range.is_empty() {
+        prompt.push_str("|END|>");
+    }
+
+    for chunk in buffer.text_for_range(range.end..buffer.len()) {
+        prompt.push_str(chunk);
+    }
+
+    prompt.push('\n');
+
+    if range.is_empty() {
+        writeln!(
+            prompt,
+            "Assume the cursor is located where the `<|START|>` span is."
+        )
+        .unwrap();
+        writeln!(
+            prompt,
+            "{content_type} can't be replaced, so assume your answer will be inserted at the cursor.",
+        )
+        .unwrap();
+        writeln!(
+            prompt,
+            "Generate {content_type} based on the users prompt: {user_prompt}",
+        )
+        .unwrap();
+    } else {
+        writeln!(prompt, "Modify the user's selected {content_type} based upon the users prompt: '{user_prompt}'").unwrap();
+        writeln!(prompt, "You must reply with only the adjusted {content_type} (within the '<|START|' and '|END|>' spans) not the entire file.").unwrap();
+        writeln!(
+            prompt,
+            "Double check that you only return code and not the '<|START|' and '|END|'> spans"
+        )
+        .unwrap();
+    }
+
+    writeln!(prompt, "Never make remarks about the output.").unwrap();
+    writeln!(
+        prompt,
+        "Do not return anything else, except the generated {content_type}."
+    )
+    .unwrap();
+
+    Ok(prompt)
+}
--- a/crates/assistant/src/prompts/prompt_library.rs
+++ b/crates/assistant/src/prompts/prompt_library.rs
@@ -0,0 +1,245 @@
+use anyhow::Context;
+use collections::HashMap;
+use fs::Fs;
+
+use gray_matter::{engine::YAML, Matter};
+use parking_lot::RwLock;
+use serde::{Deserialize, Serialize};
+use smol::stream::StreamExt;
+use std::sync::Arc;
+use util::paths::PROMPTS_DIR;
+use uuid::Uuid;
+
+use super::prompt::StaticPrompt;
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Serialize, Deserialize)]
+pub struct PromptId(pub Uuid);
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub enum SortOrder {
+    Alphabetical,
+}
+
+#[allow(unused)]
+impl PromptId {
+    pub fn new() -> Self {
+        Self(Uuid::new_v4())
+    }
+
+    pub fn from_str(id: &str) -> anyhow::Result<Self> {
+        Ok(Self(Uuid::parse_str(id)?))
+    }
+}
+
+impl Default for PromptId {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[derive(Default, Serialize, Deserialize)]
+pub struct PromptLibraryState {
+    /// A set of prompts that all assistant contexts will start with
+    default_prompt: Vec<PromptId>,
+    /// All [Prompt]s loaded into the library
+    prompts: HashMap<PromptId, StaticPrompt>,
+    /// Prompts that have been changed but haven't been
+    /// saved back to the file system
+    dirty_prompts: Vec<PromptId>,
+    version: usize,
+}
+
+pub struct PromptLibrary {
+    state: RwLock<PromptLibraryState>,
+}
+
+impl Default for PromptLibrary {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl PromptLibrary {
+    fn new() -> Self {
+        Self {
+            state: RwLock::new(PromptLibraryState::default()),
+        }
+    }
+
+    pub fn new_prompt(&self) -> StaticPrompt {
+        StaticPrompt::default()
+    }
+
+    pub fn add_prompt(&self, prompt: StaticPrompt) {
+        let mut state = self.state.write();
+        let id = *prompt.id();
+        state.prompts.insert(id, prompt);
+        state.version += 1;
+    }
+
+    pub fn prompts(&self) -> HashMap<PromptId, StaticPrompt> {
+        let state = self.state.read();
+        state.prompts.clone()
+    }
+
+    pub fn sorted_prompts(&self, sort_order: SortOrder) -> Vec<(PromptId, StaticPrompt)> {
+        let state = self.state.read();
+
+        let mut prompts = state
+            .prompts
+            .iter()
+            .map(|(id, prompt)| (*id, prompt.clone()))
+            .collect::<Vec<_>>();
+
+        match sort_order {
+            SortOrder::Alphabetical => prompts.sort_by(|(_, a), (_, b)| a.title().cmp(&b.title())),
+        };
+
+        prompts
+    }
+
+    pub fn prompt_by_id(&self, id: PromptId) -> Option<StaticPrompt> {
+        let state = self.state.read();
+        state.prompts.get(&id).cloned()
+    }
+
+    pub fn first_prompt_id(&self) -> Option<PromptId> {
+        let state = self.state.read();
+        state.prompts.keys().next().cloned()
+    }
+
+    pub fn is_dirty(&self, id: &PromptId) -> bool {
+        let state = self.state.read();
+        state.dirty_prompts.contains(&id)
+    }
+
+    pub fn set_dirty(&self, id: PromptId, dirty: bool) {
+        let mut state = self.state.write();
+        if dirty {
+            if !state.dirty_prompts.contains(&id) {
+                state.dirty_prompts.push(id);
+            }
+            state.version += 1;
+        } else {
+            state.dirty_prompts.retain(|&i| i != id);
+            state.version += 1;
+        }
+    }
+
+    /// Load the state of the prompt library from the file system
+    /// or create a new one if it doesn't exist
+    pub async fn load_index(fs: Arc<dyn Fs>) -> anyhow::Result<Self> {
+        let path = PROMPTS_DIR.join("index.json");
+
+        let state = if fs.is_file(&path).await {
+            let json = fs.load(&path).await?;
+            serde_json::from_str(&json)?
+        } else {
+            PromptLibraryState::default()
+        };
+
+        let mut prompt_library = Self {
+            state: RwLock::new(state),
+        };
+
+        prompt_library.load_prompts(fs).await?;
+
+        Ok(prompt_library)
+    }
+
+    /// Load all prompts from the file system
+    /// adding them to the library if they don't already exist
+    pub async fn load_prompts(&mut self, fs: Arc<dyn Fs>) -> anyhow::Result<()> {
+        self.state.get_mut().prompts.clear();
+
+        let mut prompt_paths = fs.read_dir(&PROMPTS_DIR).await?;
+
+        while let Some(prompt_path) = prompt_paths.next().await {
+            let prompt_path = prompt_path.with_context(|| "Failed to read prompt path")?;
+            let file_name_lossy = if prompt_path.file_name().is_some() {
+                Some(
+                    prompt_path
+                        .file_name()
+                        .unwrap()
+                        .to_string_lossy()
+                        .to_string(),
+                )
+            } else {
+                None
+            };
+
+            if !fs.is_file(&prompt_path).await
+                || prompt_path.extension().and_then(|ext| ext.to_str()) != Some("md")
+            {
+                continue;
+            }
+
+            let json = fs
+                .load(&prompt_path)
+                .await
+                .with_context(|| format!("Failed to load prompt {:?}", prompt_path))?;
+
+            // Check that the prompt is valid
+            let matter = Matter::<YAML>::new();
+            let result = matter.parse(&json);
+            if result.data.is_none() {
+                log::warn!("Invalid prompt: {:?}", prompt_path);
+                continue;
+            }
+
+            let static_prompt = StaticPrompt::new(json, file_name_lossy.clone());
+
+            let state = self.state.get_mut();
+
+            let id = Uuid::new_v4();
+            state.prompts.insert(PromptId(id), static_prompt);
+            state.version += 1;
+        }
+
+        // Write any changes back to the file system
+        self.save_index(fs.clone()).await?;
+
+        Ok(())
+    }
+
+    /// Save the current state of the prompt library to the
+    /// file system as a JSON file
+    pub async fn save_index(&self, fs: Arc<dyn Fs>) -> anyhow::Result<()> {
+        fs.create_dir(&PROMPTS_DIR).await?;
+
+        let path = PROMPTS_DIR.join("index.json");
+
+        let json = {
+            let state = self.state.read();
+            serde_json::to_string(&*state)?
+        };
+
+        fs.atomic_write(path, json).await?;
+
+        Ok(())
+    }
+
+    pub async fn save_prompt(
+        &self,
+        prompt_id: PromptId,
+        updated_content: Option<String>,
+        fs: Arc<dyn Fs>,
+    ) -> anyhow::Result<()> {
+        if let Some(updated_content) = updated_content {
+            let mut state = self.state.write();
+            if let Some(prompt) = state.prompts.get_mut(&prompt_id) {
+                prompt.update(prompt_id, updated_content);
+                state.version += 1;
+            }
+        }
+
+        if let Some(prompt) = self.prompt_by_id(prompt_id) {
+            prompt.save(fs).await?;
+            self.set_dirty(prompt_id, false);
+        } else {
+            log::warn!("Failed to save prompt: {:?}", prompt_id);
+        }
+
+        Ok(())
+    }
+}
--- a/crates/assistant/src/prompts/prompt_manager.rs
+++ b/crates/assistant/src/prompts/prompt_manager.rs
@@ -0,0 +1,512 @@
+use collections::HashMap;
+use editor::{Editor, EditorEvent};
+use fs::Fs;
+use gpui::{prelude::FluentBuilder, *};
+use language::{language_settings, Buffer, LanguageRegistry};
+use picker::{Picker, PickerDelegate};
+use std::sync::Arc;
+use ui::{prelude::*, IconButtonShape, Indicator, ListItem, ListItemSpacing, Tooltip};
+use util::{ResultExt, TryFutureExt};
+use workspace::ModalView;
+
+use crate::prompts::{PromptId, PromptLibrary, SortOrder, StaticPrompt, PROMPT_DEFAULT_TITLE};
+
+actions!(prompt_manager, [NewPrompt, SavePrompt]);
+
+pub struct PromptManager {
+    focus_handle: FocusHandle,
+    prompt_library: Arc<PromptLibrary>,
+    language_registry: Arc<LanguageRegistry>,
+    #[allow(dead_code)]
+    fs: Arc<dyn Fs>,
+    picker: View<Picker<PromptManagerDelegate>>,
+    prompt_editors: HashMap<PromptId, View<Editor>>,
+    active_prompt_id: Option<PromptId>,
+    last_new_prompt_id: Option<PromptId>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl PromptManager {
+    pub fn new(
+        prompt_library: Arc<PromptLibrary>,
+        language_registry: Arc<LanguageRegistry>,
+        fs: Arc<dyn Fs>,
+        cx: &mut ViewContext<Self>,
+    ) -> Self {
+        let prompt_manager = cx.view().downgrade();
+        let picker = cx.new_view(|cx| {
+            Picker::uniform_list(
+                PromptManagerDelegate {
+                    prompt_manager,
+                    matching_prompts: vec![],
+                    matching_prompt_ids: vec![],
+                    prompt_library: prompt_library.clone(),
+                    selected_index: 0,
+                    _subscriptions: vec![],
+                },
+                cx,
+            )
+            .max_height(rems(35.75))
+            .modal(false)
+        });
+
+        let focus_handle = picker.focus_handle(cx);
+
+        let subscriptions = vec![
+            // cx.on_focus_in(&focus_handle, Self::focus_in),
+            // cx.on_focus_out(&focus_handle, Self::focus_out),
+        ];
+
+        let mut manager = Self {
+            focus_handle,
+            prompt_library,
+            language_registry,
+            fs,
+            picker,
+            prompt_editors: HashMap::default(),
+            active_prompt_id: None,
+            last_new_prompt_id: None,
+            _subscriptions: subscriptions,
+        };
+
+        manager.active_prompt_id = manager.prompt_library.first_prompt_id();
+
+        manager
+    }
+
+    fn dispatch_context(&self, cx: &ViewContext<Self>) -> KeyContext {
+        let mut dispatch_context = KeyContext::new_with_defaults();
+        dispatch_context.add("PromptManager");
+
+        let identifier = match self.active_editor() {
+            Some(active_editor) if active_editor.focus_handle(cx).is_focused(cx) => "editing",
+            _ => "not_editing",
+        };
+
+        dispatch_context.add(identifier);
+        dispatch_context
+    }
+
+    pub fn new_prompt(&mut self, _: &NewPrompt, cx: &mut ViewContext<Self>) {
+        // TODO: Why doesn't this prevent making a new prompt if you
+        // move the picker selection/maybe unfocus the editor?
+
+        // Prevent making a new prompt if the last new prompt is still empty
+        //
+        // Instead, we'll focus the last new prompt
+        if let Some(last_new_prompt_id) = self.last_new_prompt_id() {
+            if let Some(last_new_prompt) = self.prompt_library.prompt_by_id(last_new_prompt_id) {
+                let normalized_body = last_new_prompt
+                    .body()
+                    .trim()
+                    .replace(['\r', '\n'], "")
+                    .to_string();
+
+                if last_new_prompt.title() == PROMPT_DEFAULT_TITLE && normalized_body.is_empty() {
+                    self.set_editor_for_prompt(last_new_prompt_id, cx);
+                    self.focus_active_editor(cx);
+                }
+            }
+        }
+
+        let prompt = self.prompt_library.new_prompt();
+        self.set_last_new_prompt_id(Some(prompt.id().to_owned()));
+
+        self.prompt_library.add_prompt(prompt.clone());
+
+        let id = *prompt.id();
+        self.picker.update(cx, |picker, _cx| {
+            let prompts = self
+                .prompt_library
+                .sorted_prompts(SortOrder::Alphabetical)
+                .clone()
+                .into_iter();
+
+            picker.delegate.prompt_library = self.prompt_library.clone();
+            picker.delegate.matching_prompts = prompts.clone().map(|(_, p)| Arc::new(p)).collect();
+            picker.delegate.matching_prompt_ids = prompts.map(|(id, _)| id).collect();
+            picker.delegate.selected_index = picker
+                .delegate
+                .matching_prompts
+                .iter()
+                .position(|p| p.id() == &id)
+                .unwrap_or(0);
+        });
+
+        self.active_prompt_id = Some(id);
+
+        cx.notify();
+    }
+
+    pub fn save_prompt(
+        &mut self,
+        fs: Arc<dyn Fs>,
+        prompt_id: PromptId,
+        new_content: String,
+        cx: &mut ViewContext<Self>,
+    ) -> Result<()> {
+        let library = self.prompt_library.clone();
+        if library.prompt_by_id(prompt_id).is_some() {
+            cx.spawn(|_, _| async move {
+                library
+                    .save_prompt(prompt_id, Some(new_content), fs)
+                    .log_err()
+                    .await;
+            })
+            .detach();
+            cx.notify();
+        }
+
+        Ok(())
+    }
+
+    pub fn set_active_prompt(&mut self, prompt_id: Option<PromptId>, cx: &mut ViewContext<Self>) {
+        self.active_prompt_id = prompt_id;
+        cx.notify();
+    }
+
+    pub fn last_new_prompt_id(&self) -> Option<PromptId> {
+        self.last_new_prompt_id
+    }
+
+    pub fn set_last_new_prompt_id(&mut self, id: Option<PromptId>) {
+        self.last_new_prompt_id = id;
+    }
+
+    pub fn focus_active_editor(&self, cx: &mut ViewContext<Self>) {
+        if let Some(active_prompt_id) = self.active_prompt_id {
+            if let Some(editor) = self.prompt_editors.get(&active_prompt_id) {
+                let focus_handle = editor.focus_handle(cx);
+
+                cx.focus(&focus_handle)
+            }
+        }
+    }
+
+    pub fn active_editor(&self) -> Option<&View<Editor>> {
+        self.active_prompt_id
+            .and_then(|active_prompt_id| self.prompt_editors.get(&active_prompt_id))
+    }
+
+    fn set_editor_for_prompt(
+        &mut self,
+        prompt_id: PromptId,
+        cx: &mut ViewContext<Self>,
+    ) -> impl IntoElement {
+        let prompt_library = self.prompt_library.clone();
+
+        let editor_for_prompt = self.prompt_editors.entry(prompt_id).or_insert_with(|| {
+            cx.new_view(|cx| {
+                let text = if let Some(prompt) = prompt_library.prompt_by_id(prompt_id) {
+                    prompt.content().to_owned()
+                } else {
+                    "".to_string()
+                };
+
+                let buffer = cx.new_model(|cx| {
+                    let mut buffer = Buffer::local(text, cx);
+                    let markdown = self.language_registry.language_for_name("Markdown");
+                    cx.spawn(|buffer, mut cx| async move {
+                        if let Some(markdown) = markdown.await.log_err() {
+                            _ = buffer.update(&mut cx, |buffer, cx| {
+                                buffer.set_language(Some(markdown), cx);
+                            });
+                        }
+                    })
+                    .detach();
+                    buffer.set_language_registry(self.language_registry.clone());
+                    buffer
+                });
+                let mut editor = Editor::for_buffer(buffer, None, cx);
+                editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
+                editor.set_show_gutter(false, cx);
+                editor
+            })
+        });
+
+        editor_for_prompt.clone()
+    }
+
+    fn dismiss(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
+        cx.emit(DismissEvent);
+    }
+
+    fn render_prompt_list(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let picker = self.picker.clone();
+
+        v_flex()
+            .id("prompt-list")
+            .bg(cx.theme().colors().surface_background)
+            .h_full()
+            .w_1_3()
+            .overflow_hidden()
+            .child(
+                h_flex()
+                    .bg(cx.theme().colors().background)
+                    .p(Spacing::Small.rems(cx))
+                    .border_b_1()
+                    .border_color(cx.theme().colors().border)
+                    .h(rems(1.75))
+                    .w_full()
+                    .flex_none()
+                    .justify_between()
+                    .child(Label::new("Prompt Library").size(LabelSize::Small))
+                    .child(
+                        IconButton::new("new-prompt", IconName::Plus)
+                            .shape(IconButtonShape::Square)
+                            .tooltip(move |cx| Tooltip::text("New Prompt", cx))
+                            .on_click(|_, cx| {
+                                cx.dispatch_action(NewPrompt.boxed_clone());
+                            }),
+                    ),
+            )
+            .child(
+                v_flex()
+                    .h(rems(38.25))
+                    .flex_grow()
+                    .justify_start()
+                    .child(picker),
+            )
+    }
+}
+
+impl Render for PromptManager {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let active_prompt_id = self.active_prompt_id;
+        let active_prompt = if let Some(active_prompt_id) = active_prompt_id {
+            self.prompt_library.clone().prompt_by_id(active_prompt_id)
+        } else {
+            None
+        };
+        let active_editor = self.active_editor().map(|editor| editor.clone());
+        let updated_content = if let Some(editor) = active_editor {
+            Some(editor.read(cx).text(cx))
+        } else {
+            None
+        };
+        let can_save = active_prompt_id.is_some() && updated_content.is_some();
+        let fs = self.fs.clone();
+
+        h_flex()
+            .id("prompt-manager")
+            .key_context(self.dispatch_context(cx))
+            .track_focus(&self.focus_handle)
+            .on_action(cx.listener(Self::dismiss))
+            .on_action(cx.listener(Self::new_prompt))
+            .elevation_3(cx)
+            .size_full()
+            .flex_none()
+            .w(rems(64.))
+            .h(rems(40.))
+            .overflow_hidden()
+            .child(self.render_prompt_list(cx))
+            .child(
+                div().w_2_3().h_full().child(
+                    v_flex()
+                        .id("prompt-editor")
+                        .border_l_1()
+                        .border_color(cx.theme().colors().border)
+                        .bg(cx.theme().colors().editor_background)
+                        .size_full()
+                        .flex_none()
+                        .min_w_64()
+                        .h_full()
+                        .overflow_hidden()
+                        .child(
+                            h_flex()
+                                .bg(cx.theme().colors().background)
+                                .p(Spacing::Small.rems(cx))
+                                .border_b_1()
+                                .border_color(cx.theme().colors().border)
+                                .h_7()
+                                .w_full()
+                                .justify_between()
+                                .child(
+                                    h_flex()
+                                        .gap(Spacing::XXLarge.rems(cx))
+                                        .child(if can_save {
+                                            IconButton::new("save", IconName::Save)
+                                                .shape(IconButtonShape::Square)
+                                                .tooltip(move |cx| Tooltip::text("Save Prompt", cx))
+                                                .on_click(cx.listener(move |this, _event, cx| {
+                                                    if let Some(prompt_id) = active_prompt_id {
+                                                        this.save_prompt(
+                                                            fs.clone(),
+                                                            prompt_id,
+                                                            updated_content.clone().unwrap_or(
+                                                                "TODO: make unreachable"
+                                                                    .to_string(),
+                                                            ),
+                                                            cx,
+                                                        )
+                                                        .log_err();
+                                                    }
+                                                }))
+                                        } else {
+                                            IconButton::new("save", IconName::Save)
+                                                .shape(IconButtonShape::Square)
+                                                .disabled(true)
+                                        })
+                                        .when_some(active_prompt, |this, active_prompt| {
+                                            let path = active_prompt.path();
+
+                                            this.child(
+                                                IconButton::new("reveal", IconName::Reveal)
+                                                    .shape(IconButtonShape::Square)
+                                                    .disabled(path.is_none())
+                                                    .tooltip(move |cx| {
+                                                        Tooltip::text("Reveal in Finder", cx)
+                                                    })
+                                                    .on_click(cx.listener(move |_, _event, cx| {
+                                                        if let Some(path) = path.clone() {
+                                                            cx.reveal_path(&path);
+                                                        }
+                                                    })),
+                                            )
+                                        }),
+                                )
+                                .child(
+                                    IconButton::new("dismiss", IconName::Close)
+                                        .shape(IconButtonShape::Square)
+                                        .tooltip(move |cx| Tooltip::text("Close", cx))
+                                        .on_click(|_, cx| {
+                                            cx.dispatch_action(menu::Cancel.boxed_clone());
+                                        }),
+                                ),
+                        )
+                        .when_some(active_prompt_id, |this, active_prompt_id| {
+                            this.child(
+                                h_flex()
+                                    .flex_1()
+                                    .w_full()
+                                    .py(Spacing::Large.rems(cx))
+                                    .px(Spacing::XLarge.rems(cx))
+                                    .child(self.set_editor_for_prompt(active_prompt_id, cx)),
+                            )
+                        }),
+                ),
+            )
+    }
+}
+
+impl EventEmitter<DismissEvent> for PromptManager {}
+impl EventEmitter<EditorEvent> for PromptManager {}
+
+impl ModalView for PromptManager {}
+
+impl FocusableView for PromptManager {
+    fn focus_handle(&self, _cx: &AppContext) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+pub struct PromptManagerDelegate {
+    prompt_manager: WeakView<PromptManager>,
+    matching_prompts: Vec<Arc<StaticPrompt>>,
+    matching_prompt_ids: Vec<PromptId>,
+    prompt_library: Arc<PromptLibrary>,
+    selected_index: usize,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl PickerDelegate for PromptManagerDelegate {
+    type ListItem = ListItem;
+
+    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
+        "Find a prompt…".into()
+    }
+
+    fn match_count(&self) -> usize {
+        self.matching_prompt_ids.len()
+    }
+
+    fn selected_index(&self) -> usize {
+        self.selected_index
+    }
+
+    fn set_selected_index(&mut self, ix: usize, _: &mut ViewContext<Picker<Self>>) {
+        self.selected_index = ix;
+    }
+
+    fn selected_index_changed(
+        &self,
+        ix: usize,
+        _cx: &mut ViewContext<Picker<Self>>,
+    ) -> Option<Box<dyn Fn(&mut WindowContext) + 'static>> {
+        let prompt_id = self.matching_prompt_ids.get(ix).copied()?;
+        let prompt_manager = self.prompt_manager.upgrade()?;
+
+        Some(Box::new(move |cx| {
+            prompt_manager.update(cx, |manager, cx| {
+                manager.set_active_prompt(Some(prompt_id), cx);
+            })
+        }))
+    }
+
+    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
+        let prompt_library = self.prompt_library.clone();
+        cx.spawn(|picker, mut cx| async move {
+            async {
+                let prompts = prompt_library.sorted_prompts(SortOrder::Alphabetical);
+                let matching_prompts = prompts
+                    .into_iter()
+                    .filter(|(_, prompt)| {
+                        prompt
+                            .content()
+                            .to_lowercase()
+                            .contains(&query.to_lowercase())
+                    })
+                    .collect::<Vec<_>>();
+                picker.update(&mut cx, |picker, cx| {
+                    picker.delegate.matching_prompt_ids =
+                        matching_prompts.iter().map(|(id, _)| *id).collect();
+                    picker.delegate.matching_prompts = matching_prompts
+                        .into_iter()
+                        .map(|(_, prompt)| Arc::new(prompt))
+                        .collect();
+                    cx.notify();
+                })?;
+                anyhow::Ok(())
+            }
+            .log_err()
+            .await;
+        })
+    }
+
+    fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<Self>>) {
+        let prompt_manager = self.prompt_manager.upgrade().unwrap();
+        prompt_manager.update(cx, move |manager, cx| manager.focus_active_editor(cx));
+    }
+
+    fn should_dismiss(&self) -> bool {
+        false
+    }
+
+    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
+        self.prompt_manager
+            .update(cx, |_, cx| {
+                cx.emit(DismissEvent);
+            })
+            .ok();
+    }
+
+    fn render_match(
+        &self,
+        ix: usize,
+        selected: bool,
+        _cx: &mut ViewContext<Picker<Self>>,
+    ) -> Option<Self::ListItem> {
+        let prompt = self.matching_prompts.get(ix)?;
+
+        let is_diry = self.prompt_library.is_dirty(prompt.id());
+
+        Some(
+            ListItem::new(ix)
+                .inset(true)
+                .spacing(ListItemSpacing::Sparse)
+                .selected(selected)
+                .child(Label::new(prompt.title()))
+                .end_slot(div().when(is_diry, |this| this.child(Indicator::dot()))),
+        )
+    }
+}
--- a/crates/assistant/src/search.rs
+++ b/crates/assistant/src/search.rs
@@ -0,0 +1,171 @@
+use language::Rope;
+use std::ops::Range;
+
+/// Search the given buffer for the given substring, ignoring any differences
+/// in line indentation between the query and the buffer.
+///
+/// Returns a vector of ranges of byte offsets in the buffer corresponding
+/// to the entire lines of the buffer.
+pub fn fuzzy_search_lines(haystack: &Rope, needle: &str) -> Option<Range<usize>> {
+    const SIMILARITY_THRESHOLD: f64 = 0.8;
+
+    let mut best_match: Option<(Range<usize>, f64)> = None; // (range, score)
+    let mut haystack_lines = haystack.chunks().lines();
+    let mut haystack_line_start = 0;
+    while let Some(mut haystack_line) = haystack_lines.next() {
+        let next_haystack_line_start = haystack_line_start + haystack_line.len() + 1;
+        let mut advanced_to_next_haystack_line = false;
+
+        let mut matched = true;
+        let match_start = haystack_line_start;
+        let mut match_end = next_haystack_line_start;
+        let mut match_score = 0.0;
+        let mut needle_lines = needle.lines().peekable();
+        while let Some(needle_line) = needle_lines.next() {
+            let similarity = line_similarity(haystack_line, needle_line);
+            if similarity >= SIMILARITY_THRESHOLD {
+                match_end = haystack_lines.offset();
+                match_score += similarity;
+
+                if needle_lines.peek().is_some() {
+                    if let Some(next_haystack_line) = haystack_lines.next() {
+                        advanced_to_next_haystack_line = true;
+                        haystack_line = next_haystack_line;
+                    } else {
+                        matched = false;
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            } else {
+                matched = false;
+                break;
+            }
+        }
+
+        if matched
+            && best_match
+                .as_ref()
+                .map(|(_, best_score)| match_score > *best_score)
+                .unwrap_or(true)
+        {
+            best_match = Some((match_start..match_end, match_score));
+        }
+
+        if advanced_to_next_haystack_line {
+            haystack_lines.seek(next_haystack_line_start);
+        }
+        haystack_line_start = next_haystack_line_start;
+    }
+
+    best_match.map(|(range, _)| range)
+}
+
+/// Calculates the similarity between two lines, ignoring leading and trailing whitespace,
+/// using the Jaro-Winkler distance.
+///
+/// Returns a value between 0.0 and 1.0, where 1.0 indicates an exact match.
+fn line_similarity(line1: &str, line2: &str) -> f64 {
+    strsim::jaro_winkler(line1.trim(), line2.trim())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use gpui::{AppContext, Context as _};
+    use language::Buffer;
+    use unindent::Unindent as _;
+    use util::test::marked_text_ranges;
+
+    #[gpui::test]
+    fn test_fuzzy_search_lines(cx: &mut AppContext) {
+        let (text, expected_ranges) = marked_text_ranges(
+            &r#"
+            fn main() {
+                if a() {
+                    assert_eq!(
+                        1 + 2,
+                        does_not_match,
+                    );
+                }
+
+                println!("hi");
+
+                assert_eq!(
+                    1 + 2,
+                    3,
+                ); // this last line does not match
+
+            «    assert_eq!(
+                    1 + 2,
+                    3,
+                );
+            »
+
+            «    assert_eq!(
+                    "something",
+                    "else",
+                );
+            »
+            }
+            "#
+            .unindent(),
+            false,
+        );
+
+        let buffer = cx.new_model(|cx| Buffer::local(&text, cx));
+        let snapshot = buffer.read_with(cx, |buffer, _| buffer.snapshot());
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            assert_eq!(
+                1 + 2,
+                3,
+            );
+            "
+            .unindent(),
+        )
+        .unwrap();
+        assert_eq!(actual_range, expected_ranges[0]);
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            assert_eq!(
+                1 + 2,
+                3,
+            );
+            "
+            .unindent(),
+        )
+        .unwrap();
+        assert_eq!(actual_range, expected_ranges[0]);
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            asst_eq!(
+                \"something\",
+                \"els\"
+            )
+            "
+            .unindent(),
+        )
+        .unwrap();
+        assert_eq!(actual_range, expected_ranges[1]);
+
+        let actual_range = fuzzy_search_lines(
+            snapshot.as_rope(),
+            &"
+            assert_eq!(
+                2 + 1,
+                3,
+            );
+            "
+            .unindent(),
+        );
+        assert_eq!(actual_range, None);
+    }
+}
--- a/crates/assistant/src/slash_command.rs
+++ b/crates/assistant/src/slash_command.rs
@@ -0,0 +1,329 @@
+use crate::assistant_panel::ConversationEditor;
+use anyhow::Result;
+pub use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandRegistry};
+use editor::{CompletionProvider, Editor};
+use fuzzy::{match_strings, StringMatchCandidate};
+use gpui::{Model, Task, ViewContext, WeakView, WindowContext};
+use language::{Anchor, Buffer, CodeLabel, Documentation, LanguageServerId, ToPoint};
+use parking_lot::{Mutex, RwLock};
+use rope::Point;
+use std::{
+    ops::Range,
+    sync::{
+        atomic::{AtomicBool, Ordering::SeqCst},
+        Arc,
+    },
+};
+use workspace::Workspace;
+
+pub mod active_command;
+pub mod file_command;
+pub mod project_command;
+pub mod prompt_command;
+pub mod rustdoc_command;
+pub mod search_command;
+pub mod tabs_command;
+
+pub(crate) struct SlashCommandCompletionProvider {
+    editor: WeakView<ConversationEditor>,
+    commands: Arc<SlashCommandRegistry>,
+    cancel_flag: Mutex<Arc<AtomicBool>>,
+    workspace: WeakView<Workspace>,
+}
+
+pub(crate) struct SlashCommandLine {
+    /// The range within the line containing the command name.
+    pub name: Range<usize>,
+    /// The range within the line containing the command argument.
+    pub argument: Option<Range<usize>>,
+}
+
+impl SlashCommandCompletionProvider {
+    pub fn new(
+        editor: WeakView<ConversationEditor>,
+        commands: Arc<SlashCommandRegistry>,
+        workspace: WeakView<Workspace>,
+    ) -> Self {
+        Self {
+            cancel_flag: Mutex::new(Arc::new(AtomicBool::new(false))),
+            editor,
+            commands,
+            workspace,
+        }
+    }
+
+    fn complete_command_name(
+        &self,
+        command_name: &str,
+        command_range: Range<Anchor>,
+        name_range: Range<Anchor>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<Vec<project::Completion>>> {
+        let candidates = self
+            .commands
+            .command_names()
+            .into_iter()
+            .enumerate()
+            .map(|(ix, def)| StringMatchCandidate {
+                id: ix,
+                string: def.to_string(),
+                char_bag: def.as_ref().into(),
+            })
+            .collect::<Vec<_>>();
+        let commands = self.commands.clone();
+        let command_name = command_name.to_string();
+        let editor = self.editor.clone();
+        let workspace = self.workspace.clone();
+        cx.spawn(|mut cx| async move {
+            let matches = match_strings(
+                &candidates,
+                &command_name,
+                true,
+                usize::MAX,
+                &Default::default(),
+                cx.background_executor().clone(),
+            )
+            .await;
+
+            cx.update(|cx| {
+                matches
+                    .into_iter()
+                    .filter_map(|mat| {
+                        let command = commands.command(&mat.string)?;
+                        let mut new_text = mat.string.clone();
+                        let requires_argument = command.requires_argument();
+                        if requires_argument {
+                            new_text.push(' ');
+                        }
+
+                        Some(project::Completion {
+                            old_range: name_range.clone(),
+                            documentation: Some(Documentation::SingleLine(command.description())),
+                            new_text,
+                            label: command.label(cx),
+                            server_id: LanguageServerId(0),
+                            lsp_completion: Default::default(),
+                            show_new_completions_on_confirm: requires_argument,
+                            confirm: (!requires_argument).then(|| {
+                                let command_name = mat.string.clone();
+                                let command_range = command_range.clone();
+                                let editor = editor.clone();
+                                let workspace = workspace.clone();
+                                Arc::new(move |cx: &mut WindowContext| {
+                                    editor
+                                        .update(cx, |editor, cx| {
+                                            editor.run_command(
+                                                command_range.clone(),
+                                                &command_name,
+                                                None,
+                                                workspace.clone(),
+                                                cx,
+                                            );
+                                        })
+                                        .ok();
+                                }) as Arc<_>
+                            }),
+                        })
+                    })
+                    .collect()
+            })
+        })
+    }
+
+    fn complete_command_argument(
+        &self,
+        command_name: &str,
+        argument: String,
+        command_range: Range<Anchor>,
+        argument_range: Range<Anchor>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<Vec<project::Completion>>> {
+        let new_cancel_flag = Arc::new(AtomicBool::new(false));
+        let mut flag = self.cancel_flag.lock();
+        flag.store(true, SeqCst);
+        *flag = new_cancel_flag.clone();
+
+        if let Some(command) = self.commands.command(command_name) {
+            let completions = command.complete_argument(
+                argument,
+                new_cancel_flag.clone(),
+                self.workspace.clone(),
+                cx,
+            );
+            let command_name: Arc<str> = command_name.into();
+            let editor = self.editor.clone();
+            let workspace = self.workspace.clone();
+            cx.background_executor().spawn(async move {
+                Ok(completions
+                    .await?
+                    .into_iter()
+                    .map(|arg| project::Completion {
+                        old_range: argument_range.clone(),
+                        label: CodeLabel::plain(arg.clone(), None),
+                        new_text: arg.clone(),
+                        documentation: None,
+                        server_id: LanguageServerId(0),
+                        lsp_completion: Default::default(),
+                        show_new_completions_on_confirm: false,
+                        confirm: Some(Arc::new({
+                            let command_name = command_name.clone();
+                            let command_range = command_range.clone();
+                            let editor = editor.clone();
+                            let workspace = workspace.clone();
+                            move |cx| {
+                                editor
+                                    .update(cx, |editor, cx| {
+                                        editor.run_command(
+                                            command_range.clone(),
+                                            &command_name,
+                                            Some(&arg),
+                                            workspace.clone(),
+                                            cx,
+                                        );
+                                    })
+                                    .ok();
+                            }
+                        })),
+                    })
+                    .collect())
+            })
+        } else {
+            cx.background_executor()
+                .spawn(async move { Ok(Vec::new()) })
+        }
+    }
+}
+
+impl CompletionProvider for SlashCommandCompletionProvider {
+    fn completions(
+        &self,
+        buffer: &Model<Buffer>,
+        buffer_position: Anchor,
+        cx: &mut ViewContext<Editor>,
+    ) -> Task<Result<Vec<project::Completion>>> {
+        let Some((name, argument, command_range, argument_range)) =
+            buffer.update(cx, |buffer, _cx| {
+                let position = buffer_position.to_point(buffer);
+                let line_start = Point::new(position.row, 0);
+                let mut lines = buffer.text_for_range(line_start..position).lines();
+                let line = lines.next()?;
+                let call = SlashCommandLine::parse(line)?;
+
+                let command_range_start = Point::new(position.row, call.name.start as u32 - 1);
+                let command_range_end = Point::new(
+                    position.row,
+                    call.argument.as_ref().map_or(call.name.end, |arg| arg.end) as u32,
+                );
+                let command_range = buffer.anchor_after(command_range_start)
+                    ..buffer.anchor_after(command_range_end);
+
+                let name = line[call.name.clone()].to_string();
+
+                Some(if let Some(argument) = call.argument {
+                    let start =
+                        buffer.anchor_after(Point::new(position.row, argument.start as u32));
+                    let argument = line[argument.clone()].to_string();
+                    (name, Some(argument), command_range, start..buffer_position)
+                } else {
+                    let start =
+                        buffer.anchor_after(Point::new(position.row, call.name.start as u32));
+                    (name, None, command_range, start..buffer_position)
+                })
+            })
+        else {
+            return Task::ready(Ok(Vec::new()));
+        };
+
+        if let Some(argument) = argument {
+            self.complete_command_argument(&name, argument, command_range, argument_range, cx)
+        } else {
+            self.complete_command_name(&name, command_range, argument_range, cx)
+        }
+    }
+
+    fn resolve_completions(
+        &self,
+        _: Model<Buffer>,
+        _: Vec<usize>,
+        _: Arc<RwLock<Box<[project::Completion]>>>,
+        _: &mut ViewContext<Editor>,
+    ) -> Task<Result<bool>> {
+        Task::ready(Ok(true))
+    }
+
+    fn apply_additional_edits_for_completion(
+        &self,
+        _: Model<Buffer>,
+        _: project::Completion,
+        _: bool,
+        _: &mut ViewContext<Editor>,
+    ) -> Task<Result<Option<language::Transaction>>> {
+        Task::ready(Ok(None))
+    }
+
+    fn is_completion_trigger(
+        &self,
+        buffer: &Model<Buffer>,
+        position: language::Anchor,
+        _text: &str,
+        _trigger_in_words: bool,
+        cx: &mut ViewContext<Editor>,
+    ) -> bool {
+        let buffer = buffer.read(cx);
+        let position = position.to_point(buffer);
+        let line_start = Point::new(position.row, 0);
+        let mut lines = buffer.text_for_range(line_start..position).lines();
+        if let Some(line) = lines.next() {
+            SlashCommandLine::parse(line).is_some()
+        } else {
+            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) = &mut call.argument {
+                    if (*argument).is_empty() && c.is_whitespace() {
+                        argument.start = next_ix;
+                    }
+                    argument.end = next_ix;
+                }
+                // The command name ends at the first whitespace character.
+                else if !call.name.is_empty() {
+                    if c.is_whitespace() {
+                        call.argument = Some(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,
+                    argument: None,
+                });
+            }
+            // The line can't contain anything before the slash except for whitespace.
+            else if !c.is_whitespace() {
+                return None;
+            }
+            ix = next_ix;
+        }
+        call
+    }
+}
--- a/crates/assistant/src/slash_command/active_command.rs
+++ b/crates/assistant/src/slash_command/active_command.rs
@@ -0,0 +1,104 @@
+use super::{file_command::FilePlaceholder, SlashCommand, SlashCommandOutput};
+use anyhow::{anyhow, Result};
+use assistant_slash_command::SlashCommandOutputSection;
+use editor::Editor;
+use gpui::{AppContext, Task, WeakView};
+use language::LspAdapterDelegate;
+use std::{borrow::Cow, sync::Arc};
+use ui::{IntoElement, WindowContext};
+use workspace::Workspace;
+
+pub(crate) struct ActiveSlashCommand;
+
+impl SlashCommand for ActiveSlashCommand {
+    fn name(&self) -> String {
+        "active".into()
+    }
+
+    fn description(&self) -> String {
+        "insert active tab".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert Active Tab".into()
+    }
+
+    fn complete_argument(
+        &self,
+        _query: String,
+        _cancel: std::sync::Arc<std::sync::atomic::AtomicBool>,
+        _workspace: WeakView<Workspace>,
+        _cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        Task::ready(Err(anyhow!("this command does not require argument")))
+    }
+
+    fn requires_argument(&self) -> bool {
+        false
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let output = workspace.update(cx, |workspace, cx| {
+            let Some(active_item) = workspace.active_item(cx) else {
+                return Task::ready(Err(anyhow!("no active tab")));
+            };
+            let Some(buffer) = active_item
+                .downcast::<Editor>()
+                .and_then(|editor| editor.read(cx).buffer().read(cx).as_singleton())
+            else {
+                return Task::ready(Err(anyhow!("active tab is not an editor")));
+            };
+
+            let snapshot = buffer.read(cx).snapshot();
+            let path = snapshot.resolve_file_path(cx, true);
+            let text = cx.background_executor().spawn({
+                let path = path.clone();
+                async move {
+                    let path = path
+                        .as_ref()
+                        .map(|path| path.to_string_lossy())
+                        .unwrap_or_else(|| Cow::Borrowed("untitled"));
+
+                    let mut output = String::with_capacity(path.len() + snapshot.len() + 9);
+                    output.push_str("```");
+                    output.push_str(&path);
+                    output.push('\n');
+                    for chunk in snapshot.as_rope().chunks() {
+                        output.push_str(chunk);
+                    }
+                    if !output.ends_with('\n') {
+                        output.push('\n');
+                    }
+                    output.push_str("```");
+                    output
+                }
+            });
+            cx.foreground_executor().spawn(async move {
+                let text = text.await;
+                let range = 0..text.len();
+                Ok(SlashCommandOutput {
+                    text,
+                    sections: vec![SlashCommandOutputSection {
+                        range,
+                        render_placeholder: Arc::new(move |id, unfold, _| {
+                            FilePlaceholder {
+                                id,
+                                path: path.clone(),
+                                line_range: None,
+                                unfold,
+                            }
+                            .into_any_element()
+                        }),
+                    }],
+                })
+            })
+        });
+        output.unwrap_or_else(|error| Task::ready(Err(error)))
+    }
+}
--- a/crates/assistant/src/slash_command/file_command.rs
+++ b/crates/assistant/src/slash_command/file_command.rs
@@ -0,0 +1,225 @@
+use super::{SlashCommand, SlashCommandOutput};
+use anyhow::{anyhow, Result};
+use assistant_slash_command::SlashCommandOutputSection;
+use fuzzy::PathMatch;
+use gpui::{AppContext, RenderOnce, SharedString, Task, View, WeakView};
+use language::{LineEnding, LspAdapterDelegate};
+use project::PathMatchCandidateSet;
+use std::{
+    ops::Range,
+    path::{Path, PathBuf},
+    sync::{atomic::AtomicBool, Arc},
+};
+use ui::{prelude::*, ButtonLike, ElevationIndex};
+use workspace::Workspace;
+
+pub(crate) struct FileSlashCommand;
+
+impl FileSlashCommand {
+    fn search_paths(
+        &self,
+        query: String,
+        cancellation_flag: Arc<AtomicBool>,
+        workspace: &View<Workspace>,
+        cx: &mut AppContext,
+    ) -> Task<Vec<PathMatch>> {
+        if query.is_empty() {
+            let workspace = workspace.read(cx);
+            let project = workspace.project().read(cx);
+            let entries = workspace.recent_navigation_history(Some(10), cx);
+            let path_prefix: Arc<str> = "".into();
+            Task::ready(
+                entries
+                    .into_iter()
+                    .filter_map(|(entry, _)| {
+                        let worktree = project.worktree_for_id(entry.worktree_id, cx)?;
+                        let mut full_path = PathBuf::from(worktree.read(cx).root_name());
+                        full_path.push(&entry.path);
+                        Some(PathMatch {
+                            score: 0.,
+                            positions: Vec::new(),
+                            worktree_id: entry.worktree_id.to_usize(),
+                            path: full_path.into(),
+                            path_prefix: path_prefix.clone(),
+                            distance_to_relative_ancestor: 0,
+                        })
+                    })
+                    .collect(),
+            )
+        } else {
+            let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
+            let candidate_sets = worktrees
+                .into_iter()
+                .map(|worktree| {
+                    let worktree = worktree.read(cx);
+                    PathMatchCandidateSet {
+                        snapshot: worktree.snapshot(),
+                        include_ignored: worktree
+                            .root_entry()
+                            .map_or(false, |entry| entry.is_ignored),
+                        include_root_name: true,
+                        directories_only: false,
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            let executor = cx.background_executor().clone();
+            cx.foreground_executor().spawn(async move {
+                fuzzy::match_path_sets(
+                    candidate_sets.as_slice(),
+                    query.as_str(),
+                    None,
+                    false,
+                    100,
+                    &cancellation_flag,
+                    executor,
+                )
+                .await
+            })
+        }
+    }
+}
+
+impl SlashCommand for FileSlashCommand {
+    fn name(&self) -> String {
+        "file".into()
+    }
+
+    fn description(&self) -> String {
+        "insert file".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert File".into()
+    }
+
+    fn requires_argument(&self) -> bool {
+        true
+    }
+
+    fn complete_argument(
+        &self,
+        query: String,
+        cancellation_flag: Arc<AtomicBool>,
+        workspace: WeakView<Workspace>,
+        cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        let Some(workspace) = workspace.upgrade() else {
+            return Task::ready(Err(anyhow!("workspace was dropped")));
+        };
+
+        let paths = self.search_paths(query, cancellation_flag, &workspace, cx);
+        cx.background_executor().spawn(async move {
+            Ok(paths
+                .await
+                .into_iter()
+                .map(|path_match| {
+                    format!(
+                        "{}{}",
+                        path_match.path_prefix,
+                        path_match.path.to_string_lossy()
+                    )
+                })
+                .collect())
+        })
+    }
+
+    fn run(
+        self: Arc<Self>,
+        argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let Some(workspace) = workspace.upgrade() else {
+            return Task::ready(Err(anyhow!("workspace was dropped")));
+        };
+
+        let Some(argument) = argument else {
+            return Task::ready(Err(anyhow!("missing path")));
+        };
+
+        let path = PathBuf::from(argument);
+        let abs_path = workspace
+            .read(cx)
+            .visible_worktrees(cx)
+            .find_map(|worktree| {
+                let worktree = worktree.read(cx);
+                let worktree_root_path = Path::new(worktree.root_name());
+                let relative_path = path.strip_prefix(worktree_root_path).ok()?;
+                worktree.absolutize(&relative_path).ok()
+            });
+
+        let Some(abs_path) = abs_path else {
+            return Task::ready(Err(anyhow!("missing path")));
+        };
+
+        let fs = workspace.read(cx).app_state().fs.clone();
+        let argument = argument.to_string();
+        let text = cx.background_executor().spawn(async move {
+            let mut content = fs.load(&abs_path).await?;
+            LineEnding::normalize(&mut content);
+            let mut output = String::with_capacity(argument.len() + content.len() + 9);
+            output.push_str("```");
+            output.push_str(&argument);
+            output.push('\n');
+            output.push_str(&content);
+            if !output.ends_with('\n') {
+                output.push('\n');
+            }
+            output.push_str("```");
+            anyhow::Ok(output)
+        });
+        cx.foreground_executor().spawn(async move {
+            let text = text.await?;
+            let range = 0..text.len();
+            Ok(SlashCommandOutput {
+                text,
+                sections: vec![SlashCommandOutputSection {
+                    range,
+                    render_placeholder: Arc::new(move |id, unfold, _cx| {
+                        FilePlaceholder {
+                            path: Some(path.clone()),
+                            line_range: None,
+                            id,
+                            unfold,
+                        }
+                        .into_any_element()
+                    }),
+                }],
+            })
+        })
+    }
+}
+
+#[derive(IntoElement)]
+pub struct FilePlaceholder {
+    pub path: Option<PathBuf>,
+    pub line_range: Option<Range<u32>>,
+    pub id: ElementId,
+    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
+}
+
+impl RenderOnce for FilePlaceholder {
+    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
+        let unfold = self.unfold;
+        let title = if let Some(path) = self.path.as_ref() {
+            SharedString::from(path.to_string_lossy().to_string())
+        } else {
+            SharedString::from("untitled")
+        };
+
+        ButtonLike::new(self.id)
+            .style(ButtonStyle::Filled)
+            .layer(ElevationIndex::ElevatedSurface)
+            .child(Icon::new(IconName::File))
+            .child(Label::new(title))
+            .when_some(self.line_range, |button, line_range| {
+                button.child(Label::new(":")).child(Label::new(format!(
+                    "{}-{}",
+                    line_range.start, line_range.end
+                )))
+            })
+            .on_click(move |_, cx| unfold(cx))
+    }
+}
--- a/crates/assistant/src/slash_command/project_command.rs
+++ b/crates/assistant/src/slash_command/project_command.rs
@@ -0,0 +1,156 @@
+use super::{SlashCommand, SlashCommandOutput};
+use anyhow::{anyhow, Context, Result};
+use assistant_slash_command::SlashCommandOutputSection;
+use fs::Fs;
+use gpui::{AppContext, Model, Task, WeakView};
+use language::LspAdapterDelegate;
+use project::{Project, ProjectPath};
+use std::{
+    fmt::Write,
+    path::Path,
+    sync::{atomic::AtomicBool, Arc},
+};
+use ui::{prelude::*, ButtonLike, ElevationIndex};
+use workspace::Workspace;
+
+pub(crate) struct ProjectSlashCommand;
+
+impl ProjectSlashCommand {
+    async fn build_message(fs: Arc<dyn Fs>, path_to_cargo_toml: &Path) -> Result<String> {
+        let buffer = fs.load(path_to_cargo_toml).await?;
+        let cargo_toml: cargo_toml::Manifest = toml::from_str(&buffer)?;
+
+        let mut message = String::new();
+        writeln!(message, "You are in a Rust project.")?;
+
+        if let Some(workspace) = cargo_toml.workspace {
+            writeln!(
+                message,
+                "The project is a Cargo workspace with the following members:"
+            )?;
+            for member in workspace.members {
+                writeln!(message, "- {member}")?;
+            }
+
+            if !workspace.default_members.is_empty() {
+                writeln!(message, "The default members are:")?;
+                for member in workspace.default_members {
+                    writeln!(message, "- {member}")?;
+                }
+            }
+
+            if !workspace.dependencies.is_empty() {
+                writeln!(
+                    message,
+                    "The following workspace dependencies are installed:"
+                )?;
+                for dependency in workspace.dependencies.keys() {
+                    writeln!(message, "- {dependency}")?;
+                }
+            }
+        } else if let Some(package) = cargo_toml.package {
+            writeln!(
+                message,
+                "The project name is \"{name}\".",
+                name = package.name
+            )?;
+
+            let description = package
+                .description
+                .as_ref()
+                .and_then(|description| description.get().ok().cloned());
+            if let Some(description) = description.as_ref() {
+                writeln!(message, "It describes itself as \"{description}\".")?;
+            }
+
+            if !cargo_toml.dependencies.is_empty() {
+                writeln!(message, "The following dependencies are installed:")?;
+                for dependency in cargo_toml.dependencies.keys() {
+                    writeln!(message, "- {dependency}")?;
+                }
+            }
+        }
+
+        Ok(message)
+    }
+
+    fn path_to_cargo_toml(project: Model<Project>, cx: &mut AppContext) -> Option<Arc<Path>> {
+        let worktree = project.read(cx).worktrees().next()?;
+        let worktree = worktree.read(cx);
+        let entry = worktree.entry_for_path("Cargo.toml")?;
+        let path = ProjectPath {
+            worktree_id: worktree.id(),
+            path: entry.path.clone(),
+        };
+        Some(Arc::from(
+            project.read(cx).absolute_path(&path, cx)?.as_path(),
+        ))
+    }
+}
+
+impl SlashCommand for ProjectSlashCommand {
+    fn name(&self) -> String {
+        "project".into()
+    }
+
+    fn description(&self) -> String {
+        "insert project metadata".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert Project Metadata".into()
+    }
+
+    fn complete_argument(
+        &self,
+        _query: String,
+        _cancel: Arc<AtomicBool>,
+        _workspace: WeakView<Workspace>,
+        _cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        Task::ready(Err(anyhow!("this command does not require argument")))
+    }
+
+    fn requires_argument(&self) -> bool {
+        false
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let output = workspace.update(cx, |workspace, cx| {
+            let project = workspace.project().clone();
+            let fs = workspace.project().read(cx).fs().clone();
+            let path = Self::path_to_cargo_toml(project, cx);
+            let output = cx.background_executor().spawn(async move {
+                let path = path.with_context(|| "Cargo.toml not found")?;
+                Self::build_message(fs, &path).await
+            });
+
+            cx.foreground_executor().spawn(async move {
+                let text = output.await?;
+                let range = 0..text.len();
+                Ok(SlashCommandOutput {
+                    text,
+                    sections: vec![SlashCommandOutputSection {
+                        range,
+                        render_placeholder: Arc::new(move |id, unfold, _cx| {
+                            ButtonLike::new(id)
+                                .style(ButtonStyle::Filled)
+                                .layer(ElevationIndex::ElevatedSurface)
+                                .child(Icon::new(IconName::FileTree))
+                                .child(Label::new("Project"))
+                                .on_click(move |_, cx| unfold(cx))
+                                .into_any_element()
+                        }),
+                    }],
+                })
+            })
+        });
+        output.unwrap_or_else(|error| Task::ready(Err(error)))
+    }
+}
--- a/crates/assistant/src/slash_command/prompt_command.rs
+++ b/crates/assistant/src/slash_command/prompt_command.rs
@@ -0,0 +1,117 @@
+use super::{SlashCommand, SlashCommandOutput};
+use crate::prompts::PromptLibrary;
+use anyhow::{anyhow, Context, Result};
+use assistant_slash_command::SlashCommandOutputSection;
+use fuzzy::StringMatchCandidate;
+use gpui::{AppContext, Task, WeakView};
+use language::LspAdapterDelegate;
+use std::sync::{atomic::AtomicBool, Arc};
+use ui::{prelude::*, ButtonLike, ElevationIndex};
+use workspace::Workspace;
+
+pub(crate) struct PromptSlashCommand {
+    library: Arc<PromptLibrary>,
+}
+
+impl PromptSlashCommand {
+    pub fn new(library: Arc<PromptLibrary>) -> Self {
+        Self { library }
+    }
+}
+
+impl SlashCommand for PromptSlashCommand {
+    fn name(&self) -> String {
+        "prompt".into()
+    }
+
+    fn description(&self) -> String {
+        "insert prompt from library".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert Prompt from Library".into()
+    }
+
+    fn requires_argument(&self) -> bool {
+        true
+    }
+
+    fn complete_argument(
+        &self,
+        query: String,
+        cancellation_flag: Arc<AtomicBool>,
+        _workspace: WeakView<Workspace>,
+        cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        let library = self.library.clone();
+        let executor = cx.background_executor().clone();
+        cx.background_executor().spawn(async move {
+            let candidates = library
+                .prompts()
+                .into_iter()
+                .enumerate()
+                .map(|(ix, prompt)| StringMatchCandidate::new(ix, prompt.1.title().to_string()))
+                .collect::<Vec<_>>();
+            let matches = fuzzy::match_strings(
+                &candidates,
+                &query,
+                false,
+                100,
+                &cancellation_flag,
+                executor,
+            )
+            .await;
+            Ok(matches
+                .into_iter()
+                .map(|mat| candidates[mat.candidate_id].string.clone())
+                .collect())
+        })
+    }
+
+    fn run(
+        self: Arc<Self>,
+        title: Option<&str>,
+        _workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let Some(title) = title else {
+            return Task::ready(Err(anyhow!("missing prompt name")));
+        };
+
+        let library = self.library.clone();
+        let title = SharedString::from(title.to_string());
+        let prompt = cx.background_executor().spawn({
+            let title = title.clone();
+            async move {
+                let prompt = library
+                    .prompts()
+                    .into_iter()
+                    .map(|prompt| (prompt.1.title(), prompt))
+                    .find(|(t, _)| t == &title)
+                    .with_context(|| format!("no prompt found with title {:?}", title))?
+                    .1;
+                anyhow::Ok(prompt.1.body())
+            }
+        });
+        cx.foreground_executor().spawn(async move {
+            let prompt = prompt.await?;
+            let range = 0..prompt.len();
+            Ok(SlashCommandOutput {
+                text: prompt,
+                sections: vec![SlashCommandOutputSection {
+                    range,
+                    render_placeholder: Arc::new(move |id, unfold, _cx| {
+                        ButtonLike::new(id)
+                            .style(ButtonStyle::Filled)
+                            .layer(ElevationIndex::ElevatedSurface)
+                            .child(Icon::new(IconName::Library))
+                            .child(Label::new(title.clone()))
+                            .on_click(move |_, cx| unfold(cx))
+                            .into_any_element()
+                    }),
+                }],
+            })
+        })
+    }
+}
--- a/crates/assistant/src/slash_command/rustdoc_command.rs
+++ b/crates/assistant/src/slash_command/rustdoc_command.rs
@@ -0,0 +1,165 @@
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+
+use anyhow::{anyhow, bail, Context, Result};
+use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandOutputSection};
+use futures::AsyncReadExt;
+use gpui::{AppContext, Task, WeakView};
+use http::{AsyncBody, HttpClient, HttpClientWithUrl};
+use language::LspAdapterDelegate;
+use rustdoc_to_markdown::convert_rustdoc_to_markdown;
+use ui::{prelude::*, ButtonLike, ElevationIndex};
+use workspace::Workspace;
+
+pub(crate) struct RustdocSlashCommand;
+
+impl RustdocSlashCommand {
+    async fn build_message(
+        http_client: Arc<HttpClientWithUrl>,
+        crate_name: String,
+        module_path: Vec<String>,
+    ) -> Result<String> {
+        let version = "latest";
+        let path = format!(
+            "{crate_name}/{version}/{crate_name}/{module_path}",
+            module_path = module_path.join("/")
+        );
+
+        let mut response = http_client
+            .get(
+                &format!("https://docs.rs/{path}"),
+                AsyncBody::default(),
+                true,
+            )
+            .await?;
+
+        let mut body = Vec::new();
+        response
+            .body_mut()
+            .read_to_end(&mut body)
+            .await
+            .context("error reading docs.rs response body")?;
+
+        if response.status().is_client_error() {
+            let text = String::from_utf8_lossy(body.as_slice());
+            bail!(
+                "status error {}, response: {text:?}",
+                response.status().as_u16()
+            );
+        }
+
+        convert_rustdoc_to_markdown(&body[..])
+    }
+}
+
+impl SlashCommand for RustdocSlashCommand {
+    fn name(&self) -> String {
+        "rustdoc".into()
+    }
+
+    fn description(&self) -> String {
+        "insert Rust docs".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert Rust Documentation".into()
+    }
+
+    fn requires_argument(&self) -> bool {
+        true
+    }
+
+    fn complete_argument(
+        &self,
+        _query: String,
+        _cancel: Arc<AtomicBool>,
+        _workspace: WeakView<Workspace>,
+        _cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        Task::ready(Ok(Vec::new()))
+    }
+
+    fn run(
+        self: Arc<Self>,
+        argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let Some(argument) = argument else {
+            return Task::ready(Err(anyhow!("missing crate name")));
+        };
+        let Some(workspace) = workspace.upgrade() else {
+            return Task::ready(Err(anyhow!("workspace was dropped")));
+        };
+
+        let http_client = workspace.read(cx).client().http_client();
+        let mut path_components = argument.split("::");
+        let crate_name = match path_components
+            .next()
+            .ok_or_else(|| anyhow!("missing crate name"))
+        {
+            Ok(crate_name) => crate_name.to_string(),
+            Err(err) => return Task::ready(Err(err)),
+        };
+        let module_path = path_components.map(ToString::to_string).collect::<Vec<_>>();
+
+        let text = cx.background_executor().spawn({
+            let crate_name = crate_name.clone();
+            let module_path = module_path.clone();
+            async move { Self::build_message(http_client, crate_name, module_path).await }
+        });
+
+        let crate_name = SharedString::from(crate_name);
+        let module_path = if module_path.is_empty() {
+            None
+        } else {
+            Some(SharedString::from(module_path.join("::")))
+        };
+        cx.foreground_executor().spawn(async move {
+            let text = text.await?;
+            let range = 0..text.len();
+            Ok(SlashCommandOutput {
+                text,
+                sections: vec![SlashCommandOutputSection {
+                    range,
+                    render_placeholder: Arc::new(move |id, unfold, _cx| {
+                        RustdocPlaceholder {
+                            id,
+                            unfold,
+                            crate_name: crate_name.clone(),
+                            module_path: module_path.clone(),
+                        }
+                        .into_any_element()
+                    }),
+                }],
+            })
+        })
+    }
+}
+
+#[derive(IntoElement)]
+struct RustdocPlaceholder {
+    pub id: ElementId,
+    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
+    pub crate_name: SharedString,
+    pub module_path: Option<SharedString>,
+}
+
+impl RenderOnce for RustdocPlaceholder {
+    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
+        let unfold = self.unfold;
+
+        let crate_path = self
+            .module_path
+            .map(|module_path| format!("{crate_name}::{module_path}", crate_name = self.crate_name))
+            .unwrap_or(self.crate_name.to_string());
+
+        ButtonLike::new(self.id)
+            .style(ButtonStyle::Filled)
+            .layer(ElevationIndex::ElevatedSurface)
+            .child(Icon::new(IconName::FileRust))
+            .child(Label::new(format!("rustdoc: {crate_path}")))
+            .on_click(move |_, cx| unfold(cx))
+    }
+}
--- a/crates/assistant/src/slash_command/search_command.rs
+++ b/crates/assistant/src/slash_command/search_command.rs
@@ -0,0 +1,191 @@
+use super::{file_command::FilePlaceholder, SlashCommand, SlashCommandOutput};
+use anyhow::Result;
+use assistant_slash_command::SlashCommandOutputSection;
+use gpui::{AppContext, Task, WeakView};
+use language::{CodeLabel, HighlightId, LineEnding, LspAdapterDelegate};
+use semantic_index::SemanticIndex;
+use std::{
+    fmt::Write,
+    path::PathBuf,
+    sync::{atomic::AtomicBool, Arc},
+};
+use ui::{prelude::*, ButtonLike, ElevationIndex, Icon, IconName};
+use util::ResultExt;
+use workspace::Workspace;
+
+pub(crate) struct SearchSlashCommand;
+
+impl SlashCommand for SearchSlashCommand {
+    fn name(&self) -> String {
+        "search".into()
+    }
+
+    fn label(&self, cx: &AppContext) -> CodeLabel {
+        let mut label = CodeLabel::default();
+        label.push_str("search ", None);
+        label.push_str(
+            "--n",
+            cx.theme().syntax().highlight_id("comment").map(HighlightId),
+        );
+        label.filter_range = 0.."search".len();
+        label
+    }
+
+    fn description(&self) -> String {
+        "semantic search".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Semantic Search".into()
+    }
+
+    fn requires_argument(&self) -> bool {
+        true
+    }
+
+    fn complete_argument(
+        &self,
+        _query: String,
+        _cancel: Arc<AtomicBool>,
+        _workspace: WeakView<Workspace>,
+        _cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        Task::ready(Ok(Vec::new()))
+    }
+
+    fn run(
+        self: Arc<Self>,
+        argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let Some(workspace) = workspace.upgrade() else {
+            return Task::ready(Err(anyhow::anyhow!("workspace was dropped")));
+        };
+        let Some(argument) = argument else {
+            return Task::ready(Err(anyhow::anyhow!("missing search query")));
+        };
+
+        let mut limit = None;
+        let mut query = String::new();
+        for part in argument.split(' ') {
+            if let Some(parameter) = part.strip_prefix("--") {
+                if let Ok(count) = parameter.parse::<usize>() {
+                    limit = Some(count);
+                    continue;
+                }
+            }
+
+            query.push_str(part);
+            query.push(' ');
+        }
+        query.pop();
+
+        if query.is_empty() {
+            return Task::ready(Err(anyhow::anyhow!("missing search query")));
+        }
+
+        let project = workspace.read(cx).project().clone();
+        let fs = project.read(cx).fs().clone();
+        let project_index =
+            cx.update_global(|index: &mut SemanticIndex, cx| index.project_index(project, cx));
+
+        cx.spawn(|cx| async move {
+            let results = project_index
+                .read_with(&cx, |project_index, cx| {
+                    project_index.search(query.clone(), limit.unwrap_or(5), cx)
+                })?
+                .await?;
+
+            let mut loaded_results = Vec::new();
+            for result in results {
+                let (full_path, file_content) =
+                    result.worktree.read_with(&cx, |worktree, _cx| {
+                        let entry_abs_path = worktree.abs_path().join(&result.path);
+                        let mut entry_full_path = PathBuf::from(worktree.root_name());
+                        entry_full_path.push(&result.path);
+                        let file_content = async {
+                            let entry_abs_path = entry_abs_path;
+                            fs.load(&entry_abs_path).await
+                        };
+                        (entry_full_path, file_content)
+                    })?;
+                if let Some(file_content) = file_content.await.log_err() {
+                    loaded_results.push((result, full_path, file_content));
+                }
+            }
+
+            let output = cx
+                .background_executor()
+                .spawn(async move {
+                    let mut text = format!("Search results for {query}:\n");
+                    let mut sections = Vec::new();
+                    for (result, full_path, file_content) in loaded_results {
+                        let range_start = result.range.start.min(file_content.len());
+                        let range_end = result.range.end.min(file_content.len());
+
+                        let start_line =
+                            file_content[0..range_start].matches('\n').count() as u32 + 1;
+                        let end_line = file_content[0..range_end].matches('\n').count() as u32 + 1;
+                        let start_line_byte_offset = file_content[0..range_start]
+                            .rfind('\n')
+                            .map(|pos| pos + 1)
+                            .unwrap_or_default();
+                        let end_line_byte_offset = file_content[range_end..]
+                            .find('\n')
+                            .map(|pos| range_end + pos)
+                            .unwrap_or_else(|| file_content.len());
+
+                        let section_start_ix = text.len();
+                        writeln!(
+                            text,
+                            "```{}:{}-{}",
+                            result.path.display(),
+                            start_line,
+                            end_line,
+                        )
+                        .unwrap();
+                        let mut excerpt =
+                            file_content[start_line_byte_offset..end_line_byte_offset].to_string();
+                        LineEnding::normalize(&mut excerpt);
+                        text.push_str(&excerpt);
+                        writeln!(text, "\n```\n").unwrap();
+                        let section_end_ix = text.len() - 1;
+
+                        sections.push(SlashCommandOutputSection {
+                            range: section_start_ix..section_end_ix,
+                            render_placeholder: Arc::new(move |id, unfold, _| {
+                                FilePlaceholder {
+                                    id,
+                                    path: Some(full_path.clone()),
+                                    line_range: Some(start_line..end_line),
+                                    unfold,
+                                }
+                                .into_any_element()
+                            }),
+                        });
+                    }
+
+                    let query = SharedString::from(query);
+                    sections.push(SlashCommandOutputSection {
+                        range: 0..text.len(),
+                        render_placeholder: Arc::new(move |id, unfold, _cx| {
+                            ButtonLike::new(id)
+                                .style(ButtonStyle::Filled)
+                                .layer(ElevationIndex::ElevatedSurface)
+                                .child(Icon::new(IconName::MagnifyingGlass))
+                                .child(Label::new(query.clone()))
+                                .on_click(move |_, cx| unfold(cx))
+                                .into_any_element()
+                        }),
+                    });
+
+                    SlashCommandOutput { text, sections }
+                })
+                .await;
+
+            Ok(output)
+        })
+    }
+}
--- a/crates/assistant/src/slash_command/tabs_command.rs
+++ b/crates/assistant/src/slash_command/tabs_command.rs
@@ -0,0 +1,117 @@
+use super::{file_command::FilePlaceholder, SlashCommand, SlashCommandOutput};
+use anyhow::{anyhow, Result};
+use assistant_slash_command::SlashCommandOutputSection;
+use collections::HashMap;
+use editor::Editor;
+use gpui::{AppContext, Entity, Task, WeakView};
+use language::LspAdapterDelegate;
+use std::{fmt::Write, path::Path, sync::Arc};
+use ui::{IntoElement, WindowContext};
+use workspace::Workspace;
+
+pub(crate) struct TabsSlashCommand;
+
+impl SlashCommand for TabsSlashCommand {
+    fn name(&self) -> String {
+        "tabs".into()
+    }
+
+    fn description(&self) -> String {
+        "insert open tabs".into()
+    }
+
+    fn menu_text(&self) -> String {
+        "Insert Open Tabs".into()
+    }
+
+    fn requires_argument(&self) -> bool {
+        false
+    }
+
+    fn complete_argument(
+        &self,
+        _query: String,
+        _cancel: Arc<std::sync::atomic::AtomicBool>,
+        _workspace: WeakView<Workspace>,
+        _cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>> {
+        Task::ready(Err(anyhow!("this command does not require argument")))
+    }
+
+    fn run(
+        self: Arc<Self>,
+        _argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        _delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>> {
+        let open_buffers = workspace.update(cx, |workspace, cx| {
+            let mut timestamps_by_entity_id = HashMap::default();
+            let mut open_buffers = Vec::new();
+
+            for pane in workspace.panes() {
+                let pane = pane.read(cx);
+                for entry in pane.activation_history() {
+                    timestamps_by_entity_id.insert(entry.entity_id, entry.timestamp);
+                }
+            }
+
+            for editor in workspace.items_of_type::<Editor>(cx) {
+                if let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
+                    if let Some(timestamp) = timestamps_by_entity_id.get(&editor.entity_id()) {
+                        let snapshot = buffer.read(cx).snapshot();
+                        let full_path = snapshot.resolve_file_path(cx, true);
+                        open_buffers.push((full_path, snapshot, *timestamp));
+                    }
+                }
+            }
+
+            open_buffers
+        });
+
+        match open_buffers {
+            Ok(mut open_buffers) => cx.background_executor().spawn(async move {
+                open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
+
+                let mut sections = Vec::new();
+                let mut text = String::new();
+                for (full_path, buffer, _) in open_buffers {
+                    let section_start_ix = text.len();
+                    writeln!(
+                        text,
+                        "```{}\n",
+                        full_path
+                            .as_deref()
+                            .unwrap_or(Path::new("untitled"))
+                            .display()
+                    )
+                    .unwrap();
+                    for chunk in buffer.as_rope().chunks() {
+                        text.push_str(chunk);
+                    }
+                    if !text.ends_with('\n') {
+                        text.push('\n');
+                    }
+                    writeln!(text, "```\n").unwrap();
+                    let section_end_ix = text.len() - 1;
+
+                    sections.push(SlashCommandOutputSection {
+                        range: section_start_ix..section_end_ix,
+                        render_placeholder: Arc::new(move |id, unfold, _| {
+                            FilePlaceholder {
+                                id,
+                                path: full_path.clone(),
+                                line_range: None,
+                                unfold,
+                            }
+                            .into_any_element()
+                        }),
+                    });
+                }
+
+                Ok(SlashCommandOutput { text, sections })
+            }),
+            Err(error) => Task::ready(Err(error)),
+        }
+    }
+}
--- a/crates/assistant/src/system_prompts/edits.md
+++ b/crates/assistant/src/system_prompts/edits.md
@@ -0,0 +1,86 @@
+When the user asks you to suggest edits for a buffer, use a strict template consisting of:
+
+* A markdown code block with the file path as the language identifier.
+* The original code that should be replaced
+* A separator line (`---`)
+* The new text that should replace the original lines
+
+Each code block may only contain an edit for one single contiguous range of text. Use multiple code blocks for multiple edits.
+
+## Example
+
+If you have a buffer with the following lines:
+
+```path/to/file.rs
+fn quicksort(arr: &mut [i32]) {
+    if arr.len() <= 1 {
+        return;
+    }
+    let pivot_index = partition(arr);
+    let (left, right) = arr.split_at_mut(pivot_index);
+    quicksort(left);
+    quicksort(&mut right[1..]);
+}
+
+fn partition(arr: &mut [i32]) -> usize {
+    let last_index = arr.len() - 1;
+    let pivot = arr[last_index];
+    let mut i = 0;
+    for j in 0..last_index {
+        if arr[j] <= pivot {
+            arr.swap(i, j);
+            i += 1;
+        }
+    }
+    arr.swap(i, last_index);
+    i
+}
+```
+
+And you want to replace the for loop inside `partition`, output the following.
+
+```edit path/to/file.rs
+for j in 0..last_index {
+    if arr[j] <= pivot {
+        arr.swap(i, j);
+        i += 1;
+    }
+}
+---
+let mut j = 0;
+while j < last_index {
+    if arr[j] <= pivot {
+        arr.swap(i, j);
+        i += 1;
+    }
+    j += 1;
+}
+```
+
+If you wanted to insert comments above the partition function, output the following:
+
+```edit path/to/file.rs
+fn partition(arr: &mut [i32]) -> usize {
+---
+// A helper function used for quicksort.
+fn partition(arr: &mut [i32]) -> usize {
+```
+
+If you wanted to delete the partition function, output the following:
+
+```edit path/to/file.rs
+fn partition(arr: &mut [i32]) -> usize {
+    let last_index = arr.len() - 1;
+    let pivot = arr[last_index];
+    let mut i = 0;
+    for j in 0..last_index {
+        if arr[j] <= pivot {
+            arr.swap(i, j);
+            i += 1;
+        }
+    }
+    arr.swap(i, last_index);
+    i
+}
+---
+```
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -1,61 +0,0 @@
-[package]
-name = "assistant2"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/assistant2.rs"
-
-[features]
-default = []
-stories = ["dep:story"]
-
-[dependencies]
-anyhow.workspace = true
-assistant_tooling.workspace = true
-client.workspace = true
-collections.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-log.workspace = true
-nanoid.workspace = true
-open_ai.workspace = true
-picker.workspace = true
-project.workspace = true
-rich_text.workspace = true
-schemars.workspace = true
-semantic_index.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-story = { workspace = true, optional = true }
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-assets.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-languages.workspace = true
-node_runtime.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-release_channel.workspace = true
-settings = { workspace = true, features = ["test-support"] }
-theme = { workspace = true, features = ["test-support"] }
-util = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
--- a/crates/assistant2/evals/list-of-into-element.md
+++ b/crates/assistant2/evals/list-of-into-element.md
@@ -1 +0,0 @@
-> Give me a comprehensive list of all the elements defined in my project using the following query: `impl Element for {}, impl<T: 'static> Element for {}, impl IntoElement for {})`
--- a/crates/assistant2/evals/new-gpui-element.md
+++ b/crates/assistant2/evals/new-gpui-element.md
@@ -1 +0,0 @@
-> What are all the places we define a new gpui element in my project? (impl Element for {})
--- a/crates/assistant2/evals/settings-file.md
+++ b/crates/assistant2/evals/settings-file.md
@@ -1,3 +0,0 @@
-Use tools frequently, especially when referring to files and code. The Zed editor we're working in can show me files directly when you add annotations. Be concise in chat, bountiful in tool calling.
-
-Teach me everything you can about how zed loads settings. Please annotate the code inline.
--- a/crates/assistant2/evals/what-is-the-assistant2-crate.md
+++ b/crates/assistant2/evals/what-is-the-assistant2-crate.md
@@ -1 +0,0 @@
-> Can you tell me what the assistant2 crate is for in my project? Tell me in 100 words or less.
--- a/crates/assistant2/src/assistant2.rs
+++ b/crates/assistant2/src/assistant2.rs
--- a/crates/assistant2/src/assistant_settings.rs
+++ b/crates/assistant2/src/assistant_settings.rs
@@ -1,26 +0,0 @@
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone)]
-pub struct AssistantSettings {
-    pub enabled: bool,
-}
-
-#[derive(Default, Debug, Deserialize, Serialize, Clone, JsonSchema)]
-pub struct AssistantSettingsContent {
-    pub enabled: Option<bool>,
-}
-
-impl Settings for AssistantSettings {
-    const KEY: Option<&'static str> = Some("assistant_v2");
-
-    type FileContent = AssistantSettingsContent;
-
-    fn load(
-        sources: SettingsSources<Self::FileContent>,
-        _: &mut gpui::AppContext,
-    ) -> anyhow::Result<Self> {
-        Ok(sources.json_merge().unwrap_or_else(|_| Default::default()))
-    }
-}
--- a/crates/assistant2/src/attachments.rs
+++ b/crates/assistant2/src/attachments.rs
@@ -1,3 +0,0 @@
-mod active_file;
-
-pub use active_file::*;
--- a/crates/assistant2/src/attachments/active_file.rs
+++ b/crates/assistant2/src/attachments/active_file.rs
@@ -1,144 +0,0 @@
-use std::{path::PathBuf, sync::Arc};
-
-use anyhow::{anyhow, Result};
-use assistant_tooling::{LanguageModelAttachment, ProjectContext, ToolOutput};
-use editor::Editor;
-use gpui::{Render, Task, View, WeakModel, WeakView};
-use language::Buffer;
-use project::ProjectPath;
-use serde::{Deserialize, Serialize};
-use ui::{prelude::*, ButtonLike, Tooltip, WindowContext};
-use util::maybe;
-use workspace::Workspace;
-
-#[derive(Serialize, Deserialize)]
-pub struct ActiveEditorAttachment {
-    #[serde(skip)]
-    buffer: Option<WeakModel<Buffer>>,
-    path: Option<PathBuf>,
-}
-
-pub struct FileAttachmentView {
-    project_path: Option<ProjectPath>,
-    buffer: Option<WeakModel<Buffer>>,
-    error: Option<anyhow::Error>,
-}
-
-impl Render for FileAttachmentView {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        if let Some(error) = &self.error {
-            return div().child(error.to_string()).into_any_element();
-        }
-
-        let filename: SharedString = self
-            .project_path
-            .as_ref()
-            .and_then(|p| p.path.file_name()?.to_str())
-            .unwrap_or("Untitled")
-            .to_string()
-            .into();
-
-        ButtonLike::new("file-attachment")
-            .child(
-                h_flex()
-                    .gap_1()
-                    .bg(cx.theme().colors().editor_background)
-                    .rounded_md()
-                    .child(ui::Icon::new(IconName::File))
-                    .child(filename.clone()),
-            )
-            .tooltip(move |cx| Tooltip::with_meta("File Attached", None, filename.clone(), cx))
-            .into_any_element()
-    }
-}
-
-impl ToolOutput for FileAttachmentView {
-    fn generate(&self, project: &mut ProjectContext, cx: &mut WindowContext) -> String {
-        if let Some(path) = &self.project_path {
-            project.add_file(path.clone());
-            return format!("current file: {}", path.path.display());
-        }
-
-        if let Some(buffer) = self.buffer.as_ref().and_then(|buffer| buffer.upgrade()) {
-            return format!("current untitled buffer text:\n{}", buffer.read(cx).text());
-        }
-
-        String::new()
-    }
-}
-
-pub struct ActiveEditorAttachmentTool {
-    workspace: WeakView<Workspace>,
-}
-
-impl ActiveEditorAttachmentTool {
-    pub fn new(workspace: WeakView<Workspace>, _cx: &mut WindowContext) -> Self {
-        Self { workspace }
-    }
-}
-
-impl LanguageModelAttachment for ActiveEditorAttachmentTool {
-    type Output = ActiveEditorAttachment;
-    type View = FileAttachmentView;
-
-    fn name(&self) -> Arc<str> {
-        "active-editor-attachment".into()
-    }
-
-    fn run(&self, cx: &mut WindowContext) -> Task<Result<ActiveEditorAttachment>> {
-        Task::ready(maybe!({
-            let active_buffer = self
-                .workspace
-                .update(cx, |workspace, cx| {
-                    workspace
-                        .active_item(cx)
-                        .and_then(|item| Some(item.act_as::<Editor>(cx)?.read(cx).buffer().clone()))
-                })?
-                .ok_or_else(|| anyhow!("no active buffer"))?;
-
-            let buffer = active_buffer.read(cx);
-
-            if let Some(buffer) = buffer.as_singleton() {
-                let path = project::File::from_dyn(buffer.read(cx).file())
-                    .and_then(|file| file.worktree.read(cx).absolutize(&file.path).ok());
-                return Ok(ActiveEditorAttachment {
-                    buffer: Some(buffer.downgrade()),
-                    path,
-                });
-            } else {
-                Err(anyhow!("no active buffer"))
-            }
-        }))
-    }
-
-    fn view(
-        &self,
-        output: Result<ActiveEditorAttachment>,
-        cx: &mut WindowContext,
-    ) -> View<Self::View> {
-        let error;
-        let project_path;
-        let buffer;
-        match output {
-            Ok(output) => {
-                error = None;
-                let workspace = self.workspace.upgrade().unwrap();
-                let project = workspace.read(cx).project();
-                project_path = output
-                    .path
-                    .and_then(|path| project.read(cx).project_path_for_absolute_path(&path, cx));
-                buffer = output.buffer;
-            }
-            Err(err) => {
-                error = Some(err);
-                buffer = None;
-                project_path = None;
-            }
-        }
-        cx.new_view(|_cx| FileAttachmentView {
-            project_path,
-            buffer,
-            error,
-        })
-    }
-}
--- a/crates/assistant2/src/completion_provider.rs
+++ b/crates/assistant2/src/completion_provider.rs
@@ -1,183 +0,0 @@
-use anyhow::Result;
-use assistant_tooling::ToolFunctionDefinition;
-use client::{proto, Client};
-use futures::{future::BoxFuture, stream::BoxStream, FutureExt, StreamExt};
-use gpui::{AppContext, Global};
-use std::sync::Arc;
-
-pub use open_ai::RequestMessage as CompletionMessage;
-
-#[derive(Clone)]
-pub struct CompletionProvider(Arc<dyn CompletionProviderBackend>);
-
-impl CompletionProvider {
-    pub fn get(cx: &AppContext) -> &Self {
-        cx.global::<CompletionProvider>()
-    }
-
-    pub fn new(backend: impl CompletionProviderBackend) -> Self {
-        Self(Arc::new(backend))
-    }
-
-    pub fn default_model(&self) -> String {
-        self.0.default_model()
-    }
-
-    pub fn available_models(&self) -> Vec<String> {
-        self.0.available_models()
-    }
-
-    pub fn complete(
-        &self,
-        model: String,
-        messages: Vec<CompletionMessage>,
-        stop: Vec<String>,
-        temperature: f32,
-        tools: Vec<ToolFunctionDefinition>,
-    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<proto::LanguageModelResponseMessage>>>>
-    {
-        self.0.complete(model, messages, stop, temperature, tools)
-    }
-}
-
-impl Global for CompletionProvider {}
-
-pub trait CompletionProviderBackend: 'static {
-    fn default_model(&self) -> String;
-    fn available_models(&self) -> Vec<String>;
-    fn complete(
-        &self,
-        model: String,
-        messages: Vec<CompletionMessage>,
-        stop: Vec<String>,
-        temperature: f32,
-        tools: Vec<ToolFunctionDefinition>,
-    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<proto::LanguageModelResponseMessage>>>>;
-}
-
-pub struct CloudCompletionProvider {
-    client: Arc<Client>,
-}
-
-impl CloudCompletionProvider {
-    pub fn new(client: Arc<Client>) -> Self {
-        Self { client }
-    }
-}
-
-impl CompletionProviderBackend for CloudCompletionProvider {
-    fn default_model(&self) -> String {
-        "gpt-4-turbo".into()
-    }
-
-    fn available_models(&self) -> Vec<String> {
-        vec!["gpt-4-turbo".into(), "gpt-4".into(), "gpt-3.5-turbo".into()]
-    }
-
-    fn complete(
-        &self,
-        model: String,
-        messages: Vec<CompletionMessage>,
-        stop: Vec<String>,
-        temperature: f32,
-        tools: Vec<ToolFunctionDefinition>,
-    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<proto::LanguageModelResponseMessage>>>>
-    {
-        let client = self.client.clone();
-        let tools: Vec<proto::ChatCompletionTool> = tools
-            .iter()
-            .filter_map(|tool| {
-                Some(proto::ChatCompletionTool {
-                    variant: Some(proto::chat_completion_tool::Variant::Function(
-                        proto::chat_completion_tool::FunctionObject {
-                            name: tool.name.clone(),
-                            description: Some(tool.description.clone()),
-                            parameters: Some(serde_json::to_string(&tool.parameters).ok()?),
-                        },
-                    )),
-                })
-            })
-            .collect();
-
-        let tool_choice = match tools.is_empty() {
-            true => None,
-            false => Some("auto".into()),
-        };
-
-        async move {
-            let stream = client
-                .request_stream(proto::CompleteWithLanguageModel {
-                    model,
-                    messages: messages
-                        .into_iter()
-                        .map(|message| match message {
-                            CompletionMessage::Assistant {
-                                content,
-                                tool_calls,
-                            } => proto::LanguageModelRequestMessage {
-                                role: proto::LanguageModelRole::LanguageModelAssistant as i32,
-                                content: content.unwrap_or_default(),
-                                tool_call_id: None,
-                                tool_calls: tool_calls
-                                    .into_iter()
-                                    .map(|tool_call| match tool_call.content {
-                                        open_ai::ToolCallContent::Function { function } => {
-                                            proto::ToolCall {
-                                                id: tool_call.id,
-                                                variant: Some(proto::tool_call::Variant::Function(
-                                                    proto::tool_call::FunctionCall {
-                                                        name: function.name,
-                                                        arguments: function.arguments,
-                                                    },
-                                                )),
-                                            }
-                                        }
-                                    })
-                                    .collect(),
-                            },
-                            CompletionMessage::User { content } => {
-                                proto::LanguageModelRequestMessage {
-                                    role: proto::LanguageModelRole::LanguageModelUser as i32,
-                                    content,
-                                    tool_call_id: None,
-                                    tool_calls: Vec::new(),
-                                }
-                            }
-                            CompletionMessage::System { content } => {
-                                proto::LanguageModelRequestMessage {
-                                    role: proto::LanguageModelRole::LanguageModelSystem as i32,
-                                    content,
-                                    tool_calls: Vec::new(),
-                                    tool_call_id: None,
-                                }
-                            }
-                            CompletionMessage::Tool {
-                                content,
-                                tool_call_id,
-                            } => proto::LanguageModelRequestMessage {
-                                role: proto::LanguageModelRole::LanguageModelTool as i32,
-                                content,
-                                tool_call_id: Some(tool_call_id),
-                                tool_calls: Vec::new(),
-                            },
-                        })
-                        .collect(),
-                    stop,
-                    temperature,
-                    tool_choice,
-                    tools,
-                })
-                .await?;
-
-            Ok(stream
-                .filter_map(|response| async move {
-                    match response {
-                        Ok(mut response) => Some(Ok(response.choices.pop()?.delta?)),
-                        Err(error) => Some(Err(error)),
-                    }
-                })
-                .boxed())
-        }
-        .boxed()
-    }
-}
--- a/crates/assistant2/src/saved_conversation.rs
+++ b/crates/assistant2/src/saved_conversation.rs
@@ -1,57 +0,0 @@
-use assistant_tooling::{SavedToolFunctionCall, SavedUserAttachment};
-use gpui::SharedString;
-use serde::{Deserialize, Serialize};
-
-use crate::MessageId;
-
-#[derive(Serialize, Deserialize)]
-pub struct SavedConversation {
-    /// The schema version of the conversation.
-    pub version: String,
-    /// The title of the conversation, generated by the Assistant.
-    pub title: String,
-    pub messages: Vec<SavedChatMessage>,
-}
-
-#[derive(Serialize, Deserialize)]
-pub enum SavedChatMessage {
-    User {
-        id: MessageId,
-        body: String,
-        attachments: Vec<SavedUserAttachment>,
-    },
-    Assistant {
-        id: MessageId,
-        messages: Vec<SavedAssistantMessagePart>,
-        error: Option<SharedString>,
-    },
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct SavedAssistantMessagePart {
-    pub body: SharedString,
-    pub tool_calls: Vec<SavedToolFunctionCall>,
-}
-
-/// Returns a list of placeholder conversations for mocking the UI.
-///
-/// Once we have real saved conversations to pull from we can use those instead.
-pub fn placeholder_conversations() -> Vec<SavedConversation> {
-    vec![
-        SavedConversation {
-            version: "0.3.0".to_string(),
-            title: "How to get a list of exported functions in an Erlang module".to_string(),
-            messages: vec![],
-        },
-        SavedConversation {
-            version: "0.3.0".to_string(),
-            title: "7 wonders of the ancient world".to_string(),
-            messages: vec![],
-        },
-        SavedConversation {
-            version: "0.3.0".to_string(),
-            title: "Size difference between u8 and a reference to u8 in Rust".to_string(),
-            messages: vec![],
-        },
-    ]
-}
--- a/crates/assistant2/src/saved_conversation_picker.rs
+++ b/crates/assistant2/src/saved_conversation_picker.rs
@@ -1,188 +0,0 @@
-use std::sync::Arc;
-
-use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
-use gpui::{AppContext, DismissEvent, EventEmitter, FocusHandle, FocusableView, View, WeakView};
-use picker::{Picker, PickerDelegate};
-use ui::{prelude::*, HighlightedLabel, ListItem, ListItemSpacing};
-use util::ResultExt;
-use workspace::{ModalView, Workspace};
-
-use crate::saved_conversation::{self, SavedConversation};
-use crate::ToggleSavedConversations;
-
-pub struct SavedConversationPicker {
-    picker: View<Picker<SavedConversationPickerDelegate>>,
-}
-
-impl EventEmitter<DismissEvent> for SavedConversationPicker {}
-
-impl ModalView for SavedConversationPicker {}
-
-impl FocusableView for SavedConversationPicker {
-    fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
-        self.picker.focus_handle(cx)
-    }
-}
-
-impl SavedConversationPicker {
-    pub fn register(workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>) {
-        workspace.register_action(|workspace, _: &ToggleSavedConversations, cx| {
-            workspace.toggle_modal(cx, move |cx| {
-                let delegate = SavedConversationPickerDelegate::new(cx.view().downgrade());
-                Self::new(delegate, cx)
-            });
-        });
-    }
-
-    pub fn new(delegate: SavedConversationPickerDelegate, cx: &mut ViewContext<Self>) -> Self {
-        let picker = cx.new_view(|cx| Picker::uniform_list(delegate, cx));
-        Self { picker }
-    }
-}
-
-impl Render for SavedConversationPicker {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        v_flex().w(rems(34.)).child(self.picker.clone())
-    }
-}
-
-pub struct SavedConversationPickerDelegate {
-    view: WeakView<SavedConversationPicker>,
-    saved_conversations: Vec<SavedConversation>,
-    selected_index: usize,
-    matches: Vec<StringMatch>,
-}
-
-impl SavedConversationPickerDelegate {
-    pub fn new(weak_view: WeakView<SavedConversationPicker>) -> Self {
-        let saved_conversations = saved_conversation::placeholder_conversations();
-        let matches = saved_conversations
-            .iter()
-            .map(|conversation| StringMatch {
-                candidate_id: 0,
-                score: 0.0,
-                positions: Default::default(),
-                string: conversation.title.clone(),
-            })
-            .collect();
-
-        Self {
-            view: weak_view,
-            saved_conversations,
-            selected_index: 0,
-            matches,
-        }
-    }
-}
-
-impl PickerDelegate for SavedConversationPickerDelegate {
-    type ListItem = ui::ListItem;
-
-    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
-        "Select saved conversation...".into()
-    }
-
-    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 update_matches(
-        &mut self,
-        query: String,
-        cx: &mut ViewContext<Picker<Self>>,
-    ) -> gpui::Task<()> {
-        let background_executor = cx.background_executor().clone();
-        let candidates = self
-            .saved_conversations
-            .iter()
-            .enumerate()
-            .map(|(id, conversation)| {
-                let text = conversation.title.clone();
-
-                StringMatchCandidate {
-                    id,
-                    char_bag: text.as_str().into(),
-                    string: text,
-                }
-            })
-            .collect::<Vec<_>>();
-
-        cx.spawn(move |this, mut cx| async move {
-            let matches = if query.is_empty() {
-                candidates
-                    .into_iter()
-                    .enumerate()
-                    .map(|(index, candidate)| StringMatch {
-                        candidate_id: index,
-                        string: candidate.string,
-                        positions: Vec::new(),
-                        score: 0.0,
-                    })
-                    .collect()
-            } else {
-                match_strings(
-                    &candidates,
-                    &query,
-                    false,
-                    100,
-                    &Default::default(),
-                    background_executor,
-                )
-                .await
-            };
-
-            this.update(&mut cx, |this, _cx| {
-                this.delegate.matches = matches;
-                this.delegate.selected_index = this
-                    .delegate
-                    .selected_index
-                    .min(this.delegate.matches.len().saturating_sub(1));
-            })
-            .log_err();
-        })
-    }
-
-    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        if self.matches.is_empty() {
-            self.dismissed(cx);
-            return;
-        }
-
-        // TODO: Implement selecting a saved conversation.
-    }
-
-    fn dismissed(&mut self, cx: &mut ui::prelude::ViewContext<Picker<Self>>) {
-        self.view
-            .update(cx, |_, cx| cx.emit(DismissEvent))
-            .log_err();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _cx: &mut ViewContext<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let conversation_match = &self.matches[ix];
-        let _conversation = &self.saved_conversations[conversation_match.candidate_id];
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .selected(selected)
-                .child(HighlightedLabel::new(
-                    conversation_match.string.clone(),
-                    conversation_match.positions.clone(),
-                )),
-        )
-    }
-}
--- a/crates/assistant2/src/tools.rs
+++ b/crates/assistant2/src/tools.rs
@@ -1,7 +0,0 @@
-mod annotate_code;
-mod create_buffer;
-mod project_index;
-
-pub use annotate_code::*;
-pub use create_buffer::*;
-pub use project_index::*;
--- a/crates/assistant2/src/tools/annotate_code.rs
+++ b/crates/assistant2/src/tools/annotate_code.rs
@@ -1,209 +0,0 @@
-use anyhow::Result;
-use assistant_tooling::{LanguageModelTool, ProjectContext, ToolOutput};
-use editor::{
-    display_map::{BlockContext, BlockDisposition, BlockProperties, BlockStyle},
-    Editor, MultiBuffer,
-};
-use gpui::{prelude::*, AnyElement, Model, Task, View, WeakView};
-use language::ToPoint;
-use project::{search::SearchQuery, Project, ProjectPath};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use std::path::Path;
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::Workspace;
-
-pub struct AnnotationTool {
-    workspace: WeakView<Workspace>,
-    project: Model<Project>,
-}
-
-impl AnnotationTool {
-    pub fn new(workspace: WeakView<Workspace>, project: Model<Project>) -> Self {
-        Self { workspace, project }
-    }
-}
-
-#[derive(Debug, Deserialize, JsonSchema, Clone)]
-pub struct AnnotationInput {
-    /// Name for this set of annotations
-    title: String,
-    /// Excerpts from the file to show to the user.
-    excerpts: Vec<Excerpt>,
-}
-
-#[derive(Debug, Deserialize, JsonSchema, Clone)]
-struct Excerpt {
-    /// Path to the file
-    path: String,
-    /// A short, distinctive string that appears in the file, used to define a location in the file.
-    text_passage: String,
-    /// Text to display above the code excerpt
-    annotation: String,
-}
-
-impl LanguageModelTool for AnnotationTool {
-    type Input = AnnotationInput;
-    type Output = String;
-    type View = AnnotationResultView;
-
-    fn name(&self) -> String {
-        "annotate_code".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Dynamically annotate symbols in the current codebase. Opens a buffer in a panel in their editor, to the side of the conversation. The annotations are shown in the editor as a block decoration.".to_string()
-    }
-
-    fn execute(&self, input: &Self::Input, cx: &mut WindowContext) -> Task<Result<Self::Output>> {
-        let workspace = self.workspace.clone();
-        let project = self.project.clone();
-        let excerpts = input.excerpts.clone();
-        let title = input.title.clone();
-
-        let worktree_id = project.update(cx, |project, cx| {
-            let worktree = project.worktrees().next()?;
-            let worktree_id = worktree.read(cx).id();
-            Some(worktree_id)
-        });
-
-        let worktree_id = if let Some(worktree_id) = worktree_id {
-            worktree_id
-        } else {
-            return Task::ready(Err(anyhow::anyhow!("No worktree found")));
-        };
-
-        let buffer_tasks = project.update(cx, |project, cx| {
-            excerpts
-                .iter()
-                .map(|excerpt| {
-                    project.open_buffer(
-                        ProjectPath {
-                            worktree_id,
-                            path: Path::new(&excerpt.path).into(),
-                        },
-                        cx,
-                    )
-                })
-                .collect::<Vec<_>>()
-        });
-
-        cx.spawn(move |mut cx| async move {
-            let buffers = futures::future::try_join_all(buffer_tasks).await?;
-
-            let multibuffer = cx.new_model(|_cx| {
-                MultiBuffer::new(0, language::Capability::ReadWrite).with_title(title)
-            })?;
-            let editor =
-                cx.new_view(|cx| Editor::for_multibuffer(multibuffer, Some(project), cx))?;
-
-            for (excerpt, buffer) in excerpts.iter().zip(buffers.iter()) {
-                let snapshot = buffer.update(&mut cx, |buffer, _cx| buffer.snapshot())?;
-
-                let query =
-                    SearchQuery::text(&excerpt.text_passage, false, false, false, vec![], vec![])?;
-
-                let matches = query.search(&snapshot, None).await;
-                let Some(first_match) = matches.first() else {
-                    log::warn!(
-                        "text {:?} does not appear in '{}'",
-                        excerpt.text_passage,
-                        excerpt.path
-                    );
-                    continue;
-                };
-                let mut start = first_match.start.to_point(&snapshot);
-                start.column = 0;
-
-                editor.update(&mut cx, |editor, cx| {
-                    let ranges = editor.buffer().update(cx, |multibuffer, cx| {
-                        multibuffer.push_excerpts_with_context_lines(
-                            buffer.clone(),
-                            vec![start..start],
-                            5,
-                            cx,
-                        )
-                    });
-                    let annotation = SharedString::from(excerpt.annotation.clone());
-                    editor.insert_blocks(
-                        [BlockProperties {
-                            position: ranges[0].start,
-                            height: annotation.split('\n').count() as u8 + 1,
-                            style: BlockStyle::Fixed,
-                            render: Box::new(move |cx| Self::render_note_block(&annotation, cx)),
-                            disposition: BlockDisposition::Above,
-                        }],
-                        None,
-                        cx,
-                    );
-                })?;
-            }
-
-            workspace
-                .update(&mut cx, |workspace, cx| {
-                    workspace.add_item_to_active_pane(Box::new(editor.clone()), None, cx);
-                })
-                .log_err();
-
-            anyhow::Ok("showed comments to users in a new view".into())
-        })
-    }
-
-    fn view(
-        &self,
-        _: Self::Input,
-        output: Result<Self::Output>,
-        cx: &mut WindowContext,
-    ) -> View<Self::View> {
-        cx.new_view(|_cx| AnnotationResultView { output })
-    }
-}
-
-impl AnnotationTool {
-    fn render_note_block(explanation: &SharedString, cx: &mut BlockContext) -> AnyElement {
-        let anchor_x = cx.anchor_x;
-        let gutter_width = cx.gutter_dimensions.width;
-
-        h_flex()
-            .w_full()
-            .py_2()
-            .border_y_1()
-            .border_color(cx.theme().colors().border)
-            .child(
-                h_flex()
-                    .justify_center()
-                    .w(gutter_width)
-                    .child(Icon::new(IconName::Ai).color(Color::Hint)),
-            )
-            .child(
-                h_flex()
-                    .w_full()
-                    .ml(anchor_x - gutter_width)
-                    .child(explanation.clone()),
-            )
-            .into_any_element()
-    }
-}
-
-pub struct AnnotationResultView {
-    output: Result<String>,
-}
-
-impl Render for AnnotationResultView {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        match &self.output {
-            Ok(output) => div().child(output.clone().into_any_element()),
-            Err(error) => div().child(format!("failed to open path: {:?}", error)),
-        }
-    }
-}
-
-impl ToolOutput for AnnotationResultView {
-    fn generate(&self, _: &mut ProjectContext, _: &mut WindowContext) -> String {
-        match &self.output {
-            Ok(output) => output.clone(),
-            Err(err) => format!("Failed to create buffer: {err:?}"),
-        }
-    }
-}
--- a/crates/assistant2/src/tools/create_buffer.rs
+++ b/crates/assistant2/src/tools/create_buffer.rs
@@ -1,120 +0,0 @@
-use anyhow::Result;
-use assistant_tooling::{LanguageModelTool, ProjectContext, ToolOutput};
-use editor::Editor;
-use gpui::{prelude::*, Model, Task, View, WeakView};
-use project::Project;
-use schemars::JsonSchema;
-use serde::Deserialize;
-use ui::prelude::*;
-use util::ResultExt;
-use workspace::Workspace;
-
-pub struct CreateBufferTool {
-    workspace: WeakView<Workspace>,
-    project: Model<Project>,
-}
-
-impl CreateBufferTool {
-    pub fn new(workspace: WeakView<Workspace>, project: Model<Project>) -> Self {
-        Self { workspace, project }
-    }
-}
-
-#[derive(Debug, Deserialize, JsonSchema)]
-pub struct CreateBufferInput {
-    /// The contents of the buffer.
-    text: String,
-
-    /// The name of the language to use for the buffer.
-    ///
-    /// This should be a human-readable name, like "Rust", "JavaScript", or "Python".
-    language: String,
-}
-
-impl LanguageModelTool for CreateBufferTool {
-    type Input = CreateBufferInput;
-    type Output = ();
-    type View = CreateBufferView;
-
-    fn name(&self) -> String {
-        "create_buffer".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Create a new buffer in the current codebase".to_string()
-    }
-
-    fn execute(&self, input: &Self::Input, cx: &mut WindowContext) -> Task<Result<Self::Output>> {
-        cx.spawn({
-            let workspace = self.workspace.clone();
-            let project = self.project.clone();
-            let text = input.text.clone();
-            let language_name = input.language.clone();
-            |mut cx| async move {
-                let language = cx
-                    .update(|cx| {
-                        project
-                            .read(cx)
-                            .languages()
-                            .language_for_name(&language_name)
-                    })?
-                    .await?;
-
-                let buffer = cx
-                    .update(|cx| project.update(cx, |project, cx| project.create_buffer(cx)))?
-                    .await?;
-
-                buffer.update(&mut cx, |buffer, cx| {
-                    buffer.edit([(0..0, text)], None, cx);
-                    buffer.set_language(Some(language), cx)
-                })?;
-
-                workspace
-                    .update(&mut cx, |workspace, cx| {
-                        workspace.add_item_to_active_pane(
-                            Box::new(
-                                cx.new_view(|cx| Editor::for_buffer(buffer, Some(project), cx)),
-                            ),
-                            None,
-                            cx,
-                        );
-                    })
-                    .log_err();
-
-                Ok(())
-            }
-        })
-    }
-
-    fn view(
-        &self,
-        input: Self::Input,
-        output: Result<Self::Output>,
-        cx: &mut WindowContext,
-    ) -> View<Self::View> {
-        cx.new_view(|_cx| CreateBufferView {
-            language: input.language,
-            output,
-        })
-    }
-}
-
-pub struct CreateBufferView {
-    language: String,
-    output: Result<()>,
-}
-
-impl Render for CreateBufferView {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        div().child("Opening a buffer")
-    }
-}
-
-impl ToolOutput for CreateBufferView {
-    fn generate(&self, _: &mut ProjectContext, _: &mut WindowContext) -> String {
-        match &self.output {
-            Ok(_) => format!("Created a new {} buffer", self.language),
-            Err(err) => format!("Failed to create buffer: {err:?}"),
-        }
-    }
-}
--- a/crates/assistant2/src/tools/project_index.rs
+++ b/crates/assistant2/src/tools/project_index.rs
@@ -1,253 +0,0 @@
-use anyhow::{anyhow, Result};
-use assistant_tooling::{LanguageModelTool, ToolOutput};
-use collections::BTreeMap;
-use gpui::{prelude::*, Model, Task};
-use project::ProjectPath;
-use schemars::JsonSchema;
-use semantic_index::{ProjectIndex, Status};
-use serde::{Deserialize, Serialize};
-use serde_json::Value;
-use std::{fmt::Write as _, ops::Range, path::Path, sync::Arc};
-use ui::{div, prelude::*, CollapsibleContainer, Color, Icon, IconName, Label, WindowContext};
-
-const DEFAULT_SEARCH_LIMIT: usize = 20;
-
-pub struct ProjectIndexTool {
-    project_index: Model<ProjectIndex>,
-}
-
-// Note: Comments on a `LanguageModelTool::Input` become descriptions on the generated JSON schema as shown to the language model.
-// Any changes or deletions to the `CodebaseQuery` comments will change model behavior.
-
-#[derive(Deserialize, JsonSchema)]
-pub struct CodebaseQuery {
-    /// Semantic search query
-    query: String,
-    /// Maximum number of results to return, defaults to 20
-    limit: Option<usize>,
-}
-
-pub struct ProjectIndexView {
-    input: CodebaseQuery,
-    status: Status,
-    excerpts: Result<BTreeMap<ProjectPath, Vec<Range<usize>>>>,
-    element_id: ElementId,
-    expanded_header: bool,
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct ProjectIndexOutput {
-    status: Status,
-    worktrees: BTreeMap<Arc<Path>, WorktreeIndexOutput>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct WorktreeIndexOutput {
-    excerpts: BTreeMap<Arc<Path>, Vec<Range<usize>>>,
-}
-
-impl ProjectIndexView {
-    fn toggle_header(&mut self, cx: &mut ViewContext<Self>) {
-        self.expanded_header = !self.expanded_header;
-        cx.notify();
-    }
-}
-
-impl Render for ProjectIndexView {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let query = self.input.query.clone();
-        let excerpts = match &self.excerpts {
-            Err(err) => {
-                return div().child(Label::new(format!("Error: {}", err)).color(Color::Error));
-            }
-            Ok(excerpts) => excerpts,
-        };
-
-        let file_count = excerpts.len();
-        let header = h_flex()
-            .gap_2()
-            .child(Icon::new(IconName::File))
-            .child(format!(
-                "Read {} {}",
-                file_count,
-                if file_count == 1 { "file" } else { "files" }
-            ));
-
-        v_flex().gap_3().child(
-            CollapsibleContainer::new(self.element_id.clone(), self.expanded_header)
-                .start_slot(header)
-                .on_click(cx.listener(move |this, _, cx| {
-                    this.toggle_header(cx);
-                }))
-                .child(
-                    v_flex()
-                        .gap_3()
-                        .p_3()
-                        .child(
-                            h_flex()
-                                .gap_2()
-                                .child(Icon::new(IconName::MagnifyingGlass))
-                                .child(Label::new(format!("`{}`", query)).color(Color::Muted)),
-                        )
-                        .child(v_flex().gap_2().children(excerpts.keys().map(|path| {
-                            h_flex().gap_2().child(Icon::new(IconName::File)).child(
-                                Label::new(path.path.to_string_lossy().to_string())
-                                    .color(Color::Muted),
-                            )
-                        }))),
-                ),
-        )
-    }
-}
-
-impl ToolOutput for ProjectIndexView {
-    fn generate(
-        &self,
-        context: &mut assistant_tooling::ProjectContext,
-        _: &mut WindowContext,
-    ) -> String {
-        match &self.excerpts {
-            Ok(excerpts) => {
-                let mut body = "found results in the following paths:\n".to_string();
-
-                for (project_path, ranges) in excerpts {
-                    context.add_excerpts(project_path.clone(), ranges);
-                    writeln!(&mut body, "* {}", &project_path.path.display()).unwrap();
-                }
-
-                if self.status != Status::Idle {
-                    body.push_str("Still indexing. Results may be incomplete.\n");
-                }
-
-                body
-            }
-            Err(err) => format!("Error: {}", err),
-        }
-    }
-}
-
-impl ProjectIndexTool {
-    pub fn new(project_index: Model<ProjectIndex>) -> Self {
-        Self { project_index }
-    }
-}
-
-impl LanguageModelTool for ProjectIndexTool {
-    type Input = CodebaseQuery;
-    type Output = ProjectIndexOutput;
-    type View = ProjectIndexView;
-
-    fn name(&self) -> String {
-        "query_codebase".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Semantic search against the user's current codebase, returning excerpts related to the query by computing a dot product against embeddings of code chunks in the code base and an embedding of the query.".to_string()
-    }
-
-    fn execute(&self, query: &Self::Input, cx: &mut WindowContext) -> Task<Result<Self::Output>> {
-        let project_index = self.project_index.read(cx);
-        let status = project_index.status();
-        let search = project_index.search(
-            query.query.clone(),
-            query.limit.unwrap_or(DEFAULT_SEARCH_LIMIT),
-            cx,
-        );
-
-        cx.spawn(|mut cx| async move {
-            let search_results = search.await?;
-
-            cx.update(|cx| {
-                let mut output = ProjectIndexOutput {
-                    status,
-                    worktrees: Default::default(),
-                };
-
-                for search_result in search_results {
-                    let worktree_path = search_result.worktree.read(cx).abs_path();
-                    let excerpts = &mut output
-                        .worktrees
-                        .entry(worktree_path)
-                        .or_insert(WorktreeIndexOutput {
-                            excerpts: Default::default(),
-                        })
-                        .excerpts;
-
-                    let excerpts_for_path = excerpts.entry(search_result.path).or_default();
-                    let ix = match excerpts_for_path
-                        .binary_search_by_key(&search_result.range.start, |r| r.start)
-                    {
-                        Ok(ix) | Err(ix) => ix,
-                    };
-                    excerpts_for_path.insert(ix, search_result.range);
-                }
-
-                output
-            })
-        })
-    }
-
-    fn view(
-        &self,
-        input: Self::Input,
-        output: Result<Self::Output>,
-        cx: &mut WindowContext,
-    ) -> gpui::View<Self::View> {
-        cx.new_view(|cx| {
-            let status;
-            let excerpts;
-            match output {
-                Ok(output) => {
-                    status = output.status;
-                    let project_index = self.project_index.read(cx);
-                    if let Some(project) = project_index.project().upgrade() {
-                        let project = project.read(cx);
-                        excerpts = Ok(output
-                            .worktrees
-                            .into_iter()
-                            .filter_map(|(abs_path, output)| {
-                                for worktree in project.worktrees() {
-                                    let worktree = worktree.read(cx);
-                                    if worktree.abs_path() == abs_path {
-                                        return Some((worktree.id(), output.excerpts));
-                                    }
-                                }
-                                None
-                            })
-                            .flat_map(|(worktree_id, excerpts)| {
-                                excerpts.into_iter().map(move |(path, ranges)| {
-                                    (ProjectPath { worktree_id, path }, ranges)
-                                })
-                            })
-                            .collect::<BTreeMap<_, _>>());
-                    } else {
-                        excerpts = Err(anyhow!("project was dropped"));
-                    }
-                }
-                Err(err) => {
-                    status = Status::Idle;
-                    excerpts = Err(err);
-                }
-            };
-
-            ProjectIndexView {
-                input,
-                status,
-                excerpts,
-                element_id: ElementId::Name(nanoid::nanoid!().into()),
-                expanded_header: false,
-            }
-        })
-    }
-
-    fn render_running(arguments: &Option<Value>, _: &mut WindowContext) -> impl IntoElement {
-        let text: String = arguments
-            .as_ref()
-            .and_then(|arguments| arguments.get("query"))
-            .and_then(|query| query.as_str())
-            .map(|query| format!("Searching for: {}", query))
-            .unwrap_or_else(|| "Preparing search...".to_string());
-
-        CollapsibleContainer::new(ElementId::Name(nanoid::nanoid!().into()), false).start_slot(text)
-    }
-}
--- a/crates/assistant2/src/ui.rs
+++ b/crates/assistant2/src/ui.rs
@@ -1,17 +0,0 @@
-mod active_file_button;
-mod chat_message;
-mod chat_notice;
-mod composer;
-mod project_index_button;
-
-#[cfg(feature = "stories")]
-mod stories;
-
-pub use active_file_button::*;
-pub use chat_message::*;
-pub use chat_notice::*;
-pub use composer::*;
-pub use project_index_button::*;
-
-#[cfg(feature = "stories")]
-pub use stories::*;
--- a/crates/assistant2/src/ui/active_file_button.rs
+++ b/crates/assistant2/src/ui/active_file_button.rs
@@ -1,134 +0,0 @@
-use crate::attachments::ActiveEditorAttachmentTool;
-use assistant_tooling::AttachmentRegistry;
-use editor::Editor;
-use gpui::{prelude::*, Subscription, View};
-use std::sync::Arc;
-use ui::{prelude::*, ButtonLike, Color, Icon, IconName, Tooltip};
-use workspace::Workspace;
-
-#[derive(Clone)]
-enum Status {
-    ActiveFile(String),
-    #[allow(dead_code)]
-    NoFile,
-}
-
-pub struct ActiveFileButton {
-    attachment_registry: Arc<AttachmentRegistry>,
-    status: Status,
-    #[allow(dead_code)]
-    workspace_subscription: Subscription,
-}
-
-impl ActiveFileButton {
-    pub fn new(
-        attachment_registry: Arc<AttachmentRegistry>,
-        workspace: View<Workspace>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        let workspace_subscription = cx.subscribe(&workspace, Self::handle_workspace_event);
-
-        cx.defer(move |this, cx| this.update_active_buffer(workspace.clone(), cx));
-
-        Self {
-            attachment_registry,
-            status: Status::NoFile,
-            workspace_subscription,
-        }
-    }
-
-    pub fn set_enabled(&mut self, enabled: bool) {
-        self.attachment_registry
-            .set_attachment_tool_enabled::<ActiveEditorAttachmentTool>(enabled);
-    }
-
-    pub fn update_active_buffer(&mut self, workspace: View<Workspace>, cx: &mut ViewContext<Self>) {
-        let active_buffer = workspace
-            .read(cx)
-            .active_item(cx)
-            .and_then(|item| Some(item.act_as::<Editor>(cx)?.read(cx).buffer().clone()));
-
-        if let Some(buffer) = active_buffer {
-            let buffer = buffer.read(cx);
-
-            if let Some(singleton) = buffer.as_singleton() {
-                let singleton = singleton.read(cx);
-
-                let filename: String = singleton
-                    .file()
-                    .map(|file| file.path().to_string_lossy())
-                    .unwrap_or("Untitled".into())
-                    .into();
-
-                self.status = Status::ActiveFile(filename);
-            }
-        }
-    }
-
-    fn handle_workspace_event(
-        &mut self,
-        workspace: View<Workspace>,
-        event: &workspace::Event,
-        cx: &mut ViewContext<Self>,
-    ) {
-        if let workspace::Event::ActiveItemChanged = event {
-            self.update_active_buffer(workspace, cx);
-        }
-    }
-}
-
-impl Render for ActiveFileButton {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let is_enabled = self
-            .attachment_registry
-            .is_attachment_tool_enabled::<ActiveEditorAttachmentTool>();
-
-        let icon = if is_enabled {
-            Icon::new(IconName::File)
-                .size(IconSize::XSmall)
-                .color(Color::Default)
-        } else {
-            Icon::new(IconName::File)
-                .size(IconSize::XSmall)
-                .color(Color::Disabled)
-        };
-
-        let indicator = None;
-
-        let status = self.status.clone();
-
-        ButtonLike::new("active-file-button")
-            .child(
-                ui::IconWithIndicator::new(icon, indicator)
-                    .indicator_border_color(Some(gpui::transparent_black())),
-            )
-            .tooltip({
-                move |cx| {
-                    let status = status.clone();
-                    let (tooltip, meta) = match (is_enabled, status) {
-                        (false, _) => (
-                            "Active file disabled".to_string(),
-                            Some("Click to enable".to_string()),
-                        ),
-                        (true, Status::ActiveFile(filename)) => (
-                            format!("Active file {filename} enabled"),
-                            Some("Click to disable".to_string()),
-                        ),
-                        (true, Status::NoFile) => {
-                            ("No file active for conversation".to_string(), None)
-                        }
-                    };
-
-                    if let Some(meta) = meta {
-                        Tooltip::with_meta(tooltip, None, meta, cx)
-                    } else {
-                        Tooltip::text(tooltip, cx)
-                    }
-                }
-            })
-            .on_click(cx.listener(move |this, _, cx| {
-                this.set_enabled(!is_enabled);
-                cx.notify();
-            }))
-    }
-}
--- a/crates/assistant2/src/ui/chat_message.rs
+++ b/crates/assistant2/src/ui/chat_message.rs
@@ -1,140 +0,0 @@
-use std::sync::Arc;
-
-use client::User;
-use gpui::{hsla, AnyElement, ClickEvent};
-use ui::{prelude::*, Avatar, Tooltip};
-
-use crate::MessageId;
-
-pub enum UserOrAssistant {
-    User(Option<Arc<User>>),
-    Assistant,
-}
-
-#[derive(IntoElement)]
-pub struct ChatMessage {
-    id: MessageId,
-    player: UserOrAssistant,
-    messages: Vec<AnyElement>,
-    selected: bool,
-    collapsed: bool,
-    on_collapse_handle_click: Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>,
-}
-
-impl ChatMessage {
-    pub fn new(
-        id: MessageId,
-        player: UserOrAssistant,
-        messages: Vec<AnyElement>,
-        collapsed: bool,
-        on_collapse_handle_click: Box<dyn Fn(&ClickEvent, &mut WindowContext) + 'static>,
-    ) -> Self {
-        Self {
-            id,
-            player,
-            messages,
-            selected: false,
-            collapsed,
-            on_collapse_handle_click,
-        }
-    }
-}
-
-impl Selectable for ChatMessage {
-    fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-}
-
-impl RenderOnce for ChatMessage {
-    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        let message_group = SharedString::from(format!("{}_group", self.id.0));
-
-        let collapse_handle_id = SharedString::from(format!("{}_collapse_handle", self.id.0));
-
-        let content_padding = Spacing::Small.rems(cx);
-        // Clamp the message height to exactly 1.5 lines when collapsed.
-        let collapsed_height = content_padding.to_pixels(cx.rem_size()) + cx.line_height() * 1.5;
-
-        let background_color = if let UserOrAssistant::User(_) = &self.player {
-            Some(cx.theme().colors().surface_background)
-        } else {
-            None
-        };
-
-        let (username, avatar_uri) = match self.player {
-            UserOrAssistant::Assistant => (
-                "Assistant".into(),
-                Some("https://zed.dev/assistant_avatar.png".into()),
-            ),
-            UserOrAssistant::User(Some(user)) => {
-                (user.github_login.clone(), Some(user.avatar_uri.clone()))
-            }
-            UserOrAssistant::User(None) => ("You".into(), None),
-        };
-
-        v_flex()
-            .group(message_group.clone())
-            .gap(Spacing::XSmall.rems(cx))
-            .p(Spacing::XSmall.rems(cx))
-            .when(self.selected, |element| {
-                element.bg(hsla(0.6, 0.67, 0.46, 0.12))
-            })
-            .rounded_lg()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .px(content_padding)
-                    .child(
-                        h_flex()
-                            .gap_2()
-                            .map(|this| {
-                                let avatar_size = rems_from_px(20.);
-                                if let Some(avatar_uri) = avatar_uri {
-                                    this.child(Avatar::new(avatar_uri).size(avatar_size))
-                                } else {
-                                    this.child(div().size(avatar_size))
-                                }
-                            })
-                            .child(Label::new(username).color(Color::Muted)),
-                    )
-                    .child(
-                        h_flex().visible_on_hover(message_group).child(
-                            // temp icons
-                            IconButton::new(
-                                collapse_handle_id.clone(),
-                                if self.collapsed {
-                                    IconName::ArrowUp
-                                } else {
-                                    IconName::ArrowDown
-                                },
-                            )
-                            .icon_size(IconSize::XSmall)
-                            .icon_color(Color::Muted)
-                            .on_click(self.on_collapse_handle_click)
-                            .tooltip(|cx| Tooltip::text("Collapse Message", cx)),
-                        ),
-                    ),
-            )
-            .when(self.messages.len() > 0, |el| {
-                el.child(
-                    h_flex().child(
-                        v_flex()
-                            .relative()
-                            .overflow_hidden()
-                            .w_full()
-                            .p(content_padding)
-                            .gap_3()
-                            .text_ui(cx)
-                            .rounded_lg()
-                            .when_some(background_color, |this, background_color| {
-                                this.bg(background_color)
-                            })
-                            .when(self.collapsed, |this| this.h(collapsed_height))
-                            .children(self.messages),
-                    ),
-                )
-            })
-    }
-}
--- a/crates/assistant2/src/ui/chat_notice.rs
+++ b/crates/assistant2/src/ui/chat_notice.rs
@@ -1,71 +0,0 @@
-use ui::{prelude::*, Avatar, IconButtonShape};
-
-#[derive(IntoElement)]
-pub struct ChatNotice {
-    message: SharedString,
-    meta: Option<SharedString>,
-}
-
-impl ChatNotice {
-    pub fn new(message: impl Into<SharedString>) -> Self {
-        Self {
-            message: message.into(),
-            meta: None,
-        }
-    }
-
-    pub fn meta(mut self, meta: impl Into<SharedString>) -> Self {
-        self.meta = Some(meta.into());
-        self
-    }
-}
-
-impl RenderOnce for ChatNotice {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        h_flex()
-            .w_full()
-            .items_start()
-            .mt_4()
-            .gap_3()
-            .child(
-                // TODO: Replace with question mark.
-                Avatar::new("https://zed.dev/assistant_avatar.png").size(rems_from_px(20.)),
-            )
-            .child(
-                v_flex()
-                    .size_full()
-                    .gap_1()
-                    .pr_4()
-                    .overflow_hidden()
-                    .child(
-                        h_flex()
-                            .justify_between()
-                            .overflow_hidden()
-                            .child(
-                                h_flex()
-                                    .flex_none()
-                                    .overflow_hidden()
-                                    .child(Label::new(self.message)),
-                            )
-                            .child(
-                                h_flex()
-                                    .flex_shrink_0()
-                                    .gap_1()
-                                    .child(Button::new("allow", "Allow"))
-                                    .child(
-                                        IconButton::new("deny", IconName::Close)
-                                            .shape(IconButtonShape::Square)
-                                            .icon_color(Color::Muted)
-                                            .size(ButtonSize::None)
-                                            .icon_size(IconSize::XSmall),
-                                    ),
-                            ),
-                    )
-                    .children(
-                        self.meta.map(|meta| {
-                            Label::new(meta).size(LabelSize::Small).color(Color::Muted)
-                        }),
-                    ),
-            )
-    }
-}
--- a/crates/assistant2/src/ui/composer.rs
+++ b/crates/assistant2/src/ui/composer.rs
@@ -1,193 +0,0 @@
-use crate::{
-    ui::{ActiveFileButton, ProjectIndexButton},
-    AssistantChat, CompletionProvider,
-};
-use editor::{Editor, EditorElement, EditorStyle};
-use gpui::{AnyElement, FontStyle, FontWeight, TextStyle, View, WeakView, WhiteSpace};
-use settings::Settings;
-use theme::ThemeSettings;
-use ui::{popover_menu, prelude::*, ButtonLike, ContextMenu, Divider, TextSize, Tooltip};
-
-#[derive(IntoElement)]
-pub struct Composer {
-    editor: View<Editor>,
-    project_index_button: View<ProjectIndexButton>,
-    active_file_button: Option<View<ActiveFileButton>>,
-    model_selector: AnyElement,
-}
-
-impl Composer {
-    pub fn new(
-        editor: View<Editor>,
-        project_index_button: View<ProjectIndexButton>,
-        active_file_button: Option<View<ActiveFileButton>>,
-        model_selector: AnyElement,
-    ) -> Self {
-        Self {
-            editor,
-            project_index_button,
-            active_file_button,
-            model_selector,
-        }
-    }
-
-    fn render_tools(&mut self, _cx: &mut WindowContext) -> impl IntoElement {
-        h_flex().child(self.project_index_button.clone())
-    }
-
-    fn render_attachment_tools(&mut self, _cx: &mut WindowContext) -> impl IntoElement {
-        h_flex().children(
-            self.active_file_button
-                .clone()
-                .map(|view| view.into_any_element()),
-        )
-    }
-}
-
-impl RenderOnce for Composer {
-    fn render(mut self, cx: &mut WindowContext) -> impl IntoElement {
-        let font_size = TextSize::Default.rems(cx);
-        let line_height = font_size.to_pixels(cx.rem_size()) * 1.3;
-        let mut editor_border = cx.theme().colors().text;
-        editor_border.fade_out(0.90);
-
-        // Remove the extra 1px added by the border
-        let padding = Spacing::XLarge.rems(cx) - rems_from_px(1.);
-
-        h_flex()
-            .p(Spacing::Small.rems(cx))
-            .w_full()
-            .items_start()
-            .child(
-                v_flex()
-                    .w_full()
-                    .rounded_lg()
-                    .p(padding)
-                    .border_1()
-                    .border_color(editor_border)
-                    .bg(cx.theme().colors().editor_background)
-                    .child(
-                        v_flex()
-                            .justify_between()
-                            .w_full()
-                            .gap_2()
-                            .child({
-                                let settings = ThemeSettings::get_global(cx);
-                                let text_style = TextStyle {
-                                    color: cx.theme().colors().editor_foreground,
-                                    font_family: settings.buffer_font.family.clone(),
-                                    font_features: settings.buffer_font.features.clone(),
-                                    font_size: font_size.into(),
-                                    font_weight: FontWeight::NORMAL,
-                                    font_style: FontStyle::Normal,
-                                    line_height: line_height.into(),
-                                    background_color: None,
-                                    underline: None,
-                                    strikethrough: None,
-                                    white_space: WhiteSpace::Normal,
-                                };
-
-                                EditorElement::new(
-                                    &self.editor,
-                                    EditorStyle {
-                                        background: cx.theme().colors().editor_background,
-                                        local_player: cx.theme().players().local(),
-                                        text: text_style,
-                                        ..Default::default()
-                                    },
-                                )
-                            })
-                            .child(
-                                h_flex()
-                                    .flex_none()
-                                    .gap_2()
-                                    .justify_between()
-                                    .w_full()
-                                    .child(
-                                        h_flex().gap_1().child(
-                                            h_flex()
-                                                .gap_2()
-                                                .child(self.render_tools(cx))
-                                                .child(Divider::vertical())
-                                                .child(self.render_attachment_tools(cx)),
-                                        ),
-                                    )
-                                    .child(h_flex().gap_1().child(self.model_selector)),
-                            ),
-                    ),
-            )
-    }
-}
-
-#[derive(IntoElement)]
-pub struct ModelSelector {
-    assistant_chat: WeakView<AssistantChat>,
-    model: String,
-}
-
-impl ModelSelector {
-    pub fn new(assistant_chat: WeakView<AssistantChat>, model: String) -> Self {
-        Self {
-            assistant_chat,
-            model,
-        }
-    }
-}
-
-impl RenderOnce for ModelSelector {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        popover_menu("model-switcher")
-            .menu(move |cx| {
-                ContextMenu::build(cx, |mut menu, cx| {
-                    for model in CompletionProvider::get(cx).available_models() {
-                        menu = menu.custom_entry(
-                            {
-                                let model = model.clone();
-                                move |_| Label::new(model.clone()).into_any_element()
-                            },
-                            {
-                                let assistant_chat = self.assistant_chat.clone();
-                                move |cx| {
-                                    _ = assistant_chat.update(cx, |assistant_chat, cx| {
-                                        assistant_chat.model.clone_from(&model);
-                                        cx.notify();
-                                    });
-                                }
-                            },
-                        );
-                    }
-                    menu
-                })
-                .into()
-            })
-            .trigger(
-                ButtonLike::new("active-model")
-                    .child(
-                        h_flex()
-                            .w_full()
-                            .gap_0p5()
-                            .child(
-                                div()
-                                    .overflow_x_hidden()
-                                    .flex_grow()
-                                    .whitespace_nowrap()
-                                    .child(
-                                        Label::new(self.model)
-                                            .size(LabelSize::Small)
-                                            .color(Color::Muted),
-                                    ),
-                            )
-                            .child(
-                                div().child(
-                                    Icon::new(IconName::ChevronDown)
-                                        .color(Color::Muted)
-                                        .size(IconSize::XSmall),
-                                ),
-                            ),
-                    )
-                    .style(ButtonStyle::Subtle)
-                    .tooltip(move |cx| Tooltip::text("Change Model", cx)),
-            )
-            .anchor(gpui::AnchorCorner::BottomRight)
-    }
-}
--- a/crates/assistant2/src/ui/project_index_button.rs
+++ b/crates/assistant2/src/ui/project_index_button.rs
@@ -1,112 +0,0 @@
-use assistant_tooling::ToolRegistry;
-use gpui::{percentage, prelude::*, Animation, AnimationExt, Model, Transformation};
-use semantic_index::{ProjectIndex, Status};
-use std::{sync::Arc, time::Duration};
-use ui::{prelude::*, ButtonLike, Color, Icon, IconName, Indicator, Tooltip};
-
-use crate::tools::ProjectIndexTool;
-
-pub struct ProjectIndexButton {
-    project_index: Model<ProjectIndex>,
-    tool_registry: Arc<ToolRegistry>,
-}
-
-impl ProjectIndexButton {
-    pub fn new(
-        project_index: Model<ProjectIndex>,
-        tool_registry: Arc<ToolRegistry>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        cx.subscribe(&project_index, |_this, _, _status: &Status, cx| {
-            cx.notify();
-        })
-        .detach();
-        Self {
-            project_index,
-            tool_registry,
-        }
-    }
-
-    pub fn set_enabled(&mut self, enabled: bool) {
-        self.tool_registry
-            .set_tool_enabled::<ProjectIndexTool>(enabled);
-    }
-}
-
-impl Render for ProjectIndexButton {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let status = self.project_index.read(cx).status();
-        let is_enabled = self.tool_registry.is_tool_enabled::<ProjectIndexTool>();
-
-        let icon = if is_enabled {
-            match status {
-                Status::Idle => Icon::new(IconName::Code)
-                    .size(IconSize::XSmall)
-                    .color(Color::Default),
-                Status::Loading => Icon::new(IconName::Code)
-                    .size(IconSize::XSmall)
-                    .color(Color::Muted),
-                Status::Scanning { .. } => Icon::new(IconName::Code)
-                    .size(IconSize::XSmall)
-                    .color(Color::Muted),
-            }
-        } else {
-            Icon::new(IconName::Code)
-                .size(IconSize::XSmall)
-                .color(Color::Disabled)
-        };
-
-        let indicator = if is_enabled {
-            match status {
-                Status::Idle => Some(Indicator::dot().color(Color::Success)),
-                Status::Scanning { .. } => Some(Indicator::dot().color(Color::Warning)),
-                Status::Loading => Some(Indicator::icon(
-                    Icon::new(IconName::Spinner)
-                        .color(Color::Accent)
-                        .with_animation(
-                            "arrow-circle",
-                            Animation::new(Duration::from_secs(2)).repeat(),
-                            |icon, delta| icon.transform(Transformation::rotate(percentage(delta))),
-                        ),
-                )),
-            }
-        } else {
-            None
-        };
-
-        ButtonLike::new("project-index")
-            .child(
-                ui::IconWithIndicator::new(icon, indicator)
-                    .indicator_border_color(Some(gpui::transparent_black())),
-            )
-            .tooltip({
-                move |cx| {
-                    let (tooltip, meta) = match (is_enabled, status) {
-                        (false, _) => (
-                            "Project index disabled".to_string(),
-                            Some("Click to enable".to_string()),
-                        ),
-                        (_, Status::Idle) => (
-                            "Project index ready".to_string(),
-                            Some("Click to disable".to_string()),
-                        ),
-                        (_, Status::Loading) => ("Project index loading...".to_string(), None),
-                        (_, Status::Scanning { remaining_count }) => (
-                            "Project index scanning...".to_string(),
-                            Some(format!("{} remaining...", remaining_count)),
-                        ),
-                    };
-
-                    if let Some(meta) = meta {
-                        Tooltip::with_meta(tooltip, None, meta, cx)
-                    } else {
-                        Tooltip::text(tooltip, cx)
-                    }
-                }
-            })
-            .on_click(cx.listener(move |this, _, cx| {
-                this.set_enabled(!is_enabled);
-                cx.notify();
-            }))
-    }
-}
--- a/crates/assistant2/src/ui/stories.rs
+++ b/crates/assistant2/src/ui/stories.rs
@@ -1,5 +0,0 @@
-mod chat_message;
-mod chat_notice;
-
-pub use chat_message::*;
-pub use chat_notice::*;
--- a/crates/assistant2/src/ui/stories/chat_message.rs
+++ b/crates/assistant2/src/ui/stories/chat_message.rs
@@ -1,101 +0,0 @@
-use std::sync::Arc;
-
-use client::User;
-use story::{StoryContainer, StoryItem, StorySection};
-use ui::prelude::*;
-
-use crate::ui::{ChatMessage, UserOrAssistant};
-use crate::MessageId;
-
-pub struct ChatMessageStory;
-
-impl Render for ChatMessageStory {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let user_1 = Arc::new(User {
-            id: 12345,
-            github_login: "iamnbutler".into(),
-            avatar_uri: "https://avatars.githubusercontent.com/u/1714999?v=4".into(),
-        });
-
-        StoryContainer::new(
-            "ChatMessage Story",
-            "crates/assistant2/src/ui/stories/chat_message.rs",
-        )
-        .child(
-            StorySection::new()
-                .child(StoryItem::new(
-                    "User chat message",
-                    ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::User(Some(user_1.clone())),
-                        vec![div().child("What can I do here?").into_any_element()],
-                        false,
-                        Box::new(|_, _| {}),
-                    ),
-                ))
-                .child(StoryItem::new(
-                    "User chat message (collapsed)",
-                    ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::User(Some(user_1.clone())),
-                        vec![div().child("What can I do here?").into_any_element()],
-                        true,
-                        Box::new(|_, _| {}),
-                    ),
-                )),
-        )
-        .child(
-            StorySection::new()
-                .child(StoryItem::new(
-                    "Assistant chat message",
-                    ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::Assistant,
-                        vec![div().child("You can talk to me!").into_any_element()],
-                        false,
-                        Box::new(|_, _| {}),
-                    ),
-                ))
-                .child(StoryItem::new(
-                    "Assistant chat message (collapsed)",
-                    ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::Assistant,
-                        vec![div().child(MULTI_LINE_MESSAGE).into_any_element()],
-                        true,
-                        Box::new(|_, _| {}),
-                    ),
-                )),
-        )
-        .child(
-            StorySection::new().child(StoryItem::new(
-                "Conversation between user and assistant",
-                v_flex()
-                    .gap_2()
-                    .child(ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::User(Some(user_1.clone())),
-                        vec![div().child("What is Rust??").into_any_element()],
-                        false,
-                        Box::new(|_, _| {}),
-                    ))
-                    .child(ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::Assistant,
-                        vec![div().child("Rust is a multi-paradigm programming language focused on performance and safety").into_any_element()],
-                        false,
-                        Box::new(|_, _| {}),
-                    ))
-                    .child(ChatMessage::new(
-                        MessageId(0),
-                        UserOrAssistant::User(Some(user_1)),
-                        vec![div().child("Sounds pretty cool!").into_any_element()],
-                        false,
-                        Box::new(|_, _| {}),
-                    )),
-            )),
-        )
-    }
-}
-
-const MULTI_LINE_MESSAGE: &str = "In 2010, the movies nominated for the 82nd Academy Awards, for films released in 2009, were as follows. Note that 2010 nominees were announced for the ceremony happening in that year, but they honor movies from the previous year";
--- a/crates/assistant2/src/ui/stories/chat_notice.rs
+++ b/crates/assistant2/src/ui/stories/chat_notice.rs
@@ -1,22 +0,0 @@
-use story::{StoryContainer, StoryItem, StorySection};
-use ui::prelude::*;
-
-use crate::ui::ChatNotice;
-
-pub struct ChatNoticeStory;
-
-impl Render for ChatNoticeStory {
-    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        StoryContainer::new(
-            "ChatNotice Story",
-            "crates/assistant2/src/ui/stories/chat_notice.rs",
-        )
-        .child(
-            StorySection::new().child(StoryItem::new(
-                "Project index request",
-                ChatNotice::new("Allow assistant to index your project?")
-                    .meta("Enabling will allow responses more relevant to this project."),
-            )),
-        )
-    }
-}
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "assistant_slash_command"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[lib]
+path = "src/assistant_slash_command.rs"
+
+[dependencies]
+anyhow.workspace = true
+collections.workspace = true
+derive_more.workspace = true
+gpui.workspace = true
+language.workspace = true
+parking_lot.workspace = true
+workspace.workspace = true
--- a/crates/assistant_slash_command/LICENSE-GPL
+++ b/crates/assistant_slash_command/LICENSE-GPL
--- a/crates/assistant_slash_command/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -0,0 +1,61 @@
+mod slash_command_registry;
+
+use anyhow::Result;
+use gpui::{AnyElement, AppContext, ElementId, Task, WeakView, WindowContext};
+use language::{CodeLabel, LspAdapterDelegate};
+pub use slash_command_registry::*;
+use std::{
+    ops::Range,
+    sync::{atomic::AtomicBool, Arc},
+};
+use workspace::Workspace;
+
+pub fn init(cx: &mut AppContext) {
+    SlashCommandRegistry::default_global(cx);
+}
+
+pub trait SlashCommand: 'static + Send + Sync {
+    fn name(&self) -> String;
+    fn label(&self, _cx: &AppContext) -> CodeLabel {
+        CodeLabel::plain(self.name(), None)
+    }
+    fn description(&self) -> String;
+    fn menu_text(&self) -> String;
+    fn complete_argument(
+        &self,
+        query: String,
+        cancel: Arc<AtomicBool>,
+        workspace: WeakView<Workspace>,
+        cx: &mut AppContext,
+    ) -> Task<Result<Vec<String>>>;
+    fn requires_argument(&self) -> bool;
+    fn run(
+        self: Arc<Self>,
+        argument: Option<&str>,
+        workspace: WeakView<Workspace>,
+        // TODO: We're just using the `LspAdapterDelegate` here because that is
+        // what the extension API is already expecting.
+        //
+        // It may be that `LspAdapterDelegate` needs a more general name, or
+        // perhaps another kind of delegate is needed here.
+        delegate: Arc<dyn LspAdapterDelegate>,
+        cx: &mut WindowContext,
+    ) -> Task<Result<SlashCommandOutput>>;
+}
+
+pub type RenderFoldPlaceholder = Arc<
+    dyn Send
+        + Sync
+        + Fn(ElementId, Arc<dyn Fn(&mut WindowContext)>, &mut WindowContext) -> AnyElement,
+>;
+
+pub struct SlashCommandOutput {
+    pub text: String,
+    pub sections: Vec<SlashCommandOutputSection<usize>>,
+}
+
+#[derive(Clone)]
+pub struct SlashCommandOutputSection<T> {
+    pub range: Range<T>,
+    pub render_placeholder: RenderFoldPlaceholder,
+}
--- a/crates/assistant_slash_command/src/slash_command_registry.rs
+++ b/crates/assistant_slash_command/src/slash_command_registry.rs
@@ -0,0 +1,78 @@
+use std::sync::Arc;
+
+use collections::{BTreeSet, HashMap};
+use derive_more::{Deref, DerefMut};
+use gpui::Global;
+use gpui::{AppContext, ReadGlobal};
+use parking_lot::RwLock;
+
+use crate::SlashCommand;
+
+#[derive(Default, Deref, DerefMut)]
+struct GlobalSlashCommandRegistry(Arc<SlashCommandRegistry>);
+
+impl Global for GlobalSlashCommandRegistry {}
+
+#[derive(Default)]
+struct SlashCommandRegistryState {
+    commands: HashMap<Arc<str>, Arc<dyn SlashCommand>>,
+    featured_commands: BTreeSet<Arc<str>>,
+}
+
+#[derive(Default)]
+pub struct SlashCommandRegistry {
+    state: RwLock<SlashCommandRegistryState>,
+}
+
+impl SlashCommandRegistry {
+    /// Returns the global [`SlashCommandRegistry`].
+    pub fn global(cx: &AppContext) -> Arc<Self> {
+        GlobalSlashCommandRegistry::global(cx).0.clone()
+    }
+
+    /// Returns the global [`SlashCommandRegistry`].
+    ///
+    /// Inserts a default [`SlashCommandRegistry`] if one does not yet exist.
+    pub fn default_global(cx: &mut AppContext) -> Arc<Self> {
+        cx.default_global::<GlobalSlashCommandRegistry>().0.clone()
+    }
+
+    pub fn new() -> Arc<Self> {
+        Arc::new(Self {
+            state: RwLock::new(SlashCommandRegistryState {
+                commands: HashMap::default(),
+                featured_commands: BTreeSet::default(),
+            }),
+        })
+    }
+
+    /// Registers the provided [`SlashCommand`].
+    pub fn register_command(&self, command: impl SlashCommand, is_featured: bool) {
+        let mut state = self.state.write();
+        let command_name: Arc<str> = command.name().into();
+        if is_featured {
+            state.featured_commands.insert(command_name.clone());
+        }
+        state.commands.insert(command_name, Arc::new(command));
+    }
+
+    /// Returns the names of registered [`SlashCommand`]s.
+    pub fn command_names(&self) -> Vec<Arc<str>> {
+        self.state.read().commands.keys().cloned().collect()
+    }
+
+    /// Returns the names of registered, featured [`SlashCommand`]s.
+    pub fn featured_command_names(&self) -> Vec<Arc<str>> {
+        self.state
+            .read()
+            .featured_commands
+            .iter()
+            .cloned()
+            .collect()
+    }
+
+    /// Returns the [`SlashCommand`] with the given name.
+    pub fn command(&self, name: &str) -> Option<Arc<dyn SlashCommand>> {
+        self.state.read().commands.get(name).cloned()
+    }
+}
--- a/crates/assistant_tooling/Cargo.toml
+++ b/crates/assistant_tooling/Cargo.toml
@@ -16,7 +16,9 @@ anyhow.workspace = true
 collections.workspace = true
 futures.workspace = true
 gpui.workspace = true
+log.workspace = true
 project.workspace = true
+repair_json.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/assistant_tooling/README.md
+++ b/crates/assistant_tooling/README.md
@@ -1,16 +1,16 @@
 # Assistant Tooling

-Bringing OpenAI compatible tool calling to GPUI.
+Bringing Language Model tool calling to GPUI.

 This unlocks:

 - **Structured Extraction** of model responses
 - **Validation** of model inputs
- **Execution** of chosen toolsn
+- **Execution** of chosen tools

 ## Overview

-Language Models can produce structured outputs that are perfect for calling functions. The most famous of these is OpenAI's tool calling. When make a chat completion you can pass a list of tools available to the model. The model will choose `0..n` tools to help them complete a user's task. It's up to _you_ to create the tools that the model can call.
+Language Models can produce structured outputs that are perfect for calling functions. The most famous of these is OpenAI's tool calling. When making a chat completion you can pass a list of tools available to the model. The model will choose `0..n` tools to help them complete a user's task. It's up to _you_ to create the tools that the model can call.

 > **User**: "Hey I need help with implementing a collapsible panel in GPUI"
 >
@@ -22,187 +22,64 @@ Language Models can produce structured outputs that are perfect for calling func
 >
 > **Assistant**: "Here are some excerpts from the GPUI codebase that might help you."

-This library is designed to facilitate this interaction mode by allowing you to go from `struct` to `tool` with a simple trait, `LanguageModelTool`.
+This library is designed to facilitate this interaction mode by allowing you to go from `struct` to `tool` with two simple traits, `LanguageModelTool` and `ToolView`.

-## Example
-
-Let's expose querying a semantic index directly by the model. First, we'll set up some _necessary_ imports
+## Using the Tool Registry

 ```rust
-use anyhow::Result;
-use assistant_tooling::{LanguageModelTool, ToolRegistry};
-use gpui::{App, AppContext, Task};
-use schemars::JsonSchema;
-use serde::Deserialize;
-use serde_json::json;
-```
+let mut tool_registry = ToolRegistry::new();
+tool_registry
+    .register(WeatherTool { api_client },
+    })
+    .unwrap(); // You can only register one tool per name

-Then we'll define the query structure the model must fill in. This _must_ derive `Deserialize` from `serde` and `JsonSchema` from the `schemars` crate.
-
-```rust
-#[derive(Deserialize, JsonSchema)]
-struct CodebaseQuery {
-    query: String,
-}
-```
-
-After that we can define our tool, with the expectation that it will need a `ProjectIndex` to search against. For this example, the index uses the same interface as `semantic_index::ProjectIndex`.
-
-```rust
-struct ProjectIndex {}
-
-impl ProjectIndex {
-    fn new() -> Self {
-        ProjectIndex {}
-    }
-
-    fn search(&self, _query: &str, _limit: usize, _cx: &AppContext) -> Task<Result<Vec<String>>> {
-        // Instead of hooking up a real index, we're going to fake it
-        if _query.contains("gpui") {
-            return Task::ready(Ok(vec![r#"// crates/gpui/src/gpui.rs
-    //! # Welcome to GPUI!
-    //!
-    //! GPUI is a hybrid immediate and retained mode, GPU accelerated, UI framework
-    //! for Rust, designed to support a wide variety of applications
-    "#
-            .to_string()]));
-        }
-        return Task::ready(Ok(vec![]));
-    }
-}
-
-struct ProjectIndexTool {
-    project_index: ProjectIndex,
-}
-```
-
-Now we can implement the `LanguageModelTool` trait for our tool by:
-
- Defining the `Input` from the model, which is `CodebaseQuery`
- Defining the `Output`
- Implementing the `name` and `description` functions to provide the model information when it's choosing a tool
- Implementing the `execute` function to run the tool
-
-```rust
-impl LanguageModelTool for ProjectIndexTool {
-    type Input = CodebaseQuery;
-    type Output = String;
-
-    fn name(&self) -> String {
-        "query_codebase".to_string()
-    }
-
-    fn description(&self) -> String {
-        "Executes a query against the codebase, returning excerpts related to the query".to_string()
-    }
-
-    fn execute(&self, query: Self::Input, cx: &AppContext) -> Task<Result<Self::Output>> {
-        let results = self.project_index.search(query.query.as_str(), 10, cx);
-
-        cx.spawn(|_cx| async move {
-            let results = results.await?;
-
-            if !results.is_empty() {
-                Ok(results.join("\n"))
-            } else {
-                Ok("No results".to_string())
-            }
-        })
-    }
-}
-```
-
-For the sake of this example, let's look at the types that OpenAI will be passing to us
-
-```rust
-// OpenAI definitions, shown here for demonstration
-#[derive(Deserialize)]
-struct FunctionCall {
-    name: String,
-    args: String,
-}
-
-#[derive(Deserialize, Eq, PartialEq)]
-enum ToolCallType {
-    #[serde(rename = "function")]
-    Function,
-    Other,
-}
-
-#[derive(Deserialize, Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
-struct ToolCallId(String);
-
-#[derive(Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
-enum ToolCall {
-    Function {
-        #[allow(dead_code)]
-        id: ToolCallId,
-        function: FunctionCall,
-    },
-    Other {
-        #[allow(dead_code)]
-        id: ToolCallId,
-    },
-}
-
-#[derive(Deserialize)]
-struct AssistantMessage {
-    role: String,
-    content: Option<String>,
-    tool_calls: Option<Vec<ToolCall>>,
-}
-```
-
-When the model wants to call tools, it will pass a list of `ToolCall`s. When those are `function`s that we can handle, we'll pass them to our `ToolRegistry` to get a future that we can await.
-
-```rust
-// Inside `fn main()`
-App::new().run(|cx: &mut AppContext| {
-    let tool = ProjectIndexTool {
-        project_index: ProjectIndex::new(),
-    };
-
-    let mut registry = ToolRegistry::new();
-    let registered = registry.register(tool);
-    assert!(registered.is_ok());
-```
-
-Let's pretend the model sent us back a message requesting
-
-```rust
-let model_response = json!({
-    "role": "assistant",
-    "tool_calls": [
-        {
-            "id": "call_1",
-            "function": {
-                "name": "query_codebase",
-                "args": r#"{"query":"GPUI Task background_executor"}"#
-            },
-            "type": "function"
-        }
-    ]
+let completion = cx.update(|cx| {
+    CompletionProvider::get(cx).complete(
+        model_name,
+        messages,
+        Vec::new(),
+        1.0,
+        // The definitions get passed directly to OpenAI when you want
+        // the model to be able to call your tool
+        tool_registry.definitions(),
+    )
 });

-let message: AssistantMessage = serde_json::from_value(model_response).unwrap();
+let mut stream = completion?.await?;

-// We know there's a tool call, so let's skip straight to it for this example
-let tool_calls = message.tool_calls.as_ref().unwrap();
-let tool_call = tool_calls.get(0).unwrap();
+let mut message = AssistantMessage::new();
+
+while let Some(delta) = stream.next().await {
+    // As messages stream in, you'll get both assistant content
+    if let Some(content) = &delta.content {
+        message
+            .body
+            .update(cx, |message, cx| message.append(&content, cx));
+    }
+
+    // And tool calls!
+    for tool_call_delta in delta.tool_calls {
+        let index = tool_call_delta.index as usize;
+        if index >= message.tool_calls.len() {
+            message.tool_calls.resize_with(index + 1, Default::default);
+        }
+        let tool_call = &mut message.tool_calls[index];
+
+        // Build up an ID
+        if let Some(id) = &tool_call_delta.id {
+            tool_call.id.push_str(id);
+        }
+
+        tool_registry.update_tool_call(
+            tool_call,
+            tool_call_delta.name.as_deref(),
+            tool_call_delta.arguments.as_deref(),
+            cx,
+        );
+    }
+}
 ```

-We can now use our registry to call the tool.
+Once the stream of tokens is complete, you can exexute the tool call by calling `tool_registry.execute_tool_call(tool_call, cx)`, which returns a `Task<Result<()>>`.

-```rust
-let task = registry.call(
-    tool_call.name,
-    tool_call.args,
-);
-
-cx.spawn(|_cx| async move {
-    let result = task.await?;
-    println!("{}", result.unwrap());
-    Ok(())
-})
-```
+As the tokens stream in and tool calls are executed, your `ToolView` will get updates. Render each tool call by passing that `tool_call` in to `tool_registry.render_tool_call(tool_call, cx)`. The final message for the model can be pulled by calling `self.tool_registry.content_for_tool_call( tool_call, &mut project_context, cx, )`.
--- a/crates/assistant_tooling/src/assistant_tooling.rs
+++ b/crates/assistant_tooling/src/assistant_tooling.rs
@@ -3,11 +3,11 @@ mod project_context;
 mod tool_registry;

 pub use attachment_registry::{
-    AttachmentRegistry, LanguageModelAttachment, SavedUserAttachment, UserAttachment,
+    AttachmentOutput, AttachmentRegistry, LanguageModelAttachment, SavedUserAttachment,
+    UserAttachment,
 };
 pub use project_context::ProjectContext;
 pub use tool_registry::{
-    tool_running_placeholder, LanguageModelTool, SavedToolFunctionCall,
-    SavedToolFunctionCallResult, ToolFunctionCall, ToolFunctionCallResult, ToolFunctionDefinition,
-    ToolOutput, ToolRegistry,
+    LanguageModelTool, SavedToolFunctionCall, ToolFunctionCall, ToolFunctionDefinition,
+    ToolRegistry, ToolView,
 };
--- a/crates/assistant_tooling/src/attachment_registry.rs
+++ b/crates/assistant_tooling/src/attachment_registry.rs
@@ -1,4 +1,4 @@
-use crate::{ProjectContext, ToolOutput};
+use crate::ProjectContext;
 use anyhow::{anyhow, Result};
 use collections::HashMap;
 use futures::future::join_all;
@@ -18,9 +18,13 @@ pub struct AttachmentRegistry {
    registered_attachments: HashMap<TypeId, RegisteredAttachment>,
 }

+pub trait AttachmentOutput {
+    fn generate(&self, project: &mut ProjectContext, cx: &mut WindowContext) -> String;
+}
+
 pub trait LanguageModelAttachment {
    type Output: DeserializeOwned + Serialize + 'static;
-    type View: Render + ToolOutput;
+    type View: Render + AttachmentOutput;

    fn name(&self) -> Arc<str>;
    fn run(&self, cx: &mut WindowContext) -> Task<Result<Self::Output>>;
--- a/crates/assistant_tooling/src/tool_registry.rs
+++ b/crates/assistant_tooling/src/tool_registry.rs
@@ -1,20 +1,18 @@
 use crate::ProjectContext;
 use anyhow::{anyhow, Result};
-use gpui::{
-    div, AnyElement, AnyView, IntoElement, ParentElement, Render, Styled, Task, View, WindowContext,
-};
+use gpui::{AnyElement, AnyView, IntoElement, Render, Task, View, WindowContext};
+use repair_json::repair;
 use schemars::{schema::RootSchema, schema_for, JsonSchema};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use serde_json::{value::RawValue, Value};
+use serde_json::value::RawValue;
 use std::{
    any::TypeId,
    collections::HashMap,
    fmt::Display,
-    sync::{
-        atomic::{AtomicBool, Ordering::SeqCst},
-        Arc,
-    },
+    mem,
+    sync::atomic::{AtomicBool, Ordering::SeqCst},
 };
+use ui::ViewContext;

 pub struct ToolRegistry {
    registered_tools: HashMap<String, RegisteredTool>,
@@ -25,37 +23,45 @@ pub struct ToolFunctionCall {
    pub id: String,
    pub name: String,
    pub arguments: String,
-    pub result: Option<ToolFunctionCallResult>,
+    state: ToolFunctionCallState,
+}
+
+#[derive(Default)]
+enum ToolFunctionCallState {
+    #[default]
+    Initializing,
+    NoSuchTool,
+    KnownTool(Box<dyn InternalToolView>),
+    ExecutedTool(Box<dyn InternalToolView>),
+}
+
+trait InternalToolView {
+    fn view(&self) -> AnyView;
+    fn generate(&self, project: &mut ProjectContext, cx: &mut WindowContext) -> String;
+    fn try_set_input(&self, input: &str, cx: &mut WindowContext);
+    fn execute(&self, cx: &mut WindowContext) -> Task<Result<()>>;
+    fn serialize_output(&self, cx: &mut WindowContext) -> Result<Box<RawValue>>;
+    fn deserialize_output(&self, raw_value: &RawValue, cx: &mut WindowContext) -> Result<()>;
 }

 #[derive(Default, Serialize, Deserialize)]
 pub struct SavedToolFunctionCall {
-    pub id: String,
-    pub name: String,
-    pub arguments: String,
-    pub result: Option<SavedToolFunctionCallResult>,
+    id: String,
+    name: String,
+    arguments: String,
+    state: SavedToolFunctionCallState,
 }

-pub enum ToolFunctionCallResult {
+#[derive(Default, Serialize, Deserialize)]
+enum SavedToolFunctionCallState {
+    #[default]
+    Initializing,
    NoSuchTool,
-    ParsingFailed,
-    Finished {
-        view: AnyView,
-        serialized_output: Result<Box<RawValue>, String>,
-        generate_fn: fn(AnyView, &mut ProjectContext, &mut WindowContext) -> String,
-    },
+    KnownTool,
+    ExecutedTool(Box<RawValue>),
 }

-#[derive(Serialize, Deserialize)]
-pub enum SavedToolFunctionCallResult {
-    NoSuchTool,
-    ParsingFailed,
-    Finished {
-        serialized_output: Result<Box<RawValue>, String>,
-    },
-}
-
-#[derive(Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct ToolFunctionDefinition {
    pub name: String,
    pub description: String,
@@ -63,14 +69,7 @@ pub struct ToolFunctionDefinition {
 }

 pub trait LanguageModelTool {
-    /// The input type that will be passed in to `execute` when the tool is called
-    /// by the language model.
-    type Input: DeserializeOwned + JsonSchema;
-
-    /// The output returned by executing the tool.
-    type Output: DeserializeOwned + Serialize + 'static;
-
-    type View: Render + ToolOutput;
+    type View: ToolView;

    /// Returns the name of the tool.
    ///
@@ -86,7 +85,7 @@ pub trait LanguageModelTool {

    /// Returns the OpenAI Function definition for the tool, for direct use with OpenAI's API.
    fn definition(&self) -> ToolFunctionDefinition {
-        let root_schema = schema_for!(Self::Input);
+        let root_schema = schema_for!(<Self::View as ToolView>::Input);

        ToolFunctionDefinition {
            name: self.name(),
@@ -95,36 +94,34 @@ pub trait LanguageModelTool {
        }
    }

-    /// Executes the tool with the given input.
-    fn execute(&self, input: &Self::Input, cx: &mut WindowContext) -> Task<Result<Self::Output>>;
-
    /// A view of the output of running the tool, for displaying to the user.
-    fn view(
-        &self,
-        input: Self::Input,
-        output: Result<Self::Output>,
-        cx: &mut WindowContext,
-    ) -> View<Self::View>;
-
-    fn render_running(_arguments: &Option<Value>, _cx: &mut WindowContext) -> impl IntoElement {
-        tool_running_placeholder()
-    }
+    fn view(&self, cx: &mut WindowContext) -> View<Self::View>;
 }

-pub fn tool_running_placeholder() -> AnyElement {
-    ui::Label::new("Researching...").into_any_element()
-}
+pub trait ToolView: Render {
+    /// The input type that will be passed in to `execute` when the tool is called
+    /// by the language model.
+    type Input: DeserializeOwned + JsonSchema;

-pub trait ToolOutput: Sized {
-    fn generate(&self, project: &mut ProjectContext, cx: &mut WindowContext) -> String;
+    /// The output returned by executing the tool.
+    type SerializedState: DeserializeOwned + Serialize;
+
+    fn generate(&self, project: &mut ProjectContext, cx: &mut ViewContext<Self>) -> String;
+    fn set_input(&mut self, input: Self::Input, cx: &mut ViewContext<Self>);
+    fn execute(&mut self, cx: &mut ViewContext<Self>) -> Task<Result<()>>;
+
+    fn serialize(&self, cx: &mut ViewContext<Self>) -> Self::SerializedState;
+    fn deserialize(
+        &mut self,
+        output: Self::SerializedState,
+        cx: &mut ViewContext<Self>,
+    ) -> Result<()>;
 }

 struct RegisteredTool {
    enabled: AtomicBool,
    type_id: TypeId,
-    execute: Box<dyn Fn(&ToolFunctionCall, &mut WindowContext) -> Task<Result<ToolFunctionCall>>>,
-    deserialize: Box<dyn Fn(&SavedToolFunctionCall, &mut WindowContext) -> ToolFunctionCall>,
-    render_running: fn(&ToolFunctionCall, &mut WindowContext) -> gpui::AnyElement,
+    build_view: Box<dyn Fn(&mut WindowContext) -> Box<dyn InternalToolView>>,
    definition: ToolFunctionDefinition,
 }

@@ -161,184 +158,141 @@ impl ToolRegistry {
            .collect()
    }

-    pub fn render_tool_call(
+    pub fn update_tool_call(
        &self,
-        tool_call: &ToolFunctionCall,
+        call: &mut ToolFunctionCall,
+        name: Option<&str>,
+        arguments: Option<&str>,
        cx: &mut WindowContext,
-    ) -> AnyElement {
-        match &tool_call.result {
-            Some(result) => div()
-                .p_2()
-                .child(result.into_any_element(&tool_call.name))
-                .into_any_element(),
-            None => {
-                let tool = self.registered_tools.get(&tool_call.name);
-
-                if let Some(tool) = tool {
-                    (tool.render_running)(&tool_call, cx)
+    ) {
+        if let Some(name) = name {
+            call.name.push_str(name);
+        }
+        if let Some(arguments) = arguments {
+            if call.arguments.is_empty() {
+                if let Some(tool) = self.registered_tools.get(&call.name) {
+                    let view = (tool.build_view)(cx);
+                    call.state = ToolFunctionCallState::KnownTool(view);
                } else {
-                    tool_running_placeholder()
+                    call.state = ToolFunctionCallState::NoSuchTool;
+                }
+            }
+            call.arguments.push_str(arguments);
+
+            if let ToolFunctionCallState::KnownTool(view) = &call.state {
+                if let Ok(repaired_arguments) = repair(call.arguments.clone()) {
+                    view.try_set_input(&repaired_arguments, cx)
                }
            }
        }
    }

-    pub fn serialize_tool_call(&self, call: &ToolFunctionCall) -> SavedToolFunctionCall {
-        SavedToolFunctionCall {
+    pub fn execute_tool_call(
+        &self,
+        tool_call: &mut ToolFunctionCall,
+        cx: &mut WindowContext,
+    ) -> Option<Task<Result<()>>> {
+        if let ToolFunctionCallState::KnownTool(view) = mem::take(&mut tool_call.state) {
+            let task = view.execute(cx);
+            tool_call.state = ToolFunctionCallState::ExecutedTool(view);
+            Some(task)
+        } else {
+            None
+        }
+    }
+
+    pub fn render_tool_call(
+        &self,
+        tool_call: &ToolFunctionCall,
+        _cx: &mut WindowContext,
+    ) -> Option<AnyElement> {
+        match &tool_call.state {
+            ToolFunctionCallState::NoSuchTool => {
+                Some(ui::Label::new("No such tool").into_any_element())
+            }
+            ToolFunctionCallState::Initializing => None,
+            ToolFunctionCallState::KnownTool(view) | ToolFunctionCallState::ExecutedTool(view) => {
+                Some(view.view().into_any_element())
+            }
+        }
+    }
+
+    pub fn content_for_tool_call(
+        &self,
+        tool_call: &ToolFunctionCall,
+        project_context: &mut ProjectContext,
+        cx: &mut WindowContext,
+    ) -> String {
+        match &tool_call.state {
+            ToolFunctionCallState::Initializing => String::new(),
+            ToolFunctionCallState::NoSuchTool => {
+                format!("No such tool: {}", tool_call.name)
+            }
+            ToolFunctionCallState::KnownTool(view) | ToolFunctionCallState::ExecutedTool(view) => {
+                view.generate(project_context, cx)
+            }
+        }
+    }
+
+    pub fn serialize_tool_call(
+        &self,
+        call: &ToolFunctionCall,
+        cx: &mut WindowContext,
+    ) -> Result<SavedToolFunctionCall> {
+        Ok(SavedToolFunctionCall {
            id: call.id.clone(),
            name: call.name.clone(),
            arguments: call.arguments.clone(),
-            result: call.result.as_ref().map(|result| match result {
-                ToolFunctionCallResult::NoSuchTool => SavedToolFunctionCallResult::NoSuchTool,
-                ToolFunctionCallResult::ParsingFailed => SavedToolFunctionCallResult::ParsingFailed,
-                ToolFunctionCallResult::Finished {
-                    serialized_output, ..
-                } => SavedToolFunctionCallResult::Finished {
-                    serialized_output: match serialized_output {
-                        Ok(value) => Ok(value.clone()),
-                        Err(e) => Err(e.to_string()),
-                    },
-                },
-            }),
-        }
+            state: match &call.state {
+                ToolFunctionCallState::Initializing => SavedToolFunctionCallState::Initializing,
+                ToolFunctionCallState::NoSuchTool => SavedToolFunctionCallState::NoSuchTool,
+                ToolFunctionCallState::KnownTool(_) => SavedToolFunctionCallState::KnownTool,
+                ToolFunctionCallState::ExecutedTool(view) => {
+                    SavedToolFunctionCallState::ExecutedTool(view.serialize_output(cx)?)
+                }
+            },
+        })
    }

    pub fn deserialize_tool_call(
        &self,
        call: &SavedToolFunctionCall,
        cx: &mut WindowContext,
-    ) -> ToolFunctionCall {
-        if let Some(tool) = &self.registered_tools.get(&call.name) {
-            (tool.deserialize)(call, cx)
-        } else {
-            ToolFunctionCall {
-                id: call.id.clone(),
-                name: call.name.clone(),
-                arguments: call.arguments.clone(),
-                result: Some(ToolFunctionCallResult::NoSuchTool),
-            }
-        }
+    ) -> Result<ToolFunctionCall> {
+        let Some(tool) = self.registered_tools.get(&call.name) else {
+            return Err(anyhow!("no such tool {}", call.name));
+        };
+
+        Ok(ToolFunctionCall {
+            id: call.id.clone(),
+            name: call.name.clone(),
+            arguments: call.arguments.clone(),
+            state: match &call.state {
+                SavedToolFunctionCallState::Initializing => ToolFunctionCallState::Initializing,
+                SavedToolFunctionCallState::NoSuchTool => ToolFunctionCallState::NoSuchTool,
+                SavedToolFunctionCallState::KnownTool => {
+                    log::error!("Deserialized tool that had not executed");
+                    let view = (tool.build_view)(cx);
+                    view.try_set_input(&call.arguments, cx);
+                    ToolFunctionCallState::KnownTool(view)
+                }
+                SavedToolFunctionCallState::ExecutedTool(output) => {
+                    let view = (tool.build_view)(cx);
+                    view.try_set_input(&call.arguments, cx);
+                    view.deserialize_output(output, cx)?;
+                    ToolFunctionCallState::ExecutedTool(view)
+                }
+            },
+        })
    }

-    pub fn register<T: 'static + LanguageModelTool>(
-        &mut self,
-        tool: T,
-        _cx: &mut WindowContext,
-    ) -> Result<()> {
+    pub fn register<T: 'static + LanguageModelTool>(&mut self, tool: T) -> Result<()> {
        let name = tool.name();
-        let tool = Arc::new(tool);
        let registered_tool = RegisteredTool {
            type_id: TypeId::of::<T>(),
            definition: tool.definition(),
            enabled: AtomicBool::new(true),
-            deserialize: Box::new({
-                let tool = tool.clone();
-                move |tool_call: &SavedToolFunctionCall, cx: &mut WindowContext| {
-                    let id = tool_call.id.clone();
-                    let name = tool_call.name.clone();
-                    let arguments = tool_call.arguments.clone();
-
-                    let Ok(input) = serde_json::from_str::<T::Input>(&tool_call.arguments) else {
-                        return ToolFunctionCall {
-                            id,
-                            name: name.clone(),
-                            arguments,
-                            result: Some(ToolFunctionCallResult::ParsingFailed),
-                        };
-                    };
-
-                    let result = match &tool_call.result {
-                        Some(result) => match result {
-                            SavedToolFunctionCallResult::NoSuchTool => {
-                                Some(ToolFunctionCallResult::NoSuchTool)
-                            }
-                            SavedToolFunctionCallResult::ParsingFailed => {
-                                Some(ToolFunctionCallResult::ParsingFailed)
-                            }
-                            SavedToolFunctionCallResult::Finished { serialized_output } => {
-                                let output = match serialized_output {
-                                    Ok(value) => {
-                                        match serde_json::from_str::<T::Output>(value.get()) {
-                                            Ok(value) => Ok(value),
-                                            Err(_) => {
-                                                return ToolFunctionCall {
-                                                    id,
-                                                    name: name.clone(),
-                                                    arguments,
-                                                    result: Some(
-                                                        ToolFunctionCallResult::ParsingFailed,
-                                                    ),
-                                                };
-                                            }
-                                        }
-                                    }
-                                    Err(e) => Err(anyhow!("{e}")),
-                                };
-
-                                let view = tool.view(input, output, cx).into();
-                                Some(ToolFunctionCallResult::Finished {
-                                    serialized_output: serialized_output.clone(),
-                                    generate_fn: generate::<T>,
-                                    view,
-                                })
-                            }
-                        },
-                        None => None,
-                    };
-
-                    ToolFunctionCall {
-                        id: tool_call.id.clone(),
-                        name: name.clone(),
-                        arguments: tool_call.arguments.clone(),
-                        result,
-                    }
-                }
-            }),
-            execute: Box::new({
-                let tool = tool.clone();
-                move |tool_call: &ToolFunctionCall, cx: &mut WindowContext| {
-                    let id = tool_call.id.clone();
-                    let name = tool_call.name.clone();
-                    let arguments = tool_call.arguments.clone();
-
-                    let Ok(input) = serde_json::from_str::<T::Input>(&arguments) else {
-                        return Task::ready(Ok(ToolFunctionCall {
-                            id,
-                            name: name.clone(),
-                            arguments,
-                            result: Some(ToolFunctionCallResult::ParsingFailed),
-                        }));
-                    };
-
-                    let result = tool.execute(&input, cx);
-                    let tool = tool.clone();
-                    cx.spawn(move |mut cx| async move {
-                        let result = result.await;
-                        let serialized_output = result
-                            .as_ref()
-                            .map_err(ToString::to_string)
-                            .and_then(|output| {
-                                Ok(RawValue::from_string(
-                                    serde_json::to_string(output).map_err(|e| e.to_string())?,
-                                )
-                                .unwrap())
-                            });
-                        let view = cx.update(|cx| tool.view(input, result, cx))?;
-
-                        Ok(ToolFunctionCall {
-                            id,
-                            name: name.clone(),
-                            arguments,
-                            result: Some(ToolFunctionCallResult::Finished {
-                                serialized_output,
-                                view: view.into(),
-                                generate_fn: generate::<T>,
-                            }),
-                        })
-                    })
-                }
-            }),
-            render_running: render_running::<T>,
+            build_view: Box::new(move |cx: &mut WindowContext| Box::new(tool.view(cx))),
        };

        let previous = self.registered_tools.insert(name.clone(), registered_tool);
@@ -347,83 +301,40 @@ impl ToolRegistry {
        }

        return Ok(());
-
-        fn render_running<T: LanguageModelTool>(
-            tool_call: &ToolFunctionCall,
-            cx: &mut WindowContext,
-        ) -> AnyElement {
-            // Attempt to parse the string arguments that are JSON as a JSON value
-            let maybe_arguments = serde_json::to_value(tool_call.arguments.clone()).ok();
-
-            T::render_running(&maybe_arguments, cx).into_any_element()
-        }
-
-        fn generate<T: LanguageModelTool>(
-            view: AnyView,
-            project: &mut ProjectContext,
-            cx: &mut WindowContext,
-        ) -> String {
-            view.downcast::<T::View>()
-                .unwrap()
-                .update(cx, |view, cx| T::View::generate(view, project, cx))
-        }
-    }
-
-    /// Task yields an error if the window for the given WindowContext is closed before the task completes.
-    pub fn call(
-        &self,
-        tool_call: &ToolFunctionCall,
-        cx: &mut WindowContext,
-    ) -> Task<Result<ToolFunctionCall>> {
-        let name = tool_call.name.clone();
-        let arguments = tool_call.arguments.clone();
-        let id = tool_call.id.clone();
-
-        let tool = match self.registered_tools.get(&name) {
-            Some(tool) => tool,
-            None => {
-                let name = name.clone();
-                return Task::ready(Ok(ToolFunctionCall {
-                    id,
-                    name: name.clone(),
-                    arguments,
-                    result: Some(ToolFunctionCallResult::NoSuchTool),
-                }));
-            }
-        };
-
-        (tool.execute)(tool_call, cx)
    }
 }

-impl ToolFunctionCallResult {
-    pub fn generate(
-        &self,
-        name: &String,
-        project: &mut ProjectContext,
-        cx: &mut WindowContext,
-    ) -> String {
-        match self {
-            ToolFunctionCallResult::NoSuchTool => format!("No tool for {name}"),
-            ToolFunctionCallResult::ParsingFailed => {
-                format!("Unable to parse arguments for {name}")
-            }
-            ToolFunctionCallResult::Finished {
-                generate_fn, view, ..
-            } => (generate_fn)(view.clone(), project, cx),
+impl<T: ToolView> InternalToolView for View<T> {
+    fn view(&self) -> AnyView {
+        self.clone().into()
+    }
+
+    fn generate(&self, project: &mut ProjectContext, cx: &mut WindowContext) -> String {
+        self.update(cx, |view, cx| view.generate(project, cx))
+    }
+
+    fn try_set_input(&self, input: &str, cx: &mut WindowContext) {
+        if let Ok(input) = serde_json::from_str::<T::Input>(input) {
+            self.update(cx, |view, cx| {
+                view.set_input(input, cx);
+                cx.notify();
+            });
        }
    }

-    fn into_any_element(&self, name: &String) -> AnyElement {
-        match self {
-            ToolFunctionCallResult::NoSuchTool => {
-                format!("Language Model attempted to call {name}").into_any_element()
-            }
-            ToolFunctionCallResult::ParsingFailed => {
-                format!("Language Model called {name} with bad arguments").into_any_element()
-            }
-            ToolFunctionCallResult::Finished { view, .. } => view.clone().into_any_element(),
-        }
+    fn execute(&self, cx: &mut WindowContext) -> Task<Result<()>> {
+        self.update(cx, |view, cx| view.execute(cx))
+    }
+
+    fn serialize_output(&self, cx: &mut WindowContext) -> Result<Box<RawValue>> {
+        let output = self.update(cx, |view, cx| view.serialize(cx));
+        Ok(RawValue::from_string(serde_json::to_string(&output)?)?)
+    }
+
+    fn deserialize_output(&self, output: &RawValue, cx: &mut WindowContext) -> Result<()> {
+        let state = serde_json::from_str::<T::SerializedState>(output.get())?;
+        self.update(cx, |view, cx| view.deserialize(state, cx))?;
+        Ok(())
    }
 }

@@ -442,7 +353,6 @@ mod test {
    use super::*;
    use gpui::{div, prelude::*, Render, TestAppContext};
    use gpui::{EmptyView, View};
-    use schemars::schema_for;
    use schemars::JsonSchema;
    use serde::{Deserialize, Serialize};
    use serde_json::json;
@@ -453,10 +363,6 @@ mod test {
        unit: String,
    }

-    struct WeatherTool {
-        current_weather: WeatherResult,
-    }
-
    #[derive(Clone, Serialize, Deserialize, PartialEq, Debug)]
    struct WeatherResult {
        location: String,
@@ -465,24 +371,81 @@ mod test {
    }

    struct WeatherView {
-        result: WeatherResult,
+        input: Option<WeatherQuery>,
+        result: Option<WeatherResult>,
+
+        // Fake API call
+        current_weather: WeatherResult,
+    }
+
+    #[derive(Clone, Serialize)]
+    struct WeatherTool {
+        current_weather: WeatherResult,
+    }
+
+    impl WeatherView {
+        fn new(current_weather: WeatherResult) -> Self {
+            Self {
+                input: None,
+                result: None,
+                current_weather,
+            }
+        }
    }

    impl Render for WeatherView {
        fn render(&mut self, _cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
-            div().child(format!("temperature: {}", self.result.temperature))
+            match self.result {
+                Some(ref result) => div()
+                    .child(format!("temperature: {}", result.temperature))
+                    .into_any_element(),
+                None => div().child("Calculating weather...").into_any_element(),
+            }
        }
    }

-    impl ToolOutput for WeatherView {
-        fn generate(&self, _output: &mut ProjectContext, _cx: &mut WindowContext) -> String {
+    impl ToolView for WeatherView {
+        type Input = WeatherQuery;
+
+        type SerializedState = WeatherResult;
+
+        fn generate(&self, _output: &mut ProjectContext, _cx: &mut ViewContext<Self>) -> String {
            serde_json::to_string(&self.result).unwrap()
        }
+
+        fn set_input(&mut self, input: Self::Input, cx: &mut ViewContext<Self>) {
+            self.input = Some(input);
+            cx.notify();
+        }
+
+        fn execute(&mut self, _cx: &mut ViewContext<Self>) -> Task<Result<()>> {
+            let input = self.input.as_ref().unwrap();
+
+            let _location = input.location.clone();
+            let _unit = input.unit.clone();
+
+            let weather = self.current_weather.clone();
+
+            self.result = Some(weather);
+
+            Task::ready(Ok(()))
+        }
+
+        fn serialize(&self, _cx: &mut ViewContext<Self>) -> Self::SerializedState {
+            self.current_weather.clone()
+        }
+
+        fn deserialize(
+            &mut self,
+            output: Self::SerializedState,
+            _cx: &mut ViewContext<Self>,
+        ) -> Result<()> {
+            self.current_weather = output;
+            Ok(())
+        }
    }

    impl LanguageModelTool for WeatherTool {
-        type Input = WeatherQuery;
-        type Output = WeatherResult;
        type View = WeatherView;

        fn name(&self) -> String {
@@ -493,89 +456,71 @@ mod test {
            "Fetches the current weather for a given location.".to_string()
        }

-        fn execute(
-            &self,
-            input: &Self::Input,
-            _cx: &mut WindowContext,
-        ) -> Task<Result<Self::Output>> {
-            let _location = input.location.clone();
-            let _unit = input.unit.clone();
-
-            let weather = self.current_weather.clone();
-
-            Task::ready(Ok(weather))
-        }
-
-        fn view(
-            &self,
-            _input: Self::Input,
-            result: Result<Self::Output>,
-            cx: &mut WindowContext,
-        ) -> View<Self::View> {
-            cx.new_view(|_cx| {
-                let result = result.unwrap();
-                WeatherView { result }
-            })
+        fn view(&self, cx: &mut WindowContext) -> View<Self::View> {
+            cx.new_view(|_cx| WeatherView::new(self.current_weather.clone()))
        }
    }

    #[gpui::test]
    async fn test_openai_weather_example(cx: &mut TestAppContext) {
-        cx.background_executor.run_until_parked();
        let (_, cx) = cx.add_window_view(|_cx| EmptyView);

-        let tool = WeatherTool {
-            current_weather: WeatherResult {
-                location: "San Francisco".to_string(),
-                temperature: 21.0,
-                unit: "Celsius".to_string(),
-            },
-        };
-
-        let tools = vec![tool.definition()];
-        assert_eq!(tools.len(), 1);
-
-        let expected = ToolFunctionDefinition {
-            name: "get_current_weather".to_string(),
-            description: "Fetches the current weather for a given location.".to_string(),
-            parameters: schema_for!(WeatherQuery),
-        };
-
-        assert_eq!(tools[0].name, expected.name);
-        assert_eq!(tools[0].description, expected.description);
-
-        let expected_schema = serde_json::to_value(&tools[0].parameters).unwrap();
-
-        assert_eq!(
-            expected_schema,
-            json!({
-                "$schema": "http://json-schema.org/draft-07/schema#",
-                "title": "WeatherQuery",
-                "type": "object",
-                "properties": {
-                    "location": {
-                        "type": "string"
-                    },
-                    "unit": {
-                        "type": "string"
-                    }
+        let mut registry = ToolRegistry::new();
+        registry
+            .register(WeatherTool {
+                current_weather: WeatherResult {
+                    location: "San Francisco".to_string(),
+                    temperature: 21.0,
+                    unit: "Celsius".to_string(),
                },
-                "required": ["location", "unit"]
            })
+            .unwrap();
+
+        let definitions = registry.definitions();
+        assert_eq!(
+            definitions,
+            [ToolFunctionDefinition {
+                name: "get_current_weather".to_string(),
+                description: "Fetches the current weather for a given location.".to_string(),
+                parameters: serde_json::from_value(json!({
+                    "$schema": "http://json-schema.org/draft-07/schema#",
+                    "title": "WeatherQuery",
+                    "type": "object",
+                    "properties": {
+                        "location": {
+                            "type": "string"
+                        },
+                        "unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": ["location", "unit"]
+                }))
+                .unwrap(),
+            }]
        );

-        let args = json!({
-            "location": "San Francisco",
-            "unit": "Celsius"
+        let mut call = ToolFunctionCall {
+            id: "the-id".to_string(),
+            name: "get_cur".to_string(),
+            ..Default::default()
+        };
+
+        let task = cx.update(|cx| {
+            registry.update_tool_call(
+                &mut call,
+                Some("rent_weather"),
+                Some(r#"{"location": "San Francisco","#),
+                cx,
+            );
+            registry.update_tool_call(&mut call, None, Some(r#" "unit": "Celsius"}"#), cx);
+            registry.execute_tool_call(&mut call, cx).unwrap()
        });
+        task.await.unwrap();

-        let query: WeatherQuery = serde_json::from_value(args).unwrap();
-
-        let result = cx.update(|cx| tool.execute(&query, cx)).await;
-
-        assert!(result.is_ok());
-        let result = result.unwrap();
-
-        assert_eq!(result, tool.current_weather);
+        match &call.state {
+            ToolFunctionCallState::ExecutedTool(_view) => {}
+            _ => panic!(),
+        }
    }
 }
--- a/crates/audio/src/assets.rs
+++ b/crates/audio/src/assets.rs
@@ -41,7 +41,12 @@ impl SoundRegistry {
        }

        let path = format!("sounds/{}.wav", name);
-        let bytes = self.assets.load(&path)?.into_owned();
+        let bytes = self
+            .assets
+            .load(&path)?
+            .map(|asset| Ok(asset))
+            .unwrap_or_else(|| Err(anyhow::anyhow!("No such asset available")))?
+            .into_owned();
        let cursor = Cursor::new(bytes);
        let source = Decoder::new(cursor)?.convert_samples::<f32>().buffered();

--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -18,6 +18,7 @@ client.workspace = true
 db.workspace = true
 editor.workspace = true
 gpui.workspace = true
+http.workspace = true
 isahc.workspace = true
 log.workspace = true
 markdown_preview.workspace = true
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -20,6 +20,7 @@ use smol::{fs, io::AsyncReadExt};
 use settings::{Settings, SettingsSources, SettingsStore};
 use smol::{fs::File, process::Command};

+use http::{HttpClient, HttpClientWithUrl};
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use std::{
    env::consts::{ARCH, OS},
@@ -29,10 +30,7 @@ use std::{
    time::Duration,
 };
 use update_notification::UpdateNotification;
-use util::{
-    http::{HttpClient, HttpClientWithUrl},
-    ResultExt,
-};
+use util::ResultExt;
 use workspace::notifications::NotificationId;
 use workspace::Workspace;

@@ -239,8 +237,9 @@ fn view_release_notes_locally(workspace: &mut Workspace, cx: &mut ViewContext<Wo
                            let buffer = cx.new_model(|cx| MultiBuffer::singleton(buffer, cx));

                            let tab_description = SharedString::from(body.title.to_string());
-                            let editor = cx
-                                .new_view(|cx| Editor::for_multibuffer(buffer, Some(project), cx));
+                            let editor = cx.new_view(|cx| {
+                                Editor::for_multibuffer(buffer, Some(project), true, cx)
+                            });
                            let workspace_handle = workspace.weak_handle();
                            let view: View<MarkdownPreviewView> = MarkdownPreviewView::new(
                                MarkdownPreviewMode::Default,
@@ -343,6 +342,16 @@ impl AutoUpdater {
    }

    async fn update(this: Model<Self>, mut cx: AsyncAppContext) -> Result<()> {
+        // Skip auto-update for flatpaks
+        #[cfg(target_os = "linux")]
+        if matches!(std::env::var("ZED_IS_FLATPAK_INSTALL"), Ok(_)) {
+            this.update(&mut cx, |this, cx| {
+                this.status = AutoUpdateStatus::Idle;
+                cx.notify();
+            })?;
+            return Ok(());
+        }
+
        let (client, current_version) = this.read_with(&cx, |this, _| {
            (this.http_client.clone(), this.current_version)
        })?;
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-down-from-line"><path d="M19 3H5"/><path d="M12 21V7"/><path d="m6 15 6 6 6-6"/></svg>`
				`@@ -0,0 +1 @@`
				<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M13.15 7.49998C13.15 4.66458 10.9402 1.84998 7.50002 1.84998C4.7217 1.84998 3.34851 3.90636 2.76336 4.99997H4.5C4.77614 4.99997 5 5.22383 5 5.49997C5 5.77611 4.77614 5.99997 4.5 5.99997H1.5C1.22386 5.99997 1 5.77611 1 5.49997V2.49997C1 2.22383 1.22386 1.99997 1.5 1.99997C1.77614 1.99997 2 2.22383 2 2.49997V4.31318C2.70453 3.07126 4.33406 0.849976 7.50002 0.849976C11.5628 0.849976 14.15 4.18537 14.15 7.49998C14.15 10.8146 11.5628 14.15 7.50002 14.15C5.55618 14.15 3.93778 13.3808 2.78548 12.2084C2.16852 11.5806 1.68668 10.839 1.35816 10.0407C1.25306 9.78536 1.37488 9.49315 1.63024 9.38806C1.8856 9.28296 2.17781 9.40478 2.2829 9.66014C2.56374 10.3425 2.97495 10.9745 3.4987 11.5074C4.47052 12.4963 5.83496 13.15 7.50002 13.15C10.9402 13.15 13.15 10.3354 13.15 7.49998ZM7 10V5.00001H8V10H7Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
				`@@ -0,0 +1 @@`
				`<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6 11L6 4L10.5 7.5L6 11Z" fill="currentColor"></path></svg>`
				`@@ -1 +0,0 @@`
				> Give me a comprehensive list of all the elements defined in my project using the following query: `impl Element for {}, impl<T: 'static> Element for {}, impl IntoElement for {})`
				`@@ -1 +0,0 @@`
				`> What are all the places we define a new gpui element in my project? (impl Element for {})`
				`@@ -1 +0,0 @@`
				`> Can you tell me what the assistant2 crate is for in my project? Tell me in 100 words or less.`