WIP: Log message

2024-05-16 14:53:37 +02:00
499 changed files with 12930 additions and 29738 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,6 @@ env:

 jobs:
  style:
-    timeout-minutes: 60
    name: Check formatting and spelling
    runs-on:
      - self-hosted
@@ -78,7 +77,6 @@ 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
@@ -103,7 +101,6 @@ jobs:

  # todo(linux): Actually run the tests
  linux_tests:
-    timeout-minutes: 60
    name: (Linux) Run Clippy and tests
    runs-on:
      - self-hosted
@@ -125,7 +122,6 @@ jobs:

  # todo(windows): Actually run the tests
  windows_tests:
-    timeout-minutes: 60
    name: (Windows) Run Clippy and tests
    runs-on: hosted-windows-1
    steps:
@@ -146,7 +142,6 @@ jobs:
        run: cargo build -p zed

  bundle-mac:
-    timeout-minutes: 60
    name: Create a macOS bundle
    runs-on:
      - self-hosted
@@ -257,7 +252,6 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  bundle-linux:
-    timeout-minutes: 60
    name: Create a Linux bundle
    runs-on:
      - self-hosted
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -15,7 +15,6 @@ env:

 jobs:
  style:
-    timeout-minutes: 60
    name: Check formatting and Clippy lints
    if: github.repository_owner == 'zed-industries'
    runs-on:
@@ -34,7 +33,6 @@ jobs:
      - name: Run clippy
        run: cargo xtask clippy
  tests:
-    timeout-minutes: 60
    name: Run tests
    if: github.repository_owner == 'zed-industries'
    runs-on:
@@ -51,7 +49,6 @@ jobs:
        uses: ./.github/actions/run_tests

  bundle-mac:
-    timeout-minutes: 60
    name: Create a macOS bundle
    if: github.repository_owner == 'zed-industries'
    runs-on:
@@ -94,7 +91,6 @@ 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:
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@
 /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
@@ -27,4 +25,3 @@ DerivedData/
 .blob_store
 .vscode
 .wrangler
-.flatpak-builder
--- a/.zed/tasks.json
+++ b/.zed/tasks.json
@@ -3,5 +3,10 @@
    "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,7 +4,7 @@ members = [
    "crates/anthropic",
    "crates/assets",
    "crates/assistant",
-    "crates/assistant_slash_command",
+    "crates/assistant2",
    "crates/assistant_tooling",
    "crates/audio",
    "crates/auto_update",
@@ -41,7 +41,6 @@ members = [
    "crates/gpui",
    "crates/gpui_macros",
    "crates/headless",
-    "crates/html_to_markdown",
    "crates/http",
    "crates/image_viewer",
    "crates/inline_completion_button",
@@ -148,9 +147,8 @@ ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
 assistant = { path = "crates/assistant" }
-assistant_slash_command = { path = "crates/assistant_slash_command" }
+assistant2 = { path = "crates/assistant2" }
 assistant_tooling = { path = "crates/assistant_tooling" }
-async-watch = "0.3.1"
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
 base64 = "0.13"
@@ -167,7 +165,6 @@ color = { path = "crates/color" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 copilot = { path = "crates/copilot" }
-dashmap = "5.5.3"
 db = { path = "crates/db" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
@@ -187,7 +184,6 @@ google_ai = { path = "crates/google_ai" }
 gpui = { path = "crates/gpui" }
 gpui_macros = { path = "crates/gpui_macros" }
 headless = { path = "crates/headless" }
-html_to_markdown = { path = "crates/html_to_markdown" }
 http = { path = "crates/http" }
 install_cli = { path = "crates/install_cli" }
 image_viewer = { path = "crates/image_viewer" }
@@ -259,7 +255,6 @@ 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"
@@ -267,9 +262,8 @@ 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 = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" }
 cap-std = "3.0"
 cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
@@ -289,9 +283,10 @@ futures-batch = "0.6.1"
 futures-lite = "1.13"
 git2 = { version = "0.18", default-features = false }
 globset = "0.4"
-heed = { version = "0.20.1", features = ["read-txn-no-tls"] }
+heed = { git = "https://github.com/meilisearch/heed", rev = "036ac23f73a021894974b9adc815bc95b3e0482a", 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.
@@ -304,14 +299,12 @@ 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"
@@ -337,7 +330,6 @@ 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"] }
@@ -357,33 +349,33 @@ toml = "0.8"
 tokio = { version = "1", features = ["full"] }
 tower-http = "0.4.4"
 tree-sitter = { version = "0.20", features = ["wasm"] }
-tree-sitter-bash = "0.20.5"
+tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "7331995b19b8f8aba2d5e26deb51d2195c18bc94" }
 tree-sitter-c = "0.20.1"
-tree-sitter-cpp = "0.20.5"
-tree-sitter-css = "0.20"
-tree-sitter-elixir = "0.1.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-embedded-template = "0.20.0"
-tree-sitter-go = { git = "https://github.com/tree-sitter/tree-sitter-go", rev = "b82ab803d887002a0af11f6ce63d72884580bf33" }
-tree-sitter-gomod = "1.0.1"
+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-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 = "0.20.2"
+tree-sitter-json = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "40a81c01a40ac48744e0c8ccabbaba1920441199" }
 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 = "0.20.5"
-tree-sitter-yaml = "0.0.1"
+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" }
 unindent = "0.1.7"
 unicase = "2.6"
 unicode-segmentation = "1.10"
 url = "2.2"
-uuid = { version = "1.1.2", features = ["v4", "v5", "serde"] }
+uuid = { version = "1.1.2", features = ["v4", "v5"] }
 wasmparser = "0.201"
 wasm-encoder = "0.201"
 wasmtime = { version = "19.0.0", default-features = false, features = [
--- a/assets/icons/arrow_down_from_line.svg
+++ b/assets/icons/arrow_down_from_line.svg
@@ -1 +0,0 @@
-<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
@@ -1 +0,0 @@
-<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/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -1,15 +1,15 @@
 {
  "stems": {
-    "Dockerfile": "docker",
    "Podfile": "ruby",
-    "Procfile": "heroku"
+    "Procfile": "heroku",
+    "Dockerfile": "docker"
  },
  "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,16 +57,14 @@
    "gitkeep": "vcs",
    "gitmodules": "vcs",
    "go": "go",
-    "gql": "graphql",
    "graphql": "graphql",
-    "graphqls": "graphql",
    "h": "c",
+    "hpp": "cpp",
    "handlebars": "code",
    "hbs": "template",
    "heex": "elixir",
-    "heic": "image",
    "heif": "image",
-    "hpp": "cpp",
+    "heic": "image",
    "hrl": "erlang",
    "hs": "haskell",
    "htm": "template",
@@ -81,9 +79,9 @@
    "jpeg": "image",
    "jpg": "image",
    "js": "javascript",
+    "jsx": "react",
    "json": "storage",
    "jsonc": "storage",
-    "jsx": "react",
    "jxl": "image",
    "kt": "kotlin",
    "ldf": "storage",
@@ -98,9 +96,9 @@
    "mdf": "storage",
    "mdx": "document",
    "metadata": "code",
+    "mkv": "video",
    "mjs": "javascript",
    "mka": "audio",
-    "mkv": "video",
    "ml": "ocaml",
    "mli": "ocaml",
    "mov": "video",
@@ -109,8 +107,8 @@
    "mts": "typescript",
    "myd": "storage",
    "myi": "storage",
-    "nim": "nim",
    "nu": "terminal",
+    "nim": "nim",
    "odp": "document",
    "ods": "document",
    "odt": "document",
@@ -132,33 +130,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",
-    "tsx": "react",
    "ttf": "font",
+    "tsx": "react",
    "txt": "document",
+    "tcl": "tcl",
    "vue": "vue",
    "wav": "audio",
    "webm": "video",
@@ -190,30 +188,27 @@
    "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"
    },
@@ -250,18 +245,18 @@
    "fsharp": {
      "icon": "icons/file_icons/fsharp.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"
    },
+    "go": {
+      "icon": "icons/file_icons/go.svg"
+    },
+    "graphql": {
+      "icon": "icons/file_icons/graphql.svg"
+    },
    "image": {
      "icon": "icons/file_icons/image.svg"
    },
@@ -277,18 +272,21 @@
    "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"
    },
-    "nim": {
-      "icon": "icons/file_icons/nim.svg"
-    },
    "ocaml": {
      "icon": "icons/file_icons/ocaml.svg"
    },
+    "nim": {
+      "icon": "icons/file_icons/nim.svg"
+    },
    "phoenix": {
      "icon": "icons/file_icons/phoenix.svg"
    },
@@ -316,36 +314,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"
    },
-    "terminal": {
-      "icon": "icons/file_icons/terminal.svg"
-    },
    "terraform": {
      "icon": "icons/file_icons/terraform.svg"
    },
+    "terminal": {
+      "icon": "icons/file_icons/terminal.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/library.svg
+++ b/assets/icons/library.svg
@@ -1 +0,0 @@
-<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
@@ -1,7 +0,0 @@
-<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
@@ -1 +0,0 @@
-<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
@@ -1 +0,0 @@
-<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/star.svg
+++ b/assets/icons/star.svg
@@ -1 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.97942 1.25171L6.9585 1.30199L5.58662 4.60039C5.54342 4.70426 5.44573 4.77523 5.3336 4.78422L1.7727 5.0697L1.71841 5.07405L1.38687 5.10063L1.08608 5.12475C0.820085 5.14607 0.712228 5.47802 0.914889 5.65162L1.14406 5.84793L1.39666 6.06431L1.43802 6.09974L4.15105 8.42374C4.23648 8.49692 4.2738 8.61176 4.24769 8.72118L3.41882 12.196L3.40618 12.249L3.32901 12.5725L3.25899 12.866C3.19708 13.1256 3.47945 13.3308 3.70718 13.1917L3.9647 13.0344L4.24854 12.861L4.29502 12.8326L7.34365 10.9705C7.43965 10.9119 7.5604 10.9119 7.6564 10.9705L10.705 12.8326L10.7515 12.861L11.0354 13.0344L11.2929 13.1917C11.5206 13.3308 11.803 13.1256 11.7411 12.866L11.671 12.5725L11.5939 12.249L11.5812 12.196L10.7524 8.72118C10.7263 8.61176 10.7636 8.49692 10.849 8.42374L13.562 6.09974L13.6034 6.06431L13.856 5.84793L14.0852 5.65162C14.2878 5.47802 14.18 5.14607 13.914 5.12475L13.6132 5.10063L13.2816 5.07405L13.2274 5.0697L9.66645 4.78422C9.55432 4.77523 9.45663 4.70426 9.41343 4.60039L8.04155 1.30199L8.02064 1.25171L7.89291 0.944609L7.77702 0.665992C7.67454 0.419604 7.32551 0.419604 7.22303 0.665992L7.10715 0.944609L6.97942 1.25171ZM7.50003 2.60397L6.50994 4.98442C6.32273 5.43453 5.89944 5.74207 5.41351 5.78103L2.84361 5.98705L4.8016 7.66428C5.17183 7.98142 5.33351 8.47903 5.2204 8.95321L4.62221 11.461L6.8224 10.1171C7.23842 9.86302 7.76164 9.86302 8.17766 10.1171L10.3778 11.461L9.77965 8.95321C9.66654 8.47903 9.82822 7.98142 10.1984 7.66428L12.1564 5.98705L9.58654 5.78103C9.10061 5.74207 8.67732 5.43453 8.49011 4.98442L7.50003 2.60397Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
--- a/assets/icons/star_filled.svg
+++ b/assets/icons/star_filled.svg
@@ -1 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.22303 0.665992C7.32551 0.419604 7.67454 0.419604 7.77702 0.665992L9.41343 4.60039C9.45663 4.70426 9.55432 4.77523 9.66645 4.78422L13.914 5.12475C14.18 5.14607 14.2878 5.47802 14.0852 5.65162L10.849 8.42374C10.7636 8.49692 10.7263 8.61176 10.7524 8.72118L11.7411 12.866C11.803 13.1256 11.5206 13.3308 11.2929 13.1917L7.6564 10.9705C7.5604 10.9119 7.43965 10.9119 7.34365 10.9705L3.70718 13.1917C3.47945 13.3308 3.19708 13.1256 3.25899 12.866L4.24769 8.72118C4.2738 8.61176 4.23648 8.49692 4.15105 8.42374L0.914889 5.65162C0.712228 5.47802 0.820086 5.14607 1.08608 5.12475L5.3336 4.78422C5.44573 4.77523 5.54342 4.70426 5.58662 4.60039L7.22303 0.665992Z" fill="currentColor"></path></svg>
--- a/assets/icons/triangle_right.svg
+++ b/assets/icons/triangle_right.svg
@@ -1 +0,0 @@
-<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/icons/zed_assistant_filled.svg
+++ b/assets/icons/zed_assistant_filled.svg
@@ -1,5 +0,0 @@
-<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 1.75L5.88467 5.14092C5.82759 5.31446 5.73055 5.47218 5.60136 5.60136C5.47218 5.73055 5.31446 5.82759 5.14092 5.88467L1.75 7L5.14092 8.11533C5.31446 8.17241 5.47218 8.26945 5.60136 8.39864C5.73055 8.52782 5.82759 8.68554 5.88467 8.85908L7 12.25L8.11533 8.85908C8.17241 8.68554 8.26945 8.52782 8.39864 8.39864C8.52782 8.26945 8.68554 8.17241 8.85908 8.11533L12.25 7L8.85908 5.88467C8.68554 5.82759 8.52782 5.73055 8.39864 5.60136C8.26945 5.47218 8.17241 5.31446 8.11533 5.14092L7 1.75Z" fill="black" stroke="black" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M2.91667 1.75V4.08333M1.75 2.91667H4.08333" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M11.0833 9.91667V12.25M9.91667 11.0833H12.25" stroke="black" stroke-opacity="0.75" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -28,6 +28,7 @@
      "ctrl-0": "zed::ResetBufferFontSize",
      "ctrl-,": "zed::OpenSettings",
      "ctrl-q": "zed::Quit",
+      "alt-f9": "zed::Hide",
      "f11": "zed::ToggleFullScreen"
    }
  },
@@ -190,18 +191,11 @@
      "ctrl-shift-enter": "editor::NewlineBelow"
    }
  },
-  {
-    "context": "Markdown",
-    "bindings": {
-      "ctrl-c": "markdown::Copy"
-    }
-  },
  {
    "context": "AssistantPanel",
    "bindings": {
      "ctrl-g": "search::SelectNextMatch",
-      "ctrl-shift-g": "search::SelectPrevMatch",
-      "alt-m": "assistant::ToggleModelSelector"
+      "ctrl-shift-g": "search::SelectPrevMatch"
    }
  },
  {
@@ -211,16 +205,7 @@
      "ctrl-s": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "PromptLibrary",
-    "bindings": {
-      "ctrl-n": "prompt_library::NewPrompt",
-      "ctrl-shift-s": "prompt_library::ToggleDefaultPrompt"
+      "ctrl-r": "assistant::CycleMessageRole"
    }
  },
  {
@@ -510,12 +495,6 @@
      "tab": "editor::ConfirmCompletion"
    }
  },
-  {
-    "context": "Editor && inline_completion && !showing_completions",
-    "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
-    }
-  },
  {
    "context": "Editor && showing_code_actions",
    "bindings": {
@@ -578,8 +557,8 @@
      "enter": "project_panel::Rename",
      "backspace": "project_panel::Trash",
      "delete": "project_panel::Trash",
-      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
-      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
+      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": true }],
+      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": true }],
      "alt-ctrl-r": "project_panel::RevealInFinder",
      "alt-shift-f": "project_panel::NewSearchInDirectory"
    }
@@ -642,7 +621,12 @@
      "pagedown": ["terminal::SendKeystroke", "pagedown"],
      "escape": ["terminal::SendKeystroke", "escape"],
      "enter": ["terminal::SendKeystroke", "enter"],
-      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"]
+      "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
+
+      // Some nice conveniences
+      "ctrl-backspace": ["terminal::SendText", "\u0015"],
+      "ctrl-right": ["terminal::SendText", "\u0005"],
+      "ctrl-left": ["terminal::SendText", "\u0001"]
    }
  }
 ]
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -208,17 +208,18 @@
    }
  },
  {
-    "context": "Markdown",
+    "context": "AssistantChat > Editor", // Used in the assistant2 crate
    "bindings": {
-      "cmd-c": "markdown::Copy"
+      "enter": ["assistant2::Submit", "Simple"],
+      "cmd-enter": ["assistant2::Submit", "Codebase"],
+      "escape": "assistant2::Cancel"
    }
  },
  {
-    "context": "AssistantPanel",
+    "context": "AssistantPanel", // Used in the assistant crate, which we're replacing
    "bindings": {
      "cmd-g": "search::SelectNextMatch",
-      "cmd-shift-g": "search::SelectPrevMatch",
-      "alt-m": "assistant::ToggleModelSelector"
+      "cmd-shift-g": "search::SelectPrevMatch"
    }
  },
  {
@@ -228,17 +229,7 @@
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline"
-    }
-  },
-  {
-    "context": "PromptLibrary",
-    "bindings": {
-      "cmd-n": "prompt_library::NewPrompt",
-      "cmd-shift-s": "prompt_library::ToggleDefaultPrompt",
-      "cmd-w": "workspace::CloseWindow"
+      "ctrl-r": "assistant::CycleMessageRole"
    }
  },
  {
@@ -526,12 +517,6 @@
      "tab": "editor::ConfirmCompletion"
    }
  },
-  {
-    "context": "Editor && inline_completion && !showing_completions",
-    "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
-    }
-  },
  {
    "context": "Editor && showing_code_actions",
    "bindings": {
@@ -588,16 +573,14 @@
      "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", { "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 }],
+      "backspace": "project_panel::Trash",
+      "delete": "project_panel::Trash",
+      "cmd-backspace": ["project_panel::Delete", { "skip_prompt": true }],
+      "cmd-delete": ["project_panel::Delete", { "skip_prompt": true }],
      "alt-cmd-r": "project_panel::RevealInFinder",
-      "alt-shift-f": "project_panel::NewSearchInDirectory",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
-      "escape": "menu::Cancel"
+      "alt-shift-f": "project_panel::NewSearchInDirectory"
    }
  },
  {
@@ -647,7 +630,7 @@
  {
    "context": "Picker",
    "bindings": {
-      "f2": "picker::UseSelectedQuery",
+      "alt-e": "picker::UseSelectedQuery",
      "alt-enter": ["picker::ConfirmInput", { "secondary": false }],
      "cmd-alt-enter": ["picker::ConfirmInput", { "secondary": true }]
    }
--- a/assets/keymaps/jetbrains.json
+++ b/assets/keymaps/jetbrains.json
@@ -53,6 +53,7 @@
      "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",
@@ -69,8 +70,7 @@
      "cmd-f12": "outline::Toggle",
      "cmd-7": "outline::Toggle",
      "cmd-shift-o": "file_finder::Toggle",
-      "cmd-l": "go_to_line::Toggle",
-      "alt-enter": "editor::ToggleCodeActions"
+      "cmd-l": "go_to_line::Toggle"
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -155,7 +155,6 @@
      "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",
@@ -379,17 +378,13 @@
      "r": ["vim::PushOperator", "Replace"],
      "s": "vim::Substitute",
      "shift-s": "vim::SubstituteLine",
-      ">": ["vim::PushOperator", "Indent"],
-      "<": ["vim::PushOperator", "Outdent"],
+      "> >": "vim::Indent",
+      "< <": "vim::Outdent",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
-      "] x": "editor::SelectSmallerSyntaxNode",
-      "] d": "editor::GoToDiagnostic",
-      "[ d": "editor::GoToPrevDiagnostic",
-      "] c": "editor::GoToHunk",
-      "[ c": "editor::GoToPrevHunk"
+      "] x": "editor::SelectSmallerSyntaxNode"
    }
  },
  {
@@ -459,18 +454,6 @@
      "s": "vim::CurrentLine"
    }
  },
