💄

Set event_stream: "/path/to/socket" in settings.

Co-Authored-By: Matthew Weitzel <mweitzel@gmail.com>

.cloudflare/README.md

@@ -1,15 +0,0 @@
-We have two cloudflare workers that let us serve some assets of this repo
-from Cloudflare.
-
-* `open-source-website-assets` is used for `install.sh`
-* `docs-proxy` is used for `https://zed.dev/docs`
-
-On push to `main`, both of these (and the files they depend on) are uploaded to Cloudflare.
-
-### Deployment
-
-These functions are deployed on push to main by the deploy_cloudflare.yml workflow. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
-
-### Testing
-
-You can use [wrangler](https://developers.cloudflare.com/workers/cli-wrangler/install-update) to test these workers locally, or to deploy custom versions.

.cloudflare/docs-proxy/src/worker.js

@@ -1,14 +0,0 @@
-export default {
-  async fetch(request, _env, _ctx) {
-    const url = new URL(request.url);
-    url.hostname = "docs-anw.pages.dev";
-
-    let res = await fetch(url, request);
-
-    if (res.status === 404) {
-      res = await fetch("https://zed.dev/404");
-    }
-
-    return res;
-  },
-};

.cloudflare/docs-proxy/wrangler.toml

@@ -1,8 +0,0 @@
-name = "docs-proxy"
-main = "src/worker.js"
-compatibility_date = "2024-05-03"
-workers_dev = true
-
-[[routes]]
-pattern = "zed.dev/docs*"
-zone_name = "zed.dev"

.cloudflare/open-source-website-assets/src/worker.js

@@ -1,19 +0,0 @@
-export default {
-  async fetch(request, env) {
-    const url = new URL(request.url);
-    const key = url.pathname.slice(1);
-
-    const object = await env.OPEN_SOURCE_WEBSITE_ASSETS_BUCKET.get(key);
-    if (!object) {
-      return await fetch("https://zed.dev/404");
-    }
-
-    const headers = new Headers();
-    object.writeHttpMetadata(headers);
-    headers.set("etag", object.httpEtag);
-
-    return new Response(object.body, {
-      headers,
-    });
-  },
-};

.cloudflare/open-source-website-assets/wrangler.toml

@@ -1,8 +0,0 @@
-name = "open-source-website-assets"
-main = "src/worker.js"
-compatibility_date = "2024-05-15"
-workers_dev = true
-
-[[r2_buckets]]
-binding = 'OPEN_SOURCE_WEBSITE_ASSETS_BUCKET'
-bucket_name = 'zed-open-source-website-assets'

.github/workflows/ci.yml

@@ -99,6 +99,7 @@ jobs:
       - name: Build other binaries and features
         run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade"
 
+  # todo(linux): Actually run the tests
   linux_tests:
     name: (Linux) Run Clippy and tests
     runs-on:
@@ -116,9 +117,6 @@ jobs:
       - name: cargo clippy
         run: cargo xtask clippy
 
-      - name: Run tests
-        uses: ./.github/actions/run_tests
-
       - name: Build Zed
         run: cargo build -p zed
 

.github/workflows/deploy_cloudflare.yml

@@ -1,56 +0,0 @@
-name: Deploy Docs
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  deploy-docs:
-    name: Deploy Docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-
-      - name: Setup mdBook
-        uses: peaceiris/actions-mdbook@v2
-        with:
-          mdbook-version: "0.4.37"
-
-      - name: Build book
-        run: |
-          set -euo pipefail
-          mkdir -p target/deploy
-          mdbook build ./docs --dest-dir=../target/deploy/docs/
-
-      - name: Deploy Docs
-        uses: cloudflare/wrangler-action@v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy target/deploy --project-name=docs
-
-      - name: Deploy Install
-        uses: cloudflare/wrangler-action@v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh
-
-      - name: Deploy Docs Workers
-        uses: cloudflare/wrangler-action@v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: deploy .cloudflare/docs-proxy/src/worker.js
-
-      - name: Deploy Install Workers
-        uses: cloudflare/wrangler-action@v3
-        with:
-          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: deploy .cloudflare/docs-proxy/src/worker.js

.github/workflows/deploy_docs.yml

@@ -0,0 +1,35 @@
+name: Deploy Docs
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy-docs:
+    name: Deploy Docs
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          clean: false
+
+      - name: Setup mdBook
+        uses: peaceiris/actions-mdbook@v2
+        with:
+          mdbook-version: "0.4.37"
+
+      - name: Build book
+        run: |
+          set -euo pipefail
+          mkdir -p target/deploy
+          mdbook build ./docs --dest-dir=../target/deploy/docs/
+
+      - name: Deploy
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          command: pages deploy target/deploy --project-name=docs

.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
@@ -26,5 +24,3 @@ DerivedData/
 .venv
 .blob_store
 .vscode
-.wrangler
-.flatpak-builder

.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"]
   }
 ]

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",
@@ -23,6 +23,7 @@ members = [
     "crates/db",
     "crates/diagnostics",
     "crates/editor",
+    "crates/event_server",
     "crates/extension",
     "crates/extension_api",
     "crates/extension_cli",
@@ -76,7 +77,6 @@ members = [
     "crates/rich_text",
     "crates/rope",
     "crates/rpc",
-    "crates/rustdoc_to_markdown",
     "crates/task",
     "crates/tasks_ui",
     "crates/search",
@@ -148,7 +148,7 @@ 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" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
@@ -169,6 +169,7 @@ copilot = { path = "crates/copilot" }
 db = { path = "crates/db" }
 diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
+event_server = { path = "crates/event_server" }
 extension = { path = "crates/extension" }
 extensions_ui = { path = "crates/extensions_ui" }
 feature_flags = { path = "crates/feature_flags" }
@@ -221,7 +222,6 @@ dev_server_projects = { path = "crates/dev_server_projects" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
-rustdoc_to_markdown = { path = "crates/rustdoc_to_markdown" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
 search = { path = "crates/search" }
@@ -257,7 +257,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"
@@ -265,9 +264,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"] }
@@ -287,9 +285,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.
@@ -302,14 +301,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"
@@ -335,7 +332,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"] }
@@ -343,7 +339,7 @@ subtle = "2.5.0"
 sysinfo = "0.30.7"
 tempfile = "3.9.0"
 thiserror = "1.0.29"
-tiktoken-rs = "0.5.9"
+tiktoken-rs = "0.5.7"
 time = { version = "0.3", features = [
     "macros",
     "parsing",
@@ -355,33 +351,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 = [
@@ -408,11 +404,11 @@ features = [
     "Win32_Graphics_Direct2D",
     "Win32_Graphics_Direct2D_Common",
     "Win32_Graphics_DirectWrite",
-    "Win32_Graphics_Dwm",
     "Win32_Graphics_Dxgi_Common",
     "Win32_Graphics_Gdi",
     "Win32_Graphics_Imaging",
     "Win32_Graphics_Imaging_D2D",
+    "Win32_Media",
     "Win32_Security",
     "Win32_Security_Credentials",
     "Win32_Storage_FileSystem",

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>

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>

assets/icons/file_icons/file_types.json

@@ -57,9 +57,7 @@
     "gitkeep": "vcs",
     "gitmodules": "vcs",
     "go": "go",
-    "gql": "graphql",
     "graphql": "graphql",
-    "graphqls": "graphql",
     "h": "c",
     "hpp": "cpp",
     "handlebars": "code",

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>

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>

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>

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>

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>

assets/keymaps/default-linux.json

@@ -53,9 +53,7 @@
       // "alt-d": "editor::DeleteToNextWordEnd",
       "ctrl-x": "editor::Cut",
       "ctrl-c": "editor::Copy",
-      "ctrl-insert": "editor::Copy",
       "ctrl-v": "editor::Paste",
-      "shift-insert": "editor::Paste",
       "ctrl-z": "editor::Undo",
       "ctrl-shift-z": "editor::Redo",
       "up": "editor::MoveUp",
@@ -191,12 +189,6 @@
       "ctrl-shift-enter": "editor::NewlineBelow"
     }
   },
-  {
-    "context": "Markdown",
-    "bindings": {
-      "ctrl-c": "markdown::Copy"
-    }
-  },
   {
     "context": "AssistantPanel",
     "bindings": {
@@ -211,9 +203,7 @@
       "ctrl-s": "workspace::Save",
       "ctrl->": "assistant::QuoteSelection",
       "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline"
+      "ctrl-r": "assistant::CycleMessageRole"
     }
   },
   {
@@ -503,12 +493,6 @@
       "tab": "editor::ConfirmCompletion"
     }
   },
-  {
-    "context": "Editor && inline_completion && !showing_completions",
-    "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
-    }
-  },
   {
     "context": "Editor && showing_code_actions",
     "bindings": {
@@ -562,17 +546,15 @@
       "alt-ctrl-n": "project_panel::NewDirectory",
       "ctrl-x": "project_panel::Cut",
       "ctrl-c": "project_panel::Copy",
-      "ctrl-insert": "project_panel::Copy",
       "ctrl-v": "project_panel::Paste",
-      "shift-insert": "project_panel::Paste",
       "ctrl-alt-c": "project_panel::CopyPath",
       "alt-ctrl-shift-c": "project_panel::CopyRelativePath",
       "f2": "project_panel::Rename",
       "enter": "project_panel::Rename",
       "backspace": "project_panel::Trash",
       "delete": "project_panel::Trash",
-      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": 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"
     }
@@ -626,9 +608,7 @@
     "bindings": {
       "ctrl-alt-space": "terminal::ShowCharacterPalette",
       "shift-ctrl-c": "terminal::Copy",
-      "ctrl-insert": "terminal::Copy",
       "shift-ctrl-v": "terminal::Paste",
-      "shift-insert": "terminal::Paste",
       "up": ["terminal::SendKeystroke", "up"],
       "pageup": ["terminal::SendKeystroke", "pageup"],
       "down": ["terminal::SendKeystroke", "down"],

assets/keymaps/default-macos.json

@@ -208,9 +208,11 @@
     }
   },
   {
-    "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"
     }
   },
   {
@@ -227,9 +229,7 @@
       "cmd-s": "workspace::Save",
       "cmd->": "assistant::QuoteSelection",
       "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline"
+      "ctrl-r": "assistant::CycleMessageRole"
     }
   },
   {
@@ -517,12 +517,6 @@
       "tab": "editor::ConfirmCompletion"
     }
   },
-  {
-    "context": "Editor && inline_completion && !showing_completions",
-    "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
-    }
-  },
   {
     "context": "Editor && showing_code_actions",
     "bindings": {
@@ -579,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"
     }
   },
   {

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"
     }
   },
   {

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",
@@ -385,11 +384,7 @@
       "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"
     }
   },
   {
@@ -498,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",

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,8 +102,6 @@
   "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*",
@@ -170,7 +142,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 +194,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 +294,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"
@@ -358,7 +311,9 @@
   // The list of language servers to use (or disable) for all languages.
   //
   // This is typically customized on a per-language basis.
-  "language_servers": ["..."],
+  "language_servers": [
+    "..."
+  ],
   // When to automatically save edited buffers. This setting can
   // take four values.
   //
@@ -493,7 +448,9 @@
   "copilot": {
     // The set of glob patterns for which copilot should be disabled
     // in any matching file.
-    "disabled_globs": [".env"]
+    "disabled_globs": [
+      ".env"
+    ]
   },
   // Settings specific to journaling
   "journal": {
@@ -522,7 +479,7 @@
     //         }
     //     }
     "shell": "system",
-    // Where to dock terminals panel. Can be `left`, `right`, `bottom`.
+    // Where to dock terminals panel. Can be 'left', 'right', 'bottom'.
     "dock": "bottom",
     // Default width when the terminal is docked to the left or right.
     "default_width": 640,
@@ -604,8 +561,13 @@
         // Default directories to search for virtual environments, relative
         // to the current working directory. We recommend overriding this
         // in your project's settings, rather than globally.
-        "directories": [".env", "env", ".venv", "venv"],
-        // Can also be `csh`, `fish`, and `nushell`
+        "directories": [
+          ".env",
+          "env",
+          ".venv",
+          "venv"
+        ],
+        // Can also be 'csh', 'fish', and `nushell`
         "activate_script": "default"
       }
     },
@@ -630,7 +592,7 @@
   // use those languages.
   //
   // For example, to treat files like `foo.notjs` as JavaScript,
-  // and `Embargo.lock` as TOML:
+  // and 'Embargo.lock' as TOML:
   //
   // {
   //   "JavaScript": ["notjs"],
@@ -647,30 +609,19 @@
   },
   // Different settings for specific languages.
   "languages": {
-    "Astro": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-astro"]
-      }
-    },
-    "Blade": {
-      "prettier": {
-        "allowed": true
-      }
+    "C++": {
+      "format_on_save": "off"
     },
     "C": {
       "format_on_save": "off"
     },
-    "C++": {
-      "format_on_save": "off"
-    },
-    "CSS": {
-      "prettier": {
-        "allowed": true
-      }
-    },
     "Elixir": {
-      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
+      "language_servers": [
+        "elixir-ls",
+        "!next-ls",
+        "!lexical",
+        "..."
+      ]
     },
     "Gleam": {
       "tab_size": 2
@@ -680,120 +631,32 @@
         "source.organizeImports": true
       }
     },
-    "GraphQL": {
-      "prettier": {
-        "allowed": true
-      }
-    },
     "HEEX": {
-      "language_servers": ["elixir-ls", "!next-ls", "!lexical", "..."]
-    },
-    "HTML": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "Java": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-java"]
-      }
-    },
-    "JavaScript": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "JSON": {
-      "prettier": {
-        "allowed": true
-      }
+      "language_servers": [
+        "elixir-ls",
+        "!next-ls",
+        "!lexical",
+        "..."
+      ]
     },
     "Make": {
       "hard_tabs": true
     },
     "Markdown": {
-      "format_on_save": "off",
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "PHP": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["@prettier/plugin-php"]
-      }
+      "format_on_save": "off"
     },
     "Prisma": {
       "tab_size": 2
     },
     "Ruby": {
       "language_servers": ["solargraph", "!ruby-lsp", "..."]
-    },
-    "SCSS": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "SQL": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-sql"]
-      }
-    },
-    "Svelte": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["prettier-plugin-svelte"]
-      }
-    },
-    "TSX": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "Twig": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "TypeScript": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "Vue.js": {
-      "prettier": {
-        "allowed": true
-      }
-    },
-    "XML": {
-      "prettier": {
-        "allowed": true,
-        "plugins": ["@prettier/plugin-xml"]
-      }
-    },
-    "YAML": {
-      "prettier": {
-        "allowed": true
-      }
     }
   },
   // Zed's Prettier integration settings.