-  {
-    "context": "Editor && vim_operator == >",
-    "bindings": {
-      ">": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "Editor && vim_operator == <",
-    "bindings": {
-      "<": "vim::CurrentLine"
-    }
-  },
  {
    "context": "Editor && VimObject",
    "bindings": {
@@ -510,8 +493,8 @@
      "shift-o": "vim::OtherEnd",
      "d": "vim::VisualDelete",
      "x": "vim::VisualDelete",
-      "shift-d": "vim::VisualDeleteLine",
-      "shift-x": "vim::VisualDeleteLine",
+      "shift-d": "vim::VisualDelete",
+      "shift-x": "vim::VisualDelete",
      "y": "vim::VisualYank",
      "shift-y": "vim::VisualYank",
      "p": "vim::Paste",
@@ -580,7 +563,7 @@
    }
  },
  {
-    "context": "Editor && vim_mode == normal && !VimWaiting",
+    "context": "Editor && vim_mode == normal",
    "bindings": {
      "g c c": "editor::ToggleComments"
    }
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1,18 +1,5 @@
 {
-  // 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
+  // The name of the Zed theme to use for the UI
  "theme": "One Dark",
  // The name of a base set of key bindings to use.
  // This setting can take four values, each named after another
@@ -37,8 +24,6 @@
  },
  // 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)
@@ -57,8 +42,6 @@
    // 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
@@ -88,15 +71,6 @@
  "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.
@@ -128,17 +102,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*",
-    "**/*.pem",
-    "**/*.key",
-    "**/*.cert",
-    "**/*.crt",
-    "**/secrets.yml"
-  ],
+  "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
  // Whether to use additional LSP queries to format (and amend) the code after
  // every "trigger" symbol input, defined by LSP server capabilities.
  "use_on_type_format": true,
@@ -170,7 +135,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": false
+    "share_on_join": true
  },
  // Toolbar related settings
  "toolbar": {
@@ -222,25 +187,6 @@
    // 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
@@ -341,7 +287,7 @@
    // AI provider.
    "provider": {
      "name": "openai",
-      // The default model to use when creating new contexts. This
+      // The default model to use when starting new conversations. This
      // setting can take three values:
      //
      // 1. "gpt-3.5-turbo"
@@ -672,6 +618,9 @@
    "Elixir": {
      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
    },
+    "Gleam": {
+      "tab_size": 2
+    },
    "Go": {
      "code_actions_on_format": {
        "source.organizeImports": true
@@ -697,7 +646,6 @@
      }
    },
    "JavaScript": {
-      "language_servers": ["typescript-language-server", "!vtsls", ".."],
      "prettier": {
        "allowed": true
      }
@@ -707,6 +655,9 @@
        "allowed": true
      }
    },
+    "Make": {
+      "hard_tabs": true
+    },
    "Markdown": {
      "format_on_save": "off",
      "prettier": {
@@ -719,6 +670,9 @@
        "plugins": ["@prettier/plugin-php"]
      }
    },
+    "Prisma": {
+      "tab_size": 2
+    },
    "Ruby": {
      "language_servers": ["solargraph", "!ruby-lsp", "..."]
    },
@@ -740,7 +694,6 @@
      }
    },
    "TSX": {
-      "language_servers": ["typescript-language-server", "!vtsls", ".."],
      "prettier": {
        "allowed": true
      }
@@ -751,7 +704,6 @@
      }
    },
    "TypeScript": {
-      "language_servers": ["typescript-language-server", "!vtsls", ".."],
      "prettier": {
        "allowed": true
      }
@@ -845,17 +797,5 @@
  //   - `short`: "2 s, 15 l, 32 c"
  //   - `long`: "2 selections, 15 lines, 32 characters"
  // Default: 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
+  "line_indicator_format": "long"
 }
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -5,15 +5,6 @@
    {
      "name": "Gruvbox Dark",
      "appearance": "dark",
-      "accents": [
-        "#cc241dff",
-        "#98971aff",
-        "#d79921ff",
-        "#458588ff",
-        "#b16286ff",
-        "#689d6aff",
-        "#d65d0eff"
-      ],
      "style": {
        "border": "#5b534dff",
        "border.variant": "#494340ff",
@@ -388,15 +379,6 @@
    {
      "name": "Gruvbox Dark Hard",
      "appearance": "dark",
-      "accents": [
-        "#cc241dff",
-        "#98971aff",
-        "#d79921ff",
-        "#458588ff",
-        "#b16286ff",
-        "#689d6aff",
-        "#d65d0eff"
-      ],
      "style": {
        "border": "#5b534dff",
        "border.variant": "#494340ff",
@@ -771,15 +753,6 @@
    {
      "name": "Gruvbox Dark Soft",
      "appearance": "dark",
-      "accents": [
-        "#cc241dff",
-        "#98971aff",
-        "#d79921ff",
-        "#458588ff",
-        "#b16286ff",
-        "#689d6aff",
-        "#d65d0eff"
-      ],
      "style": {
        "border": "#5b534dff",
        "border.variant": "#494340ff",
@@ -1154,15 +1127,6 @@
    {
      "name": "Gruvbox Light",
      "appearance": "light",
-      "accents": [
-        "#cc241dff",
-        "#98971aff",
-        "#d79921ff",
-        "#458588ff",
-        "#b16286ff",
-        "#689d6aff",
-        "#d65d0eff"
-      ],
      "style": {
        "border": "#c8b899ff",
        "border.variant": "#ddcca7ff",
@@ -1537,15 +1501,6 @@
    {
      "name": "Gruvbox Light Hard",
      "appearance": "light",
-      "accents": [
-        "#cc241dff",
-        "#98971aff",
-        "#d79921ff",
-        "#458588ff",
-        "#b16286ff",
-        "#689d6aff",
-        "#d65d0eff"
-      ],
      "style": {
        "border": "#c8b899ff",
        "border.variant": "#ddcca7ff",
@@ -1920,15 +1875,6 @@
    {
      "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
@@ -23,7 +23,6 @@ isahc.workspace = true
 schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
-strum.workspace = true

 [dev-dependencies]
 tokio.workspace = true
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -4,12 +4,11 @@ use http::{AsyncBody, HttpClient, Method, Request as HttpRequest};
 use isahc::config::Configurable;
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, time::Duration};
-use strum::EnumIter;

 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)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq)]
 pub enum Model {
    #[default]
    #[serde(alias = "claude-3-opus", rename = "claude-3-opus-20240229")]
--- 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<Option<std::borrow::Cow<'static, [u8]>>> {
+    fn load(&self, path: &str) -> Result<std::borrow::Cow<'static, [u8]>> {
        Self::get(path)
-            .map(|f| Some(f.data))
+            .map(|f| f.data)
            .ok_or_else(|| anyhow!("could not find asset at path \"{}\"", path))
    }

@@ -42,10 +42,7 @@ 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)?
-                    .expect("Assets should never return None");
+                let font_bytes = cx.asset_source().load(&font_path)?;
                embedded_fonts.push(font_bytes);
            }
        }
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -5,9 +5,6 @@ edition = "2021"
 publish = false
 license = "GPL-3.0-or-later"

-[lints]
-workspace = true
-
 [lib]
 path = "src/assistant.rs"
 doctest = false
@@ -15,7 +12,6 @@ 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
@@ -25,10 +21,7 @@ editor.workspace = true
 file_icons.workspace = true
 fs.workspace = true
 futures.workspace = true
-fuzzy.workspace = true
 gpui.workspace = true
-heed.workspace = true
-html_to_markdown.workspace = true
 http.workspace = true
 indoc.workspace = true
 language.workspace = true
@@ -40,16 +33,12 @@ ordered-float.workspace = true
 parking_lot.workspace = true
 project.workspace = true
 regex.workspace = true
-rope.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
@@ -58,7 +47,6 @@ ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
-picker.workspace = true

 [dev-dependencies]
 ctor.workspace = true
@@ -67,4 +55,3 @@ 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
@@ -0,0 +1,3 @@
+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/ambient_context.rs
+++ b/crates/assistant/src/ambient_context.rs
@@ -0,0 +1,17 @@
+mod current_project;
+mod recent_buffers;
+
+pub use current_project::*;
+pub use recent_buffers::*;
+
+#[derive(Default)]
+pub struct AmbientContext {
+    pub recent_buffers: RecentBuffersContext,
+    pub current_project: CurrentProjectContext,
+}
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
+pub enum ContextUpdated {
+    Updating,
+    Disabled,
+}
--- a/crates/assistant/src/ambient_context/current_project.rs
+++ b/crates/assistant/src/ambient_context/current_project.rs
@@ -0,0 +1,155 @@
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::{anyhow, Result};
+use fs::Fs;
+use gpui::{AsyncAppContext, ModelContext, Task, WeakModel};
+use project::{Project, ProjectPath};
+use util::ResultExt;
+
+use crate::ambient_context::ContextUpdated;
+use crate::assistant_panel::Conversation;
+use crate::{LanguageModelRequestMessage, Role};
+
+/// Ambient context about the current project.
+pub struct CurrentProjectContext {
+    pub enabled: bool,
+    pub message: String,
+    pub pending_message: Option<Task<()>>,
+}
+
+#[allow(clippy::derivable_impls)]
+impl Default for CurrentProjectContext {
+    fn default() -> Self {
+        Self {
+            enabled: false,
+            message: String::new(),
+            pending_message: None,
+        }
+    }
+}
+
+impl CurrentProjectContext {
+    /// Returns the [`CurrentProjectContext`] as a message to the language model.
+    pub fn to_message(&self) -> Option<LanguageModelRequestMessage> {
+        self.enabled.then(|| LanguageModelRequestMessage {
+            role: Role::System,
+            content: self.message.clone(),
+        })
+    }
+
+    /// Updates the [`CurrentProjectContext`] for the given [`Project`].
+    pub fn update(
+        &mut self,
+        fs: Arc<dyn Fs>,
+        project: WeakModel<Project>,
+        cx: &mut ModelContext<Conversation>,
+    ) -> ContextUpdated {
+        if !self.enabled {
+            self.message.clear();
+            self.pending_message = None;
+            cx.notify();
+            return ContextUpdated::Disabled;
+        }
+
+        self.pending_message = Some(cx.spawn(|conversation, mut cx| async move {
+            const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
+            cx.background_executor().timer(DEBOUNCE_TIMEOUT).await;
+
+            let Some(path_to_cargo_toml) = Self::path_to_cargo_toml(project, &mut cx).log_err()
+            else {
+                return;
+            };
+
+            let Some(path_to_cargo_toml) = path_to_cargo_toml
+                .ok_or_else(|| anyhow!("no Cargo.toml"))
+                .log_err()
+            else {
+                return;
+            };
+
+            let message_task = cx
+                .background_executor()
+                .spawn(async move { Self::build_message(fs, &path_to_cargo_toml).await });
+
+            if let Some(message) = message_task.await.log_err() {
+                conversation
+                    .update(&mut cx, |conversation, cx| {
+                        conversation.ambient_context.current_project.message = message;
+                        conversation.count_remaining_tokens(cx);
+                        cx.notify();
+                    })
+                    .log_err();
+            }
+        }));
+
+        ContextUpdated::Updating
+    }
+
+    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();
+
+        let name = cargo_toml
+            .package
+            .as_ref()
+            .map(|package| package.name.as_str());
+        if let Some(name) = name {
+            message.push_str(&format!(" named \"{name}\""));
+        }
+        message.push_str(". ");
+
+        let description = cargo_toml
+            .package
+            .as_ref()
+            .and_then(|package| package.description.as_ref())
+            .and_then(|description| description.get().ok().cloned());
+        if let Some(description) = description.as_ref() {
+            message.push_str("It describes itself as ");
+            message.push_str(&format!("\"{description}\""));
+            message.push_str(". ");
+        }
+
+        let dependencies = cargo_toml.dependencies.keys().cloned().collect::<Vec<_>>();
+        if !dependencies.is_empty() {
+            message.push_str("The following dependencies are installed: ");
+            message.push_str(&dependencies.join(", "));
+            message.push_str(". ");
+        }
+
+        Ok(message)
+    }
+
+    fn path_to_cargo_toml(
+        project: WeakModel<Project>,
+        cx: &mut AsyncAppContext,
+    ) -> Result<Option<PathBuf>> {
+        cx.update(|cx| {
+            let worktree = project.update(cx, |project, _cx| {
+                project
+                    .worktrees()
+                    .next()
+                    .ok_or_else(|| anyhow!("no worktree"))
+            })??;
+
+            let path_to_cargo_toml = worktree.update(cx, |worktree, _cx| {
+                let cargo_toml = worktree.entry_for_path("Cargo.toml")?;
+                Some(ProjectPath {
+                    worktree_id: worktree.id(),
+                    path: cargo_toml.path.clone(),
+                })
+            });
+            let path_to_cargo_toml = path_to_cargo_toml.and_then(|path| {
+                project
+                    .update(cx, |project, cx| project.absolute_path(&path, cx))
+                    .ok()
+                    .flatten()
+            });
+
+            Ok(path_to_cargo_toml)
+        })?
+    }
+}
--- a/crates/assistant/src/ambient_context/recent_buffers.rs
+++ b/crates/assistant/src/ambient_context/recent_buffers.rs
@@ -0,0 +1,201 @@
+use std::fmt::Write;
+use std::iter;
+use std::path::PathBuf;
+use std::time::Duration;
+
+use gpui::{ModelContext, Subscription, Task, WeakModel};
+use language::{Buffer, BufferSnapshot, DiagnosticEntry, Point};
+
+use crate::ambient_context::ContextUpdated;
+use crate::assistant_panel::Conversation;
+use crate::{LanguageModelRequestMessage, Role};
+
+pub struct RecentBuffersContext {
+    pub enabled: bool,
+    pub buffers: Vec<RecentBuffer>,
+    pub message: String,
+    pub pending_message: Option<Task<()>>,
+}
+
+pub struct RecentBuffer {
+    pub buffer: WeakModel<Buffer>,
+    pub _subscription: Subscription,
+}
+
+impl Default for RecentBuffersContext {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            buffers: Vec::new(),
+            message: String::new(),
+            pending_message: None,
+        }
+    }
+}
+
+impl RecentBuffersContext {
+    /// Returns the [`RecentBuffersContext`] as a message to the language model.
+    pub fn to_message(&self) -> Option<LanguageModelRequestMessage> {
+        self.enabled.then(|| LanguageModelRequestMessage {
+            role: Role::System,
+            content: self.message.clone(),
+        })
+    }
+
+    pub fn update(&mut self, cx: &mut ModelContext<Conversation>) -> ContextUpdated {
+        let buffers = self
+            .buffers
+            .iter()
+            .filter_map(|recent| {
+                recent
+                    .buffer
+                    .read_with(cx, |buffer, cx| {
+                        (
+                            buffer.file().map(|file| file.full_path(cx)),
+                            buffer.snapshot(),
+                        )
+                    })
+                    .ok()
+            })
+            .collect::<Vec<_>>();
+
+        if !self.enabled || buffers.is_empty() {
+            self.message.clear();
+            self.pending_message = None;
+            cx.notify();
+            ContextUpdated::Disabled
+        } else {
+            self.pending_message = Some(cx.spawn(|this, mut cx| async move {
+                const DEBOUNCE_TIMEOUT: Duration = Duration::from_millis(100);
+                cx.background_executor().timer(DEBOUNCE_TIMEOUT).await;
+
+                let message = cx
+                    .background_executor()
+                    .spawn(async move { Self::build_message(&buffers) })
+                    .await;
+                this.update(&mut cx, |conversation, cx| {
+                    conversation.ambient_context.recent_buffers.message = message;
+                    conversation.count_remaining_tokens(cx);
+                    cx.notify();
+                })
+                .ok();
+            }));
+
+            ContextUpdated::Updating
+        }
+    }
+
+    fn build_message(buffers: &[(Option<PathBuf>, BufferSnapshot)]) -> String {
+        let mut message = String::new();
+        writeln!(
+            message,
+            "The following is a list of recent buffers that the user has opened."
+        )
+        .unwrap();
+        writeln!(
+            message,
+            "For every line in the buffer, I will include a row number that line corresponds to."
+        )
+        .unwrap();
+        writeln!(
+            message,
+            "Lines that don't have a number correspond to errors and warnings. For example:"
+        )
+        .unwrap();
+        writeln!(message, "path/to/file.md").unwrap();
+        writeln!(message, "```markdown").unwrap();
+        writeln!(message, "1 The quick brown fox").unwrap();
+        writeln!(message, "2 jumps over one active").unwrap();
+        writeln!(message, "             --- error: should be 'the'").unwrap();
+        writeln!(message, "                 ------ error: should be 'lazy'").unwrap();
+        writeln!(message, "3 dog").unwrap();
+        writeln!(message, "```").unwrap();
+
+        message.push('\n');
+        writeln!(message, "Here's the actual recent buffer list:").unwrap();
+        for (path, buffer) in buffers {
+            if let Some(path) = path {
+                writeln!(message, "{}", path.display()).unwrap();
+            } else {
+                writeln!(message, "untitled").unwrap();
+            }
+
+            if let Some(language) = buffer.language() {
+                writeln!(message, "```{}", language.name().to_lowercase()).unwrap();
+            } else {
+                writeln!(message, "```").unwrap();
+            }
+
+            let mut diagnostics = buffer
+                .diagnostics_in_range::<_, Point>(
+                    language::Anchor::MIN..language::Anchor::MAX,
+                    false,
+                )
+                .peekable();
+
+            let mut active_diagnostics = Vec::<DiagnosticEntry<Point>>::new();
+            const GUTTER_PADDING: usize = 4;
+            let gutter_width =
+                ((buffer.max_point().row + 1) as f32).log10() as usize + 1 + GUTTER_PADDING;
+            for buffer_row in 0..=buffer.max_point().row {
+                let display_row = buffer_row + 1;
+                active_diagnostics.retain(|diagnostic| {
+                    (diagnostic.range.start.row..=diagnostic.range.end.row).contains(&buffer_row)
+                });
+                while diagnostics.peek().map_or(false, |diagnostic| {
+                    (diagnostic.range.start.row..=diagnostic.range.end.row).contains(&buffer_row)
+                }) {
+                    active_diagnostics.push(diagnostics.next().unwrap());
+                }
+
+                let row_width = (display_row as f32).log10() as usize + 1;
+                write!(message, "{}", display_row).unwrap();
+                if row_width < gutter_width {
+                    message.extend(iter::repeat(' ').take(gutter_width - row_width));
+                }
+
+                for chunk in buffer.text_for_range(
+                    Point::new(buffer_row, 0)..Point::new(buffer_row, buffer.line_len(buffer_row)),
+                ) {
+                    message.push_str(chunk);
+                }
+                message.push('\n');
+
+                for diagnostic in &active_diagnostics {
+                    message.extend(iter::repeat(' ').take(gutter_width));
+
+                    let start_column = if diagnostic.range.start.row == buffer_row {
+                        message
+                            .extend(iter::repeat(' ').take(diagnostic.range.start.column as usize));
+                        diagnostic.range.start.column
+                    } else {
+                        0
+                    };
+                    let end_column = if diagnostic.range.end.row == buffer_row {
+                        diagnostic.range.end.column
+                    } else {
+                        buffer.line_len(buffer_row)
+                    };
+
+                    message.extend(iter::repeat('-').take((end_column - start_column) as usize));
+                    writeln!(message, " {}", diagnostic.diagnostic.message).unwrap();
+                }
+            }
+
+            message.push('\n');
+        }
+
+        writeln!(
+            message,
+            "When quoting the above code, mention which rows the code occurs at."
+        )
+        .unwrap();
+        writeln!(
+            message,
+            "Never include rows in the quoted code itself and only report lines that didn't start with a row number."
+        )
+        .unwrap();
+
+        message
+    }
+}
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -1,37 +1,25 @@
+mod ambient_context;
 pub mod assistant_panel;
 pub mod assistant_settings;
 mod codegen;
 mod completion_provider;
-mod model_selector;
-mod prompt_library;
 mod prompts;
 mod saved_conversation;
-mod search;
-mod slash_command;
 mod streaming_diff;

 pub use assistant_panel::AssistantPanel;
-
-use assistant_settings::{AnthropicModel, AssistantSettings, CloudModel, OpenAiModel};
-use assistant_slash_command::SlashCommandRegistry;
+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, Global, SharedString, UpdateGlobal};
-pub(crate) use model_selector::*;
+use gpui::{actions, AppContext, BorrowAppContext, Global, SharedString};
 pub(crate) use saved_conversation::*;