-  // Allows to enable/disable formatting with Prettier
-  // and configure default Prettier, used when no project-level Prettier installation is found.
+  // If Prettier is enabled, Zed will use this for its Prettier instance for any applicable file, if
+  // project has no other Prettier installed.
   "prettier": {
-    // // Whether to consider prettier formatter or not when attempting to format a file.
-    // "allowed": false,
-    //
-    // // Use regular Prettier json configuration.
-    // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
-    // // the project has no other Prettier installed.
-    // "plugins": [],
-    //
-    // // Use regular Prettier json configuration.
-    // // If Prettier is allowed, Zed will use this for its Prettier instance for any applicable file, if
-    // // the project has no other Prettier installed.
+    // Use regular Prettier json configuration:
     // "trailingComma": "es5",
     // "tabWidth": 4,
     // "semi": false,
@@ -851,17 +714,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"
 }

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",

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);
             }
         }

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,18 +12,14 @@ doctest = false
 [dependencies]
 anyhow.workspace = true
 anthropic = { workspace = true, features = ["schemars"] }
-assistant_slash_command.workspace = true
-cargo_toml.workspace = true
 chrono.workspace = true
 client.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 editor.workspace = true
-feature_flags.workspace = true
 file_icons.workspace = true
 fs.workspace = true
 futures.workspace = true
-fuzzy.workspace = true
 gpui.workspace = true
 http.workspace = true
 indoc.workspace = true
@@ -39,26 +32,19 @@ ordered-float.workspace = true
 parking_lot.workspace = true
 project.workspace = true
 regex.workspace = true
-rope.workspace = true
-rustdoc_to_markdown.workspace = true
 schemars.workspace = true
 search.workspace = true
-semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
-strsim = "0.11"
 telemetry_events.workspace = true
 theme.workspace = true
 tiktoken-rs.workspace = true
-toml.workspace = true
 ui.workspace = true
 util.workspace = true
 uuid.workspace = true
 workspace.workspace = true
-picker.workspace = true
-gray_matter = "0.2.7"
 
 [dev-dependencies]
 ctor.workspace = true
@@ -67,4 +53,3 @@ env_logger.workspace = true
 log.workspace = true
 project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
-unindent.workspace = true

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.

crates/assistant/src/assistant.rs

@@ -4,26 +4,21 @@ mod codegen;
 mod completion_provider;
 mod prompts;
 mod saved_conversation;
-mod search;
-mod slash_command;
 mod streaming_diff;
 
 pub use assistant_panel::AssistantPanel;
-
 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};
+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 std::{
     fmt::{self, Display},
     sync::Arc,
 };
-use util::paths::EMBEDDINGS_DIR;
 
 actions!(
     assistant,
@@ -35,10 +30,8 @@ actions!(
         ToggleFocus,
         ResetKey,
         InlineAssist,
-        InsertActivePrompt,
+        ToggleIncludeConversation,
         ToggleHistory,
-        ApplyEdit,
-        ConfirmCommand
     ]
 );
 
@@ -233,35 +226,19 @@ impl Assistant {
 pub fn init(client: Arc<Client>, cx: &mut AppContext) {
     cx.set_global(Assistant::default());
     AssistantSettings::register(cx);
-
-    cx.spawn(|mut cx| {
-        let client = client.clone();
-        async move {
-            let embedding_provider = CloudEmbeddingProvider::new(client.clone());
-            let semantic_index = SemanticIndex::new(
-                EMBEDDINGS_DIR.join("semantic-index-db.0.mdb"),
-                Arc::new(embedding_provider),
-                &mut cx,
-            )
-            .await?;
-            cx.update(|cx| cx.set_global(semantic_index))
-        }
-    })
-    .detach();
     completion_provider::init(client, cx);
-    assistant_slash_command::init(cx);
     assistant_panel::init(cx);
 
     CommandPaletteFilter::update_global(cx, |filter, _cx| {
         filter.hide_namespace(Assistant::NAMESPACE);
     });
-    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);

crates/assistant/src/assistant_settings.rs

@@ -339,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>,
@@ -418,7 +418,7 @@ fn merge<T: Copy>(target: &mut T, value: Option<T>) {
 
 #[cfg(test)]
 mod tests {
-    use gpui::{AppContext, UpdateGlobal};
+    use gpui::{AppContext, BorrowAppContext};
     use settings::SettingsStore;
 
     use super::*;
@@ -440,7 +440,7 @@ mod tests {
         );
 
         // Ensure backward-compatibility.
-        SettingsStore::update_global(cx, |store, cx| {
+        cx.update_global::<SettingsStore, _>(|store, cx| {
             store
                 .set_user_settings(
                     r#"{
@@ -460,7 +460,7 @@ mod tests {
                 low_speed_timeout_in_seconds: None,
             }
         );
-        SettingsStore::update_global(cx, |store, cx| {
+        cx.update_global::<SettingsStore, _>(|store, cx| {
             store
                 .set_user_settings(
                     r#"{
@@ -482,7 +482,7 @@ mod tests {
         );
 
         // 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#"{

crates/assistant/src/completion_provider.rs

@@ -233,7 +233,7 @@ impl CompletionProvider {
             CompletionProvider::Anthropic(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!(),
         }
     }
 

crates/assistant/src/completion_provider/anthropic.rs

@@ -7,7 +7,7 @@ use anthropic::{stream_completion, Request, RequestMessage, Role as AnthropicRol
 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;
@@ -261,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,

crates/assistant/src/completion_provider/open_ai.rs

@@ -5,7 +5,7 @@ use crate::{
 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;
@@ -204,7 +204,9 @@ pub fn count_open_ai_tokens(
                 .collect::<Vec<_>>();
 
             match request.model {
-                LanguageModel::Anthropic(_)
+                LanguageModel::OpenAi(OpenAiModel::FourOmni)
+                | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4Omni)
+                | LanguageModel::Anthropic(_)
                 | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Opus)
                 | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Sonnet)
                 | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Haiku) => {
@@ -273,7 +275,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,

crates/assistant/src/prompts.rs

@@ -1,7 +1,95 @@
-mod prompt;
-mod prompt_library;
-mod prompt_manager;
+use language::BufferSnapshot;
+use std::{fmt::Write, ops::Range};
 
-pub use prompt::*;
-pub use prompt_library::*;
-pub use prompt_manager::*;
+pub fn generate_content_prompt(
+    user_prompt: String,
+    language_name: Option<&str>,
+    buffer: BufferSnapshot,
+    range: Range<usize>,
+    project_name: Option<String>,
+) -> anyhow::Result<String> {
+    let mut prompt = String::new();
+
+    let content_type = match language_name {
+        None | Some("Markdown" | "Plain Text") => {
+            writeln!(prompt, "You are an expert engineer.")?;
+            "Text"
+        }
+        Some(language_name) => {
+            writeln!(prompt, "You are an expert {language_name} engineer.")?;
+            writeln!(
+                prompt,
+                "Your answer MUST always and only be valid {}.",
+                language_name
+            )?;
+            "Code"
+        }
+    };
+
+    if let Some(project_name) = project_name {
+        writeln!(
+            prompt,
+            "You are currently working inside the '{project_name}' project in code editor Zed."
+        )?;
+    }
+
+    // Include file content.
+    for chunk in buffer.text_for_range(0..range.start) {
+        prompt.push_str(chunk);
+    }
+
+    if range.is_empty() {
+        prompt.push_str("<|START|>");
+    } else {
+        prompt.push_str("<|START|");
+    }
+
+    for chunk in buffer.text_for_range(range.clone()) {
+        prompt.push_str(chunk);
+    }
+
+    if !range.is_empty() {
+        prompt.push_str("|END|>");
+    }
+
+    for chunk in buffer.text_for_range(range.end..buffer.len()) {
+        prompt.push_str(chunk);
+    }
+
+    prompt.push('\n');
+
+    if range.is_empty() {
+        writeln!(
+            prompt,
+            "Assume the cursor is located where the `<|START|>` span is."
+        )
+        .unwrap();
+        writeln!(
+            prompt,
+            "{content_type} can't be replaced, so assume your answer will be inserted at the cursor.",
+        )
+        .unwrap();
+        writeln!(
+            prompt,
+            "Generate {content_type} based on the users prompt: {user_prompt}",
+        )
+        .unwrap();
+    } else {
+        writeln!(prompt, "Modify the user's selected {content_type} based upon the users prompt: '{user_prompt}'").unwrap();
+        writeln!(prompt, "You must reply with only the adjusted {content_type} (within the '<|START|' and '|END|>' spans) not the entire file.").unwrap();
+        writeln!(
+            prompt,
+            "Double check that you only return code and not the '<|START|' and '|END|'> spans"
+        )
+        .unwrap();
+    }
+
+    writeln!(prompt, "Never make remarks about the output.").unwrap();
+    writeln!(
+        prompt,
+        "Do not return anything else, except the generated {content_type}."
+    )
+    .unwrap();
+
+    Ok(prompt)
+}

crates/assistant/src/prompts/prompt.rs

@@ -1,360 +0,0 @@
-use fs::Fs;
-use language::BufferSnapshot;
-use std::{fmt::Write, ops::Range, path::PathBuf, sync::Arc};
-use ui::SharedString;
-use util::paths::PROMPTS_DIR;
-
-use gray_matter::{engine::YAML, Matter};
-use serde::{Deserialize, Serialize};
-
-use super::prompt_library::PromptId;
-
-pub const PROMPT_DEFAULT_TITLE: &str = "Untitled Prompt";
-
-fn standardize_value(value: String) -> String {
-    value.replace(['\n', '\r', '"', '\''], "")
-}
-
-fn slugify(input: String) -> String {
-    let mut slug = String::new();
-    for c in input.chars() {
-        if c.is_alphanumeric() {
-            slug.push(c.to_ascii_lowercase());
-        } else if c.is_whitespace() {
-            slug.push('-');
-        } else {
-            slug.push('_');
-        }
-    }
-    slug
-}
-
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub struct StaticPromptFrontmatter {
-    title: String,
-    version: String,
-    author: String,
-    #[serde(default)]
-    languages: Vec<String>,
-    #[serde(default)]
-    dependencies: Vec<String>,
-}
-
-impl Default for StaticPromptFrontmatter {
-    fn default() -> Self {
-        Self {
-            title: PROMPT_DEFAULT_TITLE.to_string(),
-            version: "1.0".to_string(),
-            author: "You <you@email.com>".to_string(),
-            languages: vec![],
-            dependencies: vec![],
-        }
-    }
-}
-
-impl StaticPromptFrontmatter {
-    /// Returns the frontmatter as a markdown frontmatter string
-    pub fn frontmatter_string(&self) -> String {
-        let mut frontmatter = format!(
-            "---\ntitle: \"{}\"\nversion: \"{}\"\nauthor: \"{}\"\n",
-            standardize_value(self.title.clone()),
-            standardize_value(self.version.clone()),
-            standardize_value(self.author.clone()),
-        );
-
-        if !self.languages.is_empty() {
-            let languages = self
-                .languages
-                .iter()
-                .map(|l| standardize_value(l.clone()))
-                .collect::<Vec<String>>()
-                .join(", ");
-            writeln!(frontmatter, "languages: [{}]", languages).unwrap();
-        }
-
-        if !self.dependencies.is_empty() {
-            let dependencies = self
-                .dependencies
-                .iter()
-                .map(|d| standardize_value(d.clone()))
-                .collect::<Vec<String>>()
-                .join(", ");
-            writeln!(frontmatter, "dependencies: [{}]", dependencies).unwrap();
-        }
-
-        frontmatter.push_str("---\n");
-
-        frontmatter
-    }
-}
-
-/// A static prompt that can be loaded into the prompt library
-/// from Markdown with a frontmatter header
-///
-/// Examples:
-///
-/// ### Globally available prompt
-///
-/// ```markdown
-/// ---
-/// title: Foo
-/// version: 1.0
-/// author: Jane Kim <jane@kim.com
-/// languages: ["*"]
-/// dependencies: []
-/// ---
-///
-/// Foo and bar are terms used in programming to describe generic concepts.
-/// ```
-///
-/// ### Language-specific prompt
-///
-/// ```markdown
-/// ---
-/// title: UI with GPUI
-/// version: 1.0
-/// author: Nate Butler <iamnbutler@gmail.com>
-/// languages: ["rust"]
-/// dependencies: ["gpui"]
-/// ---
-///
-/// When building a UI with GPUI, ensure you...
-/// ```
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
-pub struct StaticPrompt {
-    #[serde(skip_deserializing)]
-    id: PromptId,
-    #[serde(skip)]
-    metadata: StaticPromptFrontmatter,
-    content: String,
-    file_name: Option<SharedString>,
-}
-
-impl Default for StaticPrompt {
-    fn default() -> Self {
-        let metadata = StaticPromptFrontmatter::default();
-
-        let content = metadata.clone().frontmatter_string();
-
-        Self {
-            id: PromptId::new(),
-            metadata,
-            content,
-            file_name: None,
-        }
-    }
-}
-
-impl StaticPrompt {
-    pub fn new(content: String, file_name: Option<String>) -> Self {
-        let matter = Matter::<YAML>::new();
-        let result = matter.parse(&content);
-        let file_name = if let Some(file_name) = file_name {
-            let shared_filename: SharedString = file_name.into();
-            Some(shared_filename)
-        } else {
-            None
-        };
-
-        let metadata = result
-            .data
-            .map_or_else(
-                || Err(anyhow::anyhow!("Failed to parse frontmatter")),
-                |data| {
-                    let front_matter: StaticPromptFrontmatter = data.deserialize()?;
-                    Ok(front_matter)
-                },
-            )
-            .unwrap_or_else(|e| {
-                if let Some(file_name) = &file_name {
-                    log::error!("Failed to parse frontmatter for {}: {}", file_name, e);
-                } else {
-                    log::error!("Failed to parse frontmatter: {}", e);
-                }
-                StaticPromptFrontmatter::default()
-            });
-
-        let id = if let Some(file_name) = &file_name {
-            PromptId::from_str(file_name).unwrap_or_default()
-        } else {
-            PromptId::new()
-        };
-
-        StaticPrompt {
-            id,
-            content,
-            file_name,
-            metadata,
-        }
-    }
-
-    pub fn update(&mut self, id: PromptId, content: String) {
-        let mut updated_prompt =
-            StaticPrompt::new(content, self.file_name.clone().map(|s| s.to_string()));
-        updated_prompt.id = id;
-        *self = updated_prompt;
-    }
-}
-
-impl StaticPrompt {
-    /// Returns the prompt's id
-    pub fn id(&self) -> &PromptId {
-        &self.id
-    }
-
-    pub fn file_name(&self) -> Option<&SharedString> {
-        self.file_name.as_ref()
-    }
-
-    /// Sets the file name of the prompt
-    pub fn new_file_name(&self) -> String {
-        let in_name = format!(
-            "{}_{}_{}",
-            standardize_value(self.metadata.title.clone()),
-            standardize_value(self.metadata.version.clone()),
-            standardize_value(self.id.0.to_string())
-        );
-        let out_name = slugify(in_name);
-        out_name
-    }
-
-    /// Returns the prompt's content
-    pub fn content(&self) -> &String {
-        &self.content
-    }
-
-    /// Returns the prompt's metadata
-    pub fn _metadata(&self) -> &StaticPromptFrontmatter {
-        &self.metadata
-    }
-
-    /// Returns the prompt's title
-    pub fn title(&self) -> SharedString {
-        self.metadata.title.clone().into()
-    }
-
-    pub fn body(&self) -> String {
-        let matter = Matter::<YAML>::new();
-        let result = matter.parse(self.content.as_str());
-        result.content.clone()
-    }
-
-    pub fn path(&self) -> Option<PathBuf> {
-        if let Some(file_name) = self.file_name() {
-            let path_str = format!("{}", file_name);
-            Some(PROMPTS_DIR.join(path_str))
-        } else {
-            None
-        }
-    }
-
-    pub async fn save(&self, fs: Arc<dyn Fs>) -> anyhow::Result<()> {
-        let file_name = self.file_name();
-        let new_file_name = self.new_file_name();
-
-        let out_name = if let Some(file_name) = file_name {
-            file_name.to_owned().to_string()
-        } else {
-            format!("{}.md", new_file_name)
-        };
-        let path = PROMPTS_DIR.join(&out_name);
-        let json = self.content.clone();
-
-        fs.atomic_write(path, json).await?;
-
-        Ok(())
-    }
-}
-
-pub fn generate_content_prompt(
-    user_prompt: String,
-    language_name: Option<&str>,
-    buffer: BufferSnapshot,
-    range: Range<usize>,
-    project_name: Option<String>,
-) -> anyhow::Result<String> {
-    let mut prompt = String::new();
-
-    let content_type = match language_name {
-        None | Some("Markdown" | "Plain Text") => {
-            writeln!(prompt, "You are an expert engineer.")?;
-            "Text"
-        }
-        Some(language_name) => {
-            writeln!(prompt, "You are an expert {language_name} engineer.")?;
-            writeln!(
-                prompt,
-                "Your answer MUST always and only be valid {}.",
-                language_name
-            )?;
-            "Code"
-        }
-    };
-
-    if let Some(project_name) = project_name {
-        writeln!(
-            prompt,
-            "You are currently working inside the '{project_name}' project in code editor Zed."
-        )?;
-    }
-
-    // Include file content.
-    for chunk in buffer.text_for_range(0..range.start) {
-        prompt.push_str(chunk);
-    }
-
-    if range.is_empty() {
-        prompt.push_str("<|START|>");
-    } else {
-        prompt.push_str("<|START|");
-    }
-
-    for chunk in buffer.text_for_range(range.clone()) {
-        prompt.push_str(chunk);
-    }
-
-    if !range.is_empty() {
-        prompt.push_str("|END|>");
-    }
-
-    for chunk in buffer.text_for_range(range.end..buffer.len()) {
-        prompt.push_str(chunk);
-    }
-
-    prompt.push('\n');
-
-    if range.is_empty() {
-        writeln!(
-            prompt,
-            "Assume the cursor is located where the `<|START|>` span is."
-        )
-        .unwrap();
-        writeln!(
-            prompt,
-            "{content_type} can't be replaced, so assume your answer will be inserted at the cursor.",
-        )
-        .unwrap();
-        writeln!(
-            prompt,
-            "Generate {content_type} based on the users prompt: {user_prompt}",
-        )
-        .unwrap();
-    } else {
-        writeln!(prompt, "Modify the user's selected {content_type} based upon the users prompt: '{user_prompt}'").unwrap();
-        writeln!(prompt, "You must reply with only the adjusted {content_type} (within the '<|START|' and '|END|>' spans) not the entire file.").unwrap();
-        writeln!(
-            prompt,
-            "Double check that you only return code and not the '<|START|' and '|END|'> spans"
-        )
-        .unwrap();
-    }
-
-    writeln!(prompt, "Never make remarks about the output.").unwrap();
-    writeln!(
-        prompt,
-        "Do not return anything else, except the generated {content_type}."
-    )
-    .unwrap();
-
-    Ok(prompt)
-}

crates/assistant/src/prompts/prompt_library.rs

@@ -1,245 +0,0 @@
-use anyhow::Context;
-use collections::HashMap;
-use fs::Fs;
-
-use gray_matter::{engine::YAML, Matter};
-use parking_lot::RwLock;
-use serde::{Deserialize, Serialize};
-use smol::stream::StreamExt;
-use std::sync::Arc;
-use util::paths::PROMPTS_DIR;
-use uuid::Uuid;
-
-use super::prompt::StaticPrompt;
-
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, Serialize, Deserialize)]
-pub struct PromptId(pub Uuid);
-
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-pub enum SortOrder {
-    Alphabetical,
-}
-
-#[allow(unused)]
-impl PromptId {
-    pub fn new() -> Self {
-        Self(Uuid::new_v4())
-    }
-
-    pub fn from_str(id: &str) -> anyhow::Result<Self> {
-        Ok(Self(Uuid::parse_str(id)?))
-    }
-}
-
-impl Default for PromptId {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[derive(Default, Serialize, Deserialize)]
-pub struct PromptLibraryState {
-    /// A set of prompts that all assistant contexts will start with
-    default_prompt: Vec<PromptId>,
-    /// All [Prompt]s loaded into the library
-    prompts: HashMap<PromptId, StaticPrompt>,
-    /// Prompts that have been changed but haven't been
-    /// saved back to the file system
-    dirty_prompts: Vec<PromptId>,
-    version: usize,
-}
-
-pub struct PromptLibrary {
-    state: RwLock<PromptLibraryState>,
-}
-
-impl Default for PromptLibrary {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl PromptLibrary {
-    fn new() -> Self {
-        Self {
-            state: RwLock::new(PromptLibraryState::default()),
-        }
-    }
-
-    pub fn new_prompt(&self) -> StaticPrompt {
-        StaticPrompt::default()
-    }
-
-    pub fn add_prompt(&self, prompt: StaticPrompt) {
-        let mut state = self.state.write();
-        let id = *prompt.id();
-        state.prompts.insert(id, prompt);
-        state.version += 1;
-    }
-
-    pub fn prompts(&self) -> HashMap<PromptId, StaticPrompt> {
-        let state = self.state.read();
-        state.prompts.clone()
-    }
-
-    pub fn sorted_prompts(&self, sort_order: SortOrder) -> Vec<(PromptId, StaticPrompt)> {
-        let state = self.state.read();
-
-        let mut prompts = state
-            .prompts
-            .iter()
-            .map(|(id, prompt)| (*id, prompt.clone()))
-            .collect::<Vec<_>>();
-
-        match sort_order {
-            SortOrder::Alphabetical => prompts.sort_by(|(_, a), (_, b)| a.title().cmp(&b.title())),
-        };
-
-        prompts
-    }
-
-    pub fn prompt_by_id(&self, id: PromptId) -> Option<StaticPrompt> {
-        let state = self.state.read();
-        state.prompts.get(&id).cloned()
-    }
-
-    pub fn first_prompt_id(&self) -> Option<PromptId> {
-        let state = self.state.read();
-        state.prompts.keys().next().cloned()
-    }
-
-    pub fn is_dirty(&self, id: &PromptId) -> bool {
-        let state = self.state.read();
-        state.dirty_prompts.contains(&id)
-    }
-
-    pub fn set_dirty(&self, id: PromptId, dirty: bool) {
-        let mut state = self.state.write();
-        if dirty {
-            if !state.dirty_prompts.contains(&id) {
-                state.dirty_prompts.push(id);
-            }
-            state.version += 1;
-        } else {
-            state.dirty_prompts.retain(|&i| i != id);
-            state.version += 1;
-        }
-    }
-
-    /// Load the state of the prompt library from the file system
-    /// or create a new one if it doesn't exist
-    pub async fn load_index(fs: Arc<dyn Fs>) -> anyhow::Result<Self> {
-        let path = PROMPTS_DIR.join("index.json");
-
-        let state = if fs.is_file(&path).await {
-            let json = fs.load(&path).await?;
-            serde_json::from_str(&json)?
-        } else {
-            PromptLibraryState::default()
-        };
-
-        let mut prompt_library = Self {
-            state: RwLock::new(state),
-        };
-
-        prompt_library.load_prompts(fs).await?;
-
-        Ok(prompt_library)
-    }
-
-    /// Load all prompts from the file system
-    /// adding them to the library if they don't already exist
-    pub async fn load_prompts(&mut self, fs: Arc<dyn Fs>) -> anyhow::Result<()> {
-        self.state.get_mut().prompts.clear();
-
-        let mut prompt_paths = fs.read_dir(&PROMPTS_DIR).await?;
-
-        while let Some(prompt_path) = prompt_paths.next().await {
-            let prompt_path = prompt_path.with_context(|| "Failed to read prompt path")?;
-            let file_name_lossy = if prompt_path.file_name().is_some() {
-                Some(
-                    prompt_path
-                        .file_name()
-                        .unwrap()
-                        .to_string_lossy()
-                        .to_string(),
-                )
-            } else {
-                None
-            };
-
-            if !fs.is_file(&prompt_path).await
-                || prompt_path.extension().and_then(|ext| ext.to_str()) != Some("md")
-            {
-                continue;
-            }
-
-            let json = fs
-                .load(&prompt_path)
-                .await
-                .with_context(|| format!("Failed to load prompt {:?}", prompt_path))?;
-
-            // Check that the prompt is valid
-            let matter = Matter::<YAML>::new();
-            let result = matter.parse(&json);
-            if result.data.is_none() {
-                log::warn!("Invalid prompt: {:?}", prompt_path);
-                continue;
-            }
-
-            let static_prompt = StaticPrompt::new(json, file_name_lossy.clone());
-
-            let state = self.state.get_mut();
-
-            let id = Uuid::new_v4();
-            state.prompts.insert(PromptId(id), static_prompt);
-            state.version += 1;
-        }
-
-        // Write any changes back to the file system
-        self.save_index(fs.clone()).await?;
-
-        Ok(())
-    }
-
-    /// Save the current state of the prompt library to the
-    /// file system as a JSON file
-    pub async fn save_index(&self, fs: Arc<dyn Fs>) -> anyhow::Result<()> {
-        fs.create_dir(&PROMPTS_DIR).await?;
-
-        let path = PROMPTS_DIR.join("index.json");
-
-        let json = {
-            let state = self.state.read();
-            serde_json::to_string(&*state)?
-        };
-
-        fs.atomic_write(path, json).await?;
-
-        Ok(())
-    }
-
-    pub async fn save_prompt(
-        &self,
-        prompt_id: PromptId,
-        updated_content: Option<String>,
-        fs: Arc<dyn Fs>,
-    ) -> anyhow::Result<()> {
-        if let Some(updated_content) = updated_content {
-            let mut state = self.state.write();
-            if let Some(prompt) = state.prompts.get_mut(&prompt_id) {
-                prompt.update(prompt_id, updated_content);
-                state.version += 1;
-            }
-        }
-
-        if let Some(prompt) = self.prompt_by_id(prompt_id) {
-            prompt.save(fs).await?;
-            self.set_dirty(prompt_id, false);
-        } else {
-            log::warn!("Failed to save prompt: {:?}", prompt_id);
-        }
-
-        Ok(())
-    }
-}

crates/assistant/src/prompts/prompt_manager.rs

@@ -1,512 +0,0 @@
-use collections::HashMap;
-use editor::{Editor, EditorEvent};
-use fs::Fs;
-use gpui::{prelude::FluentBuilder, *};
-use language::{language_settings, Buffer, LanguageRegistry};
-use picker::{Picker, PickerDelegate};
-use std::sync::Arc;
-use ui::{prelude::*, IconButtonShape, Indicator, ListItem, ListItemSpacing, Tooltip};
-use util::{ResultExt, TryFutureExt};
-use workspace::ModalView;
-
-use crate::prompts::{PromptId, PromptLibrary, SortOrder, StaticPrompt, PROMPT_DEFAULT_TITLE};
-
-actions!(prompt_manager, [NewPrompt, SavePrompt]);
-
-pub struct PromptManager {
-    focus_handle: FocusHandle,
-    prompt_library: Arc<PromptLibrary>,
-    language_registry: Arc<LanguageRegistry>,
-    #[allow(dead_code)]
-    fs: Arc<dyn Fs>,
-    picker: View<Picker<PromptManagerDelegate>>,
-    prompt_editors: HashMap<PromptId, View<Editor>>,
-    active_prompt_id: Option<PromptId>,
-    last_new_prompt_id: Option<PromptId>,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl PromptManager {
-    pub fn new(
-        prompt_library: Arc<PromptLibrary>,
-        language_registry: Arc<LanguageRegistry>,
-        fs: Arc<dyn Fs>,
-        cx: &mut ViewContext<Self>,
-    ) -> Self {
-        let prompt_manager = cx.view().downgrade();
-        let picker = cx.new_view(|cx| {
-            Picker::uniform_list(
-                PromptManagerDelegate {
-                    prompt_manager,
-                    matching_prompts: vec![],
-                    matching_prompt_ids: vec![],
-                    prompt_library: prompt_library.clone(),
-                    selected_index: 0,
-                    _subscriptions: vec![],
-                },
-                cx,
-            )
-            .max_height(rems(35.75))
-            .modal(false)
-        });
-
-        let focus_handle = picker.focus_handle(cx);
-
-        let subscriptions = vec![
-            // cx.on_focus_in(&focus_handle, Self::focus_in),
-            // cx.on_focus_out(&focus_handle, Self::focus_out),
-        ];
-
-        let mut manager = Self {
-            focus_handle,
-            prompt_library,
-            language_registry,
-            fs,
-            picker,
-            prompt_editors: HashMap::default(),
-            active_prompt_id: None,
-            last_new_prompt_id: None,
-            _subscriptions: subscriptions,
-        };
-
-        manager.active_prompt_id = manager.prompt_library.first_prompt_id();
-
-        manager
-    }
-
-    fn dispatch_context(&self, cx: &ViewContext<Self>) -> KeyContext {
-        let mut dispatch_context = KeyContext::new_with_defaults();
-        dispatch_context.add("PromptManager");
-
-        let identifier = match self.active_editor() {
-            Some(active_editor) if active_editor.focus_handle(cx).is_focused(cx) => "editing",
-            _ => "not_editing",
-        };
-
-        dispatch_context.add(identifier);
-        dispatch_context
-    }
-
-    pub fn new_prompt(&mut self, _: &NewPrompt, cx: &mut ViewContext<Self>) {
-        // TODO: Why doesn't this prevent making a new prompt if you
-        // move the picker selection/maybe unfocus the editor?
-
-        // Prevent making a new prompt if the last new prompt is still empty
-        //
-        // Instead, we'll focus the last new prompt
-        if let Some(last_new_prompt_id) = self.last_new_prompt_id() {
-            if let Some(last_new_prompt) = self.prompt_library.prompt_by_id(last_new_prompt_id) {
-                let normalized_body = last_new_prompt
-                    .body()
-                    .trim()
-                    .replace(['\r', '\n'], "")
-                    .to_string();
-
-                if last_new_prompt.title() == PROMPT_DEFAULT_TITLE && normalized_body.is_empty() {
-                    self.set_editor_for_prompt(last_new_prompt_id, cx);
-                    self.focus_active_editor(cx);
-                }
-            }
-        }
-
-        let prompt = self.prompt_library.new_prompt();
-        self.set_last_new_prompt_id(Some(prompt.id().to_owned()));
-
-        self.prompt_library.add_prompt(prompt.clone());
-
-        let id = *prompt.id();
-        self.picker.update(cx, |picker, _cx| {
-            let prompts = self
-                .prompt_library
-                .sorted_prompts(SortOrder::Alphabetical)
-                .clone()
-                .into_iter();
-
-            picker.delegate.prompt_library = self.prompt_library.clone();
-            picker.delegate.matching_prompts = prompts.clone().map(|(_, p)| Arc::new(p)).collect();
-            picker.delegate.matching_prompt_ids = prompts.map(|(id, _)| id).collect();
-            picker.delegate.selected_index = picker
-                .delegate
-                .matching_prompts
-                .iter()
-                .position(|p| p.id() == &id)
-                .unwrap_or(0);
-        });
-
-        self.active_prompt_id = Some(id);
-
-        cx.notify();
-    }
-
-    pub fn save_prompt(
-        &mut self,
-        fs: Arc<dyn Fs>,
-        prompt_id: PromptId,
-        new_content: String,
-        cx: &mut ViewContext<Self>,
-    ) -> Result<()> {
-        let library = self.prompt_library.clone();
-        if library.prompt_by_id(prompt_id).is_some() {
-            cx.spawn(|_, _| async move {
-                library
-                    .save_prompt(prompt_id, Some(new_content), fs)
-                    .log_err()
-                    .await;
-            })
-            .detach();
-            cx.notify();
-        }
-
-        Ok(())
-    }
-
-    pub fn set_active_prompt(&mut self, prompt_id: Option<PromptId>, cx: &mut ViewContext<Self>) {
-        self.active_prompt_id = prompt_id;
-        cx.notify();
-    }
-
-    pub fn last_new_prompt_id(&self) -> Option<PromptId> {
-        self.last_new_prompt_id
-    }
-
-    pub fn set_last_new_prompt_id(&mut self, id: Option<PromptId>) {
-        self.last_new_prompt_id = id;
-    }
-
-    pub fn focus_active_editor(&self, cx: &mut ViewContext<Self>) {
-        if let Some(active_prompt_id) = self.active_prompt_id {
-            if let Some(editor) = self.prompt_editors.get(&active_prompt_id) {
-                let focus_handle = editor.focus_handle(cx);
-
-                cx.focus(&focus_handle)
-            }
-        }
-    }
-
-    pub fn active_editor(&self) -> Option<&View<Editor>> {
-        self.active_prompt_id
-            .and_then(|active_prompt_id| self.prompt_editors.get(&active_prompt_id))
-    }
-
-    fn set_editor_for_prompt(
-        &mut self,
-        prompt_id: PromptId,
-        cx: &mut ViewContext<Self>,
-    ) -> impl IntoElement {
-        let prompt_library = self.prompt_library.clone();
-
-        let editor_for_prompt = self.prompt_editors.entry(prompt_id).or_insert_with(|| {
-            cx.new_view(|cx| {
-                let text = if let Some(prompt) = prompt_library.prompt_by_id(prompt_id) {
-                    prompt.content().to_owned()
-                } else {
-                    "".to_string()
-                };
-
-                let buffer = cx.new_model(|cx| {
-                    let mut buffer = Buffer::local(text, cx);
-                    let markdown = self.language_registry.language_for_name("Markdown");
-                    cx.spawn(|buffer, mut cx| async move {
-                        if let Some(markdown) = markdown.await.log_err() {
-                            _ = buffer.update(&mut cx, |buffer, cx| {
-                                buffer.set_language(Some(markdown), cx);
-                            });
-                        }
-                    })
-                    .detach();
-                    buffer.set_language_registry(self.language_registry.clone());
-                    buffer
-                });
-                let mut editor = Editor::for_buffer(buffer, None, cx);
-                editor.set_soft_wrap_mode(language_settings::SoftWrap::EditorWidth, cx);
-                editor.set_show_gutter(false, cx);
-                editor
-            })
-        });
-
-        editor_for_prompt.clone()
-    }
-
-    fn dismiss(&mut self, _: &menu::Cancel, cx: &mut ViewContext<Self>) {
-        cx.emit(DismissEvent);
-    }
-
-    fn render_prompt_list(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let picker = self.picker.clone();
-
-        v_flex()
-            .id("prompt-list")
-            .bg(cx.theme().colors().surface_background)
-            .h_full()
-            .w_1_3()
-            .overflow_hidden()
-            .child(
-                h_flex()
-                    .bg(cx.theme().colors().background)
-                    .p(Spacing::Small.rems(cx))
-                    .border_b_1()
-                    .border_color(cx.theme().colors().border)
-                    .h(rems(1.75))
-                    .w_full()
-                    .flex_none()
-                    .justify_between()
-                    .child(Label::new("Prompt Library").size(LabelSize::Small))
-                    .child(
-                        IconButton::new("new-prompt", IconName::Plus)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(move |cx| Tooltip::text("New Prompt", cx))
-                            .on_click(|_, cx| {
-                                cx.dispatch_action(NewPrompt.boxed_clone());
-                            }),
-                    ),
-            )
-            .child(
-                v_flex()
-                    .h(rems(38.25))
-                    .flex_grow()
-                    .justify_start()
-                    .child(picker),
-            )
-    }
-}
-
-impl Render for PromptManager {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        let active_prompt_id = self.active_prompt_id;
-        let active_prompt = if let Some(active_prompt_id) = active_prompt_id {
-            self.prompt_library.clone().prompt_by_id(active_prompt_id)
-        } else {
-            None
-        };
-        let active_editor = self.active_editor().map(|editor| editor.clone());
-        let updated_content = if let Some(editor) = active_editor {
-            Some(editor.read(cx).text(cx))
-        } else {
-            None
-        };
-        let can_save = active_prompt_id.is_some() && updated_content.is_some();
-        let fs = self.fs.clone();
-
-        h_flex()
-            .id("prompt-manager")
-            .key_context(self.dispatch_context(cx))
-            .track_focus(&self.focus_handle)
-            .on_action(cx.listener(Self::dismiss))
-            .on_action(cx.listener(Self::new_prompt))
-            .elevation_3(cx)
-            .size_full()
-            .flex_none()
-            .w(rems(64.))
-            .h(rems(40.))
-            .overflow_hidden()
-            .child(self.render_prompt_list(cx))
-            .child(
-                div().w_2_3().h_full().child(
-                    v_flex()
-                        .id("prompt-editor")
-                        .border_l_1()
-                        .border_color(cx.theme().colors().border)
-                        .bg(cx.theme().colors().editor_background)
-                        .size_full()
-                        .flex_none()
-                        .min_w_64()
-                        .h_full()
-                        .overflow_hidden()
-                        .child(
-                            h_flex()
-                                .bg(cx.theme().colors().background)
-                                .p(Spacing::Small.rems(cx))
-                                .border_b_1()
-                                .border_color(cx.theme().colors().border)
-                                .h_7()
-                                .w_full()
-                                .justify_between()
-                                .child(
-                                    h_flex()
-                                        .gap(Spacing::XXLarge.rems(cx))
-                                        .child(if can_save {
-                                            IconButton::new("save", IconName::Save)
-                                                .shape(IconButtonShape::Square)
-                                                .tooltip(move |cx| Tooltip::text("Save Prompt", cx))
-                                                .on_click(cx.listener(move |this, _event, cx| {
-                                                    if let Some(prompt_id) = active_prompt_id {
-                                                        this.save_prompt(
-                                                            fs.clone(),
-                                                            prompt_id,
-                                                            updated_content.clone().unwrap_or(
-                                                                "TODO: make unreachable"
-                                                                    .to_string(),
-                                                            ),
-                                                            cx,
-                                                        )
-                                                        .log_err();
-                                                    }
-                                                }))
-                                        } else {
-                                            IconButton::new("save", IconName::Save)
-                                                .shape(IconButtonShape::Square)
-                                                .disabled(true)
-                                        })
-                                        .when_some(active_prompt, |this, active_prompt| {
-                                            let path = active_prompt.path();
-
-                                            this.child(
-                                                IconButton::new("reveal", IconName::Reveal)
-                                                    .shape(IconButtonShape::Square)
-                                                    .disabled(path.is_none())
-                                                    .tooltip(move |cx| {
-                                                        Tooltip::text("Reveal in Finder", cx)
-                                                    })
-                                                    .on_click(cx.listener(move |_, _event, cx| {
-                                                        if let Some(path) = path.clone() {
-                                                            cx.reveal_path(&path);
-                                                        }
-                                                    })),
-                                            )
-                                        }),
-                                )
-                                .child(
-                                    IconButton::new("dismiss", IconName::Close)
-                                        .shape(IconButtonShape::Square)
-                                        .tooltip(move |cx| Tooltip::text("Close", cx))
-                                        .on_click(|_, cx| {
-                                            cx.dispatch_action(menu::Cancel.boxed_clone());
-                                        }),
-                                ),
-                        )
-                        .when_some(active_prompt_id, |this, active_prompt_id| {
-                            this.child(
-                                h_flex()
-                                    .flex_1()
-                                    .w_full()
-                                    .py(Spacing::Large.rems(cx))
-                                    .px(Spacing::XLarge.rems(cx))
-                                    .child(self.set_editor_for_prompt(active_prompt_id, cx)),
-                            )
-                        }),
-                ),
-            )
-    }
-}
-
-impl EventEmitter<DismissEvent> for PromptManager {}
-impl EventEmitter<EditorEvent> for PromptManager {}
-
-impl ModalView for PromptManager {}
-
-impl FocusableView for PromptManager {
-    fn focus_handle(&self, _cx: &AppContext) -> gpui::FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-pub struct PromptManagerDelegate {
-    prompt_manager: WeakView<PromptManager>,
-    matching_prompts: Vec<Arc<StaticPrompt>>,
-    matching_prompt_ids: Vec<PromptId>,
-    prompt_library: Arc<PromptLibrary>,
-    selected_index: usize,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl PickerDelegate for PromptManagerDelegate {
-    type ListItem = ListItem;
-
-    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
-        "Find a prompt…".into()
-    }
-
-    fn match_count(&self) -> usize {
-        self.matching_prompt_ids.len()
-    }
-
-    fn selected_index(&self) -> usize {
-        self.selected_index
-    }
-
-    fn set_selected_index(&mut self, ix: usize, _: &mut ViewContext<Picker<Self>>) {
-        self.selected_index = ix;
-    }
-
-    fn selected_index_changed(
-        &self,
-        ix: usize,
-        _cx: &mut ViewContext<Picker<Self>>,
-    ) -> Option<Box<dyn Fn(&mut WindowContext) + 'static>> {
-        let prompt_id = self.matching_prompt_ids.get(ix).copied()?;
-        let prompt_manager = self.prompt_manager.upgrade()?;
-
-        Some(Box::new(move |cx| {
-            prompt_manager.update(cx, |manager, cx| {
-                manager.set_active_prompt(Some(prompt_id), cx);
-            })
-        }))
-    }
-
-    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
-        let prompt_library = self.prompt_library.clone();
-        cx.spawn(|picker, mut cx| async move {
-            async {
-                let prompts = prompt_library.sorted_prompts(SortOrder::Alphabetical);
-                let matching_prompts = prompts
-                    .into_iter()
-                    .filter(|(_, prompt)| {
-                        prompt
-                            .content()
-                            .to_lowercase()
-                            .contains(&query.to_lowercase())
-                    })
-                    .collect::<Vec<_>>();
-                picker.update(&mut cx, |picker, cx| {
-                    picker.delegate.matching_prompt_ids =
-                        matching_prompts.iter().map(|(id, _)| *id).collect();
-                    picker.delegate.matching_prompts = matching_prompts
-                        .into_iter()
-                        .map(|(_, prompt)| Arc::new(prompt))
-                        .collect();
-                    cx.notify();
-                })?;
-                anyhow::Ok(())
-            }
-            .log_err()
-            .await;
-        })
-    }
-
-    fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<Self>>) {
-        let prompt_manager = self.prompt_manager.upgrade().unwrap();
-        prompt_manager.update(cx, move |manager, cx| manager.focus_active_editor(cx));
-    }
-
-    fn should_dismiss(&self) -> bool {
-        false
-    }
-
-    fn dismissed(&mut self, cx: &mut ViewContext<Picker<Self>>) {
-        self.prompt_manager
-            .update(cx, |_, cx| {
-                cx.emit(DismissEvent);
-            })
-            .ok();
-    }
-
-    fn render_match(
-        &self,
-        ix: usize,
-        selected: bool,
-        _cx: &mut ViewContext<Picker<Self>>,
-    ) -> Option<Self::ListItem> {
-        let prompt = self.matching_prompts.get(ix)?;
-
-        let is_diry = self.prompt_library.is_dirty(prompt.id());
-
-        Some(
-            ListItem::new(ix)
-                .inset(true)
-                .spacing(ListItemSpacing::Sparse)
-                .selected(selected)
-                .child(Label::new(prompt.title()))
-                .end_slot(div().when(is_diry, |this| this.child(Indicator::dot()))),
-        )
-    }
-}

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);
-    }
-}

crates/assistant/src/slash_command.rs

@@ -1,329 +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 file_command;
-pub mod project_command;
-pub mod prompt_command;
-pub mod rustdoc_command;
-pub mod search_command;
-pub mod tabs_command;
-
-pub(crate) struct SlashCommandCompletionProvider {
-    editor: WeakView<ConversationEditor>,
-    commands: Arc<SlashCommandRegistry>,
-    cancel_flag: Mutex<Arc<AtomicBool>>,
-    workspace: WeakView<Workspace>,
-}
-
-pub(crate) struct SlashCommandLine {
-    /// The range within the line containing the command name.
-    pub name: Range<usize>,
-    /// The range within the line containing the command argument.
-    pub argument: Option<Range<usize>>,
-}
-
-impl SlashCommandCompletionProvider {
-    pub fn new(
-        editor: WeakView<ConversationEditor>,
-        commands: Arc<SlashCommandRegistry>,
-        workspace: WeakView<Workspace>,
-    ) -> Self {
-        Self {
-            cancel_flag: Mutex::new(Arc::new(AtomicBool::new(false))),
-            editor,
-            commands,
-            workspace,
-        }
-    }
-
-    fn complete_command_name(
-        &self,
-        command_name: &str,
-        command_range: Range<Anchor>,
-        name_range: Range<Anchor>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<Vec<project::Completion>>> {
-        let candidates = self
-            .commands
-            .command_names()
-            .into_iter()
-            .enumerate()
-            .map(|(ix, def)| StringMatchCandidate {
-                id: ix,
-                string: def.to_string(),
-                char_bag: def.as_ref().into(),
-            })
-            .collect::<Vec<_>>();
-        let commands = self.commands.clone();
-        let command_name = command_name.to_string();
-        let editor = self.editor.clone();
-        let workspace = self.workspace.clone();
-        cx.spawn(|mut cx| async move {
-            let matches = match_strings(
-                &candidates,
-                &command_name,
-                true,
-                usize::MAX,
-                &Default::default(),
-                cx.background_executor().clone(),
-            )
-            .await;
-
-            cx.update(|cx| {
-                matches
-                    .into_iter()
-                    .filter_map(|mat| {
-                        let command = commands.command(&mat.string)?;
-                        let mut new_text = mat.string.clone();
-                        let requires_argument = command.requires_argument();
-                        if requires_argument {
-                            new_text.push(' ');
-                        }
-
-                        Some(project::Completion {
-                            old_range: name_range.clone(),
-                            documentation: Some(Documentation::SingleLine(command.description())),
-                            new_text,
-                            label: command.label(cx),
-                            server_id: LanguageServerId(0),
-                            lsp_completion: Default::default(),
-                            show_new_completions_on_confirm: requires_argument,
-                            confirm: (!requires_argument).then(|| {
-                                let command_name = mat.string.clone();
-                                let command_range = command_range.clone();
-                                let editor = editor.clone();
-                                let workspace = workspace.clone();
-                                Arc::new(move |cx: &mut WindowContext| {
-                                    editor
-                                        .update(cx, |editor, cx| {
-                                            editor.run_command(
-                                                command_range.clone(),
-                                                &command_name,
-                                                None,
-                                                workspace.clone(),
-                                                cx,
-                                            );
-                                        })
-                                        .ok();
-                                }) as Arc<_>
-                            }),
-                        })
-                    })
-                    .collect()
-            })
-        })
-    }
-
-    fn complete_command_argument(
-        &self,
-        command_name: &str,
-        argument: String,
-        command_range: Range<Anchor>,
-        argument_range: Range<Anchor>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<Vec<project::Completion>>> {
-        let new_cancel_flag = Arc::new(AtomicBool::new(false));
-        let mut flag = self.cancel_flag.lock();
-        flag.store(true, SeqCst);
-        *flag = new_cancel_flag.clone();
-
-        if let Some(command) = self.commands.command(command_name) {
-            let completions = command.complete_argument(
-                argument,
-                new_cancel_flag.clone(),
-                self.workspace.clone(),
-                cx,
-            );
-            let command_name: Arc<str> = command_name.into();
-            let editor = self.editor.clone();
-            let workspace = self.workspace.clone();
-            cx.background_executor().spawn(async move {
-                Ok(completions
-                    .await?
-                    .into_iter()
-                    .map(|arg| project::Completion {
-                        old_range: argument_range.clone(),
-                        label: CodeLabel::plain(arg.clone(), None),
-                        new_text: arg.clone(),
-                        documentation: None,
-                        server_id: LanguageServerId(0),
-                        lsp_completion: Default::default(),
-                        show_new_completions_on_confirm: false,
-                        confirm: Some(Arc::new({
-                            let command_name = command_name.clone();
-                            let command_range = command_range.clone();
-                            let editor = editor.clone();
-                            let workspace = workspace.clone();
-                            move |cx| {
-                                editor
-                                    .update(cx, |editor, cx| {
-                                        editor.run_command(
-                                            command_range.clone(),
-                                            &command_name,
-                                            Some(&arg),
-                                            workspace.clone(),
-                                            cx,
-                                        );
-                                    })
-                                    .ok();
-                            }
-                        })),
-                    })
-                    .collect())
-            })
-        } else {
-            cx.background_executor()
-                .spawn(async move { Ok(Vec::new()) })
-        }
-    }
-}
-
-impl CompletionProvider for SlashCommandCompletionProvider {
-    fn completions(
-        &self,
-        buffer: &Model<Buffer>,
-        buffer_position: Anchor,
-        cx: &mut ViewContext<Editor>,
-    ) -> Task<Result<Vec<project::Completion>>> {
-        let Some((name, argument, command_range, argument_range)) =
-            buffer.update(cx, |buffer, _cx| {
-                let position = buffer_position.to_point(buffer);
-                let line_start = Point::new(position.row, 0);
-                let mut lines = buffer.text_for_range(line_start..position).lines();
-                let line = lines.next()?;
-                let call = SlashCommandLine::parse(line)?;
-
-                let command_range_start = Point::new(position.row, call.name.start as u32 - 1);
-                let command_range_end = Point::new(
-                    position.row,
-                    call.argument.as_ref().map_or(call.name.end, |arg| arg.end) as u32,
-                );
-                let command_range = buffer.anchor_after(command_range_start)
-                    ..buffer.anchor_after(command_range_end);
-
-                let name = line[call.name.clone()].to_string();
-
-                Some(if let Some(argument) = call.argument {
-                    let start =
-                        buffer.anchor_after(Point::new(position.row, argument.start as u32));
-                    let argument = line[argument.clone()].to_string();
-                    (name, Some(argument), command_range, start..buffer_position)
-                } else {
-                    let start =
-                        buffer.anchor_after(Point::new(position.row, call.name.start as u32));
-                    (name, None, command_range, start..buffer_position)
-                })
-            })
-        else {
-            return Task::ready(Ok(Vec::new()));
-        };
-
-        if let Some(argument) = argument {
-            self.complete_command_argument(&name, argument, command_range, argument_range, cx)
-        } else {
-            self.complete_command_name(&name, command_range, argument_range, cx)
-        }
-    }
-
-    fn resolve_completions(
-        &self,
-        _: Model<Buffer>,
-        _: Vec<usize>,
-        _: Arc<RwLock<Box<[project::Completion]>>>,
-        _: &mut ViewContext<Editor>,
-    ) -> Task<Result<bool>> {
-        Task::ready(Ok(true))
-    }
-
-    fn apply_additional_edits_for_completion(
-        &self,
-        _: Model<Buffer>,
-        _: project::Completion,
-        _: bool,
-        _: &mut ViewContext<Editor>,
-    ) -> Task<Result<Option<language::Transaction>>> {
-        Task::ready(Ok(None))
-    }
-
-    fn is_completion_trigger(
-        &self,
-        buffer: &Model<Buffer>,
-        position: language::Anchor,
-        _text: &str,
-        _trigger_in_words: bool,
-        cx: &mut ViewContext<Editor>,
-    ) -> bool {
-        let buffer = buffer.read(cx);
-        let position = position.to_point(buffer);
-        let line_start = Point::new(position.row, 0);
-        let mut lines = buffer.text_for_range(line_start..position).lines();
-        if let Some(line) = lines.next() {
-            SlashCommandLine::parse(line).is_some()
-        } else {
-            false
-        }
-    }
-}
-
-impl SlashCommandLine {
-    pub(crate) fn parse(line: &str) -> Option<Self> {
-        let mut call: Option<Self> = None;
-        let mut ix = 0;
-        for c in line.chars() {
-            let next_ix = ix + c.len_utf8();
-            if let Some(call) = &mut call {
-                // The command arguments start at the first non-whitespace character
-                // after the command name, and continue until the end of the line.
-                if let Some(argument) = &mut call.argument {
-                    if (*argument).is_empty() && c.is_whitespace() {
-                        argument.start = next_ix;
-                    }
-                    argument.end = next_ix;
-                }
-                // The command name ends at the first whitespace character.
-                else if !call.name.is_empty() {
-                    if c.is_whitespace() {
-                        call.argument = Some(next_ix..next_ix);
-                    } else {
-                        call.name.end = next_ix;
-                    }
-                }
-                // The command name must begin with a letter.
-                else if c.is_alphabetic() {
-                    call.name.end = next_ix;
-                } else {
-                    return None;
-                }
-            }
-            // Commands start with a slash.
-            else if c == '/' {
-                call = Some(SlashCommandLine {
-                    name: next_ix..next_ix,
-                    argument: None,
-                });
-            }
-            // The line can't contain anything before the slash except for whitespace.
-            else if !c.is_whitespace() {
-                return None;
-            }
-            ix = next_ix;
-        }
-        call
-    }
-}

crates/assistant/src/slash_command/active_command.rs

@@ -1,104 +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 tooltip_text(&self) -> String {
-        "insert active tab".into()
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancel: std::sync::Arc<std::sync::atomic::AtomicBool>,
-        _workspace: WeakView<Workspace>,
-        _cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let output = workspace.update(cx, |workspace, cx| {
-            let Some(active_item) = workspace.active_item(cx) else {
-                return Task::ready(Err(anyhow!("no active tab")));
-            };
-            let Some(buffer) = active_item
-                .downcast::<Editor>()
-                .and_then(|editor| editor.read(cx).buffer().read(cx).as_singleton())
-            else {
-                return Task::ready(Err(anyhow!("active tab is not an editor")));
-            };
-
-            let snapshot = buffer.read(cx).snapshot();
-            let path = snapshot.resolve_file_path(cx, true);
-            let text = cx.background_executor().spawn({
-                let path = path.clone();
-                async move {
-                    let path = path
-                        .as_ref()
-                        .map(|path| path.to_string_lossy())
-                        .unwrap_or_else(|| Cow::Borrowed("untitled"));
-
-                    let mut output = String::with_capacity(path.len() + snapshot.len() + 9);
-                    output.push_str("```");
-                    output.push_str(&path);
-                    output.push('\n');
-                    for chunk in snapshot.as_rope().chunks() {
-                        output.push_str(chunk);
-                    }
-                    if !output.ends_with('\n') {
-                        output.push('\n');
-                    }
-                    output.push_str("```");
-                    output
-                }
-            });
-            cx.foreground_executor().spawn(async move {
-                let text = text.await;
-                let range = 0..text.len();
-                Ok(SlashCommandOutput {
-                    text,
-                    sections: vec![SlashCommandOutputSection {
-                        range,
-                        render_placeholder: Arc::new(move |id, unfold, _| {
-                            FilePlaceholder {
-                                id,
-                                path: path.clone(),
-                                line_range: None,
-                                unfold,
-                            }
-                            .into_any_element()
-                        }),
-                    }],
-                })
-            })
-        });
-        output.unwrap_or_else(|error| Task::ready(Err(error)))
-    }
-}

crates/assistant/src/slash_command/file_command.rs

@@ -1,225 +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 a file".into()
-    }
-
-    fn tooltip_text(&self) -> String {
-        "insert file".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: WeakView<Workspace>,
-        cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let paths = self.search_paths(query, cancellation_flag, &workspace, cx);
-        cx.background_executor().spawn(async move {
-            Ok(paths
-                .await
-                .into_iter()
-                .map(|path_match| {
-                    format!(
-                        "{}{}",
-                        path_match.path_prefix,
-                        path_match.path.to_string_lossy()
-                    )
-                })
-                .collect())
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let Some(argument) = argument else {
-            return Task::ready(Err(anyhow!("missing path")));
-        };
-
-        let path = PathBuf::from(argument);
-        let abs_path = workspace
-            .read(cx)
-            .visible_worktrees(cx)
-            .find_map(|worktree| {
-                let worktree = worktree.read(cx);
-                let worktree_root_path = Path::new(worktree.root_name());
-                let relative_path = path.strip_prefix(worktree_root_path).ok()?;
-                worktree.absolutize(&relative_path).ok()
-            });
-
-        let Some(abs_path) = abs_path else {
-            return Task::ready(Err(anyhow!("missing path")));
-        };
-
-        let fs = workspace.read(cx).app_state().fs.clone();
-        let argument = argument.to_string();
-        let text = cx.background_executor().spawn(async move {
-            let mut content = fs.load(&abs_path).await?;
-            LineEnding::normalize(&mut content);
-            let mut output = String::with_capacity(argument.len() + content.len() + 9);
-            output.push_str("```");
-            output.push_str(&argument);
-            output.push('\n');
-            output.push_str(&content);
-            if !output.ends_with('\n') {
-                output.push('\n');
-            }
-            output.push_str("```");
-            anyhow::Ok(output)
-        });
-        cx.foreground_executor().spawn(async move {
-            let text = text.await?;
-            let range = 0..text.len();
-            Ok(SlashCommandOutput {
-                text,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    render_placeholder: Arc::new(move |id, unfold, _cx| {
-                        FilePlaceholder {
-                            path: Some(path.clone()),
-                            line_range: None,
-                            id,
-                            unfold,
-                        }
-                        .into_any_element()
-                    }),
-                }],
-            })
-        })
-    }
-}
-
-#[derive(IntoElement)]
-pub struct FilePlaceholder {
-    pub path: Option<PathBuf>,
-    pub line_range: Option<Range<u32>>,
-    pub id: ElementId,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-}
-
-impl RenderOnce for FilePlaceholder {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        let unfold = self.unfold;
-        let title = if let Some(path) = self.path.as_ref() {
-            SharedString::from(path.to_string_lossy().to_string())
-        } else {
-            SharedString::from("untitled")
-        };
-
-        ButtonLike::new(self.id)
-            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(IconName::File))
-            .child(Label::new(title))
-            .when_some(self.line_range, |button, line_range| {
-                button.child(Label::new(":")).child(Label::new(format!(
-                    "{}-{}",
-                    line_range.start, line_range.end
-                )))
-            })
-            .on_click(move |_, cx| unfold(cx))
-    }
-}

crates/assistant/src/slash_command/project_command.rs

@@ -1,156 +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 current project context".into()
-    }
-
-    fn tooltip_text(&self) -> String {
-        "insert current project context".into()
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancel: Arc<AtomicBool>,
-        _workspace: WeakView<Workspace>,
-        _cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let output = workspace.update(cx, |workspace, cx| {
-            let project = workspace.project().clone();
-            let fs = workspace.project().read(cx).fs().clone();
-            let path = Self::path_to_cargo_toml(project, cx);
-            let output = cx.background_executor().spawn(async move {
-                let path = path.with_context(|| "Cargo.toml not found")?;
-                Self::build_message(fs, &path).await
-            });
-
-            cx.foreground_executor().spawn(async move {
-                let text = output.await?;
-                let range = 0..text.len();
-                Ok(SlashCommandOutput {
-                    text,
-                    sections: vec![SlashCommandOutputSection {
-                        range,
-                        render_placeholder: Arc::new(move |id, unfold, _cx| {
-                            ButtonLike::new(id)
-                                .style(ButtonStyle::Filled)
-                                .layer(ElevationIndex::ElevatedSurface)
-                                .child(Icon::new(IconName::FileTree))
-                                .child(Label::new("Project"))
-                                .on_click(move |_, cx| unfold(cx))
-                                .into_any_element()
-                        }),
-                    }],
-                })
-            })
-        });
-        output.unwrap_or_else(|error| Task::ready(Err(error)))
-    }
-}

crates/assistant/src/slash_command/prompt_command.rs

@@ -1,117 +0,0 @@
-use super::{SlashCommand, SlashCommandOutput};
-use crate::prompts::PromptLibrary;
-use anyhow::{anyhow, Context, Result};
-use assistant_slash_command::SlashCommandOutputSection;
-use fuzzy::StringMatchCandidate;
-use gpui::{AppContext, Task, WeakView};
-use language::LspAdapterDelegate;
-use std::sync::{atomic::AtomicBool, Arc};
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-use workspace::Workspace;
-
-pub(crate) struct PromptSlashCommand {
-    library: Arc<PromptLibrary>,
-}
-
-impl PromptSlashCommand {
-    pub fn new(library: Arc<PromptLibrary>) -> Self {
-        Self { library }
-    }
-}
-
-impl SlashCommand for PromptSlashCommand {
-    fn name(&self) -> String {
-        "prompt".into()
-    }
-
-    fn description(&self) -> String {
-        "insert a prompt from the library".into()
-    }
-
-    fn tooltip_text(&self) -> String {
-        "insert prompt".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        _workspace: WeakView<Workspace>,
-        cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        let library = self.library.clone();
-        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
-            let candidates = library
-                .prompts()
-                .into_iter()
-                .enumerate()
-                .map(|(ix, prompt)| StringMatchCandidate::new(ix, prompt.1.title().to_string()))
-                .collect::<Vec<_>>();
-            let matches = fuzzy::match_strings(
-                &candidates,
-                &query,
-                false,
-                100,
-                &cancellation_flag,
-                executor,
-            )
-            .await;
-            Ok(matches
-                .into_iter()
-                .map(|mat| candidates[mat.candidate_id].string.clone())
-                .collect())
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        title: Option<&str>,
-        _workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let Some(title) = title else {
-            return Task::ready(Err(anyhow!("missing prompt name")));
-        };
-
-        let library = self.library.clone();
-        let title = SharedString::from(title.to_string());
-        let prompt = cx.background_executor().spawn({
-            let title = title.clone();
-            async move {
-                let prompt = library
-                    .prompts()
-                    .into_iter()
-                    .map(|prompt| (prompt.1.title(), prompt))
-                    .find(|(t, _)| t == &title)
-                    .with_context(|| format!("no prompt found with title {:?}", title))?
-                    .1;
-                anyhow::Ok(prompt.1.body())
-            }
-        });
-        cx.foreground_executor().spawn(async move {
-            let prompt = prompt.await?;
-            let range = 0..prompt.len();
-            Ok(SlashCommandOutput {
-                text: prompt,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    render_placeholder: Arc::new(move |id, unfold, _cx| {
-                        ButtonLike::new(id)
-                            .style(ButtonStyle::Filled)
-                            .layer(ElevationIndex::ElevatedSurface)
-                            .child(Icon::new(IconName::Library))
-                            .child(Label::new(title.clone()))
-                            .on_click(move |_, cx| unfold(cx))
-                            .into_any_element()
-                    }),
-                }],
-            })
-        })
-    }
-}

crates/assistant/src/slash_command/rustdoc_command.rs

@@ -1,137 +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 http::{AsyncBody, HttpClient, HttpClientWithUrl};
-use language::LspAdapterDelegate;
-use rustdoc_to_markdown::convert_rustdoc_to_markdown;
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-use workspace::Workspace;
-
-pub(crate) struct RustdocSlashCommand;
-
-impl RustdocSlashCommand {
-    async fn build_message(
-        http_client: Arc<HttpClientWithUrl>,
-        crate_name: String,
-    ) -> Result<String> {
-        let mut response = http_client
-            .get(
-                &format!("https://docs.rs/{crate_name}"),
-                AsyncBody::default(),
-                true,
-            )
-            .await?;
-
-        let mut body = Vec::new();
-        response
-            .body_mut()
-            .read_to_end(&mut body)
-            .await
-            .context("error reading docs.rs response body")?;
-
-        if response.status().is_client_error() {
-            let text = String::from_utf8_lossy(body.as_slice());
-            bail!(
-                "status error {}, response: {text:?}",
-                response.status().as_u16()
-            );
-        }
-
-        convert_rustdoc_to_markdown(&body[..])
-    }
-}
-
-impl SlashCommand for RustdocSlashCommand {
-    fn name(&self) -> String {
-        "rustdoc".into()
-    }
-
-    fn description(&self) -> String {
-        "insert the docs for a Rust crate".into()
-    }
-
-    fn tooltip_text(&self) -> String {
-        "insert rustdoc".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancel: Arc<AtomicBool>,
-        _workspace: WeakView<Workspace>,
-        _cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let Some(argument) = argument else {
-            return Task::ready(Err(anyhow!("missing crate name")));
-        };
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let http_client = workspace.read(cx).client().http_client();
-        let crate_name = argument.to_string();
-
-        let text = cx.background_executor().spawn({
-            let crate_name = crate_name.clone();
-            async move { Self::build_message(http_client, crate_name).await }
-        });
-
-        let crate_name = SharedString::from(crate_name);
-        cx.foreground_executor().spawn(async move {
-            let text = text.await?;
-            let range = 0..text.len();
-            Ok(SlashCommandOutput {
-                text,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    render_placeholder: Arc::new(move |id, unfold, _cx| {
-                        RustdocPlaceholder {
-                            id,
-                            unfold,
-                            crate_name: crate_name.clone(),
-                        }
-                        .into_any_element()
-                    }),
-                }],
-            })
-        })
-    }
-}
-
-#[derive(IntoElement)]
-struct RustdocPlaceholder {
-    pub id: ElementId,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-    pub crate_name: SharedString,
-}
-
-impl RenderOnce for RustdocPlaceholder {
-    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::FileRust))
-            .child(Label::new(format!("rustdoc: {}", self.crate_name)))
-            .on_click(move |_, cx| unfold(cx))
-    }
-}