-use semantic_index::{CloudEmbeddingProvider, SemanticIndex};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore};
-use slash_command::{
-    active_command, default_command, fetch_command, file_command, project_command, prompt_command,
-    rustdoc_command, search_command, tabs_command,
-};
 use std::{
    fmt::{self, Display},
    sync::Arc,
 };
-use util::paths::EMBEDDINGS_DIR;

 actions!(
    assistant,
@@ -43,11 +31,8 @@ actions!(
        ToggleFocus,
        ResetKey,
        InlineAssist,
-        InsertActivePrompt,
+        ToggleIncludeConversation,
        ToggleHistory,
-        ApplyEdit,
-        ConfirmCommand,
-        ToggleModelSelector
    ]
 );

@@ -86,14 +71,14 @@ impl Display for Role {

 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum LanguageModel {
-    Cloud(CloudModel),
+    ZedDotDev(ZedDotDevModel),
    OpenAi(OpenAiModel),
    Anthropic(AnthropicModel),
 }

 impl Default for LanguageModel {
    fn default() -> Self {
-        LanguageModel::Cloud(CloudModel::default())
+        LanguageModel::ZedDotDev(ZedDotDevModel::default())
    }
 }

@@ -102,7 +87,7 @@ impl LanguageModel {
        match self {
            LanguageModel::OpenAi(model) => format!("openai/{}", model.id()),
            LanguageModel::Anthropic(model) => format!("anthropic/{}", model.id()),
-            LanguageModel::Cloud(model) => format!("zed.dev/{}", model.id()),
+            LanguageModel::ZedDotDev(model) => format!("zed.dev/{}", model.id()),
        }
    }

@@ -110,7 +95,7 @@ impl LanguageModel {
        match self {
            LanguageModel::OpenAi(model) => model.display_name().into(),
            LanguageModel::Anthropic(model) => model.display_name().into(),
-            LanguageModel::Cloud(model) => model.display_name().into(),
+            LanguageModel::ZedDotDev(model) => model.display_name().into(),
        }
    }

@@ -118,7 +103,7 @@ impl LanguageModel {
        match self {
            LanguageModel::OpenAi(model) => model.max_token_count(),
            LanguageModel::Anthropic(model) => model.max_token_count(),
-            LanguageModel::Cloud(model) => model.max_token_count(),
+            LanguageModel::ZedDotDev(model) => model.max_token_count(),
        }
    }

@@ -126,7 +111,7 @@ impl LanguageModel {
        match self {
            LanguageModel::OpenAi(model) => model.id(),
            LanguageModel::Anthropic(model) => model.id(),
-            LanguageModel::Cloud(model) => model.id(),
+            LanguageModel::ZedDotDev(model) => model.id(),
        }
    }
 }
@@ -171,20 +156,6 @@ impl LanguageModelRequest {
            tools: Vec::new(),
        }
    }
-
-    /// Before we send the request to the server, we can perform fixups on it appropriate to the model.
-    pub fn preprocess(&mut self) {
-        match &self.model {
-            LanguageModel::OpenAi(_) => {}
-            LanguageModel::Anthropic(_) => {}
-            LanguageModel::Cloud(model) => match model {
-                CloudModel::Claude3Opus | CloudModel::Claude3Sonnet | CloudModel::Claude3Haiku => {
-                    preprocess_anthropic_request(self);
-                }
-                _ => {}
-            },
-        }
-    }
 }

 #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)]
@@ -256,58 +227,27 @@ 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();
-
-    prompt_library::init(cx);
    completion_provider::init(client, cx);
-    assistant_slash_command::init(cx);
-    register_slash_commands(cx);
    assistant_panel::init(cx);

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

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

-fn register_slash_commands(cx: &mut AppContext) {
-    let slash_command_registry = SlashCommandRegistry::global(cx);
-    slash_command_registry.register_command(file_command::FileSlashCommand, true);
-    slash_command_registry.register_command(active_command::ActiveSlashCommand, true);
-    slash_command_registry.register_command(tabs_command::TabsSlashCommand, true);
-    slash_command_registry.register_command(project_command::ProjectSlashCommand, true);
-    slash_command_registry.register_command(search_command::SearchSlashCommand, true);
-    slash_command_registry.register_command(prompt_command::PromptSlashCommand, true);
-    slash_command_registry.register_command(default_command::DefaultSlashCommand, true);
-    slash_command_registry.register_command(rustdoc_command::RustdocSlashCommand, false);
-    slash_command_registry.register_command(fetch_command::FetchSlashCommand, false);
-}
-
 #[cfg(test)]
 #[ctor::ctor]
 fn init_logger() {
--- 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
@@ -12,12 +12,9 @@ use serde::{
    Deserialize, Deserializer, Serialize, Serializer,
 };
 use settings::{Settings, SettingsSources};
-use strum::{EnumIter, IntoEnumIterator};

-use crate::{preprocess_anthropic_request, LanguageModel, LanguageModelRequest};
-
-#[derive(Clone, Debug, Default, PartialEq, EnumIter)]
-pub enum CloudModel {
+#[derive(Clone, Debug, Default, PartialEq)]
+pub enum ZedDotDevModel {
    Gpt3Point5Turbo,
    Gpt4,
    Gpt4Turbo,
@@ -29,7 +26,7 @@ pub enum CloudModel {
    Custom(String),
 }

-impl Serialize for CloudModel {
+impl Serialize for ZedDotDevModel {
    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
    where
        S: Serializer,
@@ -38,7 +35,7 @@ impl Serialize for CloudModel {
    }
 }

-impl<'de> Deserialize<'de> for CloudModel {
+impl<'de> Deserialize<'de> for ZedDotDevModel {
    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
    where
        D: Deserializer<'de>,
@@ -46,7 +43,7 @@ impl<'de> Deserialize<'de> for CloudModel {
        struct ZedDotDevModelVisitor;

        impl<'de> Visitor<'de> for ZedDotDevModelVisitor {
-            type Value = CloudModel;
+            type Value = ZedDotDevModel;

            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
                formatter.write_str("a string for a ZedDotDevModel variant or a custom model")
@@ -56,10 +53,13 @@ impl<'de> Deserialize<'de> for CloudModel {
            where
                E: de::Error,
            {
-                let model = CloudModel::iter()
-                    .find(|model| model.id() == value)
-                    .unwrap_or_else(|| CloudModel::Custom(value.to_string()));
-                Ok(model)
+                match value {
+                    "gpt-3.5-turbo" => Ok(ZedDotDevModel::Gpt3Point5Turbo),
+                    "gpt-4" => Ok(ZedDotDevModel::Gpt4),
+                    "gpt-4-turbo-preview" => Ok(ZedDotDevModel::Gpt4Turbo),
+                    "gpt-4o" => Ok(ZedDotDevModel::Gpt4Omni),
+                    _ => Ok(ZedDotDevModel::Custom(value.to_owned())),
+                }
            }
        }

@@ -67,29 +67,30 @@ impl<'de> Deserialize<'de> for CloudModel {
    }
 }

-impl JsonSchema for CloudModel {
+impl JsonSchema for ZedDotDevModel {
    fn schema_name() -> String {
        "ZedDotDevModel".to_owned()
    }

    fn json_schema(_generator: &mut schemars::gen::SchemaGenerator) -> Schema {
-        let variants = CloudModel::iter()
-            .filter_map(|model| {
-                let id = model.id();
-                if id.is_empty() {
-                    None
-                } else {
-                    Some(id.to_string())
-                }
-            })
-            .collect::<Vec<_>>();
+        let variants = vec![
+            "gpt-3.5-turbo".to_owned(),
+            "gpt-4".to_owned(),
+            "gpt-4-turbo-preview".to_owned(),
+            "gpt-4o".to_owned(),
+        ];
        Schema::Object(SchemaObject {
            instance_type: Some(InstanceType::String.into()),
-            enum_values: Some(variants.iter().map(|s| s.clone().into()).collect()),
+            enum_values: Some(variants.into_iter().map(|s| s.into()).collect()),
            metadata: Some(Box::new(Metadata {
                title: Some("ZedDotDevModel".to_owned()),
-                default: Some(CloudModel::default().id().into()),
-                examples: variants.into_iter().map(Into::into).collect(),
+                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::default()
            })),
            ..Default::default()
@@ -97,7 +98,7 @@ impl JsonSchema for CloudModel {
    }
 }

-impl CloudModel {
+impl ZedDotDevModel {
    pub fn id(&self) -> &str {
        match self {
            Self::Gpt3Point5Turbo => "gpt-3.5-turbo",
@@ -133,15 +134,6 @@ impl CloudModel {
            Self::Custom(_) => 4096, // TODO: Make this configurable
        }
    }
-
-    pub fn preprocess_request(&self, request: &mut LanguageModelRequest) {
-        match self {
-            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => {
-                preprocess_anthropic_request(request)
-            }
-            _ => {}
-        }
-    }
 }

 #[derive(Copy, Clone, Default, Debug, Serialize, Deserialize, JsonSchema)]
@@ -153,53 +145,51 @@ pub enum AssistantDockPosition {
    Bottom,
 }

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

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

-#[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<CloudModel> },
-    #[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>,
-    },
+fn open_ai_url() -> String {
+    open_ai::OPEN_AI_API_URL.to_string()
 }

-#[derive(Debug, Default)]
+fn anthropic_api_url() -> String {
+    anthropic::ANTHROPIC_API_URL.to_string()
+}
+
+#[derive(Default, Debug, Deserialize, Serialize)]
 pub struct AssistantSettings {
    pub enabled: bool,
    pub button: bool,
@@ -250,16 +240,16 @@ 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(AssistantProviderContent::OpenAi {
-                        default_model: settings.default_open_ai_model.clone(),
-                        api_url: Some(open_ai_api_url.clone()),
+                    Some(AssistantProvider::OpenAi {
+                        default_model: settings.default_open_ai_model.clone().unwrap_or_default(),
+                        api_url: open_ai_api_url.clone(),
                        low_speed_timeout_in_seconds: None,
                    })
                } else {
                    settings.default_open_ai_model.clone().map(|open_ai_model| {
-                        AssistantProviderContent::OpenAi {
-                            default_model: Some(open_ai_model),
-                            api_url: None,
+                        AssistantProvider::OpenAi {
+                            default_model: open_ai_model,
+                            api_url: open_ai_url(),
                            low_speed_timeout_in_seconds: None,
                        }
                    })
@@ -280,64 +270,6 @@ 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::Cloud(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::Cloud(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)]
@@ -386,7 +318,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<AssistantProviderContent>,
+    provider: Option<AssistantProvider>,
 }

 #[derive(Clone, Serialize, Deserialize, JsonSchema, Debug)]
@@ -407,11 +339,11 @@ pub struct LegacyAssistantSettingsContent {
    ///
    /// Default: 320
    pub default_height: Option<f32>,
-    /// The default OpenAI model to use when creating new contexts.
+    /// The default OpenAI model to use when starting new conversations.
    ///
    /// Default: gpt-4-1106-preview
    pub default_open_ai_model: Option<OpenAiModel>,
-    /// OpenAI API base URL to use when creating new contexts.
+    /// OpenAI API base URL to use when starting new conversations.
    ///
    /// Default: https://api.openai.com/v1
    pub openai_api_url: Option<String>,
@@ -444,82 +376,31 @@ impl Settings for AssistantSettings {
            if let Some(provider) = value.provider.clone() {
                match (&mut settings.provider, provider) {
                    (
-                        AssistantProvider::ZedDotDev { model },
-                        AssistantProviderContent::ZedDotDev {
-                            default_model: model_override,
+                        AssistantProvider::ZedDotDev { default_model },
+                        AssistantProvider::ZedDotDev {
+                            default_model: default_model_override,
                        },
                    ) => {
-                        merge(model, model_override);
+                        *default_model = default_model_override;
                    }
                    (
                        AssistantProvider::OpenAi {
-                            model,
+                            default_model,
                            api_url,
                            low_speed_timeout_in_seconds,
                        },
-                        AssistantProviderContent::OpenAi {
-                            default_model: model_override,
+                        AssistantProvider::OpenAi {
+                            default_model: default_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);
-                        }
+                        *default_model = default_model_override;
+                        *api_url = api_url_override;
+                        *low_speed_timeout_in_seconds = low_speed_timeout_in_seconds_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,
-                            },
-                        };
+                    (merged, provider_override) => {
+                        *merged = provider_override;
                    }
                }
            }
@@ -529,7 +410,7 @@ impl Settings for AssistantSettings {
    }
 }

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

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

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

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

        // The new version supports setting a custom model when using zed.dev.
-        SettingsStore::update_global(cx, |store, cx| {
+        cx.update_global::<SettingsStore, _>(|store, cx| {
            store
                .set_user_settings(
                    r#"{
@@ -620,7 +501,7 @@ mod tests {
        assert_eq!(
            AssistantSettings::get_global(cx).provider,
            AssistantProvider::ZedDotDev {
-                model: CloudModel::Custom("custom".into())
+                default_model: ZedDotDevModel::Custom("custom".into())
            }
        );
    }
--- a/crates/assistant/src/codegen.rs
+++ b/crates/assistant/src/codegen.rs
@@ -11,7 +11,6 @@ use language::{Rope, TransactionId};
 use multi_buffer::MultiBufferRow;
 use std::{cmp, future, ops::Range, sync::Arc, time::Instant};

-#[derive(Debug)]
 pub enum Event {
    Finished,
    Undone,
@@ -121,98 +120,91 @@ impl Codegen {
                    let mut edit_start = range.start.to_offset(&snapshot);

                    let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);
-                    let diff: Task<anyhow::Result<()>> =
-                        cx.background_executor().spawn(async move {
-                            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 diff = cx.background_executor().spawn(async move {
+                        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 {
-                                    if response_latency.is_none() {
-                                        response_latency = Some(request_start.elapsed());
-                                    }
-                                    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 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 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,
+                                                    );
                                            }
-                                        }

-                                        if line_indent.is_some() {
-                                            hunks_tx.send(diff.push_new(&new_text)).await?;
-                                            new_text.clear();
+                                            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 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?;
-
-                                anyhow::Ok(())
-                            };
-
-                            let result = diff.await;
-
-                            let error_message =
-                                result.as_ref().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,
-                                );
                            }
+                            hunks_tx.send(diff.push_new(&new_text)).await?;
+                            hunks_tx.send(diff.finish()).await?;

-                            result?;
-                            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 {
                        this.update(&mut cx, |this, cx| {
@@ -274,7 +266,7 @@ impl Codegen {
                        })?;
                    }

-                    diff.await?;
+                    diff.await;

                    anyhow::Ok(())
                };
--- a/crates/assistant/src/completion_provider.rs
+++ b/crates/assistant/src/completion_provider.rs
@@ -1,14 +1,14 @@
 mod anthropic;
-mod cloud;
 #[cfg(test)]
 mod fake;
 mod open_ai;
+mod zed;

 pub use anthropic::*;
-pub use cloud::*;
 #[cfg(test)]
 pub use fake::*;
 pub use open_ai::*;
+pub use zed::*;

 use crate::{
    assistant_settings::{AssistantProvider, AssistantSettings},
@@ -25,26 +25,31 @@ 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 { model } => CompletionProvider::Cloud(
-            CloudCompletionProvider::new(model.clone(), client.clone(), settings_version, cx),
-        ),
+        AssistantProvider::ZedDotDev { default_model } => {
+            CompletionProvider::ZedDotDev(ZedDotDevCompletionProvider::new(
+                default_model.clone(),
+                client.clone(),
+                settings_version,
+                cx,
+            ))
+        }
        AssistantProvider::OpenAi {
-            model,
+            default_model,
            api_url,
            low_speed_timeout_in_seconds,
        } => CompletionProvider::OpenAi(OpenAiCompletionProvider::new(
-            model.clone(),
+            default_model.clone(),
            api_url.clone(),
            client.http_client(),
            low_speed_timeout_in_seconds.map(Duration::from_secs),
            settings_version,
        )),
        AssistantProvider::Anthropic {
-            model,
+            default_model,
            api_url,
            low_speed_timeout_in_seconds,
        } => CompletionProvider::Anthropic(AnthropicCompletionProvider::new(
-            model.clone(),
+            default_model.clone(),
            api_url.clone(),
            client.http_client(),
            low_speed_timeout_in_seconds.map(Duration::from_secs),
@@ -60,13 +65,13 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                (
                    CompletionProvider::OpenAi(provider),
                    AssistantProvider::OpenAi {
-                        model,
+                        default_model,
                        api_url,
                        low_speed_timeout_in_seconds,
                    },
                ) => {
                    provider.update(
-                        model.clone(),
+                        default_model.clone(),
                        api_url.clone(),
                        low_speed_timeout_in_seconds.map(Duration::from_secs),
                        settings_version,
@@ -75,24 +80,27 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                (
                    CompletionProvider::Anthropic(provider),
                    AssistantProvider::Anthropic {
-                        model,
+                        default_model,
                        api_url,
                        low_speed_timeout_in_seconds,
                    },
                ) => {
                    provider.update(
-                        model.clone(),
+                        default_model.clone(),
                        api_url.clone(),
                        low_speed_timeout_in_seconds.map(Duration::from_secs),
                        settings_version,
                    );
                }
-                (CompletionProvider::Cloud(provider), AssistantProvider::ZedDotDev { model }) => {
-                    provider.update(model.clone(), settings_version);
+                (
+                    CompletionProvider::ZedDotDev(provider),
+                    AssistantProvider::ZedDotDev { default_model },
+                ) => {
+                    provider.update(default_model.clone(), settings_version);
                }
-                (_, AssistantProvider::ZedDotDev { model }) => {
-                    *provider = CompletionProvider::Cloud(CloudCompletionProvider::new(
-                        model.clone(),
+                (_, AssistantProvider::ZedDotDev { default_model }) => {
+                    *provider = CompletionProvider::ZedDotDev(ZedDotDevCompletionProvider::new(
+                        default_model.clone(),
                        client.clone(),
                        settings_version,
                        cx,
@@ -101,13 +109,13 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                (
                    _,
                    AssistantProvider::OpenAi {
-                        model,
+                        default_model,
                        api_url,
                        low_speed_timeout_in_seconds,
                    },
                ) => {
                    *provider = CompletionProvider::OpenAi(OpenAiCompletionProvider::new(
-                        model.clone(),
+                        default_model.clone(),
                        api_url.clone(),
                        client.http_client(),
                        low_speed_timeout_in_seconds.map(Duration::from_secs),
@@ -117,13 +125,13 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                (
                    _,
                    AssistantProvider::Anthropic {
-                        model,
+                        default_model,
                        api_url,
                        low_speed_timeout_in_seconds,
                    },
                ) => {
                    *provider = CompletionProvider::Anthropic(AnthropicCompletionProvider::new(
-                        model.clone(),
+                        default_model.clone(),
                        api_url.clone(),
                        client.http_client(),
                        low_speed_timeout_in_seconds.map(Duration::from_secs),
@@ -139,7 +147,7 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
 pub enum CompletionProvider {
    OpenAi(OpenAiCompletionProvider),
    Anthropic(AnthropicCompletionProvider),
-    Cloud(CloudCompletionProvider),
+    ZedDotDev(ZedDotDevCompletionProvider),
    #[cfg(test)]
    Fake(FakeCompletionProvider),
 }
@@ -151,30 +159,11 @@ 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::Cloud(provider) => provider
-                .available_models()
-                .map(LanguageModel::Cloud)
-                .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::Cloud(provider) => provider.settings_version(),
+            CompletionProvider::ZedDotDev(provider) => provider.settings_version(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
        }
@@ -184,7 +173,7 @@ impl CompletionProvider {
        match self {
            CompletionProvider::OpenAi(provider) => provider.is_authenticated(),
            CompletionProvider::Anthropic(provider) => provider.is_authenticated(),
-            CompletionProvider::Cloud(provider) => provider.is_authenticated(),
+            CompletionProvider::ZedDotDev(provider) => provider.is_authenticated(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => true,
        }
@@ -194,7 +183,7 @@ impl CompletionProvider {
        match self {
            CompletionProvider::OpenAi(provider) => provider.authenticate(cx),
            CompletionProvider::Anthropic(provider) => provider.authenticate(cx),
-            CompletionProvider::Cloud(provider) => provider.authenticate(cx),
+            CompletionProvider::ZedDotDev(provider) => provider.authenticate(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => Task::ready(Ok(())),
        }
@@ -204,7 +193,7 @@ impl CompletionProvider {
        match self {
            CompletionProvider::OpenAi(provider) => provider.authentication_prompt(cx),
            CompletionProvider::Anthropic(provider) => provider.authentication_prompt(cx),
-            CompletionProvider::Cloud(provider) => provider.authentication_prompt(cx),
+            CompletionProvider::ZedDotDev(provider) => provider.authentication_prompt(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
        }
@@ -214,19 +203,23 @@ impl CompletionProvider {
        match self {
            CompletionProvider::OpenAi(provider) => provider.reset_credentials(cx),
            CompletionProvider::Anthropic(provider) => provider.reset_credentials(cx),
-            CompletionProvider::Cloud(_) => Task::ready(Ok(())),
+            CompletionProvider::ZedDotDev(_) => Task::ready(Ok(())),
            #[cfg(test)]
            CompletionProvider::Fake(_) => Task::ready(Ok(())),
        }
    }

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

@@ -238,9 +231,9 @@ impl CompletionProvider {
        match self {
            CompletionProvider::OpenAi(provider) => provider.count_tokens(request, cx),
            CompletionProvider::Anthropic(provider) => provider.count_tokens(request, cx),
-            CompletionProvider::Cloud(provider) => provider.count_tokens(request, cx),
+            CompletionProvider::ZedDotDev(provider) => provider.count_tokens(request, cx),
            #[cfg(test)]
-            CompletionProvider::Fake(_) => futures::FutureExt::boxed(futures::future::ready(Ok(0))),
+            CompletionProvider::Fake(_) => unimplemented!(),
        }
    }

@@ -251,7 +244,7 @@ impl CompletionProvider {
        match self {
            CompletionProvider::OpenAi(provider) => provider.complete(request),
            CompletionProvider::Anthropic(provider) => provider.complete(request),
-            CompletionProvider::Cloud(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
@@ -1,18 +1,17 @@
+use crate::count_open_ai_tokens;
 use crate::{
    assistant_settings::AnthropicModel, CompletionProvider, LanguageModel, LanguageModelRequest,
    Role,
 };
-use crate::{count_open_ai_tokens, LanguageModelRequestMessage};
-use anthropic::{stream_completion, Request, RequestMessage};
+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 gpui::{AnyView, AppContext, FontStyle, FontWeight, 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;
@@ -20,7 +19,7 @@ use util::ResultExt;
 pub struct AnthropicCompletionProvider {
    api_key: Option<String>,
    api_url: String,
-    model: AnthropicModel,
+    default_model: AnthropicModel,
    http_client: Arc<dyn HttpClient>,
    low_speed_timeout: Option<Duration>,
    settings_version: usize,
@@ -28,7 +27,7 @@ pub struct AnthropicCompletionProvider {

 impl AnthropicCompletionProvider {
    pub fn new(
-        model: AnthropicModel,
+        default_model: AnthropicModel,
        api_url: String,
        http_client: Arc<dyn HttpClient>,
        low_speed_timeout: Option<Duration>,
@@ -37,7 +36,7 @@ impl AnthropicCompletionProvider {
        Self {
            api_key: None,
            api_url,
-            model,
+            default_model,
            http_client,
            low_speed_timeout,
            settings_version,
@@ -46,21 +45,17 @@ impl AnthropicCompletionProvider {

    pub fn update(
        &mut self,
-        model: AnthropicModel,
+        default_model: AnthropicModel,
        api_url: String,
        low_speed_timeout: Option<Duration>,
        settings_version: usize,
    ) {
-        self.model = model;
+        self.default_model = default_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
    }
@@ -110,8 +105,8 @@ impl AnthropicCompletionProvider {
            .into()
    }

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

    pub fn count_tokens(
@@ -167,37 +162,53 @@ impl AnthropicCompletionProvider {
        .boxed()
    }

-    fn to_anthropic_request(&self, mut request: LanguageModelRequest) -> Request {
-        preprocess_anthropic_request(&mut request);
-
+    fn to_anthropic_request(&self, request: LanguageModelRequest) -> Request {
        let model = match request.model {
            LanguageModel::Anthropic(model) => model,
-            _ => self.model(),
+            _ => self.default_model(),
        };

        let mut system_message = String::new();
-        if request
-            .messages
-            .first()
-            .map_or(false, |message| message.role == Role::System)
-        {
-            system_message = request.messages.remove(0).content;
+
+        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: request
-                .messages
-                .iter()
-                .map(|msg| RequestMessage {
-                    role: match msg.role {
-                        Role::User => anthropic::Role::User,
-                        Role::Assistant => anthropic::Role::Assistant,
-                        Role::System => unreachable!("filtered out by preprocess_request"),
-                    },
-                    content: msg.content.clone(),
-                })
-                .collect(),
+            messages,
            stream: true,
            system: system_message,
            max_tokens: 4092,
@@ -205,49 +216,6 @@ impl AnthropicCompletionProvider {
    }
 }

-pub fn preprocess_anthropic_request(request: &mut LanguageModelRequest) {
-    let mut new_messages: Vec<LanguageModelRequestMessage> = Vec::new();
-    let mut system_message = String::new();
-
-    for message in request.messages.drain(..) {
-        if message.content.is_empty() {
-            continue;
-        }
-
-        match message.role {
-            Role::User | Role::Assistant => {
-                if let Some(last_message) = new_messages.last_mut() {
-                    if last_message.role == message.role {
-                        last_message.content.push_str("\n\n");
-                        last_message.content.push_str(&message.content);
-                        continue;
-                    }
-                }
-
-                new_messages.push(message);
-            }
-            Role::System => {
-                if !system_message.is_empty() {
-                    system_message.push_str("\n\n");
-                }
-                system_message.push_str(&message.content);
-            }
-        }
-    }
-
-    if !system_message.is_empty() {
-        request.messages.insert(
-            0,
-            LanguageModelRequestMessage {
-                role: Role::System,
-                content: system_message,
-            },
-        );
-    }
-
-    request.messages = new_messages;
-}
-
 struct AuthenticationPrompt {
    api_key: View<Editor>,
    api_url: String,
@@ -293,7 +261,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: settings.ui_font.weight,
+            font_weight: FontWeight::NORMAL,
            font_style: FontStyle::Normal,
            line_height: relative(1.3),
            background_color: None,
--- a/crates/assistant/src/completion_provider/open_ai.rs
+++ b/crates/assistant/src/completion_provider/open_ai.rs
@@ -1,17 +1,16 @@
-use crate::assistant_settings::CloudModel;
+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, Task, TextStyle, View, WhiteSpace};
+use gpui::{AnyView, AppContext, FontStyle, FontWeight, 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::ResultExt;
@@ -19,7 +18,7 @@ use util::ResultExt;
 pub struct OpenAiCompletionProvider {
    api_key: Option<String>,
    api_url: String,
-    model: OpenAiModel,
+    default_model: OpenAiModel,
    http_client: Arc<dyn HttpClient>,
    low_speed_timeout: Option<Duration>,
    settings_version: usize,
@@ -27,7 +26,7 @@ pub struct OpenAiCompletionProvider {

 impl OpenAiCompletionProvider {
    pub fn new(
-        model: OpenAiModel,
+        default_model: OpenAiModel,
        api_url: String,
        http_client: Arc<dyn HttpClient>,
        low_speed_timeout: Option<Duration>,
@@ -36,7 +35,7 @@ impl OpenAiCompletionProvider {
        Self {
            api_key: None,
            api_url,
-            model,
+            default_model,
            http_client,
            low_speed_timeout,
            settings_version,
@@ -45,21 +44,17 @@ impl OpenAiCompletionProvider {

    pub fn update(
        &mut self,
-        model: OpenAiModel,
+        default_model: OpenAiModel,
        api_url: String,
        low_speed_timeout: Option<Duration>,
        settings_version: usize,
    ) {
-        self.model = model;
+        self.default_model = default_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
    }
@@ -109,8 +104,8 @@ impl OpenAiCompletionProvider {
            .into()
    }

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

    pub fn count_tokens(
@@ -157,7 +152,7 @@ impl OpenAiCompletionProvider {
    fn to_open_ai_request(&self, request: LanguageModelRequest) -> Request {
        let model = match request.model {
            LanguageModel::OpenAi(model) => model,
-            _ => self.model(),
+            _ => self.default_model(),
        };

        Request {
@@ -210,9 +205,9 @@ pub fn count_open_ai_tokens(

            match request.model {
                LanguageModel::Anthropic(_)
-                | LanguageModel::Cloud(CloudModel::Claude3Opus)
-                | LanguageModel::Cloud(CloudModel::Claude3Sonnet)
-                | LanguageModel::Cloud(CloudModel::Claude3Haiku) => {
+                | 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)
@@ -278,7 +273,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: settings.ui_font.weight,
+            font_weight: FontWeight::NORMAL,
            font_style: FontStyle::Normal,
            line_height: relative(1.3),
            background_color: None,
--- a/crates/assistant/src/completion_provider/cloud.rs
+++ b/crates/assistant/src/completion_provider/cloud.rs
@@ -1,5 +1,5 @@
 use crate::{
-    assistant_settings::CloudModel, count_open_ai_tokens, CompletionProvider, LanguageModel,
+    assistant_settings::ZedDotDevModel, count_open_ai_tokens, CompletionProvider, LanguageModel,
    LanguageModelRequest,
 };
 use anyhow::{anyhow, Result};
@@ -7,20 +7,19 @@ 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 CloudCompletionProvider {
+pub struct ZedDotDevCompletionProvider {
    client: Arc<Client>,
-    model: CloudModel,
+    default_model: ZedDotDevModel,
    settings_version: usize,
    status: client::Status,
    _maintain_client_status: Task<()>,
 }

-impl CloudCompletionProvider {
+impl ZedDotDevCompletionProvider {
    pub fn new(
-        model: CloudModel,
+        default_model: ZedDotDevModel,
        client: Arc<Client>,
        settings_version: usize,
        cx: &mut AppContext,
@@ -30,7 +29,7 @@ impl CloudCompletionProvider {
        let maintain_client_status = cx.spawn(|mut cx| async move {
            while let Some(status) = status_rx.next().await {
                let _ = cx.update_global::<CompletionProvider, _>(|provider, _cx| {
-                    if let CompletionProvider::Cloud(provider) = provider {
+                    if let CompletionProvider::ZedDotDev(provider) = provider {
                        provider.status = status;
                    } else {
                        unreachable!()
@@ -40,39 +39,24 @@ impl CloudCompletionProvider {
        });
        Self {
            client,
-            model,
+            default_model,
            settings_version,
            status,
            _maintain_client_status: maintain_client_status,
        }
    }

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

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

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

    pub fn is_authenticated(&self) -> bool {
@@ -94,19 +78,21 @@ impl CloudCompletionProvider {
        cx: &AppContext,
    ) -> BoxFuture<'static, Result<usize>> {
        match request.model {
-            LanguageModel::Cloud(CloudModel::Gpt4)
-            | LanguageModel::Cloud(CloudModel::Gpt4Turbo)
-            | LanguageModel::Cloud(CloudModel::Gpt4Omni)
-            | LanguageModel::Cloud(CloudModel::Gpt3Point5Turbo) => {
+            LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4)
+            | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4Turbo)
+            | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4Omni)
+            | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt3Point5Turbo) => {
                count_open_ai_tokens(request, cx.background_executor())
            }
-            LanguageModel::Cloud(
-                CloudModel::Claude3Opus | CloudModel::Claude3Sonnet | CloudModel::Claude3Haiku,
+            LanguageModel::ZedDotDev(
+                ZedDotDevModel::Claude3Opus
+                | ZedDotDevModel::Claude3Sonnet
+                | ZedDotDevModel::Claude3Haiku,
            ) => {
                // Can't find a tokenizer for Claude 3, so for now just use the same as OpenAI's as an approximation.
                count_open_ai_tokens(request, cx.background_executor())
            }
-            LanguageModel::Cloud(CloudModel::Custom(model)) => {
+            LanguageModel::ZedDotDev(ZedDotDevModel::Custom(model)) => {
                let request = self.client.request(proto::CountTokensWithLanguageModel {
                    model,
                    messages: request
@@ -127,10 +113,8 @@ impl CloudCompletionProvider {

    pub fn complete(
        &self,
-        mut request: LanguageModelRequest,
+        request: LanguageModelRequest,
    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {
-        request.preprocess();
-
        let request = proto::CompleteWithLanguageModel {
            model: request.model.id().to_string(),
            messages: request
--- a/crates/assistant/src/model_selector.rs
+++ b/crates/assistant/src/model_selector.rs
@@ -1,84 +0,0 @@
-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/prompt_library.rs
+++ b/crates/assistant/src/prompt_library.rs
--- a/crates/assistant/src/search.rs
+++ b/crates/assistant/src/search.rs
@@ -1,171 +0,0 @@
-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
@@ -1,333 +0,0 @@
-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 default_command;
-pub mod fetch_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,
-                                                true,
-                                                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),
-                                            true,
-                                            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
@@ -1,105 +0,0 @@
-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()
-                        }),
-                    }],
-                    run_commands_in_text: false,
-                })
-            })
-        });
-        output.unwrap_or_else(|error| Task::ready(Err(error)))
-    }
-}
--- a/crates/assistant/src/slash_command/default_command.rs
+++ b/crates/assistant/src/slash_command/default_command.rs
@@ -1,81 +0,0 @@
-use super::{prompt_command::PromptPlaceholder, SlashCommand, SlashCommandOutput};
-use crate::prompt_library::PromptStore;
-use anyhow::{anyhow, Result};
-use assistant_slash_command::SlashCommandOutputSection;
-use gpui::{AppContext, Task, WeakView};
-use language::LspAdapterDelegate;
-use std::{
-    fmt::Write,
-    sync::{atomic::AtomicBool, Arc},
-};
-use ui::prelude::*;
-use workspace::Workspace;
-
-pub(crate) struct DefaultSlashCommand;
-
-impl SlashCommand for DefaultSlashCommand {
-    fn name(&self) -> String {
-        "default".into()
-    }
-
-    fn description(&self) -> String {
-        "insert default prompt".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert Default Prompt".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancellation_flag: Arc<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 store = PromptStore::global(cx);
-        cx.background_executor().spawn(async move {
-            let store = store.await?;
-            let prompts = store.default_prompt_metadata();
-
-            let mut text = String::new();
-            writeln!(text, "Default Prompt:").unwrap();
-            for prompt in prompts {
-                if let Some(title) = prompt.title {
-                    writeln!(text, "/prompt {}", title).unwrap();
-                }
-            }
-            text.pop();
-
-            Ok(SlashCommandOutput {
-                sections: vec![SlashCommandOutputSection {
-                    range: 0..text.len(),
-                    render_placeholder: Arc::new(move |id, unfold, _cx| {
-                        PromptPlaceholder {
-                            title: "Default".into(),
-                            id,
-                            unfold,
-                        }
-                        .into_any_element()
-                    }),
-                }],
-                text,
-                run_commands_in_text: true,
-            })
-        })
-    }
-}
--- a/crates/assistant/src/slash_command/fetch_command.rs
+++ b/crates/assistant/src/slash_command/fetch_command.rs
@@ -1,134 +0,0 @@
-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 html_to_markdown::convert_html_to_markdown;
-use http::{AsyncBody, HttpClient, HttpClientWithUrl};
-use language::LspAdapterDelegate;
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-use workspace::Workspace;
-
-pub(crate) struct FetchSlashCommand;
-
-impl FetchSlashCommand {
-    async fn build_message(http_client: Arc<HttpClientWithUrl>, url: &str) -> Result<String> {
-        let mut url = url.to_owned();
-        if !url.starts_with("https://") {
-            url = format!("https://{url}");
-        }
-
-        let mut response = http_client.get(&url, AsyncBody::default(), true).await?;
-
-        let mut body = Vec::new();
-        response
-            .body_mut()
-            .read_to_end(&mut body)
-            .await
-            .context("error reading 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_html_to_markdown(&body[..])
-    }
-}
-
-impl SlashCommand for FetchSlashCommand {
-    fn name(&self) -> String {
-        "fetch".into()
-    }
-
-    fn description(&self) -> String {
-        "insert URL contents".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert fetched URL contents".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 URL")));
-        };
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let http_client = workspace.read(cx).client().http_client();
-        let url = argument.to_string();
-
-        let text = cx.background_executor().spawn({
-            let url = url.clone();
-            async move { Self::build_message(http_client, &url).await }
-        });
-
-        let url = SharedString::from(url);
-        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| {
-                        FetchPlaceholder {
-                            id,
-                            unfold,
-                            url: url.clone(),
-                        }
-                        .into_any_element()
-                    }),
-                }],
-                run_commands_in_text: false,
-            })
-        })
-    }
-}
-
-#[derive(IntoElement)]
-struct FetchPlaceholder {
-    pub id: ElementId,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-    pub url: SharedString,
-}
-
-impl RenderOnce for FetchPlaceholder {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        let unfold = self.unfold;
-
-        ButtonLike::new(self.id)
-            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(IconName::AtSign))
-            .child(Label::new(format!("fetch {url}", url = self.url)))
-            .on_click(move |_, cx| unfold(cx))
-    }
-}
--- a/crates/assistant/src/slash_command/file_command.rs
+++ b/crates/assistant/src/slash_command/file_command.rs
@@ -1,226 +0,0 @@
-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()
-                    }),
-                }],
-                run_commands_in_text: false,
-            })
-        })
-    }
-}
-
-#[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
@@ -1,157 +0,0 @@
-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()
-                        }),
-                    }],
-                    run_commands_in_text: false,
-                })
-            })
-        });
-        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
@@ -1,110 +0,0 @@
-use super::{SlashCommand, SlashCommandOutput};
-use crate::prompt_library::PromptStore;
-use anyhow::{anyhow, Context, Result};
-use assistant_slash_command::SlashCommandOutputSection;
-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;
-
-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 store = PromptStore::global(cx);
-        cx.background_executor().spawn(async move {
-            let prompts = store.await?.search(query).await;
-            Ok(prompts
-                .into_iter()
-                .filter_map(|prompt| Some(prompt.title?.to_string()))
-                .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 store = PromptStore::global(cx);
-        let title = SharedString::from(title.to_string());
-        let prompt = cx.background_executor().spawn({
-            let title = title.clone();
-            async move {
-                let store = store.await?;
-                let prompt_id = store
-                    .id_for_title(&title)
-                    .with_context(|| format!("no prompt found with title {:?}", title))?;
-                let body = store.load(prompt_id).await?;
-                anyhow::Ok(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| {
-                        PromptPlaceholder {
-                            id,
-                            unfold,
-                            title: title.clone(),
-                        }
-                        .into_any_element()
-                    }),
-                }],
-                run_commands_in_text: true,
-            })
-        })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct PromptPlaceholder {
-    pub title: SharedString,
-    pub id: ElementId,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-}
-
-impl RenderOnce for PromptPlaceholder {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        let unfold = self.unfold;
-        ButtonLike::new(self.id)
-            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(IconName::Library))
-            .child(Label::new(self.title))
-            .on_click(move |_, cx| unfold(cx))
-    }
-}
--- a/crates/assistant/src/slash_command/rustdoc_command.rs
+++ b/crates/assistant/src/slash_command/rustdoc_command.rs
@@ -1,232 +0,0 @@
-use std::path::Path;
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use anyhow::{anyhow, bail, Context, Result};
-use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandOutputSection};
-use fs::Fs;
-use futures::AsyncReadExt;
-use gpui::{AppContext, Model, Task, WeakView};
-use html_to_markdown::convert_rustdoc_to_markdown;
-use http::{AsyncBody, HttpClient, HttpClientWithUrl};
-use language::LspAdapterDelegate;
-use project::{Project, ProjectPath};
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-use workspace::Workspace;
-
-#[derive(Debug, Clone, Copy)]
-enum RustdocSource {
-    /// The docs were sourced from local `cargo doc` output.
-    Local,
-    /// The docs were sourced from `docs.rs`.
-    DocsDotRs,
-}
-
-pub(crate) struct RustdocSlashCommand;
-
-impl RustdocSlashCommand {
-    async fn build_message(
-        fs: Arc<dyn Fs>,
-        http_client: Arc<HttpClientWithUrl>,
-        crate_name: String,
-        module_path: Vec<String>,
-        path_to_cargo_toml: Option<&Path>,
-    ) -> Result<(RustdocSource, String)> {
-        let cargo_workspace_root = path_to_cargo_toml.and_then(|path| path.parent());
-        if let Some(cargo_workspace_root) = cargo_workspace_root {
-            let mut local_cargo_doc_path = cargo_workspace_root.join("target/doc");
-            local_cargo_doc_path.push(&crate_name);
-            if !module_path.is_empty() {
-                local_cargo_doc_path.push(module_path.join("/"));
-            }
-            local_cargo_doc_path.push("index.html");
-
-            if let Ok(contents) = fs.load(&local_cargo_doc_path).await {
-                return Ok((
-                    RustdocSource::Local,
-                    convert_rustdoc_to_markdown(contents.as_bytes())?,
-                ));
-            }
-        }
-
-        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()
-            );
-        }
-
-        Ok((
-            RustdocSource::DocsDotRs,
-            convert_rustdoc_to_markdown(&body[..])?,
-        ))
-    }
-
-    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 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 project = workspace.read(cx).project().clone();
-        let fs = project.read(cx).fs().clone();
-        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 path_to_cargo_toml = Self::path_to_cargo_toml(project, cx);
-
-        let text = cx.background_executor().spawn({
-            let crate_name = crate_name.clone();
-            let module_path = module_path.clone();
-            async move {
-                Self::build_message(
-                    fs,
-                    http_client,
-                    crate_name,
-                    module_path,
-                    path_to_cargo_toml.as_deref(),
-                )
-                .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 (source, 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,
-                            source,
-                            crate_name: crate_name.clone(),
-                            module_path: module_path.clone(),
-                        }
-                        .into_any_element()
-                    }),
-                }],
-                run_commands_in_text: false,
-            })
-        })
-    }
-}
-
-#[derive(IntoElement)]
-struct RustdocPlaceholder {
-    pub id: ElementId,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-    pub source: RustdocSource,
-    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 ({source}): {crate_path}",
-                source = match self.source {
-                    RustdocSource::Local => "local",
-                    RustdocSource::DocsDotRs => "docs.rs",
-                }
-            )))
-            .on_click(move |_, cx| unfold(cx))
-    }
-}
--- a/crates/assistant/src/slash_command/search_command.rs
+++ b/crates/assistant/src/slash_command/search_command.rs
@@ -1,195 +0,0 @@
-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,
-                        run_commands_in_text: false,
-                    }
-                })
-                .await;
-
-            Ok(output)
-        })
-    }
-}
--- a/crates/assistant/src/slash_command/tabs_command.rs
+++ b/crates/assistant/src/slash_command/tabs_command.rs
@@ -1,121 +0,0 @@
-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,
-                    run_commands_in_text: false,
-                })
-            }),
-            Err(error) => Task::ready(Err(error)),
-        }
-    }
-}
--- a/crates/assistant/src/system_prompts/edits.md
+++ b/crates/assistant/src/system_prompts/edits.md
@@ -1,86 +0,0 @@
-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
@@ -0,0 +1,66 @@
+[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
+chrono.workspace = true
+collections.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
+language.workspace = true
+log.workspace = true
+markdown.workspace = true
+open_ai.workspace = true
+picker.workspace = true
+project.workspace = true
+regex.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
+unindent.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
+markdown = { workspace = true, features = ["test-support"] }
+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"] }
+http = { workspace = true, features = ["test-support"] }
+workspace = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_slash_command/LICENSE-GPL
+++ b/crates/assistant_slash_command/LICENSE-GPL
--- a/crates/assistant2/evals/list-of-into-element.md
+++ b/crates/assistant2/evals/list-of-into-element.md
@@ -0,0 +1 @@
+> 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
@@ -0,0 +1 @@
+> 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
@@ -0,0 +1,3 @@
+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
@@ -0,0 +1 @@
+> 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
@@ -0,0 +1,26 @@
+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
@@ -0,0 +1,3 @@
+mod active_file;
+
+pub use active_file::*;
--- a/crates/assistant2/src/attachments/active_file.rs
+++ b/crates/assistant2/src/attachments/active_file.rs
@@ -0,0 +1,144 @@
+use std::{path::PathBuf, sync::Arc};
+
+use anyhow::{anyhow, Result};
+use assistant_tooling::{AttachmentOutput, LanguageModelAttachment, ProjectContext};
+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 AttachmentOutput 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
@@ -0,0 +1,183 @@
+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
@@ -0,0 +1,90 @@
+use std::cmp::Reverse;
+use std::ffi::OsStr;
+use std::path::PathBuf;
+use std::sync::Arc;
+
+use anyhow::Result;
+use assistant_tooling::{SavedToolFunctionCall, SavedUserAttachment};
+use fs::Fs;
+use futures::StreamExt;
+use gpui::SharedString;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use util::paths::CONVERSATIONS_DIR;
+
+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>,
+}
+
+pub struct SavedConversationMetadata {
+    pub title: String,
+    pub path: PathBuf,
+    pub mtime: chrono::DateTime<chrono::Local>,
+}
+
+impl SavedConversationMetadata {
+    pub async fn list(fs: Arc<dyn Fs>) -> Result<Vec<Self>> {
+        fs.create_dir(&CONVERSATIONS_DIR).await?;
+
+        let mut paths = fs.read_dir(&CONVERSATIONS_DIR).await?;
+        let mut conversations = Vec::new();
+        while let Some(path) = paths.next().await {
+            let path = path?;
+            if path.extension() != Some(OsStr::new("json")) {
+                continue;
+            }
+
+            let pattern = r" - \d+.zed.\d.\d.\d.json$";
+            let re = Regex::new(pattern).unwrap();
+
+            let metadata = fs.metadata(&path).await?;
+            if let Some((file_name, metadata)) = path
+                .file_name()
+                .and_then(|name| name.to_str())
+                .zip(metadata)
+            {
+                // This is used to filter out conversations saved by the old assistant.
+                if !re.is_match(file_name) {
+                    continue;
+                }
+
+                let title = re.replace(file_name, "");
+                conversations.push(Self {
+                    title: title.into_owned(),
+                    path,
+                    mtime: metadata.mtime.into(),
+                });
+            }
+        }
+        conversations.sort_unstable_by_key(|conversation| Reverse(conversation.mtime));
+
+        Ok(conversations)
+    }
+}
--- a/crates/assistant2/src/saved_conversations.rs
+++ b/crates/assistant2/src/saved_conversations.rs
@@ -0,0 +1,196 @@
+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 crate::saved_conversation::SavedConversationMetadata;
+
+pub struct SavedConversations {
+    focus_handle: FocusHandle,
+    picker: Option<View<Picker<SavedConversationPickerDelegate>>>,
+}
+
+impl EventEmitter<DismissEvent> for SavedConversations {}
+
+impl FocusableView for SavedConversations {
+    fn focus_handle(&self, cx: &AppContext) -> FocusHandle {
+        if let Some(picker) = self.picker.as_ref() {
+            picker.focus_handle(cx)
+        } else {
+            self.focus_handle.clone()
+        }
+    }
+}
+
+impl SavedConversations {
+    pub fn new(cx: &mut ViewContext<Self>) -> Self {
+        Self {
+            focus_handle: cx.focus_handle(),
+            picker: None,
+        }
+    }
+
+    pub fn init(
+        &mut self,
+        saved_conversations: Vec<SavedConversationMetadata>,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let delegate =
+            SavedConversationPickerDelegate::new(cx.view().downgrade(), saved_conversations);
+        self.picker = Some(cx.new_view(|cx| Picker::uniform_list(delegate, cx).modal(false)));
+    }
+}
+
+impl Render for SavedConversations {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        v_flex()
+            .w_full()
+            .bg(cx.theme().colors().panel_background)
+            .children(self.picker.clone())
+    }
+}
+
+pub struct SavedConversationPickerDelegate {
+    view: WeakView<SavedConversations>,
+    saved_conversations: Vec<SavedConversationMetadata>,
+    selected_index: usize,
+    matches: Vec<StringMatch>,
+}
+
+impl SavedConversationPickerDelegate {
+    pub fn new(
+        weak_view: WeakView<SavedConversations>,
+        saved_conversations: Vec<SavedConversationMetadata>,
+    ) -> Self {
+        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)
+                .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
@@ -0,0 +1,7 @@
+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
@@ -0,0 +1,304 @@
+use anyhow::Result;
+use assistant_tooling::{LanguageModelTool, ProjectContext, ToolView};
+use editor::{
+    display_map::{BlockContext, BlockDisposition, BlockProperties, BlockStyle},
+    Editor, MultiBuffer,
+};
+use futures::{channel::mpsc::UnboundedSender, StreamExt as _};
+use gpui::{prelude::*, AnyElement, AsyncWindowContext, 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(Default, Debug, Deserialize, JsonSchema, Clone)]
+pub struct AnnotationInput {
+    /// Name for this set of annotations
+    #[serde(default = "default_title")]
+    title: String,
+    /// Excerpts from the file to show to the user.
+    excerpts: Vec<Excerpt>,
+}
+
+fn default_title() -> String {
+    "Untitled".to_string()
+}
+
+#[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 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 view(&self, cx: &mut WindowContext) -> View<Self::View> {
+        cx.new_view(|cx| {
+            let (tx, mut rx) = futures::channel::mpsc::unbounded();
+            cx.spawn(|view, mut cx| async move {
+                while let Some(excerpt) = rx.next().await {
+                    AnnotationResultView::add_excerpt(view.clone(), excerpt, &mut cx).await?;
+                }
+                anyhow::Ok(())
+            })
+            .detach();
+
+            AnnotationResultView {
+                project: self.project.clone(),
+                workspace: self.workspace.clone(),
+                tx,
+                pending_excerpt: None,
+                added_editor_to_workspace: false,
+                editor: None,
+                error: None,
+                rendered_excerpt_count: 0,
+            }
+        })
+    }
+}
+
+pub struct AnnotationResultView {
+    workspace: WeakView<Workspace>,
+    project: Model<Project>,
+    pending_excerpt: Option<Excerpt>,
+    added_editor_to_workspace: bool,
+    editor: Option<View<Editor>>,
+    tx: UnboundedSender<Excerpt>,
+    error: Option<anyhow::Error>,
+    rendered_excerpt_count: usize,
+}
+
+impl AnnotationResultView {
+    async fn add_excerpt(
+        this: WeakView<Self>,
+        excerpt: Excerpt,
+        cx: &mut AsyncWindowContext,
+    ) -> Result<()> {
+        let project = this.update(cx, |this, _cx| this.project.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 Err(anyhow::anyhow!("No worktree found"));
+        };
+
+        let buffer_task = project.update(cx, |project, cx| {
+            project.open_buffer(
+                ProjectPath {
+                    worktree_id,
+                    path: Path::new(&excerpt.path).into(),
+                },
+                cx,
+            )
+        })?;
+
+        let buffer = match buffer_task.await {
+            Ok(buffer) => buffer,
+            Err(error) => {
+                return this.update(cx, |this, cx| {
+                    this.error = Some(error);
+                    cx.notify();
+                })
+            }
+        };
+
+        let snapshot = buffer.update(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
+            );
+            return Ok(());
+        };
+
+        this.update(cx, |this, cx| {
+            let mut start = first_match.start.to_point(&snapshot);
+            start.column = 0;
+
+            if let Some(editor) = &this.editor {
+                editor.update(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);
+                    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,
+                    );
+                });
+
+                if !this.added_editor_to_workspace {
+                    this.added_editor_to_workspace = true;
+                    this.workspace
+                        .update(cx, |workspace, cx| {
+                            workspace.add_item_to_active_pane(Box::new(editor.clone()), None, cx);
+                        })
+                        .log_err();
+                }
+            }
+        })?;
+
+        Ok(())
+    }
+
+    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()
+    }
+}
+
+impl Render for AnnotationResultView {
+    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
+        if let Some(error) = &self.error {
+            ui::Label::new(error.to_string()).into_any_element()
+        } else {
+            ui::Label::new(SharedString::from(format!(
+                "Opened a buffer with {} excerpts",
+                self.rendered_excerpt_count
+            )))
+            .into_any_element()
+        }
+    }
+}
+
+impl ToolView for AnnotationResultView {
+    type Input = AnnotationInput;
+    type SerializedState = Option<String>;
+
+    fn generate(&self, _: &mut ProjectContext, _: &mut ViewContext<Self>) -> String {
+        if let Some(error) = &self.error {
+            format!("Failed to create buffer: {error:?}")
+        } else {
+            format!(
+                "opened {} excerpts in a buffer",
+                self.rendered_excerpt_count
+            )
+        }
+    }
+
+    fn set_input(&mut self, mut input: Self::Input, cx: &mut ViewContext<Self>) {
+        let editor = if let Some(editor) = &self.editor {
+            editor.clone()
+        } else {
+            let multibuffer = cx.new_model(|_cx| {
+                MultiBuffer::new(0, language::Capability::ReadWrite).with_title(String::new())
+            });
+            let editor = cx.new_view(|cx| {
+                Editor::for_multibuffer(multibuffer.clone(), Some(self.project.clone()), cx)
+            });
+
+            self.editor = Some(editor.clone());
+            editor
+        };
+
+        editor.update(cx, |editor, cx| {
+            editor.buffer().update(cx, |multibuffer, cx| {
+                if multibuffer.title(cx) != input.title {
+                    multibuffer.set_title(input.title.clone(), cx);
+                }
+            });
+
+            self.pending_excerpt = input.excerpts.pop();
+            for excerpt in input.excerpts.iter().skip(self.rendered_excerpt_count) {
+                self.tx.unbounded_send(excerpt.clone()).ok();
+            }
+            self.rendered_excerpt_count = input.excerpts.len();
+        });
+
+        cx.notify();
+    }
+
+    fn execute(&mut self, _cx: &mut ViewContext<Self>) -> Task<Result<()>> {
+        if let Some(excerpt) = self.pending_excerpt.take() {
+            self.rendered_excerpt_count += 1;
+            self.tx.unbounded_send(excerpt.clone()).ok();
+        }
+
+        self.tx.close_channel();
+        Task::ready(Ok(()))
+    }
+
+    fn serialize(&self, _cx: &mut ViewContext<Self>) -> Self::SerializedState {
+        self.error.as_ref().map(|error| error.to_string())
+    }
+
+    fn deserialize(
+        &mut self,
+        output: Self::SerializedState,
+        _cx: &mut ViewContext<Self>,
+    ) -> Result<()> {
+        if let Some(error_message) = output {
+            self.error = Some(anyhow::anyhow!("{}", error_message));
+        }
+        Ok(())
+    }
+}
--- a/crates/assistant2/src/tools/create_buffer.rs
+++ b/crates/assistant2/src/tools/create_buffer.rs
@@ -0,0 +1,145 @@
+use anyhow::{anyhow, Result};
+use assistant_tooling::{LanguageModelTool, ProjectContext, ToolView};
+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, Clone, 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 View = CreateBufferView;
+
+    fn name(&self) -> String {
+        "create_file".to_string()
+    }
+
+    fn description(&self) -> String {
+        "Create a new untitled file in the current codebase. Side effect: opens it in a new pane/tab for the user to edit.".to_string()
+    }
+
+    fn view(&self, cx: &mut WindowContext) -> View<Self::View> {
+        cx.new_view(|_cx| CreateBufferView {
+            workspace: self.workspace.clone(),
+            project: self.project.clone(),
+            input: None,
+            error: None,
+        })
+    }
+}
+
+pub struct CreateBufferView {
+    workspace: WeakView<Workspace>,
+    project: Model<Project>,
+    input: Option<CreateBufferInput>,
+    error: Option<anyhow::Error>,
+}
+
+impl Render for CreateBufferView {
+    fn render(&mut self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
+        ui::Label::new("Opening a buffer")
+    }
+}
+
+impl ToolView for CreateBufferView {
+    type Input = CreateBufferInput;
+
+    type SerializedState = ();
+
+    fn generate(&self, _project: &mut ProjectContext, _cx: &mut ViewContext<Self>) -> String {
+        let Some(input) = self.input.as_ref() else {
+            return "No input".to_string();
+        };
+
+        match &self.error {
+            None => format!("Created a new {} buffer", input.language),
+            Some(err) => format!("Failed to create buffer: {err:?}"),
+        }
+    }
+
+    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<()>> {
+        cx.spawn({
+            let workspace = self.workspace.clone();
+            let project = self.project.clone();
+            let input = self.input.clone();
+            |_this, mut cx| async move {
+                let input = input.ok_or_else(|| anyhow!("no input"))?;
+
+                let text = input.text.clone();
+                let language_name = input.language.clone();
+                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 serialize(&self, _cx: &mut ViewContext<Self>) -> Self::SerializedState {
+        ()
+    }
+
+    fn deserialize(
+        &mut self,
+        _output: Self::SerializedState,
+        _cx: &mut ViewContext<Self>,
+    ) -> Result<()> {
+        Ok(())
+    }
+}
--- a/crates/assistant2/src/tools/project_index.rs
+++ b/crates/assistant2/src/tools/project_index.rs
@@ -0,0 +1,428 @@
+use anyhow::Result;
+use assistant_tooling::{LanguageModelTool, ToolView};
+use collections::BTreeMap;
+use file_icons::FileIcons;
+use gpui::{prelude::*, AnyElement, Model, Task};
+use project::ProjectPath;
+use schemars::JsonSchema;
+use semantic_index::{ProjectIndex, Status};
+use serde::{Deserialize, Serialize};
+use std::{
+    fmt::Write as _,
+    ops::Range,
+    path::{Path, PathBuf},
+    str::FromStr as _,
+    sync::Arc,
+};
+use ui::{prelude::*, CollapsibleContainer, Color, Icon, IconName, Label, WindowContext};
+
+const DEFAULT_SEARCH_LIMIT: usize = 20;
+
+pub struct ProjectIndexTool {
+    project_index: Model<ProjectIndex>,
+}
+
+#[derive(Default)]
+enum ProjectIndexToolState {
+    #[default]
+    CollectingQuery,
+    Searching,
+    Error(anyhow::Error),
+    Finished {
+        excerpts: BTreeMap<ProjectPath, Vec<Range<usize>>>,
+        index_status: Status,
+    },
+}
+
+pub struct ProjectIndexView {
+    project_index: Model<ProjectIndex>,
+    input: CodebaseQuery,
+    expanded_header: bool,
+    state: ProjectIndexToolState,
+}
+
+#[derive(Default, Deserialize, JsonSchema)]
+pub struct CodebaseQuery {
+    /// Semantic search query
+    query: String,
+    /// Criteria to include results
+    includes: Option<SearchFilter>,
+    /// Criteria to exclude results
+    excludes: Option<SearchFilter>,
+}
+
+#[derive(Deserialize, JsonSchema, Clone, Default)]
+pub struct SearchFilter {
+    /// Filter by file path prefix
+    prefix_path: Option<String>,
+    /// Filter by file extension
+    extension: Option<String>,
+    // Note: we possibly can't do content filtering very easily given the project context handling
+    // the final results, so we're leaving out direct string matches for now
+}
+
+fn project_starts_with(prefix_path: Option<String>, project_path: ProjectPath) -> bool {
+    if let Some(path) = &prefix_path {
+        if let Some(path) = PathBuf::from_str(path).ok() {
+            return project_path.path.starts_with(path);
+        }
+    }
+
+    return false;
+}
+
+impl SearchFilter {
+    fn matches(&self, project_path: &ProjectPath) -> bool {
+        let path_match = project_starts_with(self.prefix_path.clone(), project_path.clone());
+
+        path_match
+            && (if let Some(extension) = &self.extension {
+                project_path
+                    .path
+                    .extension()
+                    .and_then(|ext| ext.to_str())
+                    .map(|ext| ext == extension)
+                    .unwrap_or(false)
+            } else {
+                true
+            })
+    }
+}
+
+#[derive(Serialize, Deserialize)]
+pub struct SerializedState {
+    index_status: Status,
+    error_message: Option<String>,
+    worktrees: BTreeMap<Arc<Path>, WorktreeIndexOutput>,
+}
+
+#[derive(Default, 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();
+    }
+
+    fn render_filter_section(
+        &mut self,
+        heading: &str,
+        filter: Option<SearchFilter>,
+        cx: &mut ViewContext<Self>,
+    ) -> Option<AnyElement> {
+        let filter = match filter {
+            Some(filter) => filter,
+            None => return None,
+        };
+
+        // Any of the filter fields can be empty. We'll show nothing if they're all empty.
+        let path = filter.prefix_path.as_ref().map(|path| {
+            let icon_path = FileIcons::get_icon(Path::new(path), cx)
+                .map(SharedString::from)
+                .unwrap_or_else(|| SharedString::from("icons/file_icons/file.svg"));
+
+            h_flex()
+                .gap_1()
+                .child("Paths: ")
+                .child(Icon::from_path(icon_path))
+                .child(ui::Label::new(path.clone()).color(Color::Muted))
+        });
+
+        let extension = filter.extension.as_ref().map(|extension| {
+            let icon_path = FileIcons::get_icon(Path::new(extension), cx)
+                .map(SharedString::from)
+                .unwrap_or_else(|| SharedString::from("icons/file_icons/file.svg"));
+
+            h_flex()
+                .gap_1()
+                .child("Extensions: ")
+                .child(Icon::from_path(icon_path))
+                .child(ui::Label::new(extension.clone()).color(Color::Muted))
+        });
+
+        if path.is_none() && extension.is_none() {
+            return None;
+        }
+
+        Some(
+            v_flex()
+                .child(ui::Label::new(heading.to_string()))
+                .gap_1()
+                .children(path)
+                .children(extension)
+                .into_any_element(),
+        )
+    }
+}
+
+impl Render for ProjectIndexView {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
+        let query = self.input.query.clone();
+
+        let (header_text, content) = match &self.state {
+            ProjectIndexToolState::Error(error) => {
+                return format!("failed to search: {error:?}").into_any_element()
+            }
+            ProjectIndexToolState::CollectingQuery | ProjectIndexToolState::Searching => {
+                ("Searching...".to_string(), div())
+            }
+            ProjectIndexToolState::Finished { excerpts, .. } => {
+                let file_count = excerpts.len();
+
+                if excerpts.is_empty() {
+                    ("No results found".to_string(), div())
+                } else {
+                    let header_text = format!(
+                        "Read {} {}",
+                        file_count,
+                        if file_count == 1 { "file" } else { "files" }
+                    );
+
+                    let el = 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),
+                        )
+                    }));
+
+                    (header_text, el)
+                }
+            }
+        };
+
+        let header = h_flex()
+            .gap_2()
+            .child(Icon::new(IconName::File))
+            .child(header_text);
+
+        v_flex()
+            .gap_3()
+            .child(
+                CollapsibleContainer::new("collapsible-container", 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)),
+                            )
+                            .children(self.render_filter_section(
+                                "Includes",
+                                self.input.includes.clone(),
+                                cx,
+                            ))
+                            .children(self.render_filter_section(
+                                "Excludes",
+                                self.input.excludes.clone(),
+                                cx,
+                            ))
+                            .child(content),
+                    ),
+            )
+            .into_any_element()
+    }
+}
+
+impl ToolView for ProjectIndexView {
+    type Input = CodebaseQuery;
+    type SerializedState = SerializedState;
+
+    fn generate(
+        &self,
+        context: &mut assistant_tooling::ProjectContext,
+        _: &mut ViewContext<Self>,
+    ) -> String {
+        match &self.state {
+            ProjectIndexToolState::CollectingQuery => String::new(),
+            ProjectIndexToolState::Searching => String::new(),
+            ProjectIndexToolState::Error(error) => format!("failed to search: {error:?}"),
+            ProjectIndexToolState::Finished {
+                excerpts,
+                index_status,
+            } => {
+                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 *index_status != Status::Idle {
+                    body.push_str("Still indexing. Results may be incomplete.\n");
+                }
+
+                body
+            }
+        }
+    }
+
+    fn set_input(&mut self, input: Self::Input, cx: &mut ViewContext<Self>) {
+        self.input = input;
+        cx.notify();
+    }
+
+    fn execute(&mut self, cx: &mut ViewContext<Self>) -> Task<Result<()>> {
+        self.state = ProjectIndexToolState::Searching;
+        cx.notify();
+
+        let project_index = self.project_index.read(cx);
+        let index_status = project_index.status();
+
+        // TODO: wire the filters into the search here instead of processing after.
+        // Otherwise we'll get zero results sometimes.
+        let search = project_index.search(self.input.query.clone(), DEFAULT_SEARCH_LIMIT, cx);
+
+        let includes = self.input.includes.clone();
+        let excludes = self.input.excludes.clone();
+
+        cx.spawn(|this, mut cx| async move {
+            let search_result = search.await;
+            this.update(&mut cx, |this, cx| {
+                match search_result {
+                    Ok(search_results) => {
+                        let mut excerpts = BTreeMap::<ProjectPath, Vec<Range<usize>>>::new();
+                        for search_result in search_results {
+                            let project_path = ProjectPath {
+                                worktree_id: search_result.worktree.read(cx).id(),
+                                path: search_result.path,
+                            };
+
+                            if let Some(includes) = &includes {
+                                if !includes.matches(&project_path) {
+                                    continue;
+                                }
+                            } else if let Some(excludes) = &excludes {
+                                if excludes.matches(&project_path) {
+                                    continue;
+                                }
+                            }
+
+                            excerpts
+                                .entry(project_path)
+                                .or_default()
+                                .push(search_result.range);
+                        }
+                        this.state = ProjectIndexToolState::Finished {
+                            excerpts,
+                            index_status,
+                        };
+                    }
+                    Err(error) => {
+                        this.state = ProjectIndexToolState::Error(error);
+                    }
+                }
+                cx.notify();
+            })
+        })
+    }
+
+    fn serialize(&self, cx: &mut ViewContext<Self>) -> Self::SerializedState {
+        let mut serialized = SerializedState {
+            error_message: None,
+            index_status: Status::Idle,
+            worktrees: Default::default(),
+        };
+        match &self.state {
+            ProjectIndexToolState::Error(err) => serialized.error_message = Some(err.to_string()),
+            ProjectIndexToolState::Finished {
+                excerpts,
+                index_status,
+            } => {
+                serialized.index_status = *index_status;
+                if let Some(project) = self.project_index.read(cx).project().upgrade() {
+                    let project = project.read(cx);
+                    for (project_path, excerpts) in excerpts {
+                        if let Some(worktree) =
+                            project.worktree_for_id(project_path.worktree_id, cx)
+                        {
+                            let worktree_path = worktree.read(cx).abs_path();
+                            serialized
+                                .worktrees
+                                .entry(worktree_path)
+                                .or_default()
+                                .excerpts
+                                .insert(project_path.path.clone(), excerpts.clone());
+                        }
+                    }
+                }
+            }
+            _ => {}
+        }
+        serialized
+    }
+
+    fn deserialize(
+        &mut self,
+        serialized: Self::SerializedState,
+        cx: &mut ViewContext<Self>,
+    ) -> Result<()> {
+        if !serialized.worktrees.is_empty() {
+            let mut excerpts = BTreeMap::<ProjectPath, Vec<Range<usize>>>::new();
+            if let Some(project) = self.project_index.read(cx).project().upgrade() {
+                let project = project.read(cx);
+                for (worktree_path, worktree_state) in serialized.worktrees {
+                    if let Some(worktree) = project
+                        .worktrees()
+                        .find(|worktree| worktree.read(cx).abs_path() == worktree_path)
+                    {
+                        let worktree_id = worktree.read(cx).id();
+                        for (path, serialized_excerpts) in worktree_state.excerpts {
+                            excerpts.insert(ProjectPath { worktree_id, path }, serialized_excerpts);
+                        }
+                    }
+                }
+            }
+            self.state = ProjectIndexToolState::Finished {
+                excerpts,
+                index_status: serialized.index_status,
+            };
+        }
+        cx.notify();
+        Ok(())
+    }
+}
+
+impl ProjectIndexTool {
+    pub fn new(project_index: Model<ProjectIndex>) -> Self {
+        Self { project_index }
+    }
+}
+
+impl LanguageModelTool for ProjectIndexTool {
+    type View = ProjectIndexView;
+
+    fn name(&self) -> String {
+        "semantic_search_codebase".to_string()
+    }
+
+    fn description(&self) -> String {
+        unindent::unindent(
+            r#"This search tool uses a semantic index to perform search queries across your codebase, identifying and returning excerpts of text and code possibly related to the query.
+
+            Ideal for:
+            - Discovering implementations of similar logic within the project
+            - Finding usage examples of functions, classes/structures, libraries, and other code elements
+            - Developing understanding of the codebase's architecture and design
+
+            Note: The search's effectiveness is directly related to the current state of the codebase and the specificity of your query. It is recommended that you use snippets of code that are similar to the code you wish to find."#,
+        )
+    }
+
+    fn view(&self, cx: &mut WindowContext) -> gpui::View<Self::View> {
+        cx.new_view(|_| ProjectIndexView {
+            state: ProjectIndexToolState::CollectingQuery,
+            input: Default::default(),
+            expanded_header: false,
+            project_index: self.project_index.clone(),
+        })
+    }
+}
--- a/crates/assistant2/src/ui.rs
+++ b/crates/assistant2/src/ui.rs
@@ -0,0 +1,17 @@
+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
@@ -0,0 +1,134 @@
+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
@@ -0,0 +1,140 @@
+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().w_full().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
@@ -0,0 +1,71 @@
+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
@@ -0,0 +1,193 @@
+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
@@ -0,0 +1,112 @@
+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
@@ -0,0 +1,5 @@
+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
@@ -0,0 +1,101 @@
+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
@@ -0,0 +1,22 @@
+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
@@ -1,21 +0,0 @@
-[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/src/assistant_slash_command.rs
+++ b/crates/assistant_slash_command/src/assistant_slash_command.rs
@@ -1,62 +0,0 @@
-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>>,
-    pub run_commands_in_text: bool,
-}
-
-#[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
@@ -1,78 +0,0 @@
-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/audio/src/assets.rs
+++ b/crates/audio/src/assets.rs
@@ -41,12 +41,7 @@ impl SoundRegistry {
        }

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

--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -237,9 +237,8 @@ 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), true, cx)
-                            });
+                            let editor = cx
+                                .new_view(|cx| Editor::for_multibuffer(buffer, Some(project), cx));
                            let workspace_handle = workspace.weak_handle();
                            let view: View<MarkdownPreviewView> = MarkdownPreviewView::new(
                                MarkdownPreviewMode::Default,
@@ -342,16 +341,6 @@ 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/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -62,7 +62,6 @@ pub struct ChannelStore {
    opened_buffers: HashMap<ChannelId, OpenedModelHandle<ChannelBuffer>>,
    opened_chats: HashMap<ChannelId, OpenedModelHandle<ChannelChat>>,
    client: Arc<Client>,
-    did_subscribe: bool,
    user_store: Model<UserStore>,
    _rpc_subscriptions: [Subscription; 2],
    _watch_connection_status: Task<Option<()>>,
@@ -124,7 +123,6 @@ impl Channel {
    }
 }

-#[derive(Debug)]
 pub struct ChannelMembership {
    pub user: Arc<User>,
    pub kind: proto::channel_member::Kind,
@@ -244,20 +242,6 @@ impl ChannelStore {
                .log_err();
            }),
            channel_states: Default::default(),
-            did_subscribe: false,
-        }
-    }
-
-    pub fn initialize(&mut self) {
-        if !self.did_subscribe {
-            if self
-                .client
-                .send(proto::SubscribeToChannels {})
-                .log_err()
-                .is_some()
-            {
-                self.did_subscribe = true;
-            }
        }
    }