crates/assistant/src/slash_command/search_command.rs

@@ -1,191 +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 {
-        "semantically search files".into()
-    }
-
-    fn tooltip_text(&self) -> String {
-        "search".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        true
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancel: Arc<AtomicBool>,
-        _workspace: WeakView<Workspace>,
-        _cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow::anyhow!("workspace was dropped")));
-        };
-        let Some(argument) = argument else {
-            return Task::ready(Err(anyhow::anyhow!("missing search query")));
-        };
-
-        let mut limit = None;
-        let mut query = String::new();
-        for part in argument.split(' ') {
-            if let Some(parameter) = part.strip_prefix("--") {
-                if let Ok(count) = parameter.parse::<usize>() {
-                    limit = Some(count);
-                    continue;
-                }
-            }
-
-            query.push_str(part);
-            query.push(' ');
-        }
-        query.pop();
-
-        if query.is_empty() {
-            return Task::ready(Err(anyhow::anyhow!("missing search query")));
-        }
-
-        let project = workspace.read(cx).project().clone();
-        let fs = project.read(cx).fs().clone();
-        let project_index =
-            cx.update_global(|index: &mut SemanticIndex, cx| index.project_index(project, cx));
-
-        cx.spawn(|cx| async move {
-            let results = project_index
-                .read_with(&cx, |project_index, cx| {
-                    project_index.search(query.clone(), limit.unwrap_or(5), cx)
-                })?
-                .await?;
-
-            let mut loaded_results = Vec::new();
-            for result in results {
-                let (full_path, file_content) =
-                    result.worktree.read_with(&cx, |worktree, _cx| {
-                        let entry_abs_path = worktree.abs_path().join(&result.path);
-                        let mut entry_full_path = PathBuf::from(worktree.root_name());
-                        entry_full_path.push(&result.path);
-                        let file_content = async {
-                            let entry_abs_path = entry_abs_path;
-                            fs.load(&entry_abs_path).await
-                        };
-                        (entry_full_path, file_content)
-                    })?;
-                if let Some(file_content) = file_content.await.log_err() {
-                    loaded_results.push((result, full_path, file_content));
-                }
-            }
-
-            let output = cx
-                .background_executor()
-                .spawn(async move {
-                    let mut text = format!("Search results for {query}:\n");
-                    let mut sections = Vec::new();
-                    for (result, full_path, file_content) in loaded_results {
-                        let range_start = result.range.start.min(file_content.len());
-                        let range_end = result.range.end.min(file_content.len());
-
-                        let start_line =
-                            file_content[0..range_start].matches('\n').count() as u32 + 1;
-                        let end_line = file_content[0..range_end].matches('\n').count() as u32 + 1;
-                        let start_line_byte_offset = file_content[0..range_start]
-                            .rfind('\n')
-                            .map(|pos| pos + 1)
-                            .unwrap_or_default();
-                        let end_line_byte_offset = file_content[range_end..]
-                            .find('\n')
-                            .map(|pos| range_end + pos)
-                            .unwrap_or_else(|| file_content.len());
-
-                        let section_start_ix = text.len();
-                        writeln!(
-                            text,
-                            "```{}:{}-{}",
-                            result.path.display(),
-                            start_line,
-                            end_line,
-                        )
-                        .unwrap();
-                        let mut excerpt =
-                            file_content[start_line_byte_offset..end_line_byte_offset].to_string();
-                        LineEnding::normalize(&mut excerpt);
-                        text.push_str(&excerpt);
-                        writeln!(text, "\n```\n").unwrap();
-                        let section_end_ix = text.len() - 1;
-
-                        sections.push(SlashCommandOutputSection {
-                            range: section_start_ix..section_end_ix,
-                            render_placeholder: Arc::new(move |id, unfold, _| {
-                                FilePlaceholder {
-                                    id,
-                                    path: Some(full_path.clone()),
-                                    line_range: Some(start_line..end_line),
-                                    unfold,
-                                }
-                                .into_any_element()
-                            }),
-                        });
-                    }
-
-                    let query = SharedString::from(query);
-                    sections.push(SlashCommandOutputSection {
-                        range: 0..text.len(),
-                        render_placeholder: Arc::new(move |id, unfold, _cx| {
-                            ButtonLike::new(id)
-                                .style(ButtonStyle::Filled)
-                                .layer(ElevationIndex::ElevatedSurface)
-                                .child(Icon::new(IconName::MagnifyingGlass))
-                                .child(Label::new(query.clone()))
-                                .on_click(move |_, cx| unfold(cx))
-                                .into_any_element()
-                        }),
-                    });
-
-                    SlashCommandOutput { text, sections }
-                })
-                .await;
-
-            Ok(output)
-        })
-    }
-}

crates/assistant/src/slash_command/tabs_command.rs

@@ -1,117 +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 content from open tabs".into()
-    }
-
-    fn tooltip_text(&self) -> String {
-        "insert open tabs".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancel: Arc<std::sync::atomic::AtomicBool>,
-        _workspace: WeakView<Workspace>,
-        _cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        Task::ready(Err(anyhow!("this command does not require argument")))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let open_buffers = workspace.update(cx, |workspace, cx| {
-            let mut timestamps_by_entity_id = HashMap::default();
-            let mut open_buffers = Vec::new();
-
-            for pane in workspace.panes() {
-                let pane = pane.read(cx);
-                for entry in pane.activation_history() {
-                    timestamps_by_entity_id.insert(entry.entity_id, entry.timestamp);
-                }
-            }
-
-            for editor in workspace.items_of_type::<Editor>(cx) {
-                if let Some(buffer) = editor.read(cx).buffer().read(cx).as_singleton() {
-                    if let Some(timestamp) = timestamps_by_entity_id.get(&editor.entity_id()) {
-                        let snapshot = buffer.read(cx).snapshot();
-                        let full_path = snapshot.resolve_file_path(cx, true);
-                        open_buffers.push((full_path, snapshot, *timestamp));
-                    }
-                }
-            }
-
-            open_buffers
-        });
-
-        match open_buffers {
-            Ok(mut open_buffers) => cx.background_executor().spawn(async move {
-                open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
-
-                let mut sections = Vec::new();
-                let mut text = String::new();
-                for (full_path, buffer, _) in open_buffers {
-                    let section_start_ix = text.len();
-                    writeln!(
-                        text,
-                        "```{}\n",
-                        full_path
-                            .as_deref()
-                            .unwrap_or(Path::new("untitled"))
-                            .display()
-                    )
-                    .unwrap();
-                    for chunk in buffer.as_rope().chunks() {
-                        text.push_str(chunk);
-                    }
-                    if !text.ends_with('\n') {
-                        text.push('\n');
-                    }
-                    writeln!(text, "```\n").unwrap();
-                    let section_end_ix = text.len() - 1;
-
-                    sections.push(SlashCommandOutputSection {
-                        range: section_start_ix..section_end_ix,
-                        render_placeholder: Arc::new(move |id, unfold, _| {
-                            FilePlaceholder {
-                                id,
-                                path: full_path.clone(),
-                                line_range: None,
-                                unfold,
-                            }
-                            .into_any_element()
-                        }),
-                    });
-                }
-
-                Ok(SlashCommandOutput { text, sections })
-            }),
-            Err(error) => Task::ready(Err(error)),
-        }
-    }
-}

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
-}
----
-```

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"] }

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 {})`

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 {})

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.

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.

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()))
+    }
+}