@@ -831,11 +815,9 @@ impl ChannelStore {
            Ok(())
        })
    }
-    pub fn fuzzy_search_members(
+    pub fn get_channel_member_details(
        &self,
        channel_id: ChannelId,
-        query: String,
-        limit: u16,
        cx: &mut ModelContext<Self>,
    ) -> Task<Result<Vec<ChannelMembership>>> {
        let client = self.client.clone();
@@ -844,24 +826,26 @@ impl ChannelStore {
            let response = client
                .request(proto::GetChannelMembers {
                    channel_id: channel_id.0,
-                    query,
-                    limit: limit as u64,
                })
                .await?;
-            user_store.update(&mut cx, |user_store, _| {
-                user_store.insert(response.users);
-                response
-                    .members
-                    .into_iter()
-                    .filter_map(|member| {
-                        Some(ChannelMembership {
-                            user: user_store.get_cached_user(member.user_id)?,
-                            role: member.role(),
-                            kind: member.kind(),
-                        })
-                    })
-                    .collect()
-            })
+
+            let user_ids = response.members.iter().map(|m| m.user_id).collect();
+            let user_store = user_store
+                .upgrade()
+                .ok_or_else(|| anyhow!("user store dropped"))?;
+            let users = user_store
+                .update(&mut cx, |user_store, cx| user_store.get_users(user_ids, cx))?
+                .await?;
+
+            Ok(users
+                .into_iter()
+                .zip(response.members)
+                .map(|(user, member)| ChannelMembership {
+                    user,
+                    role: member.role(),
+                    kind: member.kind(),
+                })
+                .collect())
        })
    }