crates/assistant2/src/attachments.rs

@@ -0,0 +1,3 @@
+mod active_file;
+
+pub use active_file::*;

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,
+        })
+    }
+}

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()
+    }
+}

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)
+    }
+}

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(),
+                )),
+        )
+    }
+}

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::*;

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(())
+    }
+}

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(())
+    }
+}

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(),
+        })
+    }
+}

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::*;

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();
+            }))
+    }
+}

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),
+                    ),
+                )
+            })
+    }
+}

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)
+                        }),
+                    ),
+            )
+    }
+}

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)
+    }
+}

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();
+            }))
+    }
+}

crates/assistant2/src/ui/stories.rs

@@ -0,0 +1,5 @@
+mod chat_message;
+mod chat_notice;
+
+pub use chat_message::*;
+pub use chat_notice::*;

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";

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."),
+            )),
+        )
+    }
+}

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

crates/assistant_slash_command/src/assistant_slash_command.rs

@@ -1,61 +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 tooltip_text(&self) -> String;
-    fn complete_argument(
-        &self,
-        query: String,
-        cancel: Arc<AtomicBool>,
-        workspace: WeakView<Workspace>,
-        cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>>;
-    fn requires_argument(&self) -> bool;
-    fn run(
-        self: Arc<Self>,
-        argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        // TODO: We're just using the `LspAdapterDelegate` here because that is
-        // what the extension API is already expecting.
-        //
-        // It may be that `LspAdapterDelegate` needs a more general name, or
-        // perhaps another kind of delegate is needed here.
-        delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>>;
-}
-
-pub type RenderFoldPlaceholder = Arc<
-    dyn Send
-        + Sync
-        + Fn(ElementId, Arc<dyn Fn(&mut WindowContext)>, &mut WindowContext) -> AnyElement,
->;
-
-pub struct SlashCommandOutput {
-    pub text: String,
-    pub sections: Vec<SlashCommandOutputSection<usize>>,
-}
-
-#[derive(Clone)]
-pub struct SlashCommandOutputSection<T> {
-    pub range: Range<T>,
-    pub render_placeholder: RenderFoldPlaceholder,
-}

crates/assistant_slash_command/src/slash_command_registry.rs

@@ -1,64 +0,0 @@
-use std::sync::Arc;
-
-use collections::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>>,
-}
-
-#[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(),
-            }),
-        })
-    }
-
-    /// Registers the provided [`SlashCommand`].
-    pub fn register_command(&self, command: impl SlashCommand) {
-        self.state
-            .write()
-            .commands
-            .insert(command.name().into(), 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 [`SlashCommand`] with the given name.
-    pub fn command(&self, name: &str) -> Option<Arc<dyn SlashCommand>> {
-        self.state.read().commands.get(name).cloned()
-    }
-}

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();
 

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)
         })?;

crates/channel/src/channel_store.rs

@@ -123,7 +123,6 @@ impl Channel {
     }
 }
 
-#[derive(Debug)]
 pub struct ChannelMembership {
     pub user: Arc<User>,
     pub kind: proto::channel_member::Kind,
@@ -816,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();
@@ -829,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())
         })
     }
 

crates/cli/src/main.rs

@@ -4,10 +4,8 @@ use anyhow::{Context, Result};
 use clap::Parser;
 use cli::{ipc::IpcOneShotServer, CliRequest, CliResponse, IpcHandshake};
 use std::{
-    env, fs, io,
+    env, fs,
     path::{Path, PathBuf},
-    process::ExitStatus,
-    thread::{self, JoinHandle},
 };
 use util::paths::PathLikeWithPosition;
 
@@ -16,7 +14,6 @@ struct Detect;
 trait InstalledApp {
     fn zed_version_string(&self) -> String;
     fn launch(&self, ipc_url: String) -> anyhow::Result<()>;
-    fn run_foreground(&self, ipc_url: String) -> io::Result<ExitStatus>;
 }
 
 #[derive(Parser, Debug)]
@@ -40,9 +37,6 @@ struct Args {
     /// Print Zed's version and the app path.
     #[arg(short, long)]
     version: bool,
-    /// Run zed in the foreground (useful for debugging)
-    #[arg(long)]
-    foreground: bool,
     /// Custom path to Zed.app or the zed binary
     #[arg(long)]
     zed: Option<PathBuf>,
@@ -60,13 +54,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 +66,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 {
@@ -115,6 +99,10 @@ fn main() -> Result<()> {
         IpcOneShotServer::<IpcHandshake>::new().context("Handshake before Zed spawn")?;
     let url = format!("zed-cli://{server_name}");
 
+    app.launch(url)?;
+    let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
+    let (tx, rx) = (handshake.requests, handshake.responses);
+
     let open_new_workspace = if args.new {
         Some(true)
     } else if args.add {
@@ -123,33 +111,20 @@ fn main() -> Result<()> {
         None
     };
 
-    let sender: JoinHandle<anyhow::Result<()>> = thread::spawn(move || {
-        let (_, handshake) = server.accept().context("Handshake after Zed spawn")?;
-        let (tx, rx) = (handshake.requests, handshake.responses);
-        tx.send(CliRequest::Open {
-            paths,
-            wait: args.wait,
-            open_new_workspace,
-            dev_server_token: args.dev_server_token,
-        })?;
+    tx.send(CliRequest::Open {
+        paths,
+        wait: args.wait,
+        open_new_workspace,
+        dev_server_token: args.dev_server_token,
+    })?;
 
-        while let Ok(response) = rx.recv() {
-            match response {
-                CliResponse::Ping => {}
-                CliResponse::Stdout { message } => println!("{message}"),
-                CliResponse::Stderr { message } => eprintln!("{message}"),
-                CliResponse::Exit { status } => std::process::exit(status),
-            }
+    while let Ok(response) = rx.recv() {
+        match response {
+            CliResponse::Ping => {}
+            CliResponse::Stdout { message } => println!("{message}"),
+            CliResponse::Stderr { message } => eprintln!("{message}"),
+            CliResponse::Exit { status } => std::process::exit(status),
         }
-
-        Ok(())
-    });
-
-    if args.foreground {
-        app.run_foreground(url)?;
-    } else {
-        app.launch(url)?;
-        sender.join().unwrap()?;
     }
 
     Ok(())
@@ -166,8 +141,7 @@ mod linux {
             unix::net::{SocketAddr, UnixDatagram},
         },
         path::{Path, PathBuf},
-        process::{self, ExitStatus},
-        thread,
+        process, thread,
         time::Duration,
     };
 
@@ -234,12 +208,6 @@ mod linux {
             }
             Ok(())
         }
-
-        fn run_foreground(&self, ipc_url: String) -> io::Result<ExitStatus> {
-            std::process::Command::new(self.0.clone())
-                .arg(ipc_url)
-                .status()
-        }
     }
 
     impl App {
@@ -285,121 +253,11 @@ 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("bin").join("zed-app").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/bin/zed-app".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 {
     use crate::{Detect, InstalledApp};
-    use std::io;
     use std::path::Path;
-    use std::process::ExitStatus;
 
     struct App;
     impl InstalledApp for App {
@@ -409,9 +267,6 @@ mod windows {
         fn launch(&self, _ipc_url: String) -> anyhow::Result<()> {
             unimplemented!()
         }
-        fn run_foreground(&self, _ipc_url: String) -> io::Result<ExitStatus> {
-            unimplemented!()
-        }
     }
 
     impl Detect {
@@ -433,9 +288,9 @@ mod mac_os {
     use serde::Deserialize;
     use std::{
         ffi::OsStr,
-        fs, io,
+        fs,
         path::{Path, PathBuf},
-        process::{Command, ExitStatus},
+        process::Command,
         ptr,
     };
 
@@ -587,15 +442,6 @@ mod mac_os {
 
             Ok(())
         }
-
-        fn run_foreground(&self, ipc_url: String) -> io::Result<ExitStatus> {
-            let path = match self {
-                Bundle::App { app_bundle, .. } => app_bundle.join("Contents/MacOS/zed"),
-                Bundle::LocalPath { executable, .. } => executable.clone(),
-            };
-
-            std::process::Command::new(path).arg(ipc_url).status()
-        }
     }
 
     impl Bundle {

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;
                         }

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,
         });

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>,

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:

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
 );
 

crates/collab/migrations/20240514164510_store_ssh_connect_string.sql

@@ -1 +0,0 @@
-ALTER TABLE dev_servers ADD COLUMN ssh_connection_string TEXT;

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,
         }
     }

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,
 }
 

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
     }

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)]
@@ -700,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.

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)

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,
             })
         })

crates/collab/src/db/queries/projects.rs