@@ -1050,7 +1034,7 @@ impl ChannelStore {

    fn handle_disconnect(&mut self, wait_for_reconnect: bool, cx: &mut ModelContext<Self>) {
        cx.notify();
-        self.did_subscribe = false;
+
        self.disconnect_channel_buffers_task.get_or_insert_with(|| {
            cx.spawn(move |this, mut cx| async move {
                if wait_for_reconnect {
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -60,13 +60,6 @@ fn parse_path_with_position(
 }

 fn main() -> Result<()> {
-    // Exit flatpak sandbox if needed
-    #[cfg(target_os = "linux")]
-    {
-        flatpak::try_restart_to_host();
-        flatpak::ld_extra_libs();
-    }
-
    // Intercept version designators
    #[cfg(target_os = "macos")]
    if let Some(channel) = std::env::args().nth(1).filter(|arg| arg.starts_with("--")) {
@@ -79,9 +72,6 @@ fn main() -> Result<()> {
    }
    let args = Args::parse();

-    #[cfg(target_os = "linux")]
-    let args = flatpak::set_bin_if_no_escape(args);
-
    let app = Detect::detect(args.zed.as_deref()).context("Bundle detection")?;

    if args.version {
@@ -191,15 +181,14 @@ mod linux {
                let cli = env::current_exe()?;
                let dir = cli
                    .parent()
-                    .and_then(Path::parent)
                    .ok_or_else(|| anyhow!("no parent path for cli"))?;

-                match dir.join("libexec").join("zed-editor").canonicalize() {
+                match dir.join("zed").canonicalize() {
                    Ok(path) => Ok(path),
-                    // In development cli and zed are in the ./target/ directory together
-                    Err(e) => match cli.parent().unwrap().join("zed").canonicalize() {
-                        Ok(path) if path != cli => Ok(path),
-                        _ => Err(e),
+                    // development builds have Zed capitalized
+                    Err(e) => match dir.join("Zed").canonicalize() {
+                        Ok(path) => Ok(path),
+                        Err(_) => Err(e),
                    },
                }
            }?;
@@ -255,8 +244,10 @@ mod linux {
                        eprintln!("failed to setsid: {}", std::io::Error::last_os_error());
                        process::exit(1);
                    }
-                    if let Err(_) = fork::close_fd() {
-                        eprintln!("failed to close_fd: {}", std::io::Error::last_os_error());
+                    if std::env::var("ZED_KEEP_FD").is_err() {
+                        if let Err(_) = fork::close_fd() {
+                            eprintln!("failed to close_fd: {}", std::io::Error::last_os_error());
+                        }
                    }
                    let error =
                        exec::execvp(path.clone(), &[path.as_os_str(), &OsString::from(ipc_url)]);
@@ -284,114 +275,6 @@ mod linux {
    }
 }

-#[cfg(target_os = "linux")]
-mod flatpak {
-    use std::ffi::OsString;
-    use std::path::PathBuf;
-    use std::process::Command;
-    use std::{env, process};
-
-    const EXTRA_LIB_ENV_NAME: &'static str = "ZED_FLATPAK_LIB_PATH";
-    const NO_ESCAPE_ENV_NAME: &'static str = "ZED_FLATPAK_NO_ESCAPE";
-
-    /// Adds bundled libraries to LD_LIBRARY_PATH if running under flatpak
-    pub fn ld_extra_libs() {
-        let mut paths = if let Ok(paths) = env::var("LD_LIBRARY_PATH") {
-            env::split_paths(&paths).collect()
-        } else {
-            Vec::new()
-        };
-
-        if let Ok(extra_path) = env::var(EXTRA_LIB_ENV_NAME) {
-            paths.push(extra_path.into());
-        }
-
-        env::set_var("LD_LIBRARY_PATH", env::join_paths(paths).unwrap());
-    }
-
-    /// Restarts outside of the sandbox if currently running within it
-    pub fn try_restart_to_host() {
-        if let Some(flatpak_dir) = get_flatpak_dir() {
-            let mut args = vec!["/usr/bin/flatpak-spawn".into(), "--host".into()];
-            args.append(&mut get_xdg_env_args());
-            args.push("--env=ZED_IS_FLATPAK_INSTALL=1".into());
-            args.push(
-                format!(
-                    "--env={EXTRA_LIB_ENV_NAME}={}",
-                    flatpak_dir.join("lib").to_str().unwrap()
-                )
-                .into(),
-            );
-            args.push(flatpak_dir.join("bin").join("zed").into());
-
-            let mut is_app_location_set = false;
-            for arg in &env::args_os().collect::<Vec<_>>()[1..] {
-                args.push(arg.clone());
-                is_app_location_set |= arg == "--zed";
-            }
-
-            if !is_app_location_set {
-                args.push("--zed".into());
-                args.push(flatpak_dir.join("libexec").join("zed-editor").into());
-            }
-
-            let error = exec::execvp("/usr/bin/flatpak-spawn", args);
-            eprintln!("failed restart cli on host: {:?}", error);
-            process::exit(1);
-        }
-    }
-
-    pub fn set_bin_if_no_escape(mut args: super::Args) -> super::Args {
-        if env::var(NO_ESCAPE_ENV_NAME).is_ok()
-            && env::var("FLATPAK_ID").map_or(false, |id| id.starts_with("dev.zed.Zed"))
-        {
-            if args.zed.is_none() {
-                args.zed = Some("/app/libexec/zed-editor".into());
-                env::set_var("ZED_IS_FLATPAK_INSTALL", "1");
-            }
-        }
-        args
-    }
-
-    fn get_flatpak_dir() -> Option<PathBuf> {
-        if env::var(NO_ESCAPE_ENV_NAME).is_ok() {
-            return None;
-        }
-
-        if let Ok(flatpak_id) = env::var("FLATPAK_ID") {
-            if !flatpak_id.starts_with("dev.zed.Zed") {
-                return None;
-            }
-
-            let install_dir = Command::new("/usr/bin/flatpak-spawn")
-                .arg("--host")
-                .arg("flatpak")
-                .arg("info")
-                .arg("--show-location")
-                .arg(flatpak_id)
-                .output()
-                .unwrap();
-            let install_dir = PathBuf::from(String::from_utf8(install_dir.stdout).unwrap().trim());
-            Some(install_dir.join("files"))
-        } else {
-            None
-        }
-    }
-
-    fn get_xdg_env_args() -> Vec<OsString> {
-        let xdg_keys = [
-            "XDG_DATA_HOME",
-            "XDG_CONFIG_HOME",
-            "XDG_CACHE_HOME",
-            "XDG_STATE_HOME",
-        ];
-        env::vars()
-            .filter(|(key, _)| xdg_keys.contains(&key.as_str()))
-            .map(|(key, val)| format!("--env=FLATPAK_{}={}", key, val).into())
-            .collect()
-    }
-}
-
 // todo("windows")
 #[cfg(target_os = "windows")]
 mod windows {
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -17,7 +17,8 @@ use futures::{
    TryFutureExt as _, TryStreamExt,
 };
 use gpui::{
-    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, Global, Model, Task, WeakModel,
+    actions, AnyModel, AnyWeakModel, AppContext, AsyncAppContext, BorrowAppContext, Global, Model,
+    Task, WeakModel,
 };
 use http::{HttpClient, HttpClientWithUrl};
 use lazy_static::lazy_static;
@@ -28,7 +29,7 @@ use release_channel::{AppVersion, ReleaseChannel};
 use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources};
+use settings::{Settings, SettingsSources, SettingsStore};
 use std::fmt;
 use std::pin::Pin;
 use std::{
@@ -84,9 +85,8 @@ lazy_static! {
        std::env::var("ZED_ALWAYS_ACTIVE").map_or(false, |e| !e.is_empty());
 }

-pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(500);
-pub const MAX_RECONNECTION_DELAY: Duration = Duration::from_secs(10);
-pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(20);
+pub const INITIAL_RECONNECTION_DELAY: Duration = Duration::from_millis(100);
+pub const CONNECTION_TIMEOUT: Duration = Duration::from_secs(5);

 actions!(client, [SignIn, SignOut, Reconnect]);

@@ -114,35 +114,11 @@ impl Settings for ClientSettings {
    }
 }

-#[derive(Default, Clone, Serialize, Deserialize, JsonSchema)]
-pub struct ProxySettingsContent {
-    proxy: Option<String>,
-}
-
-#[derive(Deserialize, Default)]
-pub struct ProxySettings {
-    pub proxy: Option<String>,
-}
-
-impl Settings for ProxySettings {
-    const KEY: Option<&'static str> = None;
-
-    type FileContent = ProxySettingsContent;
-
-    fn load(sources: SettingsSources<Self::FileContent>, _: &mut AppContext) -> Result<Self> {
-        Ok(Self {
-            proxy: sources
-                .user
-                .and_then(|value| value.proxy.clone())
-                .or(sources.default.proxy.clone()),
-        })
-    }
-}
-
 pub fn init_settings(cx: &mut AppContext) {
    TelemetrySettings::register(cx);
-    ClientSettings::register(cx);
-    ProxySettings::register(cx);
+    cx.update_global(|store: &mut SettingsStore, cx| {
+        store.register_setting::<ClientSettings>(cx);
+    });
 }

 pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
@@ -288,6 +264,7 @@ struct ClientState {
    status: (watch::Sender<Status>, watch::Receiver<Status>),
    entity_id_extractors: HashMap<TypeId, fn(&dyn AnyTypedEnvelope) -> u64>,
    _reconnect_task: Option<Task<()>>,
+    reconnect_interval: Duration,
    entities_by_type_and_remote_id: HashMap<(TypeId, u64), WeakSubscriber>,
    models_by_message_type: HashMap<TypeId, AnyWeakModel>,
    entity_types_by_message_type: HashMap<TypeId, TypeId>,
@@ -363,6 +340,7 @@ impl Default for ClientState {
            status: watch::channel_with(Status::SignedOut),
            entity_id_extractors: Default::default(),
            _reconnect_task: None,
+            reconnect_interval: Duration::from_secs(5),
            models_by_message_type: Default::default(),
            entities_by_type_and_remote_id: Default::default(),
            entity_types_by_message_type: Default::default(),
@@ -534,7 +512,6 @@ impl Client {
        let clock = Arc::new(clock::RealSystemClock);
        let http = Arc::new(HttpClientWithUrl::new(
            &ClientSettings::get_global(cx).server_url,
-            ProxySettings::get_global(cx).proxy.clone(),
        ));
        Self::new(clock, http.clone(), cx)
    }
@@ -622,6 +599,7 @@ impl Client {
            }
            Status::ConnectionLost => {
                let this = self.clone();
+                let reconnect_interval = state.reconnect_interval;
                state._reconnect_task = Some(cx.spawn(move |cx| async move {
                    #[cfg(any(test, feature = "test-support"))]
                    let mut rng = StdRng::seed_from_u64(0);
@@ -640,9 +618,8 @@ impl Client {
                            );
                            cx.background_executor().timer(delay).await;
                            delay = delay
-                                .mul_f32(rng.gen_range(0.5..=2.5))
-                                .max(INITIAL_RECONNECTION_DELAY)
-                                .min(MAX_RECONNECTION_DELAY);
+                                .mul_f32(rng.gen_range(1.0..=2.0))
+                                .min(reconnect_interval);
                        } else {
                            break;
                        }
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -15,9 +15,9 @@ use std::io::Write;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
 use sysinfo::{CpuRefreshKind, Pid, ProcessRefreshKind, RefreshKind, System};
 use telemetry_events::{
-    ActionEvent, AppEvent, AssistantEvent, AssistantKind, CallEvent, CpuEvent, EditEvent,
-    EditorEvent, Event, EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent,
-    MemoryEvent, SettingEvent,
+    ActionEvent, AppEvent, AssistantEvent, AssistantKind, CallEvent, CopilotEvent, CpuEvent,
+    EditEvent, EditorEvent, Event, EventRequestBody, EventWrapper, ExtensionEvent, MemoryEvent,
+    SettingEvent,
 };
 use tempfile::NamedTempFile;
 #[cfg(not(debug_assertions))]
@@ -241,14 +241,14 @@ impl Telemetry {
        self.report_event(event)
    }

-    pub fn report_inline_completion_event(
+    pub fn report_copilot_event(
        self: &Arc<Self>,
-        provider: String,
+        suggestion_id: Option<String>,
        suggestion_accepted: bool,
        file_extension: Option<String>,
    ) {
-        let event = Event::InlineCompletion(InlineCompletionEvent {
-            provider,
+        let event = Event::Copilot(CopilotEvent {
+            suggestion_id,
            suggestion_accepted,
            file_extension,
        });
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -89,7 +89,6 @@ pub enum ContactRequestStatus {

 pub struct UserStore {
    users: HashMap<u64, Arc<User>>,
-    by_github_login: HashMap<String, u64>,
    participant_indices: HashMap<u64, ParticipantIndex>,
    update_contacts_tx: mpsc::UnboundedSender<UpdateContacts>,
    current_user: watch::Receiver<Option<Arc<User>>>,
@@ -145,7 +144,6 @@ impl UserStore {
        ];
        Self {
            users: Default::default(),
-            by_github_login: Default::default(),
            current_user: current_user_rx,
            contacts: Default::default(),
            incoming_contact_requests: Default::default(),
@@ -192,13 +190,10 @@ impl UserStore {

                                cx.update(|cx| {
                                    if let Some(info) = info {
-                                        let disable_staff = std::env::var("ZED_DISABLE_STAFF")
-                                            .map_or(false, |v| v != "" && v != "0");
-                                        let staff = info.staff && !disable_staff;
-                                        cx.update_flags(staff, info.flags);
+                                        cx.update_flags(info.staff, info.flags);
                                        client.telemetry.set_authenticated_user_info(
                                            Some(info.metrics_id.clone()),
-                                            staff,
+                                            info.staff,
                                        )
                                    }
                                })?;
@@ -236,7 +231,6 @@ impl UserStore {
    #[cfg(feature = "test-support")]
    pub fn clear_cache(&mut self) {
        self.users.clear();
-        self.by_github_login.clear();
    }

    async fn handle_update_invite_info(
@@ -650,12 +644,6 @@ impl UserStore {
        })
    }

-    pub fn cached_user_by_github_login(&self, github_login: &str) -> Option<Arc<User>> {
-        self.by_github_login
-            .get(github_login)
-            .and_then(|id| self.users.get(id).cloned())
-    }
-
    pub fn current_user(&self) -> Option<Arc<User>> {
        self.current_user.borrow().clone()
    }
@@ -673,31 +661,26 @@ impl UserStore {
        cx.spawn(|this, mut cx| async move {
            if let Some(rpc) = client.upgrade() {
                let response = rpc.request(request).await.context("error loading users")?;
-                let users = response.users;
+                let users = response
+                    .users
+                    .into_iter()
+                    .map(User::new)
+                    .collect::<Vec<_>>();

-                this.update(&mut cx, |this, _| this.insert(users))
+                this.update(&mut cx, |this, _| {
+                    for user in &users {
+                        this.users.insert(user.id, user.clone());
+                    }
+                })
+                .ok();
+
+                Ok(users)
            } else {
                Ok(Vec::new())
            }
        })
    }

-    pub fn insert(&mut self, users: Vec<proto::User>) -> Vec<Arc<User>> {
-        let mut ret = Vec::with_capacity(users.len());
-        for user in users {
-            let user = User::new(user);
-            if let Some(old) = self.users.insert(user.id, user.clone()) {
-                if old.github_login != user.github_login {
-                    self.by_github_login.remove(&old.github_login);
-                }
-            }
-            self.by_github_login
-                .insert(user.github_login.clone(), user.id);
-            ret.push(user)
-        }
-        ret
-    }
-
    pub fn set_participant_indices(
        &mut self,
        participant_indices: HashMap<u64, ParticipantIndex>,
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -107,5 +107,4 @@ theme.workspace = true
 unindent.workspace = true
 util.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
-worktree = { workspace = true, features = ["test-support"] }
 headless.workspace = true
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -172,8 +172,6 @@ spec:
                secretKeyRef:
                  name: slack
                  key: panics_webhook
-            - name: COMPLETE_WITH_LANGUAGE_MODEL_RATE_LIMIT_PER_HOUR
-              value: "1000"
            - name: SUPERMAVEN_ADMIN_API_KEY
              valueFrom:
                secretKeyRef:
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -407,7 +407,6 @@ CREATE TABLE dev_servers (
    id INTEGER PRIMARY KEY AUTOINCREMENT,
    user_id INTEGER NOT NULL REFERENCES users(id),
    name TEXT NOT NULL,
-    ssh_connection_string TEXT,
    hashed_token TEXT NOT NULL
 );

--- a/crates/collab/migrations/20240514164510_store_ssh_connect_string.sql
+++ b/crates/collab/migrations/20240514164510_store_ssh_connect_string.sql
@@ -1 +0,0 @@
-ALTER TABLE dev_servers ADD COLUMN ssh_connection_string TEXT;
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -15,9 +15,8 @@ use serde::{Serialize, Serializer};
 use sha2::{Digest, Sha256};
 use std::sync::{Arc, OnceLock};
 use telemetry_events::{
-    ActionEvent, AppEvent, AssistantEvent, CallEvent, CpuEvent, EditEvent, EditorEvent, Event,
-    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, MemoryEvent,
-    SettingEvent,
+    ActionEvent, AppEvent, AssistantEvent, CallEvent, CopilotEvent, CpuEvent, EditEvent,
+    EditorEvent, Event, EventRequestBody, EventWrapper, ExtensionEvent, MemoryEvent, SettingEvent,
 };
 use uuid::Uuid;

@@ -27,7 +26,6 @@ pub fn router() -> Router {
    Router::new()
        .route("/telemetry/events", post(post_events))
        .route("/telemetry/crashes", post(post_crash))
-        .route("/telemetry/panics", post(post_panic))
        .route("/telemetry/hangs", post(post_hang))
 }

@@ -282,77 +280,30 @@ pub async fn post_hang(
        backtrace = %backtrace,
        "hang report");

-    Ok(())
-}
-
-pub async fn post_panic(
-    Extension(app): Extension<Arc<AppState>>,
-    TypedHeader(ZedChecksumHeader(checksum)): TypedHeader<ZedChecksumHeader>,
-    body: Bytes,
-) -> Result<()> {
-    let Some(expected) = calculate_json_checksum(app.clone(), &body) else {
-        return Err(Error::Http(
-            StatusCode::INTERNAL_SERVER_ERROR,
-            "events not enabled".into(),
-        ))?;
-    };
-
-    if checksum != expected {
-        return Err(Error::Http(
-            StatusCode::BAD_REQUEST,
-            "invalid checksum".into(),
-        ))?;
-    }
-
-    let report: telemetry_events::PanicRequest = serde_json::from_slice(&body)
-        .map_err(|_| Error::Http(StatusCode::BAD_REQUEST, "invalid json".into()))?;
-    let panic = report.panic;
-
-    tracing::error!(
-        service = "client",
-        version = %panic.app_version,
-        os_name = %panic.os_name,
-        os_version = %panic.os_version.clone().unwrap_or_default(),
-        installation_id = %panic.installation_id.unwrap_or_default(),
-        description = %panic.payload,
-        backtrace = %panic.backtrace.join("\n"),
-        "panic report");
-
-    let backtrace = if panic.backtrace.len() > 25 {
-        let total = panic.backtrace.len();
-        format!(
-            "{}\n   and {} more",
-            panic
-                .backtrace
-                .iter()
-                .take(20)
-                .cloned()
-                .collect::<Vec<_>>()
-                .join("\n"),
-            total - 20
-        )
-    } else {
-        panic.backtrace.join("\n")
-    };
-    let backtrace_with_summary = panic.payload + "\n" + &backtrace;
-
    if let Some(slack_panics_webhook) = app.config.slack_panics_webhook.clone() {
        let payload = slack::WebhookBody::new(|w| {
-            w.add_section(|s| s.text(slack::Text::markdown("Panic request".to_string())))
+            w.add_section(|s| s.text(slack::Text::markdown("Possible Hang".to_string())))
                .add_section(|s| {
                    s.add_field(slack::Text::markdown(format!(
                        "*Version:*\n {} ",
-                        panic.app_version
+                        report.app_version.unwrap_or_default()
                    )))
                    .add_field({
+                        let hostname = app.config.blob_store_url.clone().unwrap_or_default();
+                        let hostname = hostname.strip_prefix("https://").unwrap_or_else(|| {
+                            hostname.strip_prefix("http://").unwrap_or_default()
+                        });
+
                        slack::Text::markdown(format!(
-                            "*OS:*\n{} {}",
-                            panic.os_name,
-                            panic.os_version.unwrap_or_default()
+                            "*Incident:*\n<https://{}.{}/{}.hang.json|{}…>",
+                            CRASH_REPORTS_BUCKET,
+                            hostname,
+                            incident_id,
+                            incident_id.chars().take(8).collect::<String>(),
                        ))
                    })
                })
-                .add_rich_text(|r| r.add_preformatted(|p| p.add_text(backtrace_with_summary)))
+                .add_rich_text(|r| r.add_preformatted(|p| p.add_text(backtrace)))
        });
        let payload_json = serde_json::to_string(&payload).map_err(|err| {
            log::error!("Failed to serialize payload to JSON: {err}");
@@ -425,19 +376,13 @@ pub async fn post_events(
                first_event_at,
                country_code.clone(),
            )),
-            // Needed for clients sending old copilot_event types
-            Event::Copilot(_) => {}
-            Event::InlineCompletion(event) => {
-                to_upload
-                    .inline_completion_events
-                    .push(InlineCompletionEventRow::from_event(
-                        event.clone(),
-                        &wrapper,
-                        &request_body,
-                        first_event_at,
-                        country_code.clone(),
-                    ))
-            }
+            Event::Copilot(event) => to_upload.copilot_events.push(CopilotEventRow::from_event(
+                event.clone(),
+                &wrapper,
+                &request_body,
+                first_event_at,
+                country_code.clone(),
+            )),
            Event::Call(event) => to_upload.call_events.push(CallEventRow::from_event(
                event.clone(),
                &wrapper,
@@ -519,7 +464,7 @@ pub async fn post_events(
 #[derive(Default)]
 struct ToUpload {
    editor_events: Vec<EditorEventRow>,
-    inline_completion_events: Vec<InlineCompletionEventRow>,
+    copilot_events: Vec<CopilotEventRow>,
    assistant_events: Vec<AssistantEventRow>,
    call_events: Vec<CallEventRow>,
    cpu_events: Vec<CpuEventRow>,
@@ -538,14 +483,14 @@ impl ToUpload {
            .await
            .with_context(|| format!("failed to upload to table '{EDITOR_EVENTS_TABLE}'"))?;

-        const INLINE_COMPLETION_EVENTS_TABLE: &str = "inline_completion_events";
+        const COPILOT_EVENTS_TABLE: &str = "copilot_events";
        Self::upload_to_table(
-            INLINE_COMPLETION_EVENTS_TABLE,
-            &self.inline_completion_events,
+            COPILOT_EVENTS_TABLE,
+            &self.copilot_events,
            clickhouse_client,
        )
        .await
-        .with_context(|| format!("failed to upload to table '{INLINE_COMPLETION_EVENTS_TABLE}'"))?;
+        .with_context(|| format!("failed to upload to table '{COPILOT_EVENTS_TABLE}'"))?;

        const ASSISTANT_EVENTS_TABLE: &str = "assistant_events";
        Self::upload_to_table(
@@ -645,7 +590,7 @@ where

    let country_code = country_code.as_bytes();

-    serializer.serialize_u16(((country_code[1] as u16) << 8) + country_code[0] as u16)
+    serializer.serialize_u16(((country_code[0] as u16) << 8) + country_code[1] as u16)
 }

 #[derive(Serialize, Debug, clickhouse::Row)]
@@ -715,9 +660,9 @@ impl EditorEventRow {
 }

 #[derive(Serialize, Debug, clickhouse::Row)]
-pub struct InlineCompletionEventRow {
+pub struct CopilotEventRow {
    pub installation_id: String,
-    pub provider: String,
+    pub suggestion_id: String,
    pub suggestion_accepted: bool,
    pub app_version: String,
    pub file_extension: String,
@@ -737,9 +682,9 @@ pub struct InlineCompletionEventRow {
    pub patch: Option<i32>,
 }

-impl InlineCompletionEventRow {
+impl CopilotEventRow {
    fn from_event(
-        event: InlineCompletionEvent,
+        event: CopilotEvent,
        wrapper: &EventWrapper,
        body: &EventRequestBody,
        first_event_at: chrono::DateTime<chrono::Utc>,
@@ -766,7 +711,7 @@ impl InlineCompletionEventRow {
            country_code: country_code.unwrap_or("XX".to_string()),
            region_code: "".to_string(),
            city: "".to_string(),
-            provider: event.provider,
+            suggestion_id: event.suggestion_id.unwrap_or_default(),
            suggestion_accepted: event.suggestion_accepted,
        }
    }
--- a/crates/collab/src/api/extensions.rs
+++ b/crates/collab/src/api/extensions.rs
@@ -239,74 +239,61 @@ async fn fetch_extensions_from_blob_store(
 ) -> anyhow::Result<()> {
    log::info!("fetching extensions from blob store");

-    let mut next_marker = None;
-    let mut published_versions = HashMap::<String, Vec<String>>::default();
+    let list = blob_store_client
+        .list_objects()
+        .bucket(blob_store_bucket)
+        .prefix("extensions/")
+        .send()
+        .await?;

-    loop {
-        let list = blob_store_client
-            .list_objects()
-            .bucket(blob_store_bucket)
-            .prefix("extensions/")
-            .set_marker(next_marker.clone())
-            .send()
-            .await?;
-        let objects = list.contents.unwrap_or_default();
-        log::info!("fetched {} object(s) from blob store", objects.len());
+    let objects = list.contents.unwrap_or_default();

-        for object in &objects {
-            let Some(key) = object.key.as_ref() else {
-                continue;
-            };
-            let mut parts = key.split('/');
-            let Some(_) = parts.next().filter(|part| *part == "extensions") else {
-                continue;
-            };
-            let Some(extension_id) = parts.next() else {
-                continue;
-            };
-            let Some(version) = parts.next() else {
-                continue;
-            };
-            if parts.next() == Some("manifest.json") {
-                published_versions
-                    .entry(extension_id.to_owned())
-                    .or_default()
-                    .push(version.to_owned());
-            }
-        }
-
-        if let (Some(true), Some(last_object)) = (list.is_truncated, objects.last()) {
-            next_marker.clone_from(&last_object.key);
-        } else {
-            break;
+    let mut published_versions = HashMap::<&str, Vec<&str>>::default();
+    for object in &objects {
+        let Some(key) = object.key.as_ref() else {
+            continue;
+        };
+        let mut parts = key.split('/');
+        let Some(_) = parts.next().filter(|part| *part == "extensions") else {
+            continue;
+        };
+        let Some(extension_id) = parts.next() else {
+            continue;
+        };
+        let Some(version) = parts.next() else {
+            continue;
+        };
+        if parts.next() == Some("manifest.json") {
+            published_versions
+                .entry(extension_id)
+                .or_default()
+                .push(version);
        }
    }

-    log::info!("found {} published extensions", published_versions.len());
-
    let known_versions = app_state.db.get_known_extension_versions().await?;

    let mut new_versions = HashMap::<&str, Vec<NewExtensionVersion>>::default();
    let empty = Vec::new();
-    for (extension_id, published_versions) in &published_versions {
+    for (extension_id, published_versions) in published_versions {
        let known_versions = known_versions.get(extension_id).unwrap_or(&empty);

        for published_version in published_versions {
            if known_versions
-                .binary_search_by_key(&published_version, |known_version| known_version)
+                .binary_search_by_key(&published_version, String::as_str)
                .is_err()
            {
                if let Some(extension) = fetch_extension_manifest(
                    blob_store_client,
                    blob_store_bucket,
-                    &extension_id,
-                    &published_version,
+                    extension_id,
+                    published_version,
                )
                .await
                .log_err()
                {
                    new_versions
-                        .entry(&extension_id)
+                        .entry(extension_id)
                        .or_default()
                        .push(extension);
                }
--- a/crates/collab/src/db.rs
+++ b/crates/collab/src/db.rs
@@ -509,7 +509,8 @@ pub type NotificationBatch = Vec<(UserId, proto::Notification)>;

 pub struct CreatedChannelMessage {
    pub message_id: MessageId,
-    pub participant_connection_ids: HashSet<ConnectionId>,
+    pub participant_connection_ids: Vec<ConnectionId>,
+    pub channel_members: Vec<UserId>,
    pub notifications: NotificationBatch,
 }

@@ -654,7 +655,6 @@ pub struct ChannelsForUser {
    pub channel_memberships: Vec<channel_member::Model>,
    pub channel_participants: HashMap<ChannelId, Vec<UserId>>,
    pub hosted_projects: Vec<proto::HostedProject>,
-    pub invited_channels: Vec<Channel>,

    pub observed_buffer_versions: Vec<proto::ChannelBufferVersion>,
    pub observed_channel_messages: Vec<proto::ChannelMessageId>,
--- a/crates/collab/src/db/queries/buffers.rs
+++ b/crates/collab/src/db/queries/buffers.rs
@@ -440,7 +440,12 @@ impl Database {
        channel_id: ChannelId,
        user: UserId,
        operations: &[proto::Operation],
-    ) -> Result<(HashSet<ConnectionId>, i32, Vec<proto::VectorClockEntry>)> {
+    ) -> Result<(
+        Vec<ConnectionId>,
+        Vec<UserId>,
+        i32,
+        Vec<proto::VectorClockEntry>,
+    )> {
        self.transaction(move |tx| async move {
            let channel = self.get_channel_internal(channel_id, &tx).await?;

@@ -474,6 +479,7 @@ impl Database {
                .filter_map(|op| operation_to_storage(op, &buffer, serialization_version))
                .collect::<Vec<_>>();

+            let mut channel_members;
            let max_version;

            if !operations.is_empty() {
@@ -498,6 +504,12 @@ impl Database {
                )
                .await?;

+                channel_members = self.get_channel_participants(&channel, &tx).await?;
+                let collaborators = self
+                    .get_channel_buffer_collaborators_internal(channel_id, &tx)
+                    .await?;
+                channel_members.retain(|member| !collaborators.contains(member));
+
                buffer_operation::Entity::insert_many(operations)
                    .on_conflict(
                        OnConflict::columns([
@@ -512,10 +524,11 @@ impl Database {
                    .exec(&*tx)
                    .await?;
            } else {
+                channel_members = Vec::new();
                max_version = Vec::new();
            }

-            let mut connections = HashSet::default();
+            let mut connections = Vec::new();
            let mut rows = channel_buffer_collaborator::Entity::find()
                .filter(
                    Condition::all()
@@ -525,13 +538,13 @@ impl Database {
                .await?;
            while let Some(row) = rows.next().await {
                let row = row?;
-                connections.insert(ConnectionId {
+                connections.push(ConnectionId {
                    id: row.connection_id as u32,
                    owner_id: row.connection_server_id.0 as u32,
                });
            }

-            Ok((connections, buffer.epoch, max_version))
+            Ok((connections, channel_members, buffer.epoch, max_version))
        })
        .await
    }
--- a/crates/collab/src/db/queries/channels.rs
+++ b/crates/collab/src/db/queries/channels.rs
@@ -3,7 +3,7 @@ use rpc::{
    proto::{channel_member::Kind, ChannelBufferVersion, VectorClockEntry},
    ErrorCode, ErrorCodeExt,
 };
-use sea_orm::{DbBackend, TryGetableMany};
+use sea_orm::TryGetableMany;

 impl Database {
    #[cfg(test)]
@@ -416,9 +416,7 @@ impl Database {
        user_id: UserId,
        tx: &DatabaseTransaction,
    ) -> Result<MembershipUpdated> {
-        let new_channels = self
-            .get_user_channels(user_id, Some(channel), false, tx)
-            .await?;
+        let new_channels = self.get_user_channels(user_id, Some(channel), tx).await?;
        let removed_channels = self
            .get_channel_descendants_excluding_self([channel], tx)
            .await?
@@ -483,10 +481,44 @@ impl Database {
        .await
    }

+    /// Returns all channel invites for the user with the given ID.
+    pub async fn get_channel_invites_for_user(&self, user_id: UserId) -> Result<Vec<Channel>> {
+        self.transaction(|tx| async move {
+            let mut role_for_channel: HashMap<ChannelId, ChannelRole> = HashMap::default();
+
+            let channel_invites = channel_member::Entity::find()
+                .filter(
+                    channel_member::Column::UserId
+                        .eq(user_id)
+                        .and(channel_member::Column::Accepted.eq(false)),
+                )
+                .all(&*tx)
+                .await?;
+
+            for invite in channel_invites {
+                role_for_channel.insert(invite.channel_id, invite.role);
+            }
+
+            let channels = channel::Entity::find()
+                .filter(channel::Column::Id.is_in(role_for_channel.keys().copied()))
+                .all(&*tx)
+                .await?;
+
+            let channels = channels.into_iter().map(Channel::from_model).collect();
+
+            Ok(channels)
+        })
+        .await
+    }
+
    /// Returns all channels for the user with the given ID.
    pub async fn get_channels_for_user(&self, user_id: UserId) -> Result<ChannelsForUser> {
-        self.transaction(|tx| async move { self.get_user_channels(user_id, None, true, &tx).await })
-            .await
+        self.transaction(|tx| async move {
+            let tx = tx;
+
+            self.get_user_channels(user_id, None, &tx).await
+        })
+        .await
    }

    /// Returns all channels for the user with the given ID that are descendants
@@ -495,37 +527,25 @@ impl Database {
        &self,
        user_id: UserId,
        ancestor_channel: Option<&channel::Model>,
-        include_invites: bool,
        tx: &DatabaseTransaction,
    ) -> Result<ChannelsForUser> {
-        let mut filter = channel_member::Column::UserId.eq(user_id);
-        if !include_invites {
-            filter = filter.and(channel_member::Column::Accepted.eq(true))
-        }
+        let mut filter = channel_member::Column::UserId
+            .eq(user_id)
+            .and(channel_member::Column::Accepted.eq(true));
+
        if let Some(ancestor) = ancestor_channel {
            filter = filter.and(channel_member::Column::ChannelId.eq(ancestor.root_id()));
        }

-        let mut channels = Vec::<channel::Model>::new();
-        let mut invited_channels = Vec::<Channel>::new();
-        let mut channel_memberships = Vec::<channel_member::Model>::new();
-        let mut rows = channel_member::Entity::find()
+        let channel_memberships = channel_member::Entity::find()
            .filter(filter)
-            .inner_join(channel::Entity)
-            .select_also(channel::Entity)
-            .stream(tx)
+            .all(tx)
+            .await?;
+
+        let channels = channel::Entity::find()
+            .filter(channel::Column::Id.is_in(channel_memberships.iter().map(|m| m.channel_id)))
+            .all(tx)
            .await?;
-        while let Some(row) = rows.next().await {
-            if let (membership, Some(channel)) = row? {
-                if membership.accepted {
-                    channel_memberships.push(membership);
-                    channels.push(channel);
-                } else {
-                    invited_channels.push(Channel::from_model(channel));
-                }
-            }
-        }
-        drop(rows);

        let mut descendants = self
            .get_channel_descendants_excluding_self(channels.iter(), tx)
@@ -623,7 +643,6 @@ impl Database {
        Ok(ChannelsForUser {
            channel_memberships,
            channels,
-            invited_channels,
            hosted_projects,
            channel_participants,
            latest_buffer_versions,
@@ -681,73 +700,77 @@ impl Database {
    pub async fn get_channel_participant_details(
        &self,
        channel_id: ChannelId,
-        filter: &str,
-        limit: u64,
        user_id: UserId,
-    ) -> Result<(Vec<proto::ChannelMember>, Vec<proto::User>)> {
-        let members = self
+    ) -> Result<Vec<proto::ChannelMember>> {
+        let (role, members) = self
            .transaction(move |tx| async move {
                let channel = self.get_channel_internal(channel_id, &tx).await?;
-                self.check_user_is_channel_participant(&channel, user_id, &tx)
+                let role = self
+                    .check_user_is_channel_participant(&channel, user_id, &tx)
                    .await?;
-                let mut query = channel_member::Entity::find()
-                    .find_also_related(user::Entity)
-                    .filter(channel_member::Column::ChannelId.eq(channel.root_id()));
-
-                if cfg!(any(test, feature = "sqlite")) && self.pool.get_database_backend() == DbBackend::Sqlite {
-                    query = query.filter(Expr::cust_with_values(
-                        "UPPER(github_login) LIKE ?",
-                        [Self::fuzzy_like_string(&filter.to_uppercase())],
-                    ))
-                } else {
-                    query = query.filter(Expr::cust_with_values(
-                        "github_login ILIKE $1",
-                        [Self::fuzzy_like_string(filter)],
-                    ))
-                }
-                let members = query.order_by(
-                        Expr::cust(
-                            "not role = 'admin', not role = 'member', not role = 'guest', not accepted, github_login",
-                        ),
-                        sea_orm::Order::Asc,
-                    )
-                    .limit(limit)
-                    .all(&*tx)
-                    .await?;
-
-                Ok(members)
+                Ok((
+                    role,
+                    self.get_channel_participant_details_internal(&channel, &tx)
+                        .await?,
+                ))
            })
            .await?;

-        let mut users: Vec<proto::User> = Vec::with_capacity(members.len());
-
-        let members = members
-            .into_iter()
-            .map(|(member, user)| {
-                if let Some(user) = user {
-                    users.push(proto::User {
-                        id: user.id.to_proto(),
-                        avatar_url: format!(
-                            "https://github.com/{}.png?size=128",
-                            user.github_login
-                        ),
-                        github_login: user.github_login,
-                    })
-                }
-                proto::ChannelMember {
-                    role: member.role.into(),
-                    user_id: member.user_id.to_proto(),
-                    kind: if member.accepted {
+        if role == ChannelRole::Admin {
+            Ok(members
+                .into_iter()
+                .map(|channel_member| proto::ChannelMember {
+                    role: channel_member.role.into(),
+                    user_id: channel_member.user_id.to_proto(),
+                    kind: if channel_member.accepted {
                        Kind::Member
                    } else {
                        Kind::Invitee
                    }
                    .into(),
-                }
-            })
-            .collect();
+                })
+                .collect())
+        } else {
+            return Ok(members
+                .into_iter()
+                .filter_map(|member| {
+                    if !member.accepted {
+                        return None;
+                    }
+                    Some(proto::ChannelMember {
+                        role: member.role.into(),
+                        user_id: member.user_id.to_proto(),
+                        kind: Kind::Member.into(),
+                    })
+                })
+                .collect());
+        }
+    }

-        Ok((members, users))
+    async fn get_channel_participant_details_internal(
+        &self,
+        channel: &channel::Model,
+        tx: &DatabaseTransaction,
+    ) -> Result<Vec<channel_member::Model>> {
+        Ok(channel_member::Entity::find()
+            .filter(channel_member::Column::ChannelId.eq(channel.root_id()))
+            .all(tx)
+            .await?)
+    }
+
+    /// Returns the participants in the given channel.
+    pub async fn get_channel_participants(
+        &self,
+        channel: &channel::Model,
+        tx: &DatabaseTransaction,
+    ) -> Result<Vec<UserId>> {
+        let participants = self
+            .get_channel_participant_details_internal(channel, tx)
+            .await?;
+        Ok(participants
+            .into_iter()
+            .map(|member| member.user_id)
+            .collect())
    }

    /// Returns whether the given user is an admin in the specified channel.
--- a/crates/collab/src/db/queries/dev_servers.rs
+++ b/crates/collab/src/db/queries/dev_servers.rs
@@ -73,7 +73,6 @@ impl Database {
    pub async fn create_dev_server(
        &self,
        name: &str,
-        ssh_connection_string: Option<&str>,
        hashed_access_token: &str,
        user_id: UserId,
    ) -> crate::Result<(dev_server::Model, proto::DevServerProjectsUpdate)> {
@@ -87,9 +86,6 @@ impl Database {
                hashed_token: ActiveValue::Set(hashed_access_token.to_string()),
                name: ActiveValue::Set(name.trim().to_string()),
                user_id: ActiveValue::Set(user_id),
-                ssh_connection_string: ActiveValue::Set(
-                    ssh_connection_string.map(ToOwned::to_owned),
-                ),
            })
            .exec_with_returning(&*tx)
            .await?;
@@ -137,7 +133,6 @@ impl Database {
        &self,
        id: DevServerId,
        name: &str,
-        ssh_connection_string: Option<&str>,
        user_id: UserId,
    ) -> crate::Result<proto::DevServerProjectsUpdate> {
        self.transaction(|tx| async move {
@@ -150,9 +145,6 @@ impl Database {

            dev_server::Entity::update(dev_server::ActiveModel {
                name: ActiveValue::Set(name.trim().to_string()),
-                ssh_connection_string: ActiveValue::Set(
-                    ssh_connection_string.map(ToOwned::to_owned),
-                ),
                ..dev_server.clone().into_active_model()
            })
            .exec(&*tx)
--- a/crates/collab/src/db/queries/messages.rs
+++ b/crates/collab/src/db/queries/messages.rs
@@ -251,7 +251,7 @@ impl Database {
                .await?;

            let mut is_participant = false;
-            let mut participant_connection_ids = HashSet::default();
+            let mut participant_connection_ids = Vec::new();
            let mut participant_user_ids = Vec::new();
            while let Some(row) = rows.next().await {
                let row = row?;
@@ -259,7 +259,7 @@ impl Database {
                    is_participant = true;
                }
                participant_user_ids.push(row.user_id);
-                participant_connection_ids.insert(row.connection());
+                participant_connection_ids.push(row.connection());
            }
            drop(rows);

@@ -336,9 +336,13 @@ impl Database {
                }
            }

+            let mut channel_members = self.get_channel_participants(&channel, &tx).await?;
+            channel_members.retain(|member| !participant_user_ids.contains(member));
+
            Ok(CreatedChannelMessage {
                message_id,
                participant_connection_ids,
+                channel_members,
                notifications,
            })
        })
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`<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>`
				`@@ -1 +0,0 @@`
				<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M6.97942 1.25171L6.9585 1.30199L5.58662 4.60039C5.54342 4.70426 5.44573 4.77523 5.3336 4.78422L1.7727 5.0697L1.71841 5.07405L1.38687 5.10063L1.08608 5.12475C0.820085 5.14607 0.712228 5.47802 0.914889 5.65162L1.14406 5.84793L1.39666 6.06431L1.43802 6.09974L4.15105 8.42374C4.23648 8.49692 4.2738 8.61176 4.24769 8.72118L3.41882 12.196L3.40618 12.249L3.32901 12.5725L3.25899 12.866C3.19708 13.1256 3.47945 13.3308 3.70718 13.1917L3.9647 13.0344L4.24854 12.861L4.29502 12.8326L7.34365 10.9705C7.43965 10.9119 7.5604 10.9119 7.6564 10.9705L10.705 12.8326L10.7515 12.861L11.0354 13.0344L11.2929 13.1917C11.5206 13.3308 11.803 13.1256 11.7411 12.866L11.671 12.5725L11.5939 12.249L11.5812 12.196L10.7524 8.72118C10.7263 8.61176 10.7636 8.49692 10.849 8.42374L13.562 6.09974L13.6034 6.06431L13.856 5.84793L14.0852 5.65162C14.2878 5.47802 14.18 5.14607 13.914 5.12475L13.6132 5.10063L13.2816 5.07405L13.2274 5.0697L9.66645 4.78422C9.55432 4.77523 9.45663 4.70426 9.41343 4.60039L8.04155 1.30199L8.02064 1.25171L7.89291 0.944609L7.77702 0.665992C7.67454 0.419604 7.32551 0.419604 7.22303 0.665992L7.10715 0.944609L6.97942 1.25171ZM7.50003 2.60397L6.50994 4.98442C6.32273 5.43453 5.89944 5.74207 5.41351 5.78103L2.84361 5.98705L4.8016 7.66428C5.17183 7.98142 5.33351 8.47903 5.2204 8.95321L4.62221 11.461L6.8224 10.1171C7.23842 9.86302 7.76164 9.86302 8.17766 10.1171L10.3778 11.461L9.77965 8.95321C9.66654 8.47903 9.82822 7.98142 10.1984 7.66428L12.1564 5.98705L9.58654 5.78103C9.10061 5.74207 8.67732 5.43453 8.49011 4.98442L7.50003 2.60397Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
				`@@ -1 +0,0 @@`
				`<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>`
				`@@ -0,0 +1 @@`
				> 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 {})`
				`@@ -0,0 +1 @@`
				`> What are all the places we define a new gpui element in my project? (impl Element for {})`
				`@@ -0,0 +1 @@`
				`> Can you tell me what the assistant2 crate is for in my project? Tell me in 100 words or less.`
				`@@ -1 +0,0 @@`
				`ALTER TABLE dev_servers ADD COLUMN ssh_connection_string TEXT;`