@@ -66,16 +66,6 @@ impl Database {
                     .await?
                     .ok_or_else(|| anyhow!("no remote project"))?;
 
-                let (_, dev_server) = dev_server_project::Entity::find_by_id(dev_server_project_id)
-                    .find_also_related(dev_server::Entity)
-                    .one(&*tx)
-                    .await?
-                    .ok_or_else(|| anyhow!("no dev_server_project"))?;
-
-                if !dev_server.is_some_and(|dev_server| dev_server.user_id == participant.user_id) {
-                    return Err(anyhow!("not your dev server"))?;
-                }
-
                 if project.room_id.is_some() {
                     return Err(anyhow!("project already shared"))?;
                 };
@@ -87,6 +77,7 @@ impl Database {
                 .exec(&*tx)
                 .await?;
 
+                // todo! check user is a project-collaborator
                 let room = self.get_room(room_id, &tx).await?;
                 return Ok((project.id, room));
             }
@@ -1101,36 +1092,6 @@ impl Database {
         .map(|guard| guard.into_inner())
     }
 
-    /// Returns the host connection for a request to join a shared project.
-    pub async fn host_for_owner_project_request(
-        &self,
-        project_id: ProjectId,
-        _connection_id: ConnectionId,
-        user_id: UserId,
-    ) -> Result<ConnectionId> {
-        self.project_transaction(project_id, |tx| async move {
-            let (project, dev_server_project) = project::Entity::find_by_id(project_id)
-                .find_also_related(dev_server_project::Entity)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("no such project"))?;
-
-            let Some(dev_server_project) = dev_server_project else {
-                return Err(anyhow!("not a dev server project"))?;
-            };
-            let dev_server = dev_server::Entity::find_by_id(dev_server_project.dev_server_id)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("no such dev server"))?;
-            if dev_server.user_id != user_id {
-                return Err(anyhow!("not your project"))?;
-            }
-            project.host_connection()
-        })
-        .await
-        .map(|guard| guard.into_inner())
-    }
-
     pub async fn connections_for_buffer_update(
         &self,
         project_id: ProjectId,

crates/collab/src/db/queries/users.rs

@@ -48,9 +48,6 @@ impl Database {
 
     /// Returns all users by ID. There are no access checks here, so this should only be used internally.
     pub async fn get_users_by_ids(&self, ids: Vec<UserId>) -> Result<Vec<user::Model>> {
-        if ids.len() >= 10000_usize {
-            return Err(anyhow!("too many users"))?;
-        }
         self.transaction(|tx| async {
             let tx = tx;
             Ok(user::Entity::find()

crates/collab/src/db/tables/dev_server.rs

@@ -10,7 +10,6 @@ pub struct Model {
     pub name: String,
     pub user_id: UserId,
     pub hashed_token: String,
-    pub ssh_connection_string: Option<String>,
 }
 
 impl ActiveModelBehavior for ActiveModel {}
@@ -33,7 +32,6 @@ impl Model {
             dev_server_id: self.id.to_proto(),
             name: self.name.clone(),
             status: status as i32,
-            ssh_connection_string: self.ssh_connection_string.clone(),
         }
     }
 }

crates/collab/src/db/tests/channel_tests.rs

@@ -1,7 +1,7 @@
 use crate::{
     db::{
         tests::{channel_tree, new_test_connection, new_test_user},
-        Channel, ChannelId, ChannelRole, Database, NewUserParams, RoomId, UserId,
+        Channel, ChannelId, ChannelRole, Database, NewUserParams, RoomId,
     },
     test_both_dbs,
 };
@@ -40,15 +40,15 @@ async fn test_channels(db: &Arc<Database>) {
         .await
         .unwrap();
 
-    let (members, _) = db
-        .get_channel_participant_details(replace_id, "", 10, a_id)
+    let mut members = db
+        .transaction(|tx| async move {
+            let channel = db.get_channel_internal(replace_id, &tx).await?;
+            db.get_channel_participants(&channel, &tx).await
+        })
         .await
         .unwrap();
-    let ids = members
-        .into_iter()
-        .map(|m| UserId::from_proto(m.user_id))
-        .collect::<Vec<_>>();
-    assert_eq!(ids, &[a_id, b_id]);
+    members.sort();
+    assert_eq!(members, &[a_id, b_id]);
 
     let rust_id = db.create_root_channel("rust", a_id).await.unwrap();
     let cargo_id = db.create_sub_channel("cargo", rust_id, a_id).await.unwrap();
@@ -195,8 +195,8 @@ async fn test_channel_invites(db: &Arc<Database>) {
 
     assert_eq!(user_3_invites, &[channel_1_1]);
 
-    let (mut members, _) = db
-        .get_channel_participant_details(channel_1_1, "", 100, user_1)
+    let mut members = db
+        .get_channel_participant_details(channel_1_1, user_1)
         .await
         .unwrap();
 
@@ -231,8 +231,8 @@ async fn test_channel_invites(db: &Arc<Database>) {
         .await
         .unwrap();
 
-    let (members, _) = db
-        .get_channel_participant_details(channel_1_3, "", 100, user_1)
+    let members = db
+        .get_channel_participant_details(channel_1_3, user_1)
         .await
         .unwrap();
     assert_eq!(
@@ -243,16 +243,16 @@ async fn test_channel_invites(db: &Arc<Database>) {
                 kind: proto::channel_member::Kind::Member.into(),
                 role: proto::ChannelRole::Admin.into(),
             },
-            proto::ChannelMember {
-                user_id: user_3.to_proto(),
-                kind: proto::channel_member::Kind::Invitee.into(),
-                role: proto::ChannelRole::Admin.into(),
-            },
             proto::ChannelMember {
                 user_id: user_2.to_proto(),
                 kind: proto::channel_member::Kind::Member.into(),
                 role: proto::ChannelRole::Member.into(),
             },
+            proto::ChannelMember {
+                user_id: user_3.to_proto(),
+                kind: proto::channel_member::Kind::Invitee.into(),
+                role: proto::ChannelRole::Admin.into(),
+            },
         ]
     );
 }
@@ -482,8 +482,8 @@ async fn test_user_is_channel_participant(db: &Arc<Database>) {
     .await
     .unwrap();
 
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
+    let mut members = db
+        .get_channel_participant_details(public_channel_id, admin)
         .await
         .unwrap();
 
@@ -557,8 +557,8 @@ async fn test_user_is_channel_participant(db: &Arc<Database>) {
         .await
         .is_err());
 
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
+    let mut members = db
+        .get_channel_participant_details(public_channel_id, admin)
         .await
         .unwrap();
 
@@ -594,8 +594,8 @@ async fn test_user_is_channel_participant(db: &Arc<Database>) {
         .unwrap();
 
     // currently people invited to parent channels are not shown here
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
+    let mut members = db
+        .get_channel_participant_details(public_channel_id, admin)
         .await
         .unwrap();
 
@@ -663,8 +663,8 @@ async fn test_user_is_channel_participant(db: &Arc<Database>) {
     .await
     .unwrap();
 
-    let (mut members, _) = db
-        .get_channel_participant_details(public_channel_id, "", 100, admin)
+    let mut members = db
+        .get_channel_participant_details(public_channel_id, admin)
         .await
         .unwrap();
 

crates/collab/src/rate_limiter.rs

@@ -62,7 +62,7 @@ impl RateLimiter {
         let mut bucket = self
             .buckets
             .entry(bucket_key.clone())
-            .or_insert_with(|| RateBucket::new::<T>(now));
+            .or_insert_with(|| RateBucket::new(T::capacity(), T::refill_duration(), now));
 
         if bucket.value_mut().allow(now) {
             self.dirty_buckets.insert(bucket_key);
@@ -72,19 +72,19 @@ impl RateLimiter {
         }
     }
 
-    async fn load_bucket<T: RateLimit>(
+    async fn load_bucket<K: RateLimit>(
         &self,
         user_id: UserId,
     ) -> Result<Option<RateBucket>, Error> {
         Ok(self
             .db
-            .get_rate_bucket(user_id, T::db_name())
+            .get_rate_bucket(user_id, K::db_name())
             .await?
-            .map(|saved_bucket| {
-                RateBucket::from_db::<T>(
-                    saved_bucket.token_count as usize,
-                    DateTime::from_naive_utc_and_offset(saved_bucket.last_refill, Utc),
-                )
+            .map(|saved_bucket| RateBucket {
+                capacity: K::capacity(),
+                refill_time_per_token: K::refill_duration(),
+                token_count: saved_bucket.token_count as usize,
+                last_refill: DateTime::from_naive_utc_and_offset(saved_bucket.last_refill, Utc),
             }))
     }
 
@@ -124,24 +124,15 @@ struct RateBucket {
 }
 
 impl RateBucket {
-    fn new<T: RateLimit>(now: DateTimeUtc) -> Self {
-        Self {
-            capacity: T::capacity(),
-            token_count: T::capacity(),
-            refill_time_per_token: T::refill_duration() / T::capacity() as i32,
+    fn new(capacity: usize, refill_duration: Duration, now: DateTimeUtc) -> Self {
+        RateBucket {
+            capacity,
+            token_count: capacity,
+            refill_time_per_token: refill_duration / capacity as i32,
             last_refill: now,
         }
     }
 
-    fn from_db<T: RateLimit>(token_count: usize, last_refill: DateTimeUtc) -> Self {
-        Self {
-            capacity: T::capacity(),
-            token_count,
-            refill_time_per_token: T::refill_duration() / T::capacity() as i32,
-            last_refill,
-        }
-    }
-
     fn allow(&mut self, now: DateTimeUtc) -> bool {
         self.refill(now);
         if self.token_count > 0 {
@@ -157,12 +148,9 @@ impl RateBucket {
         if elapsed >= self.refill_time_per_token {
             let new_tokens =
                 elapsed.num_milliseconds() / self.refill_time_per_token.num_milliseconds();
-            self.token_count = (self.token_count + new_tokens as usize).min(self.capacity);
 
-            let unused_refill_time = Duration::milliseconds(
-                elapsed.num_milliseconds() % self.refill_time_per_token.num_milliseconds(),
-            );
-            self.last_refill = now - unused_refill_time;
+            self.token_count = (self.token_count + new_tokens as usize).min(self.capacity);
+            self.last_refill = now;
         }
     }
 }
@@ -230,19 +218,8 @@ mod tests {
             .await
             .unwrap();
 
-        // After 1.5s, user 1 can make another request before being rate-limited again.
-        now += Duration::milliseconds(1500);
-        rate_limiter
-            .check_internal::<RateLimitA>(user_1, now)
-            .await
-            .unwrap();
-        rate_limiter
-            .check_internal::<RateLimitA>(user_1, now)
-            .await
-            .unwrap_err();
-
-        // After 500ms, user 1 can make another request before being rate-limited again.
-        now += Duration::milliseconds(500);
+        // After one second, user 1 can make another request before being rate-limited again.
+        now += Duration::seconds(1);
         rate_limiter
             .check_internal::<RateLimitA>(user_1, now)
             .await
@@ -261,17 +238,6 @@ mod tests {
             .check_internal::<RateLimitA>(user_1, now)
             .await
             .unwrap_err();
-
-        // After 1s, user 1 can make another request before being rate-limited again.
-        now += Duration::seconds(1);
-        rate_limiter
-            .check_internal::<RateLimitA>(user_1, now)
-            .await
-            .unwrap();
-        rate_limiter
-            .check_internal::<RateLimitA>(user_1, now)
-            .await
-            .unwrap_err();
     }
 
     struct RateLimitA;

crates/collab/src/rpc.rs

@@ -446,12 +446,6 @@ impl Server {
             .add_message_handler(update_language_server)
             .add_message_handler(update_diagnostic_summary)
             .add_message_handler(update_worktree_settings)
-            .add_request_handler(user_handler(
-                forward_project_request_for_owner::<proto::TaskContextForLocation>,
-            ))
-            .add_request_handler(user_handler(
-                forward_project_request_for_owner::<proto::TaskTemplates>,
-            ))
             .add_request_handler(user_handler(
                 forward_read_only_project_request::<proto::GetHover>,
             ))
@@ -1146,17 +1140,8 @@ impl Server {
             Principal::DevServer(dev_server) => {
                 {
                     let mut pool = self.connection_pool.lock();
-                    if let Some(stale_connection_id) = pool.dev_server_connection_id(dev_server.id)
-                    {
-                        self.peer.send(
-                            stale_connection_id,
-                            proto::ShutdownDevServer {
-                                reason: Some(
-                                    "another dev server connected with the same token".to_string(),
-                                ),
-                            },
-                        )?;
-                        pool.remove_connection(stale_connection_id)?;
+                    if pool.dev_server_connection_id(dev_server.id).is_some() {
+                        return Err(anyhow!(ErrorCode::DevServerAlreadyOnline))?;
                     };
                     pool.add_dev_server(connection_id, dev_server.id, zed_version);
                 }
@@ -2380,12 +2365,7 @@ async fn create_dev_server(
     let (dev_server, status) = session
         .db()
         .await
-        .create_dev_server(
-            &request.name,
-            request.ssh_connection_string.as_deref(),
-            &hashed_access_token,
-            session.user_id(),
-        )
+        .create_dev_server(&request.name, &hashed_access_token, session.user_id())
         .await?;
 
     send_dev_server_projects_update(session.user_id(), status, &session).await;
@@ -2393,7 +2373,7 @@ async fn create_dev_server(
     response.send(proto::CreateDevServerResponse {
         dev_server_id: dev_server.id.0 as u64,
         access_token: auth::generate_dev_server_token(dev_server.id.0 as usize, access_token),
-        name: request.name,
+        name: request.name.clone(),
     })?;
     Ok(())
 }
@@ -2413,12 +2393,9 @@ async fn regenerate_dev_server_token(
         .dev_server_connection_id(dev_server_id);
     if let Some(connection_id) = connection_id {
         shutdown_dev_server_internal(dev_server_id, connection_id, &session).await?;
-        session.peer.send(
-            connection_id,
-            proto::ShutdownDevServer {
-                reason: Some("dev server token was regenerated".to_string()),
-            },
-        )?;
+        session
+            .peer
+            .send(connection_id, proto::ShutdownDevServer {})?;
         let _ = remove_dev_server_connection(dev_server_id, &session).await;
     }
 
@@ -2457,12 +2434,7 @@ async fn rename_dev_server(
     let status = session
         .db()
         .await
-        .rename_dev_server(
-            dev_server_id,
-            &request.name,
-            request.ssh_connection_string.as_deref(),
-            session.user_id(),
-        )
+        .rename_dev_server(dev_server_id, &request.name, session.user_id())
         .await?;
 
     send_dev_server_projects_update(session.user_id(), status, &session).await;
@@ -2488,12 +2460,9 @@ async fn delete_dev_server(
         .dev_server_connection_id(dev_server_id);
     if let Some(connection_id) = connection_id {
         shutdown_dev_server_internal(dev_server_id, connection_id, &session).await?;
-        session.peer.send(
-            connection_id,
-            proto::ShutdownDevServer {
-                reason: Some("dev server was deleted".to_string()),
-            },
-        )?;
+        session
+            .peer
+            .send(connection_id, proto::ShutdownDevServer {})?;
         let _ = remove_dev_server_connection(dev_server_id, &session).await;
     }
 
@@ -2895,31 +2864,6 @@ where
     Ok(())
 }
 
-/// forward a project request to the dev server. Only allowed
-/// if it's your dev server.
-async fn forward_project_request_for_owner<T>(
-    request: T,
-    response: Response<T>,
-    session: UserSession,
-) -> Result<()>
-where
-    T: EntityMessage + RequestMessage,
-{
-    let project_id = ProjectId::from_proto(request.remote_entity_id());
-
-    let host_connection_id = session
-        .db()
-        .await
-        .host_for_owner_project_request(project_id, session.connection_id, session.user_id())
-        .await?;
-    let payload = session
-        .peer
-        .forward_request(session.connection_id, host_connection_id, request)
-        .await?;
-    response.send(payload)?;
-    Ok(())
-}
-
 /// forward a project request to the host. These requests are disallowed
 /// for guests.
 async fn forward_mutating_project_request<T>(
@@ -3739,15 +3683,10 @@ async fn get_channel_members(
 ) -> Result<()> {
     let db = session.db().await;
     let channel_id = ChannelId::from_proto(request.channel_id);
-    let limit = if request.limit == 0 {
-        u16::MAX as u64
-    } else {
-        request.limit
-    };
-    let (members, users) = db
-        .get_channel_participant_details(channel_id, &request.query, limit, session.user_id())
+    let members = db
+        .get_channel_participant_details(channel_id, session.user_id())
         .await?;
-    response.send(proto::GetChannelMembersResponse { members, users })?;
+    response.send(proto::GetChannelMembersResponse { members })?;
     Ok(())
 }
 
@@ -3947,13 +3886,13 @@ async fn update_channel_buffer(
     let db = session.db().await;
     let channel_id = ChannelId::from_proto(request.channel_id);
 
-    let (collaborators, epoch, version) = db
+    let (collaborators, non_collaborators, epoch, version) = db
         .update_channel_buffer(channel_id, session.user_id(), &request.operations)
         .await?;
 
     channel_buffer_updated(
         session.connection_id,
-        collaborators.clone(),
+        collaborators,
         &proto::UpdateChannelBuffer {
             channel_id: channel_id.to_proto(),
             operations: request.operations,
@@ -3963,29 +3902,25 @@ async fn update_channel_buffer(
 
     let pool = &*session.connection_pool().await;
 
-    let non_collaborators =
-        pool.channel_connection_ids(channel_id)
-            .filter_map(|(connection_id, _)| {
-                if collaborators.contains(&connection_id) {
-                    None
-                } else {
-                    Some(connection_id)
-                }
-            });
-
-    broadcast(None, non_collaborators, |peer_id| {
-        session.peer.send(
-            peer_id,
-            proto::UpdateChannels {
-                latest_channel_buffer_versions: vec![proto::ChannelBufferVersion {
-                    channel_id: channel_id.to_proto(),
-                    epoch: epoch as u64,
-                    version: version.clone(),
-                }],
-                ..Default::default()
-            },
-        )
-    });
+    broadcast(
+        None,
+        non_collaborators
+            .iter()
+            .flat_map(|user_id| pool.user_connection_ids(*user_id)),
+        |peer_id| {
+            session.peer.send(
+                peer_id,
+                proto::UpdateChannels {
+                    latest_channel_buffer_versions: vec![proto::ChannelBufferVersion {
+                        channel_id: channel_id.to_proto(),
+                        epoch: epoch as u64,
+                        version: version.clone(),
+                    }],
+                    ..Default::default()
+                },
+            )
+        },
+    );
 
     Ok(())
 }
@@ -4113,6 +4048,7 @@ async fn send_channel_message(
     let CreatedChannelMessage {
         message_id,
         participant_connection_ids,
+        channel_members,
         notifications,
     } = session
         .db()
@@ -4143,7 +4079,7 @@ async fn send_channel_message(
     };
     broadcast(
         Some(session.connection_id),
-        participant_connection_ids.clone(),
+        participant_connection_ids,
         |connection| {
             session.peer.send(
                 connection,
@@ -4159,27 +4095,24 @@ async fn send_channel_message(
     })?;
 
     let pool = &*session.connection_pool().await;
-    let non_participants =
-        pool.channel_connection_ids(channel_id)
-            .filter_map(|(connection_id, _)| {
-                if participant_connection_ids.contains(&connection_id) {
-                    None
-                } else {
-                    Some(connection_id)
-                }
-            });
-    broadcast(None, non_participants, |peer_id| {
-        session.peer.send(
-            peer_id,
-            proto::UpdateChannels {
-                latest_channel_message_ids: vec![proto::ChannelMessageId {
-                    channel_id: channel_id.to_proto(),
-                    message_id: message_id.to_proto(),
-                }],
-                ..Default::default()
-            },
-        )
-    });
+    broadcast(
+        None,
+        channel_members
+            .iter()
+            .flat_map(|user_id| pool.user_connection_ids(*user_id)),
+        |peer_id| {
+            session.peer.send(
+                peer_id,
+                proto::UpdateChannels {
+                    latest_channel_message_ids: vec![proto::ChannelMessageId {
+                        channel_id: channel_id.to_proto(),
+                        message_id: message_id.to_proto(),
+                    }],
+                    ..Default::default()
+                },
+            )
+        },
+    );
     send_notifications(pool, &session.peer, notifications);
 
     Ok(())