port command_palette

port auto_update
port vcs_menu
2024-11-17 19:04:15 +01:00 · 2024-11-16 15:16:44 +01:00 · 2024-11-16 15:12:57 +01:00 · 2024-11-16 13:59:12 +01:00 · 2024-11-14 16:39:35 +01:00 · 2024-11-14 16:36:12 +01:00
818 changed files with 7922 additions and 26930 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -245,7 +245,6 @@ jobs:
          # 25 was chosen arbitrarily.
          fetch-depth: 25
          clean: false
-          ref: ${{ github.ref }}

      - name: Limit target directory size
        run: script/clear-target-dir-if-larger-than 100
@@ -262,9 +261,6 @@ jobs:
          mkdir -p target/
          # Ignore any errors that occur while drafting release notes to not fail the build.
          script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md || true
-          script/create-draft-release target/release-notes.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Generate license file
        run: script/generate-licenses
@@ -310,6 +306,7 @@ jobs:
            target/aarch64-apple-darwin/release/Zed-aarch64.dmg
            target/x86_64-apple-darwin/release/Zed-x86_64.dmg
            target/release/Zed.dmg
+          body_path: target/release-notes.md
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -356,6 +353,7 @@ jobs:
          files: |
            target/zed-remote-server-linux-x86_64.gz
            target/release/zed-linux-x86_64.tar.gz
+          body: ""
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -402,5 +400,6 @@ jobs:
          files: |
            target/zed-remote-server-linux-aarch64.gz
            target/release/zed-linux-aarch64.tar.gz
+          body: ""
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/script_checks.yml
+++ b/.github/workflows/script_checks.yml
@@ -1,21 +0,0 @@
-name: Script
-
-on:
-  pull_request:
-    paths:
-      - "script/**"
-  push:
-    branches:
-      - main
-
-jobs:
-  shellcheck:
-    name: "ShellCheck Scripts"
-    if: github.repository_owner == 'zed-industries'
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Shellcheck ./scripts
-        run: |
-          ./script/shellcheck-scripts error
--- a/.mailmap
+++ b/.mailmap
@@ -22,14 +22,10 @@ Antonio Scandurra <me@as-cii.com> <antonio@zed.dev>
 Bennet Bo Fenner <bennet@zed.dev>
 Bennet Bo Fenner <bennet@zed.dev> <53836821+bennetbo@users.noreply.github.com>
 Bennet Bo Fenner <bennet@zed.dev> <bennetbo@gmx.de>
-Boris Cherny <boris@anthropic.com>
-Boris Cherny <boris@anthropic.com> <boris@performancejs.com>
-Chris Hayes <chris+git@hayes.software>
 Christian Bergschneider <christian.bergschneider@gmx.de>
 Christian Bergschneider <christian.bergschneider@gmx.de> <magiclake@gmx.de>
 Conrad Irwin <conrad@zed.dev>
 Conrad Irwin <conrad@zed.dev> <conrad.irwin@gmail.com>
-Dairon Medina <dairon.medina@gmail.com>
 Danilo Leal <danilo@zed.dev>
 Danilo Leal <danilo@zed.dev> <67129314+danilo-leal@users.noreply.github.com>
 Evren Sen <nervenes@icloud.com>
@@ -39,7 +35,6 @@ Fernando Tagawa <tagawafernando@gmail.com>
 Fernando Tagawa <tagawafernando@gmail.com> <fernando.tagawa.gamail.com@gmail.com>
 Greg Morenz <greg-morenz@droid.cafe>
 Greg Morenz <greg-morenz@droid.cafe> <morenzg@gmail.com>
-Ihnat Aŭtuška <autushka.ihnat@gmail.com>
 Ivan Žužak <izuzak@gmail.com>
 Ivan Žužak <izuzak@gmail.com> <ivan.zuzak@github.com>
 Joseph T. Lyons <JosephTLyons@gmail.com>
@@ -66,13 +61,10 @@ Max Brunsfeld <maxbrunsfeld@gmail.com> <max@zed.dev>
 Max Linke <maxlinke88@gmail.com>
 Max Linke <maxlinke88@gmail.com> <kain88-de@users.noreply.github.com>
 Michael Sloan <michael@zed.dev>
-Michael Sloan <michael@zed.dev> <mgsloan@gmail.com>
 Michael Sloan <michael@zed.dev> <mgsloan@google.com>
 Mikayla Maki <mikayla@zed.dev>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@gmail.com>
 Mikayla Maki <mikayla@zed.dev> <mikayla.c.maki@icloud.com>
-Muhammad Talal Anwar <mail@talal.io>
-Muhammad Talal Anwar <mail@talal.io> <talalanwar@outlook.com>
 Nate Butler <iamnbutler@gmail.com>
 Nate Butler <iamnbutler@gmail.com> <nate@zed.dev>
 Nathan Sobo <nathan@zed.dev>
@@ -96,11 +88,7 @@ Robert Clover <git@clo4.net>
 Robert Clover <git@clo4.net> <robert@clover.gdn>
 Roy Williams <roy.williams.iii@gmail.com>
 Roy Williams <roy.williams.iii@gmail.com> <roy@anthropic.com>
-Sebastijan Kelnerič <sebastijan.kelneric@sebba.dev>
-Sebastijan Kelnerič <sebastijan.kelneric@sebba.dev> <sebastijan.kelneric@vichava.com>
 Sergey Onufrienko <sergey@onufrienko.com>
-Shish <webmaster@shishnet.org>
-Shish <webmaster@shishnet.org> <shish@shishnet.org>
 Thorben Kröger <dev@thorben.net>
 Thorben Kröger <dev@thorben.net> <thorben.kroeger@hexagon.com>
 Thorsten Ball <thorsten@zed.dev>
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,24 +1,17 @@
 [workspace]
 resolver = "2"
 members = [
-    "crates/activity_indicator",
    "crates/anthropic",
    "crates/assets",
-    "crates/assistant",
-    "crates/assistant_slash_command",
    "crates/assistant_tool",
    "crates/audio",
-    "crates/auto_update",
-    "crates/breadcrumbs",
    "crates/call",
    "crates/channel",
    "crates/cli",
    "crates/client",
    "crates/clock",
    "crates/collab",
-    "crates/collab_ui",
    "crates/collections",
-    "crates/command_palette",
    "crates/command_palette_hooks",
    "crates/context_servers",
    "crates/copilot",
@@ -31,10 +24,8 @@ members = [
    "crates/extension_api",
    "crates/extension_cli",
    "crates/extension_host",
-    "crates/extensions_ui",
    "crates/feature_flags",
    "crates/feedback",
-    "crates/file_finder",
    "crates/file_icons",
    "crates/fs",
    "crates/fsevent",
@@ -49,15 +40,9 @@ members = [
    "crates/http_client",
    "crates/image_viewer",
    "crates/indexed_docs",
-    "crates/inline_completion",
-    "crates/inline_completion_button",
    "crates/install_cli",
    "crates/journal",
    "crates/language",
-    "crates/language_model",
-    "crates/language_models",
-    "crates/language_selector",
-    "crates/language_tools",
    "crates/languages",
    "crates/live_kit_client",
    "crates/live_kit_server",
@@ -72,35 +57,26 @@ members = [
    "crates/ollama",
    "crates/open_ai",
    "crates/outline",
-    "crates/outline_panel",
    "crates/paths",
    "crates/picker",
    "crates/prettier",
    "crates/project",
-    "crates/project_panel",
-    "crates/project_symbols",
    "crates/proto",
-    "crates/quick_action_bar",
-    "crates/recent_projects",
    "crates/refineable",
    "crates/refineable/derive_refineable",
    "crates/release_channel",
    "crates/remote",
    "crates/remote_server",
-    "crates/repl",
    "crates/reqwest_client",
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
    "crates/search",
-    "crates/semantic_index",
    "crates/semantic_version",
    "crates/session",
    "crates/settings",
-    "crates/settings_ui",
    "crates/snippet",
    "crates/snippet_provider",
-    "crates/snippets_ui",
    "crates/sqlez",
    "crates/sqlez_macros",
    "crates/story",
@@ -108,31 +84,24 @@ members = [
    "crates/sum_tree",
    "crates/supermaven",
    "crates/supermaven_api",
-    "crates/tab_switcher",
    "crates/task",
    "crates/tasks_ui",
    "crates/telemetry_events",
    "crates/terminal",
-    "crates/terminal_view",
    "crates/text",
    "crates/theme",
    "crates/theme_importer",
-    "crates/theme_selector",
    "crates/time_format",
-    "crates/title_bar",
-    "crates/toolchain_selector",
    "crates/ui",
    "crates/ui_input",
    "crates/ui_macros",
    "crates/reqwest_client",
    "crates/util",
-    "crates/vcs_menu",
-    "crates/vim",
-    "crates/welcome",
    "crates/workspace",
    "crates/worktree",
    "crates/zed",
    "crates/zed_actions",
+    "crates/zed_common",

    #
    # Extensions
@@ -150,6 +119,7 @@ members = [
    "extensions/haskell",
    "extensions/html",
    "extensions/lua",
+    "extensions/ocaml",
    "extensions/php",
    "extensions/perplexity",
    "extensions/prisma",
@@ -178,25 +148,18 @@ default-members = ["crates/zed"]
 # Workspace member crates
 #

-activity_indicator = { path = "crates/activity_indicator" }
 ai = { path = "crates/ai" }
 anthropic = { path = "crates/anthropic" }
 assets = { path = "crates/assets" }
-assistant = { path = "crates/assistant" }
-assistant_slash_command = { path = "crates/assistant_slash_command" }
 assistant_tool = { path = "crates/assistant_tool" }
 audio = { path = "crates/audio" }
-auto_update = { path = "crates/auto_update" }
-breadcrumbs = { path = "crates/breadcrumbs" }
 call = { path = "crates/call" }
 channel = { path = "crates/channel" }
 cli = { path = "crates/cli" }
 client = { path = "crates/client" }
 clock = { path = "crates/clock" }
 collab = { path = "crates/collab" }
-collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections" }
-command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 context_servers = { path = "crates/context_servers" }
 copilot = { path = "crates/copilot" }
@@ -205,10 +168,8 @@ diagnostics = { path = "crates/diagnostics" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
 extension_host = { path = "crates/extension_host" }
-extensions_ui = { path = "crates/extensions_ui" }
 feature_flags = { path = "crates/feature_flags" }
 feedback = { path = "crates/feedback" }
-file_finder = { path = "crates/file_finder" }
 file_icons = { path = "crates/file_icons" }
 fs = { path = "crates/fs" }
 fsevent = { path = "crates/fsevent" }
@@ -223,15 +184,9 @@ html_to_markdown = { path = "crates/html_to_markdown" }
 http_client = { path = "crates/http_client" }
 image_viewer = { path = "crates/image_viewer" }
 indexed_docs = { path = "crates/indexed_docs" }
-inline_completion = { path = "crates/inline_completion" }
-inline_completion_button = { path = "crates/inline_completion_button" }
 install_cli = { path = "crates/install_cli" }
 journal = { path = "crates/journal" }
 language = { path = "crates/language" }
-language_model = { path = "crates/language_model" }
-language_models = { path = "crates/language_models" }
-language_selector = { path = "crates/language_selector" }
-language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
 live_kit_client = { path = "crates/live_kit_client" }
 live_kit_server = { path = "crates/live_kit_server" }
@@ -246,36 +201,27 @@ notifications = { path = "crates/notifications" }
 ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
 outline = { path = "crates/outline" }
-outline_panel = { path = "crates/outline_panel" }
 paths = { path = "crates/paths" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 project = { path = "crates/project" }
-project_panel = { path = "crates/project_panel" }
-project_symbols = { path = "crates/project_symbols" }
 proto = { path = "crates/proto" }
-quick_action_bar = { path = "crates/quick_action_bar" }
-recent_projects = { path = "crates/recent_projects" }
 refineable = { path = "crates/refineable" }
 release_channel = { path = "crates/release_channel" }
 remote = { path = "crates/remote" }
 remote_server = { path = "crates/remote_server" }
-repl = { path = "crates/repl" }
 reqwest_client = { path = "crates/reqwest_client" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
 search = { path = "crates/search" }
-semantic_index = { path = "crates/semantic_index" }
 semantic_version = { path = "crates/semantic_version" }
 session = { path = "crates/session" }
 settings = { path = "crates/settings" }
-settings_ui = { path = "crates/settings_ui" }
 snippet = { path = "crates/snippet" }
 snippet_provider = { path = "crates/snippet_provider" }
-snippets_ui = { path = "crates/snippets_ui" }
 sqlez = { path = "crates/sqlez" }
 sqlez_macros = { path = "crates/sqlez_macros" }
 story = { path = "crates/story" }
@@ -283,30 +229,23 @@ storybook = { path = "crates/storybook" }
 sum_tree = { path = "crates/sum_tree" }
 supermaven = { path = "crates/supermaven" }
 supermaven_api = { path = "crates/supermaven_api" }
-tab_switcher = { path = "crates/tab_switcher" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
 telemetry_events = { path = "crates/telemetry_events" }
 terminal = { path = "crates/terminal" }
-terminal_view = { path = "crates/terminal_view" }
 text = { path = "crates/text" }
 theme = { path = "crates/theme" }
 theme_importer = { path = "crates/theme_importer" }
-theme_selector = { path = "crates/theme_selector" }
 time_format = { path = "crates/time_format" }
-title_bar = { path = "crates/title_bar" }
-toolchain_selector = { path = "crates/toolchain_selector" }
 ui = { path = "crates/ui" }
 ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
 util = { path = "crates/util" }
-vcs_menu = { path = "crates/vcs_menu" }
-vim = { path = "crates/vim" }
-welcome = { path = "crates/welcome" }
 workspace = { path = "crates/workspace" }
 worktree = { path = "crates/worktree" }
 zed = { path = "crates/zed" }
 zed_actions = { path = "crates/zed_actions" }
+zed_common = { path = "crates/zed_common" }

 #
 # External crates
@@ -326,7 +265,7 @@ async-pipe = { git = "https://github.com/zed-industries/async-pipe-rs", rev = "8
 async-recursion = "1.0.0"
 async-tar = "0.5.0"
 async-trait = "0.1"
-async-tungstenite = "0.28"
+async-tungstenite = "0.24"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 base64 = "0.22"
@@ -336,7 +275,7 @@ blade-macros = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a
 blade-util = { git = "https://github.com/kvark/blade", rev = "e142a3a5e678eb6a13e642ad8401b1f3aa38e969" }
 blake3 = "1.5.3"
 bytes = "1.0"
-cargo_metadata = "0.19"
+cargo_metadata = "0.18"
 cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
@@ -372,14 +311,12 @@ indexmap = { version = "1.6.2", features = ["serde"] }
 indoc = "2"
 itertools = "0.13.0"
 jsonwebtoken = "9.3"
-jupyter-protocol = { version = "0.2.0" }
-jupyter-websocket-client = { version = "0.4.1" }
 libc = "0.2"
 linkify = "0.10.0"
 log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
 markup5ever_rcdom = "0.3.0"
 nanoid = "0.4"
-nbformat = "0.6.0"
+nbformat = "0.3.2"
 nix = "0.29"
 num-format = "0.4.4"
 once_cell = "1.19.0"
@@ -394,7 +331,7 @@ pet-core = { git = "https://github.com/microsoft/python-environment-tools.git",
 pet-poetry = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c"  }
 pet-reporter = { git = "https://github.com/microsoft/python-environment-tools.git", rev = "ffcbf3f28c46633abd5448a52b1f396c322e0d6c"  }
 postage = { version = "0.5", features = ["futures-traits"] }
-pretty_assertions = { version = "1.3.0", features = ["unstable"] }
+pretty_assertions = "1.3.0"
 profiling = "1"
 prost = "0.9"
 prost-build = "0.9"
@@ -413,12 +350,12 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "fd110f
    "stream",
 ] }
 rsa = "0.9.6"
-runtimelib = { version = "0.21.0", default-features = false, features = [
+runtimelib = { version = "0.16.1", default-features = false, features = [
    "async-dispatcher-runtime",
 ] }
 rustc-demangle = "0.1.23"
 rust-embed = { version = "8.4", features = ["include-exclude"] }
-rustls = "0.21.12"
+rustls = "0.20.3"
 rustls-native-certs = "0.8.0"
 schemars = { version = "0.8", features = ["impl_json_schema"] }
 semver = "1.0"
@@ -567,46 +504,6 @@ rustybuzz = { opt-level = 3 }
 ttf-parser = { opt-level = 3 }
 wasmtime-cranelift = { opt-level = 3 }
 wasmtime = { opt-level = 3 }
-# Build single-source-file crates with cg=1 as it helps make `cargo build` of a whole workspace a bit faster
-activity_indicator = { codegen-units = 1 }
-assets = { codegen-units = 1 }
-breadcrumbs = { codegen-units = 1 }
-collections = { codegen-units = 1 }
-command_palette = { codegen-units = 1 }
-command_palette_hooks = { codegen-units = 1 }
-evals = { codegen-units = 1 }
-extension_cli = { codegen-units = 1 }
-feature_flags = { codegen-units = 1 }
-file_icons = { codegen-units = 1 }
-fsevent = { codegen-units = 1 }
-image_viewer = { codegen-units = 1 }
-inline_completion_button = { codegen-units = 1 }
-install_cli = { codegen-units = 1 }
-journal = { codegen-units = 1 }
-menu = { codegen-units = 1 }
-notifications = { codegen-units = 1 }
-ollama = { codegen-units = 1 }
-outline = { codegen-units = 1 }
-paths = { codegen-units = 1 }
-prettier = { codegen-units = 1 }
-project_symbols = { codegen-units = 1 }
-refineable = { codegen-units = 1 }
-release_channel = { codegen-units = 1 }
-reqwest_client = { codegen-units = 1 }
-rich_text = { codegen-units = 1 }
-semantic_version = { codegen-units = 1 }
-session = { codegen-units = 1 }
-snippet = { codegen-units = 1 }
-snippets_ui = { codegen-units = 1 }
-sqlez_macros = { codegen-units = 1 }
-story = { codegen-units = 1 }
-supermaven_api = { codegen-units = 1 }
-telemetry_events = { codegen-units = 1 }
-theme_selector = { codegen-units = 1 }
-time_format = { codegen-units = 1 }
-ui_input = { codegen-units = 1 }
-vcs_menu = { codegen-units = 1 }
-zed_actions = { codegen-units = 1 }

 [profile.release]
 debug = "limited"
--- a/assets/icons/blocks.svg
+++ b/assets/icons/blocks.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-blocks"><rect width="7" height="7" x="14" y="3" rx="1"/><path d="M10 21V8a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1H3"/></svg>
--- a/assets/icons/indicator_x.svg
+++ b/assets/icons/indicator_x.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4662 14.9152C13.5801 15.0291 13.7648 15.0291 13.8787 14.9152L14.9145 13.8793C15.0284 13.7654 15.0284 13.5807 14.9145 13.4667L12.9483 11.5004L14.9145 9.53392C15.0285 9.42004 15.0285 9.23533 14.9145 9.12137L13.8787 8.08547C13.7648 7.97154 13.5801 7.97154 13.4662 8.08547L11.5 10.0519L9.53376 8.08545C9.41988 7.97152 9.23517 7.97152 9.12124 8.08545L8.08543 9.12136C7.97152 9.23533 7.97152 9.42004 8.08543 9.53392L10.0517 11.5004L8.08545 13.4667C7.97155 13.5807 7.97155 13.7654 8.08545 13.8793L9.12126 14.9152C9.23517 15.0292 9.41988 15.0292 9.53376 14.9152L11.5 12.9489L13.4662 14.9152Z" fill="black"/>
+</svg>
--- a/assets/icons/keyboard.svg
+++ b/assets/icons/keyboard.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-keyboard"><path d="M10 8h.01"/><path d="M12 12h.01"/><path d="M14 8h.01"/><path d="M16 12h.01"/><path d="M18 8h.01"/><path d="M6 8h.01"/><path d="M7 16h10"/><path d="M8 12h.01"/><rect width="20" height="16" x="2" y="4" rx="2"/></svg>
--- a/assets/icons/knockouts/dot_bg.svg
+++ b/assets/icons/knockouts/dot_bg.svg
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="2.1" y="2.1" width="6.8" height="6.8" rx="3.4" stroke="black" stroke-width="1.8"/>
-</svg>
--- a/assets/icons/knockouts/dot_fg.svg
+++ b/assets/icons/knockouts/dot_fg.svg
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="3" y="3" width="5" height="5" rx="2.5" fill="black"/>
-</svg>
--- a/assets/icons/knockouts/triangle_bg.svg
+++ b/assets/icons/knockouts/triangle_bg.svg
@@ -1,10 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2080_948)">
-<path d="M1.52492 8.72287L1.04243 9.55H2H9H9.95757L9.47508 8.72287L5.97508 2.72287L5.5 1.90845L5.02492 2.72287L1.52492 8.72287Z" stroke="black" stroke-width="1.1"/>
-</g>
-<defs>
-<clipPath id="clip0_2080_948">
-<rect width="11" height="11" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/assets/icons/knockouts/triangle_fg.svg
+++ b/assets/icons/knockouts/triangle_fg.svg
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 9H9L5.5 3L2 9Z" fill="black"/>
-</svg>
--- a/assets/icons/knockouts/x_bg.svg
+++ b/assets/icons/knockouts/x_bg.svg
@@ -1,10 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_2050_903)">
-<path d="M1.83327 2.89393L1.19687 3.53033L1.83327 4.16672L3.16654 5.5L1.83327 6.83327L1.19687 7.46967L1.83327 8.10606L2.89393 9.16672L3.53033 9.80312L4.16672 9.16672L5.5 7.83345L6.83327 9.16672L7.46967 9.80312L8.10606 9.16672L9.16672 8.10606L9.80312 7.46967L9.16672 6.83327L7.83345 5.5L9.16672 4.16672L9.80312 3.53033L9.16672 2.89393L8.10606 1.83327L7.46967 1.19687L6.83327 1.83327L5.5 3.16654L4.16672 1.83327L3.53033 1.19687L2.89393 1.83327L1.83327 2.89393Z" stroke="black" stroke-width="1.8"/>
-</g>
-<defs>
-<clipPath id="clip0_2050_903">
-<rect width="11" height="11" fill="white"/>
-</clipPath>
-</defs>
-</svg>
--- a/assets/icons/knockouts/x_fg.svg
+++ b/assets/icons/knockouts/x_fg.svg
@@ -1,3 +0,0 @@
-<svg width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 3L5.5 5.5M8 8L5.5 5.5M5.5 5.5L3 8M5.5 5.5L8 3" stroke="black" stroke-width="1.5"/>
-</svg>
--- a/assets/icons/phone_incoming.svg
+++ b/assets/icons/phone_incoming.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-phone-incoming"><polyline points="16 2 16 8 22 8"/><line x1="22" x2="16" y1="2" y2="8"/><path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/></svg>
--- a/assets/icons/swatch_book.svg
+++ b/assets/icons/swatch_book.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-swatch-book"><path d="M11 17a4 4 0 0 1-8 0V5a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2Z"/><path d="M16.7 13H19a2 2 0 0 1 2 2v4a2 2 0 0 1-2 2H7"/><path d="M 7 17h.01"/><path d="m11 8 2.3-2.3a2.4 2.4 0 0 1 3.404.004L18.6 7.6a2.4 2.4 0 0 1 .026 3.434L9.9 19.8"/></svg>
--- a/assets/icons/triangle.svg
+++ b/assets/icons/triangle.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M8 4L4 12H12L8 4Z" fill="currentColor"/>
-</svg>
--- a/assets/icons/x.svg
+++ b/assets/icons/x.svg
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M4 4L12 12M12 4L4 12" stroke="currentColor" stroke-width="2"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -251,8 +251,6 @@
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "back": "pane::GoBack",
-      "forward": "pane::GoForward",
      "ctrl-w": "pane::CloseActiveItem",
      "ctrl-f4": "pane::CloseActiveItem",
      "alt-ctrl-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
@@ -650,24 +648,8 @@
    }
  },
  {
-    "context": "FileFinder && !menu_open",
-    "bindings": {
-      "ctrl-shift-p": "file_finder::SelectPrev",
-      "ctrl": "file_finder::OpenMenu",
-      "ctrl-j": "pane::SplitDown",
-      "ctrl-k": "pane::SplitUp",
-      "ctrl-h": "pane::SplitLeft",
-      "ctrl-l": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "FileFinder && menu_open",
-    "bindings": {
-      "j": "pane::SplitDown",
-      "k": "pane::SplitUp",
-      "h": "pane::SplitLeft",
-      "l": "pane::SplitRight"
-    }
+    "context": "FileFinder",
+    "bindings": { "ctrl-shift-p": "file_finder::SelectPrev" }
  },
  {
    "context": "TabSwitcher",
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -49,9 +49,8 @@
      "ctrl-d": "editor::Delete",
      "tab": "editor::Tab",
      "shift-tab": "editor::TabPrev",
+      "ctrl-k": "editor::CutToEndOfLine",
      "ctrl-t": "editor::Transpose",
-      "ctrl-k": "editor::KillRingCut",
-      "ctrl-y": "editor::KillRingYank",
      "cmd-k q": "editor::Rewrap",
      "cmd-k cmd-q": "editor::Rewrap",
      "cmd-backspace": "editor::DeleteToBeginningOfLine",
@@ -649,24 +648,8 @@
    }
  },
  {
-    "context": "FileFinder && !menu_open",
-    "bindings": {
-      "cmd-shift-p": "file_finder::SelectPrev",
-      "cmd": "file_finder::OpenMenu",
-      "cmd-j": "pane::SplitDown",
-      "cmd-k": "pane::SplitUp",
-      "cmd-h": "pane::SplitLeft",
-      "cmd-l": "pane::SplitRight"
-    }
-  },
-  {
-    "context": "FileFinder && menu_open",
-    "bindings": {
-      "j": "pane::SplitDown",
-      "k": "pane::SplitUp",
-      "h": "pane::SplitLeft",
-      "l": "pane::SplitRight"
-    }
+    "context": "FileFinder",
+    "bindings": { "cmd-shift-p": "file_finder::SelectPrev" }
  },
  {
    "context": "TabSwitcher",
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -4,7 +4,9 @@
      "ctrl-shift-[": "pane::ActivatePrevItem",
      "ctrl-shift-]": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
-      "ctrl-pagedown": "pane::ActivateNextItem"
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-tab": "pane::ActivateNextItem",
+      "ctrl-shift-tab": "pane::ActivatePrevItem"
    }
  },
  {
@@ -16,7 +18,6 @@
      "ctrl-shift-l": "editor::SplitSelectionIntoLines",
      "ctrl-shift-a": "editor::SelectLargerSyntaxNode",
      "ctrl-shift-d": "editor::DuplicateLineDown",
-      "alt-f3": "editor::SelectAllMatches", // find_all_under
      "f12": "editor::GoToDefinition",
      "ctrl-f12": "editor::GoToDefinitionSplit",
      "shift-f12": "editor::FindAllReferences",
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -4,7 +4,9 @@
      "cmd-shift-[": "pane::ActivatePrevItem",
      "cmd-shift-]": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
-      "ctrl-pagedown": "pane::ActivateNextItem"
+      "ctrl-pagedown": "pane::ActivateNextItem",
+      "ctrl-tab": "pane::ActivateNextItem",
+      "ctrl-shift-tab": "pane::ActivatePrevItem"
    }
  },
  {
@@ -19,7 +21,6 @@
      "cmd-shift-l": "editor::SplitSelectionIntoLines",
      "cmd-shift-a": "editor::SelectLargerSyntaxNode",
      "cmd-shift-d": "editor::DuplicateLineDown",
-      "ctrl-cmd-g": "editor::SelectAllMatches", // find_all_under
      "shift-f12": "editor::FindAllReferences",
      "alt-cmd-down": "editor::GoToDefinition",
      "ctrl-alt-cmd-down": "editor::GoToDefinitionSplit",
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -304,8 +304,7 @@
      "ctrl-q": ["vim::PushOperator", { "Literal": {} }],
      "ctrl-shift-q": ["vim::PushOperator", { "Literal": {} }],
      "ctrl-r": ["vim::PushOperator", "Register"],
-      "insert": "vim::ToggleReplace",
-      "ctrl-o": "vim::TemporaryNormal"
+      "insert": "vim::ToggleReplace"
    }
  },
  {
@@ -381,7 +380,8 @@
      "shift-b": "vim::CurlyBrackets",
      "<": "vim::AngleBrackets",
      ">": "vim::AngleBrackets",
-      "a": "vim::Argument"
+      "a": "vim::AngleBrackets",
+      "g": "vim::Argument"
    }
  },
  {
@@ -577,7 +577,7 @@
    }
  },
  {
-    "context": "EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || Welcome",
+    "context": "EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
    "use_layout_keys": true,
    "bindings": {
      ":": "command_palette::Toggle",
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -157,7 +157,7 @@
  "auto_signature_help": false,
  /// Whether to show the signature help after completion or a bracket pair inserted.
  /// If `auto_signature_help` is enabled, this setting will be treated as enabled also.
-  "show_signature_help_after_edits": false,
+  "show_signature_help_after_edits": true,
  // Whether to show wrap guides (vertical rulers) in the editor.
  // Setting this to true will show a guide at the 'preferred_line_length' value
  // if 'soft_wrap' is set to 'preferred_line_length', and will show any
@@ -383,16 +383,6 @@
      ///    "never"
      "show": null
    },
-    /// Which files containing diagnostic errors/warnings to mark in the project panel.
-    /// This setting can take the following three values:
-    ///
-    /// 1. Do not mark any files:
-    ///    "off"
-    /// 2. Only mark files with errors:
-    ///    "errors"
-    /// 3. Mark files with errors and warnings:
-    ///    "all"
-    "show_diagnostics": "all",
    // Settings related to indent guides in the project panel.
    "indent_guides": {
      // When to show indent guides in the project panel.
@@ -490,9 +480,6 @@
    "version": "2",
    // Whether the assistant is enabled.
    "enabled": true,
-    // Whether to show inline hints showing the keybindings to use the inline assistant and the
-    // assistant panel.
-    "show_hints": true,
    // Whether to show the assistant panel button in the status bar.
    "button": true,
    // Where to dock the assistant panel. Can be 'left', 'right' or 'bottom'.
@@ -583,23 +570,7 @@
  // Settings related to the file finder.
  "file_finder": {
    // Whether to show file icons in the file finder.
-    "file_icons": true,
-    // Determines how much space the file finder can take up in relation to the available window width.
-    // There are 5 possible width values:
-    //
-    // 1. Small: This value is essentially a fixed width.
-    //    "modal_width": "small"
-    // 2. Medium:
-    //    "modal_width": "medium"
-    // 3. Large:
-    //    "modal_width": "large"
-    // 4. Extra Large:
-    //    "modal_width": "xlarge"
-    // 5. Fullscreen: This value removes any horizontal padding, as it consumes the whole viewport width.
-    //    "modal_width": "full"
-    //
-    // Default: small
-    "modal_max_width": "small"
+    "file_icons": true
  },
  // Whether or not to remove any trailing whitespace from lines of a buffer
  // before saving it.
@@ -668,7 +639,7 @@
  },
  // Add files or globs of files that will be excluded by Zed entirely:
  // they will be skipped during FS scan(s), file tree and file search
-  // will lack the corresponding file entries. Overrides `file_scan_inclusions`.
+  // will lack the corresponding file entries.
  "file_scan_exclusions": [
    "**/.git",
    "**/.svn",
@@ -679,14 +650,6 @@
    "**/.classpath",
    "**/.settings"
  ],
-  // Add files or globs of files that will be included by Zed, even when
-  // ignored by git. This is useful for files that are not tracked by git,
-  // but are still important to your project. Note that globs that are
-  // overly broad can slow down Zed's file scanning. Overridden by `file_scan_exclusions`.
-  "file_scan_inclusions": [
-    ".env*",
-    "docker-compose.*.yml"
-  ],
  // Git gutter behavior configuration.
  "git": {
    // Control whether the git gutter is shown. May take 2 values:
@@ -847,12 +810,8 @@
      }
    },
    "toolbar": {
-      // Whether to display the terminal title in its toolbar's breadcrumbs.
-      // Only shown if the terminal title is not empty.
-      //
-      // The shell running in the terminal needs to be configured to emit the title.
-      // Example: `echo -e "\e]2;New Title\007";`
-      "breadcrumbs": true
+      // Whether to display the terminal title in its toolbar.
+      "title": true
    }
    // Set the terminal's font size. If this option is not included,
    // the terminal will default to matching the buffer's font size.
@@ -888,8 +847,15 @@
  //
  "file_types": {
    "Plain Text": ["txt"],
-    "JSONC": ["**/.zed/**/*.json", "**/zed/**/*.json", "**/Zed/**/*.json"],
-    "Shell Script": [".env.*"]
+    "JSON": ["flake.lock"],
+    "JSONC": [
+      "**/.zed/**/*.json",
+      "**/zed/**/*.json",
+      "**/Zed/**/*.json",
+      "tsconfig.json",
+      "pyrightconfig.json"
+    ],
+    "TOML": ["uv.lock"]
  },
  /// By default use a recent system version of node, or install our own.
  /// You can override this to use a version of node that is not in $PATH with:
@@ -1077,11 +1043,13 @@
      "api_url": "https://generativelanguage.googleapis.com"
    },
    "ollama": {
-      "api_url": "http://localhost:11434"
+      "api_url": "http://localhost:11434",
+      "low_speed_timeout_in_seconds": 60
    },
    "openai": {
      "version": "1",
-      "api_url": "https://api.openai.com/v1"
+      "api_url": "https://api.openai.com/v1",
+      "low_speed_timeout_in_seconds": 600
    }
  },
  // Zed's Prettier integration settings.
@@ -1204,6 +1172,15 @@
  //   }
  // ]
  "ssh_connections": [],
-  // Configures context servers for use in the Assistant.
-  "context_servers": {}
+  // Configures the Context Server Protocol binaries
+  //
+  // Examples:
+  // {
+  //   "id": "server-1",
+  //   "executable": "/path",
+  //   "args": ['arg1", "args2"]
+  // }
+  "experimental.context_servers": {
+    "servers": []
+  }
 }
--- a/crates/activity_indicator/Cargo.toml
+++ b/crates/activity_indicator/Cargo.toml
@@ -1,31 +0,0 @@
-[package]
-name = "activity_indicator"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/activity_indicator.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-auto_update.workspace = true
-editor.workspace = true
-extension_host.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-lsp.workspace = true
-project.workspace = true
-smallvec.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
--- a/crates/activity_indicator/LICENSE-GPL
+++ b/crates/activity_indicator/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/anthropic/src/anthropic.rs
+++ b/crates/anthropic/src/anthropic.rs
@@ -1,12 +1,13 @@
 mod supported_countries;

+use std::time::Duration;
 use std::{pin::Pin, str::FromStr};

 use anyhow::{anyhow, Context, Result};
 use chrono::{DateTime, Utc};
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, Stream, StreamExt};
 use http_client::http::{HeaderMap, HeaderValue};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use http_client::{AsyncBody, HttpClient, HttpRequestExt, Method, Request as HttpRequest};
 use serde::{Deserialize, Serialize};
 use strum::{EnumIter, EnumString};
 use thiserror::Error;
@@ -160,7 +161,10 @@ pub async fn complete(
        .method(Method::POST)
        .uri(uri)
        .header("Anthropic-Version", "2023-06-01")
-        .header("Anthropic-Beta", "prompt-caching-2024-07-31")
+        .header(
+            "Anthropic-Beta",
+            "tools-2024-04-04,prompt-caching-2024-07-31,max-tokens-3-5-sonnet-2024-07-15",
+        )
        .header("X-Api-Key", api_key)
        .header("Content-Type", "application/json");

@@ -206,8 +210,9 @@ pub async fn stream_completion(
    api_url: &str,
    api_key: &str,
    request: Request,
+    low_speed_timeout: Option<Duration>,
 ) -> Result<BoxStream<'static, Result<Event, AnthropicError>>, AnthropicError> {
-    stream_completion_with_rate_limit_info(client, api_url, api_key, request)
+    stream_completion_with_rate_limit_info(client, api_url, api_key, request, low_speed_timeout)
        .await
        .map(|output| output.0)
 }
@@ -259,6 +264,7 @@ pub async fn stream_completion_with_rate_limit_info(
    api_url: &str,
    api_key: &str,
    request: Request,
+    low_speed_timeout: Option<Duration>,
 ) -> Result<
    (
        BoxStream<'static, Result<Event, AnthropicError>>,
@@ -271,7 +277,7 @@ pub async fn stream_completion_with_rate_limit_info(
        stream: true,
    };
    let uri = format!("{api_url}/v1/messages");
-    let request_builder = HttpRequest::builder()
+    let mut request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(uri)
        .header("Anthropic-Version", "2023-06-01")
@@ -281,6 +287,9 @@ pub async fn stream_completion_with_rate_limit_info(
        )
        .header("X-Api-Key", api_key)
        .header("Content-Type", "application/json");
+    if let Some(low_speed_timeout) = low_speed_timeout {
+        request_builder = request_builder.read_timeout(low_speed_timeout);
+    }
    let serialized_request =
        serde_json::to_string(&request).context("failed to serialize request")?;
    let request = request_builder
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -1,107 +0,0 @@
-[package]
-name = "assistant"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/assistant.rs"
-doctest = false
-
-[features]
-test-support = [
-    "editor/test-support",
-    "language/test-support",
-    "project/test-support",
-    "text/test-support",
-]
-
-[dependencies]
-anthropic = { workspace = true, features = ["schemars"] }
-anyhow.workspace = true
-assets.workspace = true
-assistant_slash_command.workspace = true
-assistant_tool.workspace = true
-async-watch.workspace = true
-cargo_toml.workspace = true
-chrono.workspace = true
-client.workspace = true
-clock.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-context_servers.workspace = true
-db.workspace = true
-editor.workspace = true
-feature_flags.workspace = true
-fs.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-globset.workspace = true
-gpui.workspace = true
-handlebars.workspace = true
-heed.workspace = true
-html_to_markdown.workspace = true
-http_client.workspace = true
-indexed_docs.workspace = true
-indoc.workspace = true
-language.workspace = true
-language_model.workspace = true
-language_models.workspace = true
-log.workspace = true
-lsp.workspace = true
-markdown.workspace = true
-menu.workspace = true
-multi_buffer.workspace = true
-ollama = { workspace = true, features = ["schemars"] }
-open_ai = { workspace = true, features = ["schemars"] }
-ordered-float.workspace = true
-parking_lot.workspace = true
-paths.workspace = true
-picker.workspace = true
-project.workspace = true
-proto.workspace = true
-regex.workspace = true
-release_channel.workspace = true
-rope.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-search.workspace = true
-semantic_index.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-similar.workspace = true
-smallvec.workspace = true
-smol.workspace = true
-strum.workspace = true
-telemetry_events.workspace = true
-terminal.workspace = true
-terminal_view.workspace = true
-text.workspace = true
-theme.workspace = true
-toml.workspace = true
-ui.workspace = true
-util.workspace = true
-uuid.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
-languages = { workspace = true, features = ["test-support"] }
-log.workspace = true
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rand.workspace = true
-serde_json_lenient.workspace = true
-text = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-unindent.workspace = true
--- a/crates/assistant/LICENSE-GPL
+++ b/crates/assistant/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/assistant_slash_command/Cargo.toml
+++ b/crates/assistant_slash_command/Cargo.toml
@@ -1,33 +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
-async-trait.workspace = true
-collections.workspace = true
-derive_more.workspace = true
-extension.workspace = true
-futures.workspace = true
-gpui.workspace = true
-language.workspace = true
-language_model.workspace = true
-parking_lot.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-ui.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
--- a/crates/assistant_slash_command/LICENSE-GPL
+++ b/crates/assistant_slash_command/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ b/crates/assistant_slash_command/src/extension_slash_command.rs
@@ -1,143 +0,0 @@
-use std::path::PathBuf;
-use std::sync::{atomic::AtomicBool, Arc};
-
-use anyhow::Result;
-use async_trait::async_trait;
-use extension::{Extension, WorktreeDelegate};
-use gpui::{Task, WeakView, WindowContext};
-use language::{BufferSnapshot, LspAdapterDelegate};
-use ui::prelude::*;
-use workspace::Workspace;
-
-use crate::{
-    ArgumentCompletion, SlashCommand, SlashCommandOutput, SlashCommandOutputSection,
-    SlashCommandResult,
-};
-
-/// An adapter that allows an [`LspAdapterDelegate`] to be used as a [`WorktreeDelegate`].
-struct WorktreeDelegateAdapter(Arc<dyn LspAdapterDelegate>);
-
-#[async_trait]
-impl WorktreeDelegate for WorktreeDelegateAdapter {
-    fn id(&self) -> u64 {
-        self.0.worktree_id().to_proto()
-    }
-
-    fn root_path(&self) -> String {
-        self.0.worktree_root_path().to_string_lossy().to_string()
-    }
-
-    async fn read_text_file(&self, path: PathBuf) -> Result<String> {
-        self.0.read_text_file(path).await
-    }
-
-    async fn which(&self, binary_name: String) -> Option<String> {
-        self.0
-            .which(binary_name.as_ref())
-            .await
-            .map(|path| path.to_string_lossy().to_string())
-    }
-
-    async fn shell_env(&self) -> Vec<(String, String)> {
-        self.0.shell_env().await.into_iter().collect()
-    }
-}
-
-pub struct ExtensionSlashCommand {
-    extension: Arc<dyn Extension>,
-    command: extension::SlashCommand,
-}
-
-impl ExtensionSlashCommand {
-    pub fn new(extension: Arc<dyn Extension>, command: extension::SlashCommand) -> Self {
-        Self { extension, command }
-    }
-}
-
-impl SlashCommand for ExtensionSlashCommand {
-    fn name(&self) -> String {
-        self.command.name.clone()
-    }
-
-    fn description(&self) -> String {
-        self.command.description.clone()
-    }
-
-    fn menu_text(&self) -> String {
-        self.command.tooltip_text.clone()
-    }
-
-    fn requires_argument(&self) -> bool {
-        self.command.requires_argument
-    }
-
-    fn complete_argument(
-        self: Arc<Self>,
-        arguments: &[String],
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakView<Workspace>>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<Vec<ArgumentCompletion>>> {
-        let command = self.command.clone();
-        let arguments = arguments.to_owned();
-        cx.background_executor().spawn(async move {
-            let completions = self
-                .extension
-                .complete_slash_command_argument(command, arguments)
-                .await?;
-
-            anyhow::Ok(
-                completions
-                    .into_iter()
-                    .map(|completion| ArgumentCompletion {
-                        label: completion.label.into(),
-                        new_text: completion.new_text,
-                        replace_previous_arguments: false,
-                        after_completion: completion.run_command.into(),
-                    })
-                    .collect(),
-            )
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        arguments: &[String],
-        _context_slash_command_output_sections: &[SlashCommandOutputSection<language::Anchor>],
-        _context_buffer: BufferSnapshot,
-        _workspace: WeakView<Workspace>,
-        delegate: Option<Arc<dyn LspAdapterDelegate>>,
-        cx: &mut WindowContext,
-    ) -> Task<SlashCommandResult> {
-        let command = self.command.clone();
-        let arguments = arguments.to_owned();
-        let output = cx.background_executor().spawn(async move {
-            let delegate =
-                delegate.map(|delegate| Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _);
-            let output = self
-                .extension
-                .run_slash_command(command, arguments, delegate)
-                .await?;
-
-            anyhow::Ok(output)
-        });
-        cx.foreground_executor().spawn(async move {
-            let output = output.await?;
-            Ok(SlashCommandOutput {
-                text: output.text,
-                sections: output
-                    .sections
-                    .into_iter()
-                    .map(|section| SlashCommandOutputSection {
-                        range: section.range,
-                        icon: IconName::Code,
-                        label: section.label.into(),
-                        metadata: None,
-                    })
-                    .collect(),
-                run_commands_in_text: false,
-            }
-            .to_event_stream())
-        })
-    }
-}
--- a/crates/auto_update/Cargo.toml
+++ b/crates/auto_update/Cargo.toml
@@ -1,36 +0,0 @@
-[package]
-name = "auto_update"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/auto_update.rs"
-doctest = false
-
-[dependencies]
-anyhow.workspace = true
-client.workspace = true
-db.workspace = true
-editor.workspace = true
-gpui.workspace = true
-http_client.workspace = true
-log.workspace = true
-markdown_preview.workspace = true
-menu.workspace = true
-paths.workspace = true
-release_channel.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smol.workspace = true
-tempfile.workspace = true
-util.workspace = true
-which.workspace = true
-workspace.workspace = true
--- a/crates/auto_update/LICENSE-GPL
+++ b/crates/auto_update/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/breadcrumbs/Cargo.toml
+++ b/crates/breadcrumbs/Cargo.toml
@@ -1,27 +0,0 @@
-[package]
-name = "breadcrumbs"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/breadcrumbs.rs"
-doctest = false
-
-[dependencies]
-editor.workspace = true
-gpui.workspace = true
-itertools.workspace = true
-outline.workspace = true
-theme.workspace = true
-ui.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
--- a/crates/breadcrumbs/LICENSE-GPL
+++ b/crates/breadcrumbs/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -343,7 +343,7 @@ fn init_test(cx: &mut AppContext) -> Model<ChannelStore> {
    release_channel::init(SemanticVersion::default(), cx);
    client::init_settings(cx);

-    let clock = Arc::new(FakeSystemClock::new());
+    let clock = Arc::new(FakeSystemClock::default());
    let http = FakeHttpClient::with_404_response();
    let client = Client::new(clock, http.clone(), cx);
    let user_store = cx.new_model(|cx| UserStore::new(client.clone(), cx));
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -42,6 +42,7 @@ serde_json.workspace = true
 settings.workspace = true
 sha2.workspace = true
 smol.workspace = true
+sysinfo.workspace = true
 telemetry_events.workspace = true
 text.workspace = true
 thiserror.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1780,7 +1780,7 @@ mod tests {
        let user_id = 5;
        let client = cx.update(|cx| {
            Client::new(
-                Arc::new(FakeSystemClock::new()),
+                Arc::new(FakeSystemClock::default()),
                FakeHttpClient::with_404_response(),
                cx,
            )
@@ -1821,7 +1821,7 @@ mod tests {
        let user_id = 5;
        let client = cx.update(|cx| {
            Client::new(
-                Arc::new(FakeSystemClock::new()),
+                Arc::new(FakeSystemClock::default()),
                FakeHttpClient::with_404_response(),
                cx,
            )
@@ -1900,7 +1900,7 @@ mod tests {
        let dropped_auth_count = Arc::new(Mutex::new(0));
        let client = cx.update(|cx| {
            Client::new(
-                Arc::new(FakeSystemClock::new()),
+                Arc::new(FakeSystemClock::default()),
                FakeHttpClient::with_404_response(),
                cx,
            )
@@ -1943,7 +1943,7 @@ mod tests {
        let user_id = 5;
        let client = cx.update(|cx| {
            Client::new(
-                Arc::new(FakeSystemClock::new()),
+                Arc::new(FakeSystemClock::default()),
                FakeHttpClient::with_404_response(),
                cx,
            )
@@ -2003,7 +2003,7 @@ mod tests {
        let user_id = 5;
        let client = cx.update(|cx| {
            Client::new(
-                Arc::new(FakeSystemClock::new()),
+                Arc::new(FakeSystemClock::default()),
                FakeHttpClient::with_404_response(),
                cx,
            )
@@ -2038,7 +2038,7 @@ mod tests {
        let user_id = 5;
        let client = cx.update(|cx| {
            Client::new(
-                Arc::new(FakeSystemClock::new()),
+                Arc::new(FakeSystemClock::default()),
                FakeHttpClient::with_404_response(),
                cx,
            )
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -2,6 +2,7 @@ mod event_coalescer;

 use crate::{ChannelId, TelemetrySettings};
 use anyhow::Result;
+use chrono::{DateTime, Utc};
 use clock::SystemClock;
 use collections::{HashMap, HashSet};
 use futures::Future;
@@ -14,11 +15,12 @@ use settings::{Settings, SettingsStore};
 use sha2::{Digest, Sha256};
 use std::fs::File;
 use std::io::Write;
-use std::time::Instant;
 use std::{env, mem, path::PathBuf, sync::Arc, time::Duration};
+use sysinfo::{CpuRefreshKind, Pid, ProcessRefreshKind, RefreshKind, System};
 use telemetry_events::{
-    ActionEvent, AppEvent, AssistantEvent, CallEvent, EditEvent, EditorEvent, Event,
-    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, ReplEvent, SettingEvent,
+    ActionEvent, AppEvent, AssistantEvent, CallEvent, CpuEvent, EditEvent, EditorEvent, Event,
+    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, MemoryEvent, ReplEvent,
+    SettingEvent,
 };
 use util::{ResultExt, TryFutureExt};
 use worktree::{UpdatedEntriesSet, WorktreeId};
@@ -44,7 +46,7 @@ struct TelemetryState {
    flush_events_task: Option<Task<()>>,
    log_file: Option<File>,
    is_staff: Option<bool>,
-    first_event_date_time: Option<Instant>,
+    first_event_date_time: Option<DateTime<Utc>>,
    event_coalescer: EventCoalescer,
    max_queue_size: usize,
    worktree_id_map: WorktreeIdMap,
@@ -224,8 +226,6 @@ impl Telemetry {
        cx.background_executor()
            .spawn({
                let state = state.clone();
-                let os_version = os_version();
-                state.lock().os_version = Some(os_version.clone());
                async move {
                    if let Some(tempfile) = File::create(Self::log_file_path()).log_err() {
                        state.lock().log_file = Some(tempfile);
@@ -293,13 +293,55 @@ impl Telemetry {
        state.session_id = Some(session_id);
        state.app_version = release_channel::AppVersion::global(cx).to_string();
        state.os_name = os_name();
+
+        drop(state);
+
+        let this = self.clone();
+        cx.background_executor()
+            .spawn(async move {
+                let mut system = System::new_with_specifics(
+                    RefreshKind::new().with_cpu(CpuRefreshKind::everything()),
+                );
+
+                let refresh_kind = ProcessRefreshKind::new().with_cpu().with_memory();
+                let current_process = Pid::from_u32(std::process::id());
+                system.refresh_processes_specifics(
+                    sysinfo::ProcessesToUpdate::Some(&[current_process]),
+                    refresh_kind,
+                );
+
+                // Waiting some amount of time before the first query is important to get a reasonable value
+                // https://docs.rs/sysinfo/0.29.10/sysinfo/trait.ProcessExt.html#tymethod.cpu_usage
+                const DURATION_BETWEEN_SYSTEM_EVENTS: Duration = Duration::from_secs(4 * 60);
+
+                loop {
+                    smol::Timer::after(DURATION_BETWEEN_SYSTEM_EVENTS).await;
+
+                    let current_process = Pid::from_u32(std::process::id());
+                    system.refresh_processes_specifics(
+                        sysinfo::ProcessesToUpdate::Some(&[current_process]),
+                        refresh_kind,
+                    );
+                    let Some(process) = system.process(current_process) else {
+                        log::error!(
+                            "Failed to find own process {current_process:?} in system process table"
+                        );
+                        // TODO: Fire an error telemetry event
+                        return;
+                    };
+
+                    this.report_memory_event(process.memory(), process.virtual_memory());
+                    this.report_cpu_event(process.cpu_usage(), system.cpus().len() as u32);
+                }
+            })
+            .detach();
    }

    pub fn metrics_enabled(self: &Arc<Self>) -> bool {
        let state = self.state.lock();
        let enabled = state.settings.metrics;
        drop(state);
-        enabled
+        return enabled;
    }

    pub fn set_authenticated_user_info(
@@ -374,6 +416,28 @@ impl Telemetry {
        self.report_event(event)
    }

+    pub fn report_cpu_event(self: &Arc<Self>, usage_as_percentage: f32, core_count: u32) {
+        let event = Event::Cpu(CpuEvent {
+            usage_as_percentage,
+            core_count,
+        });
+
+        self.report_event(event)
+    }
+
+    pub fn report_memory_event(
+        self: &Arc<Self>,
+        memory_in_bytes: u64,
+        virtual_memory_in_bytes: u64,
+    ) {
+        let event = Event::Memory(MemoryEvent {
+            memory_in_bytes,
+            virtual_memory_in_bytes,
+        });
+
+        self.report_event(event)
+    }
+
    pub fn report_app_event(self: &Arc<Self>, operation: String) -> Event {
        let event = Event::App(AppEvent { operation });

@@ -405,10 +469,7 @@ impl Telemetry {

        if let Some((start, end, environment)) = period_data {
            let event = Event::Edit(EditEvent {
-                duration: end
-                    .saturating_duration_since(start)
-                    .min(Duration::from_secs(60 * 60 * 24))
-                    .as_millis() as i64,
+                duration: end.timestamp_millis() - start.timestamp_millis(),
                environment: environment.to_string(),
                is_via_ssh,
            });
@@ -506,10 +567,9 @@ impl Telemetry {
        let date_time = self.clock.utc_now();

        let milliseconds_since_first_event = match state.first_event_date_time {
-            Some(first_event_date_time) => date_time
-                .saturating_duration_since(first_event_date_time)
-                .min(Duration::from_secs(60 * 60 * 24))
-                .as_millis() as i64,
+            Some(first_event_date_time) => {
+                date_time.timestamp_millis() - first_event_date_time.timestamp_millis()
+            }
            None => {
                state.first_event_date_time = Some(date_time);
                0
@@ -642,6 +702,7 @@ pub fn calculate_json_checksum(json: &impl AsRef<[u8]>) -> Option<String> {
 #[cfg(test)]
 mod tests {
    use super::*;
+    use chrono::TimeZone;
    use clock::FakeSystemClock;
    use gpui::TestAppContext;
    use http_client::FakeHttpClient;
@@ -649,7 +710,9 @@ mod tests {
    #[gpui::test]
    fn test_telemetry_flush_on_max_queue_size(cx: &mut TestAppContext) {
        init_test(cx);
-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::new(
+            Utc.with_ymd_and_hms(1990, 4, 12, 12, 0, 0).unwrap(),
+        ));
        let http = FakeHttpClient::with_200_response();
        let system_id = Some("system_id".to_string());
        let installation_id = Some("installation_id".to_string());
@@ -680,7 +743,7 @@ mod tests {
                Some(first_date_time)
            );

-            clock.advance(Duration::from_millis(100));
+            clock.advance(chrono::Duration::milliseconds(100));

            let event = telemetry.report_app_event(operation.clone());
            assert_eq!(
@@ -696,7 +759,7 @@ mod tests {
                Some(first_date_time)
            );

-            clock.advance(Duration::from_millis(100));
+            clock.advance(chrono::Duration::milliseconds(100));

            let event = telemetry.report_app_event(operation.clone());
            assert_eq!(
@@ -712,7 +775,7 @@ mod tests {
                Some(first_date_time)
            );

-            clock.advance(Duration::from_millis(100));
+            clock.advance(chrono::Duration::milliseconds(100));

            // Adding a 4th event should cause a flush
            let event = telemetry.report_app_event(operation.clone());
@@ -733,7 +796,9 @@ mod tests {
        cx: &mut TestAppContext,
    ) {
        init_test(cx);
-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::new(
+            Utc.with_ymd_and_hms(1990, 4, 12, 12, 0, 0).unwrap(),
+        ));
        let http = FakeHttpClient::with_200_response();
        let system_id = Some("system_id".to_string());
        let installation_id = Some("installation_id".to_string());
--- a/crates/client/src/telemetry/event_coalescer.rs
+++ b/crates/client/src/telemetry/event_coalescer.rs
@@ -1,6 +1,7 @@
+use std::sync::Arc;
 use std::time;
-use std::{sync::Arc, time::Instant};

+use chrono::{DateTime, Duration, Utc};
 use clock::SystemClock;

 const COALESCE_TIMEOUT: time::Duration = time::Duration::from_secs(20);
@@ -9,8 +10,8 @@ const SIMULATED_DURATION_FOR_SINGLE_EVENT: time::Duration = time::Duration::from
 #[derive(Debug, PartialEq)]
 struct PeriodData {
    environment: &'static str,
-    start: Instant,
-    end: Option<Instant>,
+    start: DateTime<Utc>,
+    end: Option<DateTime<Utc>>,
 }

 pub struct EventCoalescer {
@@ -26,8 +27,9 @@ impl EventCoalescer {
    pub fn log_event(
        &mut self,
        environment: &'static str,
-    ) -> Option<(Instant, Instant, &'static str)> {
+    ) -> Option<(DateTime<Utc>, DateTime<Utc>, &'static str)> {
        let log_time = self.clock.utc_now();
+        let coalesce_timeout = Duration::from_std(COALESCE_TIMEOUT).unwrap();

        let Some(state) = &mut self.state else {
            self.state = Some(PeriodData {
@@ -41,7 +43,7 @@ impl EventCoalescer {
        let period_end = state
            .end
            .unwrap_or(state.start + SIMULATED_DURATION_FOR_SINGLE_EVENT);
-        let within_timeout = log_time - period_end < COALESCE_TIMEOUT;
+        let within_timeout = log_time - period_end < coalesce_timeout;
        let environment_is_same = state.environment == environment;
        let should_coaelesce = !within_timeout || !environment_is_same;

@@ -68,13 +70,16 @@ impl EventCoalescer {

 #[cfg(test)]
 mod tests {
+    use chrono::TimeZone;
    use clock::FakeSystemClock;

    use super::*;

    #[test]
    fn test_same_context_exceeding_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::new(
+            Utc.with_ymd_and_hms(1990, 4, 12, 0, 0, 0).unwrap(),
+        ));
        let environment_1 = "environment_1";
        let mut event_coalescer = EventCoalescer::new(clock.clone());

@@ -93,7 +98,7 @@ mod tests {
            })
        );

-        let within_timeout_adjustment = COALESCE_TIMEOUT / 2;
+        let within_timeout_adjustment = Duration::from_std(COALESCE_TIMEOUT / 2).unwrap();

        // Ensure that many calls within the timeout don't start a new period
        for _ in 0..100 {
@@ -113,7 +118,7 @@ mod tests {
        }

        let period_end = clock.utc_now();
-        let exceed_timeout_adjustment = COALESCE_TIMEOUT * 2;
+        let exceed_timeout_adjustment = Duration::from_std(COALESCE_TIMEOUT * 2).unwrap();
        // Logging an event exceeding the timeout should start a new period
        clock.advance(exceed_timeout_adjustment);
        let new_period_start = clock.utc_now();
@@ -132,7 +137,9 @@ mod tests {

    #[test]
    fn test_different_environment_under_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::new(
+            Utc.with_ymd_and_hms(1990, 4, 12, 0, 0, 0).unwrap(),
+        ));
        let environment_1 = "environment_1";
        let mut event_coalescer = EventCoalescer::new(clock.clone());

@@ -151,7 +158,7 @@ mod tests {
            })
        );

-        let within_timeout_adjustment = COALESCE_TIMEOUT / 2;
+        let within_timeout_adjustment = Duration::from_std(COALESCE_TIMEOUT / 2).unwrap();
        clock.advance(within_timeout_adjustment);
        let period_end = clock.utc_now();
        let period_data = event_coalescer.log_event(environment_1);
@@ -186,7 +193,9 @@ mod tests {

    #[test]
    fn test_switching_environment_while_within_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::new(
+            Utc.with_ymd_and_hms(1990, 4, 12, 0, 0, 0).unwrap(),
+        ));
        let environment_1 = "environment_1";
        let mut event_coalescer = EventCoalescer::new(clock.clone());

@@ -205,7 +214,7 @@ mod tests {
            })
        );

-        let within_timeout_adjustment = COALESCE_TIMEOUT / 2;
+        let within_timeout_adjustment = Duration::from_std(COALESCE_TIMEOUT / 2).unwrap();
        clock.advance(within_timeout_adjustment);
        let period_end = clock.utc_now();
        let environment_2 = "environment_2";
@@ -231,7 +240,9 @@ mod tests {

    #[test]
    fn test_switching_environment_while_exceeding_timeout() {
-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::new(
+            Utc.with_ymd_and_hms(1990, 4, 12, 0, 0, 0).unwrap(),
+        ));
        let environment_1 = "environment_1";
        let mut event_coalescer = EventCoalescer::new(clock.clone());

@@ -250,7 +261,7 @@ mod tests {
            })
        );

-        let exceed_timeout_adjustment = COALESCE_TIMEOUT * 2;
+        let exceed_timeout_adjustment = Duration::from_std(COALESCE_TIMEOUT * 2).unwrap();
        clock.advance(exceed_timeout_adjustment);
        let period_end = clock.utc_now();
        let environment_2 = "environment_2";
--- a/crates/clock/Cargo.toml
+++ b/crates/clock/Cargo.toml
@@ -16,6 +16,7 @@ doctest = false
 test-support = ["dep:parking_lot"]

 [dependencies]
+chrono.workspace = true
 parking_lot = { workspace = true, optional = true }
 serde.workspace = true
 smallvec.workspace = true
--- a/crates/clock/src/system_clock.rs
+++ b/crates/clock/src/system_clock.rs
@@ -1,21 +1,21 @@
-use std::time::Instant;
+use chrono::{DateTime, Utc};

 pub trait SystemClock: Send + Sync {
    /// Returns the current date and time in UTC.
-    fn utc_now(&self) -> Instant;
+    fn utc_now(&self) -> DateTime<Utc>;
 }

 pub struct RealSystemClock;

 impl SystemClock for RealSystemClock {
-    fn utc_now(&self) -> Instant {
-        Instant::now()
+    fn utc_now(&self) -> DateTime<Utc> {
+        Utc::now()
    }
 }

 #[cfg(any(test, feature = "test-support"))]
 pub struct FakeSystemClockState {
-    now: Instant,
+    now: DateTime<Utc>,
 }

 #[cfg(any(test, feature = "test-support"))]
@@ -24,30 +24,36 @@ pub struct FakeSystemClock {
    state: parking_lot::Mutex<FakeSystemClockState>,
 }

+#[cfg(any(test, feature = "test-support"))]
+impl Default for FakeSystemClock {
+    fn default() -> Self {
+        Self::new(Utc::now())
+    }
+}
+
 #[cfg(any(test, feature = "test-support"))]
 impl FakeSystemClock {
-    pub fn new() -> Self {
-        let state = FakeSystemClockState {
-            now: Instant::now(),
-        };
+    pub fn new(now: DateTime<Utc>) -> Self {
+        let state = FakeSystemClockState { now };

        Self {
            state: parking_lot::Mutex::new(state),
        }
    }

-    pub fn set_now(&self, now: Instant) {
+    pub fn set_now(&self, now: DateTime<Utc>) {
        self.state.lock().now = now;
    }

-    pub fn advance(&self, duration: std::time::Duration) {
+    /// Advances the [`FakeSystemClock`] by the specified [`Duration`](chrono::Duration).
+    pub fn advance(&self, duration: chrono::Duration) {
        self.state.lock().now += duration;
    }
 }

 #[cfg(any(test, feature = "test-support"))]
 impl SystemClock for FakeSystemClock {
-    fn utc_now(&self) -> Instant {
+    fn utc_now(&self) -> DateTime<Utc> {
        self.state.lock().now
    }
 }
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -24,7 +24,6 @@ async-stripe.workspace = true
 async-tungstenite.workspace = true
 aws-config = { version = "1.1.5" }
 aws-sdk-s3 = { version = "1.15.0" }
-aws-sdk-kinesis = "1.51.0"
 axum = { version = "0.6", features = ["json", "headers", "ws"] }
 axum-extra = { version = "0.4", features = ["erased-json"] }
 base64.workspace = true
@@ -78,19 +77,15 @@ util.workspace = true
 uuid.workspace = true

 [dev-dependencies]
-assistant = { workspace = true, features = ["test-support"] }
-context_servers.workspace = true
 async-trait.workspace = true
 audio.workspace = true
 call = { workspace = true, features = ["test-support"] }
 channel.workspace = true
 client = { workspace = true, features = ["test-support"] }
-collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
 ctor.workspace = true
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
-file_finder.workspace = true
 fs = { workspace = true, features = ["test-support"] }
 git = { workspace = true, features = ["test-support"] }
 git_hosting_providers.workspace = true
@@ -98,7 +93,6 @@ gpui = { workspace = true, features = ["test-support"] }
 hyper.workspace = true
 indoc.workspace = true
 language = { workspace = true, features = ["test-support"] }
-language_model = { workspace = true, features = ["test-support"] }
 live_kit_client = { workspace = true, features = ["test-support"] }
 lsp = { workspace = true, features = ["test-support"] }
 menu.workspace = true
@@ -107,7 +101,6 @@ node_runtime.workspace = true
 notifications = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
 project = { workspace = true, features = ["test-support"] }
-recent_projects = { workspace = true }
 release_channel.workspace = true
 remote = { workspace = true, features = ["test-support"] }
 remote_server.workspace = true
@@ -122,6 +115,7 @@ unindent.workspace = true
 util.workspace = true
 workspace = { workspace = true, features = ["test-support"] }
 worktree = { workspace = true, features = ["test-support"] }
+zed_common = { workspace = true, features = ["test-support"] }

 [package.metadata.cargo-machete]
 ignored = ["async-stripe"]
--- a/crates/collab/k8s/collab.template.yml
+++ b/crates/collab/k8s/collab.template.yml
@@ -174,31 +174,6 @@ spec:
                secretKeyRef:
                  name: blob-store
                  key: bucket
-            - name: KINESIS_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: access_key
-            - name: KINESIS_SECRET_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: secret_key
-            - name: KINESIS_STREAM
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: stream
-            - name: KINESIS_REGION
-              valueFrom:
-                secretKeyRef:
-                  name: kinesis
-                  key: region
-            - name: BLOB_STORE_BUCKET
-              valueFrom:
-                secretKeyRef:
-                  name: blob-store
-                  key: bucket
            - name: CLICKHOUSE_URL
              valueFrom:
                secretKeyRef:
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -11,11 +11,9 @@ use axum::{
    routing::post,
    Extension, Router, TypedHeader,
 };
-use chrono::Duration;
 use rpc::ExtensionMetadata;
 use semantic_version::SemanticVersion;
-use serde::{Deserialize, Serialize, Serializer};
-use serde_json::json;
+use serde::{Serialize, Serializer};
 use sha2::{Digest, Sha256};
 use std::sync::{Arc, OnceLock};
 use telemetry_events::{
@@ -23,7 +21,6 @@ use telemetry_events::{
    EventRequestBody, EventWrapper, ExtensionEvent, InlineCompletionEvent, MemoryEvent, Panic,
    ReplEvent, SettingEvent,
 };
-use util::ResultExt;
 use uuid::Uuid;

 const CRASH_REPORTS_BUCKET: &str = "zed-crash-reports";
@@ -391,6 +388,13 @@ pub async fn post_events(
    country_code_header: Option<TypedHeader<CloudflareIpCountryHeader>>,
    body: Bytes,
 ) -> Result<()> {
+    let Some(clickhouse_client) = app.clickhouse_client.clone() else {
+        Err(Error::http(
+            StatusCode::NOT_IMPLEMENTED,
+            "not supported".into(),
+        ))?
+    };
+
    let Some(expected) = calculate_json_checksum(app.clone(), &body) else {
        return Err(Error::http(
            StatusCode::INTERNAL_SERVER_ERROR,
@@ -412,34 +416,6 @@ pub async fn post_events(
    };
    let country_code = country_code_header.map(|h| h.to_string());

-    let first_event_at = chrono::Utc::now()
-        - chrono::Duration::milliseconds(last_event.milliseconds_since_first_event);
-
-    if let Some(kinesis_client) = app.kinesis_client.clone() {
-        if let Some(stream) = app.config.kinesis_stream.clone() {
-            let mut request = kinesis_client.put_records().stream_name(stream);
-            for row in for_snowflake(request_body.clone(), first_event_at, country_code.clone()) {
-                if let Some(data) = serde_json::to_vec(&row).log_err() {
-                    request = request.records(
-                        aws_sdk_kinesis::types::PutRecordsRequestEntry::builder()
-                            .partition_key(request_body.system_id.clone().unwrap_or_default())
-                            .data(data.into())
-                            .build()
-                            .unwrap(),
-                    );
-                }
-            }
-            request.send().await.log_err();
-        }
-    };
-
-    let Some(clickhouse_client) = app.clickhouse_client.clone() else {
-        Err(Error::http(
-            StatusCode::NOT_IMPLEMENTED,
-            "not supported".into(),
-        ))?
-    };
-
    let first_event_at = chrono::Utc::now()
        - chrono::Duration::milliseconds(last_event.milliseconds_since_first_event);

@@ -483,7 +459,20 @@ pub async fn post_events(
                        checksum_matched,
                    ))
            }
-            Event::Cpu(_) | Event::Memory(_) => continue,
+            Event::Cpu(event) => to_upload.cpu_events.push(CpuEventRow::from_event(
+                event.clone(),
+                wrapper,
+                &request_body,
+                first_event_at,
+                checksum_matched,
+            )),
+            Event::Memory(event) => to_upload.memory_events.push(MemoryEventRow::from_event(
+                event.clone(),
+                wrapper,
+                &request_body,
+                first_event_at,
+                checksum_matched,
+            )),
            Event::App(event) => to_upload.app_events.push(AppEventRow::from_event(
                event.clone(),
                wrapper,
@@ -934,7 +923,6 @@ pub struct CpuEventRow {
 }

 impl CpuEventRow {
-    #[allow(unused)]
    fn from_event(
        event: CpuEvent,
        wrapper: &EventWrapper,
@@ -989,7 +977,6 @@ pub struct MemoryEventRow {
 }

 impl MemoryEventRow {
-    #[allow(unused)]
    fn from_event(
        event: MemoryEvent,
        wrapper: &EventWrapper,
@@ -1377,259 +1364,3 @@ pub fn calculate_json_checksum(app: Arc<AppState>, json: &impl AsRef<[u8]>) -> O
    summer.update(checksum_seed);
    Some(summer.finalize().into_iter().collect())
 }
-
-fn for_snowflake(
-    body: EventRequestBody,
-    first_event_at: chrono::DateTime<chrono::Utc>,
-    country_code: Option<String>,
-) -> impl Iterator<Item = SnowflakeRow> {
-    body.events.into_iter().flat_map(move |event| {
-        let timestamp =
-            first_event_at + Duration::milliseconds(event.milliseconds_since_first_event);
-        let (event_type, mut event_properties) = match &event.event {
-            Event::Editor(e) => (
-                match e.operation.as_str() {
-                    "open" => "Editor Opened".to_string(),
-                    "save" => "Editor Saved".to_string(),
-                    _ => format!("Unknown Editor Event: {}", e.operation),
-                },
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::InlineCompletion(e) => (
-                format!(
-                    "Inline Completion {}",
-                    if e.suggestion_accepted {
-                        "Accepted"
-                    } else {
-                        "Discarded"
-                    }
-                ),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Call(e) => {
-                let event_type = match e.operation.trim() {
-                    "unshare project" => "Project Unshared".to_string(),
-                    "open channel notes" => "Channel Notes Opened".to_string(),
-                    "share project" => "Project Shared".to_string(),
-                    "join channel" => "Channel Joined".to_string(),
-                    "hang up" => "Call Ended".to_string(),
-                    "accept incoming" => "Incoming Call Accepted".to_string(),
-                    "invite" => "Participant Invited".to_string(),
-                    "disable microphone" => "Microphone Disabled".to_string(),
-                    "enable microphone" => "Microphone Enabled".to_string(),
-                    "enable screen share" => "Screen Share Enabled".to_string(),
-                    "disable screen share" => "Screen Share Disabled".to_string(),
-                    "decline incoming" => "Incoming Call Declined".to_string(),
-                    "enable camera" => "Camera Enabled".to_string(),
-                    "disable camera" => "Camera Disabled".to_string(),
-                    _ => format!("Unknown Call Event: {}", e.operation),
-                };
-
-                (event_type, serde_json::to_value(e).unwrap())
-            }
-            Event::Assistant(e) => (
-                match e.phase {
-                    telemetry_events::AssistantPhase::Response => "Assistant Responded".to_string(),
-                    telemetry_events::AssistantPhase::Invoked => "Assistant Invoked".to_string(),
-                    telemetry_events::AssistantPhase::Accepted => {
-                        "Assistant Response Accepted".to_string()
-                    }
-                    telemetry_events::AssistantPhase::Rejected => {
-                        "Assistant Response Rejected".to_string()
-                    }
-                },
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Cpu(_) | Event::Memory(_) => return None,
-            Event::App(e) => {
-                let mut properties = json!({});
-                let event_type = match e.operation.trim() {
-                    "extensions: install extension" => "Extension Installed".to_string(),
-                    "open" => "App Opened".to_string(),
-                    "project search: open" => "Project Search Opened".to_string(),
-                    "first open" => {
-                        properties["is_first_open"] = json!(true);
-                        "App First Opened".to_string()
-                    }
-                    "extensions: uninstall extension" => "Extension Uninstalled".to_string(),
-                    "welcome page: close" => "Welcome Page Closed".to_string(),
-                    "open project" => {
-                        properties["is_first_time"] = json!(false);
-                        "Project Opened".to_string()
-                    }
-                    "welcome page: install cli" => "CLI Installed".to_string(),
-                    "project diagnostics: open" => "Project Diagnostics Opened".to_string(),
-                    "extensions page: open" => "Extensions Page Opened".to_string(),
-                    "welcome page: change theme" => "Welcome Theme Changed".to_string(),
-                    "welcome page: toggle metric telemetry" => {
-                        properties["enabled"] = json!(false);
-                        "Welcome Telemetry Toggled".to_string()
-                    }
-                    "welcome page: change keymap" => "Keymap Changed".to_string(),
-                    "welcome page: toggle vim" => {
-                        properties["enabled"] = json!(false);
-                        "Welcome Vim Mode Toggled".to_string()
-                    }
-                    "welcome page: sign in to copilot" => "Welcome Copilot Signed In".to_string(),
-                    "welcome page: toggle diagnostic telemetry" => {
-                        "Welcome Telemetry Toggled".to_string()
-                    }
-                    "welcome page: open" => "Welcome Page Opened".to_string(),
-                    "close" => "App Closed".to_string(),
-                    "markdown preview: open" => "Markdown Preview Opened".to_string(),
-                    "welcome page: open extensions" => "Extensions Page Opened".to_string(),
-                    "open node project" | "open pnpm project" | "open yarn project" => {
-                        properties["project_type"] = json!("node");
-                        properties["is_first_time"] = json!(false);
-                        "Project Opened".to_string()
-                    }
-                    "repl sessions: open" => "REPL Session Started".to_string(),
-                    "welcome page: toggle helix" => {
-                        properties["enabled"] = json!(false);
-                        "Helix Mode Toggled".to_string()
-                    }
-                    "welcome page: edit settings" => {
-                        properties["changed_settings"] = json!([]);
-                        "Settings Edited".to_string()
-                    }
-                    "welcome page: view docs" => "Documentation Viewed".to_string(),
-                    "open ssh project" => {
-                        properties["is_first_time"] = json!(false);
-                        "SSH Project Opened".to_string()
-                    }
-                    "create ssh server" => "SSH Server Created".to_string(),
-                    "create ssh project" => "SSH Project Created".to_string(),
-                    "first open for release channel" => {
-                        properties["is_first_for_channel"] = json!(true);
-                        "App First Opened For Release Channel".to_string()
-                    }
-                    "feature upsell: toggle vim" => {
-                        properties["source"] = json!("Feature Upsell");
-                        "Vim Mode Toggled".to_string()
-                    }
-                    _ => e
-                        .operation
-                        .strip_prefix("feature upsell: viewed docs (")
-                        .and_then(|s| s.strip_suffix(')'))
-                        .map_or_else(
-                            || format!("Unknown App Event: {}", e.operation),
-                            |docs_url| {
-                                properties["url"] = json!(docs_url);
-                                properties["source"] = json!("Feature Upsell");
-                                "Documentation Viewed".to_string()
-                            },
-                        ),
-                };
-                (event_type, properties)
-            }
-            Event::Setting(e) => (
-                "Settings Changed".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Extension(e) => (
-                "Extension Loaded".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Edit(e) => (
-                "Editor Edited".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Action(e) => (
-                "Action Invoked".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-            Event::Repl(e) => (
-                "Kernel Status Changed".to_string(),
-                serde_json::to_value(e).unwrap(),
-            ),
-        };
-
-        if let serde_json::Value::Object(ref mut map) = event_properties {
-            map.insert("app_version".to_string(), body.app_version.clone().into());
-            map.insert("os_name".to_string(), body.os_name.clone().into());
-            map.insert("os_version".to_string(), body.os_version.clone().into());
-            map.insert("architecture".to_string(), body.architecture.clone().into());
-            map.insert(
-                "release_channel".to_string(),
-                body.release_channel.clone().into(),
-            );
-            map.insert("signed_in".to_string(), event.signed_in.into());
-            if let Some(country_code) = country_code.as_ref() {
-                map.insert("country".to_string(), country_code.clone().into());
-            }
-        }
-
-        // NOTE: most amplitude user properties are read out of our event_properties
-        // dictionary. See https://app.amplitude.com/data/zed/Zed/sources/detail/production/falcon%3A159998
-        // for how that is configured.
-        let user_properties = Some(serde_json::json!({
-            "is_staff": body.is_staff,
-        }));
-
-        Some(SnowflakeRow {
-            time: timestamp,
-            user_id: body.metrics_id.clone(),
-            device_id: body.system_id.clone(),
-            event_type,
-            event_properties,
-            user_properties,
-            insert_id: Some(Uuid::new_v4().to_string()),
-        })
-    })
-}
-
-#[derive(Serialize, Deserialize)]
-struct SnowflakeRow {
-    pub time: chrono::DateTime<chrono::Utc>,
-    pub user_id: Option<String>,
-    pub device_id: Option<String>,
-    pub event_type: String,
-    pub event_properties: serde_json::Value,
-    pub user_properties: Option<serde_json::Value>,
-    pub insert_id: Option<String>,
-}
-
-#[derive(Serialize, Deserialize)]
-struct SnowflakeData {
-    /// Identifier unique to each Zed installation (differs for stable, preview, dev)
-    pub installation_id: Option<String>,
-    /// Identifier unique to each logged in Zed user (randomly generated on first sign in)
-    /// Identifier unique to each Zed session (differs for each time you open Zed)
-    pub session_id: Option<String>,
-    pub metrics_id: Option<String>,
-    /// True for Zed staff, otherwise false
-    pub is_staff: Option<bool>,
-    /// Zed version number
-    pub app_version: String,
-    pub os_name: String,
-    pub os_version: Option<String>,
-    pub architecture: String,
-    /// Zed release channel (stable, preview, dev)
-    pub release_channel: Option<String>,
-    pub signed_in: bool,
-
-    #[serde(flatten)]
-    pub editor_event: Option<EditorEvent>,
-    #[serde(flatten)]
-    pub inline_completion_event: Option<InlineCompletionEvent>,
-    #[serde(flatten)]
-    pub call_event: Option<CallEvent>,
-    #[serde(flatten)]
-    pub assistant_event: Option<AssistantEvent>,
-    #[serde(flatten)]
-    pub cpu_event: Option<CpuEvent>,
-    #[serde(flatten)]
-    pub memory_event: Option<MemoryEvent>,
-    #[serde(flatten)]
-    pub app_event: Option<AppEvent>,
-    #[serde(flatten)]
-    pub setting_event: Option<SettingEvent>,
-    #[serde(flatten)]
-    pub extension_event: Option<ExtensionEvent>,
-    #[serde(flatten)]
-    pub edit_event: Option<EditEvent>,
-    #[serde(flatten)]
-    pub repl_event: Option<ReplEvent>,
-    #[serde(flatten)]
-    pub action_event: Option<ActionEvent>,
-}
--- a/crates/collab/src/lib.rs
+++ b/crates/collab/src/lib.rs
@@ -170,10 +170,6 @@ pub struct Config {
    pub blob_store_access_key: Option<String>,
    pub blob_store_secret_key: Option<String>,
    pub blob_store_bucket: Option<String>,
-    pub kinesis_region: Option<String>,
-    pub kinesis_stream: Option<String>,
-    pub kinesis_access_key: Option<String>,
-    pub kinesis_secret_key: Option<String>,
    pub zed_environment: Arc<str>,
    pub openai_api_key: Option<Arc<str>>,
    pub google_ai_api_key: Option<Arc<str>>,
@@ -242,10 +238,6 @@ impl Config {
            stripe_api_key: None,
            supermaven_admin_api_key: None,
            user_backfiller_github_access_token: None,
-            kinesis_region: None,
-            kinesis_access_key: None,
-            kinesis_secret_key: None,
-            kinesis_stream: None,
        }
    }
 }
@@ -284,7 +276,6 @@ pub struct AppState {
    pub rate_limiter: Arc<RateLimiter>,
    pub executor: Executor,
    pub clickhouse_client: Option<::clickhouse::Client>,
-    pub kinesis_client: Option<::aws_sdk_kinesis::Client>,
    pub config: Config,
 }

@@ -341,11 +332,6 @@ impl AppState {
                .clickhouse_url
                .as_ref()
                .and_then(|_| build_clickhouse_client(&config).log_err()),
-            kinesis_client: if config.kinesis_access_key.is_some() {
-                build_kinesis_client(&config).await.log_err()
-            } else {
-                None
-            },
            config,
        };
        Ok(Arc::new(this))
@@ -395,35 +381,6 @@ async fn build_blob_store_client(config: &Config) -> anyhow::Result<aws_sdk_s3::
    Ok(aws_sdk_s3::Client::new(&s3_config))
 }

-async fn build_kinesis_client(config: &Config) -> anyhow::Result<aws_sdk_kinesis::Client> {
-    let keys = aws_sdk_s3::config::Credentials::new(
-        config
-            .kinesis_access_key
-            .clone()
-            .ok_or_else(|| anyhow!("missing kinesis_access_key"))?,
-        config
-            .kinesis_secret_key
-            .clone()
-            .ok_or_else(|| anyhow!("missing kinesis_secret_key"))?,
-        None,
-        None,
-        "env",
-    );
-
-    let kinesis_config = aws_config::defaults(BehaviorVersion::latest())
-        .region(Region::new(
-            config
-                .kinesis_region
-                .clone()
-                .ok_or_else(|| anyhow!("missing blob_store_region"))?,
-        ))
-        .credentials_provider(keys)
-        .load()
-        .await;
-
-    Ok(aws_sdk_kinesis::Client::new(&kinesis_config))
-}
-
 fn build_clickhouse_client(config: &Config) -> anyhow::Result<::clickhouse::Client> {
    Ok(::clickhouse::Client::default()
        .with_url(
--- a/crates/collab/src/llm.rs
+++ b/crates/collab/src/llm.rs
@@ -267,6 +267,7 @@ async fn perform_completion(
                anthropic::ANTHROPIC_API_URL,
                api_key,
                request,
+                None,
            )
            .await
            .map_err(|err| match err {
@@ -356,6 +357,7 @@ async fn perform_completion(
                open_ai::OPEN_AI_API_URL,
                api_key,
                serde_json::from_str(params.provider_request.get())?,
+                None,
            )
            .await?;

@@ -388,6 +390,7 @@ async fn perform_completion(
                google_ai::API_URL,
                api_key,
                serde_json::from_str(params.provider_request.get())?,
+                None,
            )
            .await?;

--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -3621,6 +3621,7 @@ async fn count_language_model_tokens(
                google_ai::API_URL,
                api_key,
                serde_json::from_str(&request.request)?,
+                None,
            )
            .await?
        }
@@ -4030,18 +4031,12 @@ async fn get_llm_api_token(
        Err(anyhow!("terms of service not accepted"))?
    }

-    let has_llm_subscription = session.has_llm_subscription(&db).await?;
-
-    let bypass_account_age_check =
-        has_llm_subscription || flags.iter().any(|flag| flag == "bypass-account-age-check");
-    if !bypass_account_age_check {
-        let mut account_created_at = user.created_at;
-        if let Some(github_created_at) = user.github_user_created_at {
-            account_created_at = account_created_at.min(github_created_at);
-        }
-        if Utc::now().naive_utc() - account_created_at < MIN_ACCOUNT_AGE_FOR_LLM_USE {
-            Err(anyhow!("account too young"))?
-        }
+    let mut account_created_at = user.created_at;
+    if let Some(github_created_at) = user.github_user_created_at {
+        account_created_at = account_created_at.min(github_created_at);
+    }
+    if Utc::now().naive_utc() - account_created_at < MIN_ACCOUNT_AGE_FOR_LLM_USE {
+        Err(anyhow!("account too young"))?
    }

    let billing_preferences = db.get_billing_preferences(user.id).await?;
@@ -4051,7 +4046,7 @@ async fn get_llm_api_token(
        session.is_staff(),
        billing_preferences,
        has_llm_closed_beta_feature_flag,
-        has_llm_subscription,
+        session.has_llm_subscription(&db).await?,
        session.current_plan(&db).await?,
        &session.app_state.config,
    )?;
--- a/crates/collab/src/tests/channel_buffer_tests.rs
+++ b/crates/collab/src/tests/channel_buffer_tests.rs
@@ -5,7 +5,6 @@ use crate::{
 use call::ActiveCall;
 use channel::ACKNOWLEDGE_DEBOUNCE_INTERVAL;
 use client::{Collaborator, ParticipantIndex, UserId};
-use collab_ui::channel_view::ChannelView;
 use collections::HashMap;
 use editor::{Anchor, Editor, ToOffset};
 use futures::future;
@@ -13,6 +12,7 @@ use gpui::{BackgroundExecutor, Model, TestAppContext, ViewContext};
 use rpc::{proto::PeerId, RECEIVE_TIMEOUT};
 use serde_json::json;
 use std::ops::Range;
+use zed_common::collab_ui::channel_view::ChannelView;

 #[gpui::test]
 async fn test_core_channel_buffers(
--- a/crates/collab/src/tests/channel_message_tests.rs
+++ b/crates/collab/src/tests/channel_message_tests.rs
@@ -1,9 +1,9 @@
 use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
 use channel::{ChannelChat, ChannelMessageId, MessageParams};
-use collab_ui::chat_panel::ChatPanel;
 use gpui::{BackgroundExecutor, Model, TestAppContext};
 use rpc::Notification;
 use workspace::dock::Panel;
+use zed_common::collab_ui::chat_panel::ChatPanel;

 #[gpui::test]
 async fn test_basic_channel_messages(
@@ -351,7 +351,7 @@ async fn test_channel_message_changes(

    // Opening the chat should clear the changed flag.
    cx_b.update(|cx| {
-        collab_ui::init(&client_b.app_state, cx);
+        zed_common::collab_ui::init(&client_b.app_state, cx);
    });
    let project_b = client_b.build_empty_local_project(cx_b);
    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -25,7 +25,6 @@ use project::{
    project_settings::{InlineBlameSettings, ProjectSettings},
    SERVER_PROGRESS_THROTTLE_TIMEOUT,
 };
-use recent_projects::disconnected_overlay::DisconnectedOverlay;
 use rpc::RECEIVE_TIMEOUT;
 use serde_json::json;
 use settings::SettingsStore;
@@ -39,6 +38,7 @@ use std::{
 };
 use text::Point;
 use workspace::{CloseIntent, Workspace};
+use zed_common::recent_projects::disconnected_overlay::DisconnectedOverlay;

 #[gpui::test(iterations = 10)]
 async fn test_host_disconnect(
@@ -55,7 +55,7 @@ async fn test_host_disconnect(
        .await;

    cx_b.update(editor::init);
-    cx_b.update(recent_projects::init);
+    cx_b.update(zed_common::recent_projects::init);

    client_a
        .fs()
--- a/crates/collab/src/tests/following_tests.rs
+++ b/crates/collab/src/tests/following_tests.rs
@@ -2,10 +2,6 @@
 use crate::{rpc::RECONNECT_TIMEOUT, tests::TestServer};
 use call::{ActiveCall, ParticipantLocation};
 use client::ChannelId;
-use collab_ui::{
-    channel_view::ChannelView,
-    notifications::project_shared_notification::ProjectSharedNotification,
-};
 use editor::{Editor, ExcerptRange, MultiBuffer};
 use gpui::{
    point, BackgroundExecutor, BorrowAppContext, Context, Entity, SharedString, TestAppContext,
@@ -23,6 +19,10 @@ use workspace::{
    shared_screen::SharedScreen,
    SplitDirection, Workspace,
 };
+use zed_common::collab_ui::{
+    channel_view::ChannelView,
+    notifications::project_shared_notification::ProjectSharedNotification,
+};

 use super::TestClient;

@@ -1861,9 +1861,9 @@ async fn test_following_to_channel_notes_without_a_shared_project(
    cx_a.update(editor::init);
    cx_b.update(editor::init);
    cx_c.update(editor::init);
-    cx_a.update(collab_ui::channel_view::init);
-    cx_b.update(collab_ui::channel_view::init);
-    cx_c.update(collab_ui::channel_view::init);
+    cx_a.update(zed_common::collab_ui::channel_view::init);
+    cx_b.update(zed_common::collab_ui::channel_view::init);
+    cx_c.update(zed_common::collab_ui::channel_view::init);

    let channel_1_id = server
        .make_channel(
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -6,7 +6,6 @@ use crate::{
    },
 };
 use anyhow::{anyhow, Result};
-use assistant::{ContextStore, PromptBuilder, SlashCommandWorkingSet, ToolWorkingSet};
 use call::{room, ActiveCall, ParticipantLocation, Room};
 use client::{User, RECEIVE_TIMEOUT};
 use collections::{HashMap, HashSet};
@@ -48,6 +47,7 @@ use std::{
 };
 use unindent::Unindent as _;
 use workspace::Pane;
+use zed_common::assistant::{ContextStore, PromptBuilder, SlashCommandWorkingSet, ToolWorkingSet};

 #[ctor::ctor]
 fn init_logger() {
@@ -6486,8 +6486,6 @@ async fn test_context_collaboration_with_reconnect(
        assert_eq!(project.collaborators().len(), 1);
    });

-    cx_a.update(context_servers::init);
-    cx_b.update(context_servers::init);
    let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
    let context_store_a = cx_a
        .update(|cx| {
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -1323,8 +1323,11 @@ impl RandomizedTest for ProjectCollaborationTest {
                    match (host_file, guest_file) {
                        (Some(host_file), Some(guest_file)) => {
                            assert_eq!(guest_file.path(), host_file.path());
-                            assert_eq!(guest_file.disk_state(), host_file.disk_state(),
-                                "guest {} disk_state does not match host {} for path {:?} in project {}",
+                            assert_eq!(guest_file.is_deleted(), host_file.is_deleted());
+                            assert_eq!(
+                                guest_file.mtime(),
+                                host_file.mtime(),
+                                "guest {} mtime does not match host {} for path {:?} in project {}",
                                guest_user_id,
                                host_user_id,
                                guest_file.path(),
--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -12,7 +12,6 @@ use client::{
    UserStore,
 };
 use clock::FakeSystemClock;
-use collab_ui::channel_view::ChannelView;
 use collections::{HashMap, HashSet};
 use fs::FakeFs;
 use futures::{channel::oneshot, StreamExt as _};
@@ -44,6 +43,7 @@ use std::{
    },
 };
 use workspace::{Workspace, WorkspaceStore};
+use zed_common::collab_ui::channel_view::ChannelView;

 pub struct TestServer {
    pub app_state: Arc<AppState>,
@@ -168,7 +168,7 @@ impl TestServer {
            client::init_settings(cx);
        });

-        let clock = Arc::new(FakeSystemClock::new());
+        let clock = Arc::new(FakeSystemClock::default());
        let http = FakeHttpClient::with_404_response();
        let user_id = if let Ok(Some(user)) = self.app_state.db.get_user_by_github_login(name).await
        {
@@ -293,12 +293,12 @@ impl TestServer {
            call::init(client.clone(), user_store.clone(), cx);
            channel::init(&client, user_store.clone(), cx);
            notifications::init(client.clone(), user_store, cx);
-            collab_ui::init(&app_state, cx);
-            file_finder::init(cx);
+            zed_common::collab_ui::init(&app_state, cx);
+            zed_common::file_finder::init(cx);
            menu::init();
            settings::KeymapFile::load_asset(os_keymap, cx).unwrap();
-            language_model::LanguageModelRegistry::test(cx);
-            assistant::context_store::init(&client.clone().into());
+            zed_common::language_model::LanguageModelRegistry::test(cx);
+            zed_common::assistant::context_store::init(&client.clone().into());
        });

        client
@@ -512,7 +512,6 @@ impl TestServer {
            rate_limiter: Arc::new(RateLimiter::new(test_db.db().clone())),
            executor,
            clickhouse_client: None,
-            kinesis_client: None,
            config: Config {
                http_port: 0,
                database_url: "".into(),
@@ -551,10 +550,6 @@ impl TestServer {
                stripe_api_key: None,
                supermaven_admin_api_key: None,
                user_backfiller_github_access_token: None,
-                kinesis_region: None,
-                kinesis_stream: None,
-                kinesis_access_key: None,
-                kinesis_secret_key: None,
            },
        })
    }
--- a/crates/collab_ui/Cargo.toml
+++ b/crates/collab_ui/Cargo.toml
@@ -1,83 +0,0 @@
-[package]
-name = "collab_ui"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/collab_ui.rs"
-doctest = false
-
-[features]
-default = []
-stories = ["dep:story"]
-test-support = [
-    "call/test-support",
-    "client/test-support",
-    "collections/test-support",
-    "editor/test-support",
-    "gpui/test-support",
-    "project/test-support",
-    "settings/test-support",
-    "util/test-support",
-    "workspace/test-support",
-    "http_client/test-support",
-]
-
-[dependencies]
-anyhow.workspace = true
-call.workspace = true
-channel.workspace = true
-chrono.workspace = true
-client.workspace = true
-collections.workspace = true
-db.workspace = true
-editor.workspace = true
-emojis.workspace = true
-futures.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-language.workspace = true
-menu.workspace = true
-notifications.workspace = true
-parking_lot.workspace = true
-picker.workspace = true
-project.workspace = true
-release_channel.workspace = true
-rich_text.workspace = true
-rpc.workspace = true
-schemars.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-settings.workspace = true
-smallvec.workspace = true
-story = { workspace = true, optional = true }
-theme.workspace = true
-time_format.workspace = true
-time.workspace = true
-title_bar.workspace = true
-ui.workspace = true
-util.workspace = true
-vcs_menu.workspace = true
-workspace.workspace = true
-
-[dev-dependencies]
-call = { workspace = true, features = ["test-support"] }
-client = { workspace = true, features = ["test-support"] }
-collections = { workspace = true, features = ["test-support"] }
-editor = { workspace = true, features = ["test-support"] }
-gpui = { workspace = true, features = ["test-support"] }
-notifications = { workspace = true, features = ["test-support"] }
-pretty_assertions.workspace = true
-project = { workspace = true, features = ["test-support"] }
-rpc = { workspace = true, features = ["test-support"] }
-settings = { workspace = true, features = ["test-support"] }
-tree-sitter-md.workspace = true
-util = { workspace = true, features = ["test-support"] }
-http_client = { workspace = true, features = ["test-support"] }
-workspace = { workspace = true, features = ["test-support"] }
--- a/crates/collab_ui/LICENSE-GPL
+++ b/crates/collab_ui/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/command_palette/Cargo.toml
+++ b/crates/command_palette/Cargo.toml
@@ -1,41 +0,0 @@
-[package]
-name = "command_palette"
-version = "0.1.0"
-edition = "2021"
-publish = false
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/command_palette.rs"
-doctest = false
-
-[dependencies]
-client.workspace = true
-collections.workspace = true
-command_palette_hooks.workspace = true
-fuzzy.workspace = true
-gpui.workspace = true
-picker.workspace = true
-postage.workspace = true
-serde.workspace = true
-settings.workspace = true
-theme.workspace = true
-ui.workspace = true
-util.workspace = true
-workspace.workspace = true
-zed_actions.workspace = true
-
-[dev-dependencies]
-ctor.workspace = true
-editor = { workspace = true, features = ["test-support"] }
-env_logger.workspace = true
-go_to_line.workspace = true
-gpui = { workspace = true, features = ["test-support"] }
-language = { workspace = true, features = ["test-support"] }
-menu.workspace = true
-project = { workspace = true, features = ["test-support"] }
-serde_json.workspace = true
-workspace = { workspace = true, features = ["test-support"] }
--- a/crates/command_palette/LICENSE-GPL
+++ b/crates/command_palette/LICENSE-GPL
@@ -1 +0,0 @@
-../../LICENSE-GPL
--- a/crates/command_palette_hooks/src/command_palette_hooks.rs
+++ b/crates/command_palette_hooks/src/command_palette_hooks.rs
@@ -39,13 +39,11 @@ impl CommandPaletteFilter {
    }

    /// Updates the global [`CommandPaletteFilter`] using the given closure.
-    pub fn update_global<F>(cx: &mut AppContext, update: F)
+    pub fn update_global<F, R>(cx: &mut AppContext, update: F) -> R
    where
-        F: FnOnce(&mut Self, &mut AppContext),
+        F: FnOnce(&mut Self, &mut AppContext) -> R,
    {
-        if cx.has_global::<GlobalCommandPaletteFilter>() {
-            cx.update_global(|this: &mut GlobalCommandPaletteFilter, cx| update(&mut this.0, cx))
-        }
+        cx.update_global(|this: &mut GlobalCommandPaletteFilter, cx| update(&mut this.0, cx))
    }

    /// Returns whether the given [`Action`] is hidden by the filter.
--- a/crates/context_servers/Cargo.toml
+++ b/crates/context_servers/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/context_servers.rs"

 [dependencies]
 anyhow.workspace = true
+async-trait.workspace = true
 collections.workspace = true
 command_palette_hooks.workspace = true
 futures.workspace = true
@@ -20,7 +21,6 @@ gpui.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 postage.workspace = true
-project.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/context_servers/src/client.rs
+++ b/crates/context_servers/src/client.rs
@@ -9,7 +9,7 @@ use serde_json::{value::RawValue, Value};
 use smol::{
    channel,
    io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
-    process::Child,
+    process::{self, Child},
 };
 use std::{
    fmt,
@@ -25,13 +25,6 @@ use util::TryFutureExt;
 const JSON_RPC_VERSION: &str = "2.0";
 const REQUEST_TIMEOUT: Duration = Duration::from_secs(60);

-// Standard JSON-RPC error codes
-pub const PARSE_ERROR: i32 = -32700;
-pub const INVALID_REQUEST: i32 = -32600;
-pub const METHOD_NOT_FOUND: i32 = -32601;
-pub const INVALID_PARAMS: i32 = -32602;
-pub const INTERNAL_ERROR: i32 = -32603;
-
 type ResponseHandler = Box<dyn Send + FnOnce(Result<String, Error>)>;
 type NotificationHandler = Box<dyn Send + FnMut(Value, AsyncAppContext)>;

@@ -60,7 +53,7 @@ pub struct Client {

 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[repr(transparent)]
-pub struct ContextServerId(pub Arc<str>);
+pub struct ContextServerId(pub String);

 fn is_null_value<T: Serialize>(value: &T) -> bool {
    if let Ok(Value::Null) = serde_json::to_value(value) {
@@ -152,7 +145,7 @@ impl Client {
            &binary.args
        );

-        let mut command = util::command::new_smol_command(&binary.executable);
+        let mut command = process::Command::new(&binary.executable);
        command
            .args(&binary.args)
            .envs(binary.env.unwrap_or_default())
--- a/crates/context_servers/src/context_servers.rs
+++ b/crates/context_servers/src/context_servers.rs
@@ -8,6 +8,7 @@ use command_palette_hooks::CommandPaletteFilter;
 use gpui::{actions, AppContext};
 use settings::Settings;

+pub use crate::manager::ContextServer;
 use crate::manager::ContextServerSettings;
 pub use crate::registry::ContextServerFactoryRegistry;

--- a/crates/context_servers/src/manager.rs
+++ b/crates/context_servers/src/manager.rs
@@ -15,64 +15,40 @@
 //! and react to changes in settings.

 use std::path::Path;
+use std::pin::Pin;
 use std::sync::Arc;

-use anyhow::{bail, Result};
-use collections::HashMap;
-use command_palette_hooks::CommandPaletteFilter;
-use gpui::{AsyncAppContext, EventEmitter, Model, ModelContext, Subscription, Task, WeakModel};
+use anyhow::Result;
+use async_trait::async_trait;
+use collections::{HashMap, HashSet};
+use futures::{Future, FutureExt};
+use gpui::{AsyncAppContext, EventEmitter, ModelContext, Task};
 use log;
 use parking_lot::RwLock;
-use project::Project;
-use schemars::gen::SchemaGenerator;
-use schemars::schema::{InstanceType, Schema, SchemaObject};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
-use settings::{Settings, SettingsSources, SettingsStore};
-use util::ResultExt as _;
+use settings::{Settings, SettingsSources};

 use crate::{
    client::{self, Client},
-    types, ContextServerFactoryRegistry, CONTEXT_SERVERS_NAMESPACE,
+    types,
 };

 #[derive(Deserialize, Serialize, Default, Clone, PartialEq, Eq, JsonSchema, Debug)]
 pub struct ContextServerSettings {
-    /// Settings for context servers used in the Assistant.
-    #[serde(default)]
-    pub context_servers: HashMap<Arc<str>, ServerConfig>,
-}
-
-#[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema, Debug, Default)]
-pub struct ServerConfig {
-    /// The command to run this context server.
-    ///
-    /// This will override the command set by an extension.
-    pub command: Option<ServerCommand>,
-    /// The settings for this context server.
-    ///
-    /// Consult the documentation for the context server to see what settings
-    /// are supported.
-    #[schemars(schema_with = "server_config_settings_json_schema")]
-    pub settings: Option<serde_json::Value>,
-}
-
-fn server_config_settings_json_schema(_generator: &mut SchemaGenerator) -> Schema {
-    Schema::Object(SchemaObject {
-        instance_type: Some(InstanceType::Object.into()),
-        ..Default::default()
-    })
+    pub servers: Vec<ServerConfig>,
 }

 #[derive(Deserialize, Serialize, Clone, PartialEq, Eq, JsonSchema, Debug)]
-pub struct ServerCommand {
-    pub path: String,
+pub struct ServerConfig {
+    pub id: String,
+    pub executable: String,
    pub args: Vec<String>,
    pub env: Option<HashMap<String, String>>,
 }

 impl Settings for ContextServerSettings {
-    const KEY: Option<&'static str> = None;
+    const KEY: Option<&'static str> = Some("experimental.context_servers");

    type FileContent = Self;

@@ -84,66 +60,84 @@ impl Settings for ContextServerSettings {
    }
 }

-pub struct ContextServer {
+#[async_trait(?Send)]
+pub trait ContextServer: Send + Sync + 'static {
+    fn id(&self) -> Arc<str>;
+    fn config(&self) -> Arc<ServerConfig>;
+    fn client(&self) -> Option<Arc<crate::protocol::InitializedContextServerProtocol>>;
+    fn start<'a>(
+        self: Arc<Self>,
+        cx: &'a AsyncAppContext,
+    ) -> Pin<Box<dyn 'a + Future<Output = Result<()>>>>;
+    fn stop(&self) -> Result<()>;
+}
+
+pub struct NativeContextServer {
    pub id: Arc<str>,
    pub config: Arc<ServerConfig>,
    pub client: RwLock<Option<Arc<crate::protocol::InitializedContextServerProtocol>>>,
 }

-impl ContextServer {
-    pub fn new(id: Arc<str>, config: Arc<ServerConfig>) -> Self {
+impl NativeContextServer {
+    pub fn new(config: Arc<ServerConfig>) -> Self {
        Self {
-            id,
+            id: config.id.clone().into(),
            config,
            client: RwLock::new(None),
        }
    }
+}

-    pub fn id(&self) -> Arc<str> {
+#[async_trait(?Send)]
+impl ContextServer for NativeContextServer {
+    fn id(&self) -> Arc<str> {
        self.id.clone()
    }

-    pub fn config(&self) -> Arc<ServerConfig> {
+    fn config(&self) -> Arc<ServerConfig> {
        self.config.clone()
    }

-    pub fn client(&self) -> Option<Arc<crate::protocol::InitializedContextServerProtocol>> {
+    fn client(&self) -> Option<Arc<crate::protocol::InitializedContextServerProtocol>> {
        self.client.read().clone()
    }

-    pub async fn start(self: Arc<Self>, cx: &AsyncAppContext) -> Result<()> {
-        log::info!("starting context server {}", self.id);
-        let Some(command) = &self.config.command else {
-            bail!("no command specified for server {}", self.id);
-        };
-        let client = Client::new(
-            client::ContextServerId(self.id.clone()),
-            client::ModelContextServerBinary {
-                executable: Path::new(&command.path).to_path_buf(),
-                args: command.args.clone(),
-                env: command.env.clone(),
-            },
-            cx.clone(),
-        )?;
+    fn start<'a>(
+        self: Arc<Self>,
+        cx: &'a AsyncAppContext,
+    ) -> Pin<Box<dyn 'a + Future<Output = Result<()>>>> {
+        async move {
+            log::info!("starting context server {}", self.config.id,);
+            let client = Client::new(
+                client::ContextServerId(self.config.id.clone()),
+                client::ModelContextServerBinary {
+                    executable: Path::new(&self.config.executable).to_path_buf(),
+                    args: self.config.args.clone(),
+                    env: self.config.env.clone(),
+                },
+                cx.clone(),
+            )?;

-        let protocol = crate::protocol::ModelContextProtocol::new(client);
-        let client_info = types::Implementation {
-            name: "Zed".to_string(),
-            version: env!("CARGO_PKG_VERSION").to_string(),
-        };
-        let initialized_protocol = protocol.initialize(client_info).await?;
+            let protocol = crate::protocol::ModelContextProtocol::new(client);
+            let client_info = types::Implementation {
+                name: "Zed".to_string(),
+                version: env!("CARGO_PKG_VERSION").to_string(),
+            };
+            let initialized_protocol = protocol.initialize(client_info).await?;

-        log::debug!(
-            "context server {} initialized: {:?}",
-            self.id,
-            initialized_protocol.initialize,
-        );
+            log::debug!(
+                "context server {} initialized: {:?}",
+                self.config.id,
+                initialized_protocol.initialize,
+            );

-        *self.client.write() = Some(Arc::new(initialized_protocol));
-        Ok(())
+            *self.client.write() = Some(Arc::new(initialized_protocol));
+            Ok(())
+        }
+        .boxed_local()
    }

-    pub fn stop(&self) -> Result<()> {
+    fn stop(&self) -> Result<()> {
        let mut client = self.client.write();
        if let Some(protocol) = client.take() {
            drop(protocol);
@@ -152,13 +146,13 @@ impl ContextServer {
    }
 }

+/// A Context server manager manages the starting and stopping
+/// of all servers. To obtain a server to interact with, a crate
+/// must go through the `GlobalContextServerManager` which holds
+/// a model to the ContextServerManager.
 pub struct ContextServerManager {
-    servers: HashMap<Arc<str>, Arc<ContextServer>>,
-    project: Model<Project>,
-    registry: Model<ContextServerFactoryRegistry>,
-    update_servers_task: Option<Task<Result<()>>>,
-    needs_server_update: bool,
-    _subscriptions: Vec<Subscription>,
+    servers: HashMap<Arc<str>, Arc<dyn ContextServer>>,
+    pending_servers: HashSet<Arc<str>>,
 }

 pub enum Event {
@@ -168,66 +162,74 @@ pub enum Event {

 impl EventEmitter<Event> for ContextServerManager {}

-impl ContextServerManager {
-    pub fn new(
-        registry: Model<ContextServerFactoryRegistry>,
-        project: Model<Project>,
-        cx: &mut ModelContext<Self>,
-    ) -> Self {
-        let mut this = Self {
-            _subscriptions: vec![
-                cx.observe(&registry, |this, _registry, cx| {
-                    this.available_context_servers_changed(cx);
-                }),
-                cx.observe_global::<SettingsStore>(|this, cx| {
-                    this.available_context_servers_changed(cx);
-                }),
-            ],
-            project,
-            registry,
-            needs_server_update: false,
-            servers: HashMap::default(),
-            update_servers_task: None,
-        };
-        this.available_context_servers_changed(cx);
-        this
+impl Default for ContextServerManager {
+    fn default() -> Self {
+        Self::new()
    }
+}

-    fn available_context_servers_changed(&mut self, cx: &mut ModelContext<Self>) {
-        if self.update_servers_task.is_some() {
-            self.needs_server_update = true;
-        } else {
-            self.update_servers_task = Some(cx.spawn(|this, mut cx| async move {
-                this.update(&mut cx, |this, _| {
-                    this.needs_server_update = false;
-                })?;
-
-                Self::maintain_servers(this.clone(), cx.clone()).await?;
-
-                this.update(&mut cx, |this, cx| {
-                    let has_any_context_servers = !this.servers().is_empty();
-                    if has_any_context_servers {
-                        CommandPaletteFilter::update_global(cx, |filter, _cx| {
-                            filter.show_namespace(CONTEXT_SERVERS_NAMESPACE);
-                        });
-                    }
-
-                    this.update_servers_task.take();
-                    if this.needs_server_update {
-                        this.available_context_servers_changed(cx);
-                    }
-                })?;
-
-                Ok(())
-            }));
+impl ContextServerManager {
+    pub fn new() -> Self {
+        Self {
+            servers: HashMap::default(),
+            pending_servers: HashSet::default(),
        }
    }

-    pub fn get_server(&self, id: &str) -> Option<Arc<ContextServer>> {
-        self.servers
-            .get(id)
-            .filter(|server| server.client().is_some())
-            .cloned()
+    pub fn add_server(
+        &mut self,
+        server: Arc<dyn ContextServer>,
+        cx: &ModelContext<Self>,
+    ) -> Task<anyhow::Result<()>> {
+        let server_id = server.id();
+
+        if self.servers.contains_key(&server_id) || self.pending_servers.contains(&server_id) {
+            return Task::ready(Ok(()));
+        }
+
+        let task = {
+            let server_id = server_id.clone();
+            cx.spawn(|this, mut cx| async move {
+                server.clone().start(&cx).await?;
+                this.update(&mut cx, |this, cx| {
+                    this.servers.insert(server_id.clone(), server);
+                    this.pending_servers.remove(&server_id);
+                    cx.emit(Event::ServerStarted {
+                        server_id: server_id.clone(),
+                    });
+                })?;
+                Ok(())
+            })
+        };
+
+        self.pending_servers.insert(server_id);
+        task
+    }
+
+    pub fn get_server(&self, id: &str) -> Option<Arc<dyn ContextServer>> {
+        self.servers.get(id).cloned()
+    }
+
+    pub fn remove_server(
+        &mut self,
+        id: &Arc<str>,
+        cx: &ModelContext<Self>,
+    ) -> Task<anyhow::Result<()>> {
+        let id = id.clone();
+        cx.spawn(|this, mut cx| async move {
+            if let Some(server) =
+                this.update(&mut cx, |this, _cx| this.servers.remove(id.as_ref()))?
+            {
+                server.stop()?;
+            }
+            this.update(&mut cx, |this, cx| {
+                this.pending_servers.remove(id.as_ref());
+                cx.emit(Event::ServerStopped {
+                    server_id: id.clone(),
+                })
+            })?;
+            Ok(())
+        })
    }

    pub fn restart_server(
@@ -240,7 +242,7 @@ impl ContextServerManager {
            if let Some(server) = this.update(&mut cx, |this, _cx| this.servers.remove(&id))? {
                server.stop()?;
                let config = server.config();
-                let new_server = Arc::new(ContextServer::new(id.clone(), config));
+                let new_server = Arc::new(NativeContextServer::new(config));
                new_server.clone().start(&cx).await?;
                this.update(&mut cx, |this, cx| {
                    this.servers.insert(id.clone(), new_server);
@@ -256,83 +258,43 @@ impl ContextServerManager {
        })
    }

-    pub fn servers(&self) -> Vec<Arc<ContextServer>> {
-        self.servers
-            .values()
-            .filter(|server| server.client().is_some())
-            .cloned()
-            .collect()
+    pub fn servers(&self) -> Vec<Arc<dyn ContextServer>> {
+        self.servers.values().cloned().collect()
    }

-    async fn maintain_servers(this: WeakModel<Self>, mut cx: AsyncAppContext) -> Result<()> {
-        let mut desired_servers = HashMap::default();
+    pub fn maintain_servers(&mut self, settings: &ContextServerSettings, cx: &ModelContext<Self>) {
+        let current_servers = self
+            .servers()
+            .into_iter()
+            .map(|server| (server.id(), server.config()))
+            .collect::<HashMap<_, _>>();

-        let (registry, project) = this.update(&mut cx, |this, cx| {
-            let location = this.project.read(cx).worktrees(cx).next().map(|worktree| {
-                settings::SettingsLocation {
-                    worktree_id: worktree.read(cx).id(),
-                    path: Path::new(""),
-                }
-            });
-            let settings = ContextServerSettings::get(location, cx);
-            desired_servers = settings.context_servers.clone();
+        let new_servers = settings
+            .servers
+            .iter()
+            .map(|config| (config.id.clone(), config.clone()))
+            .collect::<HashMap<_, _>>();

-            (this.registry.clone(), this.project.clone())
-        })?;
+        let servers_to_add = new_servers
+            .values()
+            .filter(|config| !current_servers.contains_key(config.id.as_str()))
+            .cloned()
+            .collect::<Vec<_>>();

-        for (id, factory) in
-            registry.read_with(&cx, |registry, _| registry.context_server_factories())?
-        {
-            let config = desired_servers.entry(id).or_default();
-            if config.command.is_none() {
-                if let Some(extension_command) = factory(project.clone(), &cx).await.log_err() {
-                    config.command = Some(extension_command);
-                }
-            }
+        let servers_to_remove = current_servers
+            .keys()
+            .filter(|id| !new_servers.contains_key(id.as_ref()))
+            .cloned()
+            .collect::<Vec<_>>();
+
+        log::trace!("servers_to_add={:?}", servers_to_add);
+        for config in servers_to_add {
+            let server = Arc::new(NativeContextServer::new(Arc::new(config)));
+            self.add_server(server, cx).detach_and_log_err(cx);
        }

-        let mut servers_to_start = HashMap::default();
-        let mut servers_to_stop = HashMap::default();
-
-        this.update(&mut cx, |this, _cx| {
-            this.servers.retain(|id, server| {
-                if desired_servers.contains_key(id) {
-                    true
-                } else {
-                    servers_to_stop.insert(id.clone(), server.clone());
-                    false
-                }
-            });
-
-            for (id, config) in desired_servers {
-                let existing_config = this.servers.get(&id).map(|server| server.config());
-                if existing_config.as_deref() != Some(&config) {
-                    let config = Arc::new(config);
-                    let server = Arc::new(ContextServer::new(id.clone(), config));
-                    servers_to_start.insert(id.clone(), server.clone());
-                    let old_server = this.servers.insert(id.clone(), server);
-                    if let Some(old_server) = old_server {
-                        servers_to_stop.insert(id, old_server);
-                    }
-                }
-            }
-        })?;
-
-        for (id, server) in servers_to_stop {
-            server.stop().log_err();
-            this.update(&mut cx, |_, cx| {
-                cx.emit(Event::ServerStopped { server_id: id })
-            })?;
+        for id in servers_to_remove {
+            self.remove_server(&id, cx).detach_and_log_err(cx);
        }
-
-        for (id, server) in servers_to_start {
-            if server.start(&cx).await.log_err().is_some() {
-                this.update(&mut cx, |_, cx| {
-                    cx.emit(Event::ServerStarted { server_id: id })
-                })?;
-            }
-        }
-
-        Ok(())
    }
 }
--- a/crates/context_servers/src/protocol.rs
+++ b/crates/context_servers/src/protocol.rs
@@ -11,6 +11,8 @@ use collections::HashMap;
 use crate::client::Client;
 use crate::types;

+const PROTOCOL_VERSION: &str = "2024-10-07";
+
 pub struct ModelContextProtocol {
    inner: Client,
 }
@@ -21,9 +23,10 @@ impl ModelContextProtocol {
    }

    fn supported_protocols() -> Vec<types::ProtocolVersion> {
-        vec![types::ProtocolVersion(
-            types::LATEST_PROTOCOL_VERSION.to_string(),
-        )]
+        vec![
+            types::ProtocolVersion::VersionString(PROTOCOL_VERSION.to_string()),
+            types::ProtocolVersion::VersionNumber(1),
+        ]
    }

    pub async fn initialize(
@@ -31,13 +34,11 @@ impl ModelContextProtocol {
        client_info: types::Implementation,
    ) -> Result<InitializedContextServerProtocol> {
        let params = types::InitializeParams {
-            protocol_version: types::ProtocolVersion(types::LATEST_PROTOCOL_VERSION.to_string()),
+            protocol_version: types::ProtocolVersion::VersionString(PROTOCOL_VERSION.to_string()),
            capabilities: types::ClientCapabilities {
                experimental: None,
                sampling: None,
-                roots: None,
            },
-            meta: None,
            client_info,
        };

@@ -147,7 +148,6 @@ impl InitializedContextServerProtocol {
        let params = types::PromptsGetParams {
            name: prompt.as_ref().to_string(),
            arguments: Some(arguments),
-            meta: None,
        };

        let response: types::PromptsGetResponse = self
@@ -170,7 +170,6 @@ impl InitializedContextServerProtocol {
                name: argument.into(),
                value: value.into(),
            },
-            meta: None,
        };
        let result: types::CompletionCompleteResponse = self
            .inner
@@ -211,7 +210,6 @@ impl InitializedContextServerProtocol {
        let params = types::CallToolParams {
            name: tool.as_ref().to_string(),
            arguments,
-            meta: None,
        };

        let response: types::CallToolResponse = self
--- a/crates/context_servers/src/registry.rs
+++ b/crates/context_servers/src/registry.rs
@@ -2,61 +2,71 @@ use std::sync::Arc;

 use anyhow::Result;
 use collections::HashMap;
-use gpui::{AppContext, AsyncAppContext, Context, Global, Model, ReadGlobal, Task};
-use project::Project;
+use gpui::{AppContext, AsyncAppContext, ReadGlobal};
+use gpui::{Global, Task};
+use parking_lot::RwLock;

-use crate::manager::ServerCommand;
+use crate::ContextServer;

-pub type ContextServerFactory = Arc<
-    dyn Fn(Model<Project>, &AsyncAppContext) -> Task<Result<ServerCommand>> + Send + Sync + 'static,
->;
+pub type ContextServerFactory =
+    Arc<dyn Fn(&AsyncAppContext) -> Task<Result<Arc<dyn ContextServer>>> + Send + Sync + 'static>;

-struct GlobalContextServerFactoryRegistry(Model<ContextServerFactoryRegistry>);
+#[derive(Default)]
+struct GlobalContextServerFactoryRegistry(Arc<ContextServerFactoryRegistry>);

 impl Global for GlobalContextServerFactoryRegistry {}

 #[derive(Default)]
-pub struct ContextServerFactoryRegistry {
+struct ContextServerFactoryRegistryState {
    context_servers: HashMap<Arc<str>, ContextServerFactory>,
 }

+#[derive(Default)]
+pub struct ContextServerFactoryRegistry {
+    state: RwLock<ContextServerFactoryRegistryState>,
+}
+
 impl ContextServerFactoryRegistry {
    /// Returns the global [`ContextServerFactoryRegistry`].
-    pub fn global(cx: &AppContext) -> Model<Self> {
+    pub fn global(cx: &AppContext) -> Arc<Self> {
        GlobalContextServerFactoryRegistry::global(cx).0.clone()
    }

    /// Returns the global [`ContextServerFactoryRegistry`].
    ///
    /// Inserts a default [`ContextServerFactoryRegistry`] if one does not yet exist.
-    pub fn default_global(cx: &mut AppContext) -> Model<Self> {
-        if !cx.has_global::<GlobalContextServerFactoryRegistry>() {
-            let registry = cx.new_model(|_| Self::new());
-            cx.set_global(GlobalContextServerFactoryRegistry(registry));
-        }
-        cx.global::<GlobalContextServerFactoryRegistry>().0.clone()
+    pub fn default_global(cx: &mut AppContext) -> Arc<Self> {
+        cx.default_global::<GlobalContextServerFactoryRegistry>()
+            .0
+            .clone()
    }

-    pub fn new() -> Self {
-        Self {
-            context_servers: HashMap::default(),
-        }
+    pub fn new() -> Arc<Self> {
+        Arc::new(Self {
+            state: RwLock::new(ContextServerFactoryRegistryState {
+                context_servers: HashMap::default(),
+            }),
+        })
    }

    pub fn context_server_factories(&self) -> Vec<(Arc<str>, ContextServerFactory)> {
-        self.context_servers
+        self.state
+            .read()
+            .context_servers
            .iter()
            .map(|(id, factory)| (id.clone(), factory.clone()))
            .collect()
    }

    /// Registers the provided [`ContextServerFactory`].
-    pub fn register_server_factory(&mut self, id: Arc<str>, factory: ContextServerFactory) {
-        self.context_servers.insert(id, factory);
+    pub fn register_server_factory(&self, id: Arc<str>, factory: ContextServerFactory) {
+        let mut state = self.state.write();
+        state.context_servers.insert(id, factory);
    }

    /// Unregisters the [`ContextServerFactory`] for the server with the given ID.
-    pub fn unregister_server_factory_by_id(&mut self, server_id: &str) {
-        self.context_servers.remove(server_id);
+    pub fn unregister_server_factory_by_id(&self, server_id: &str) {
+        let mut state = self.state.write();
+        state.context_servers.remove(server_id);
    }
 }
--- a/crates/context_servers/src/types.rs
+++ b/crates/context_servers/src/types.rs
@@ -2,8 +2,8 @@ use collections::HashMap;
 use serde::{Deserialize, Serialize};
 use url::Url;

-pub const LATEST_PROTOCOL_VERSION: &str = "2024-11-05";
-
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub enum RequestType {
    Initialize,
    CallTool,
@@ -18,7 +18,6 @@ pub enum RequestType {
    Ping,
    ListTools,
    ListResourceTemplates,
-    ListRoots,
 }

 impl RequestType {
@@ -37,14 +36,16 @@ impl RequestType {
            RequestType::Ping => "ping",
            RequestType::ListTools => "tools/list",
            RequestType::ListResourceTemplates => "resources/templates/list",
-            RequestType::ListRoots => "roots/list",
        }
    }
 }

 #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(transparent)]
-pub struct ProtocolVersion(pub String);
+#[serde(untagged)]
+pub enum ProtocolVersion {
+    VersionString(String),
+    VersionNumber(u32),
+}

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -52,8 +53,6 @@ pub struct InitializeParams {
    pub protocol_version: ProtocolVersion,
    pub capabilities: ClientCapabilities,
    pub client_info: Implementation,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
@@ -62,40 +61,30 @@ pub struct CallToolParams {
    pub name: String,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub arguments: Option<HashMap<String, serde_json::Value>>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ResourcesUnsubscribeParams {
    pub uri: Url,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ResourcesSubscribeParams {
    pub uri: Url,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ResourcesReadParams {
    pub uri: Url,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct LoggingSetLevelParams {
    pub level: LoggingLevel,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
@@ -104,8 +93,6 @@ pub struct PromptsGetParams {
    pub name: String,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub arguments: Option<HashMap<String, String>>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
@@ -113,8 +100,6 @@ pub struct PromptsGetParams {
 pub struct CompletionCompleteParams {
    pub r#ref: CompletionReference,
    pub argument: CompletionArgument,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Serialize)]
@@ -160,16 +145,12 @@ pub struct InitializeResponse {
    pub protocol_version: ProtocolVersion,
    pub capabilities: ServerCapabilities,
    pub server_info: Implementation,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ResourcesReadResponse {
-    pub contents: Vec<ResourceContents>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
+    pub contents: Vec<ResourceContent>,
 }

 #[derive(Debug, Deserialize)]
@@ -178,39 +159,29 @@ pub struct ResourcesListResponse {
    pub resources: Vec<Resource>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SamplingMessage {
-    pub role: Role,
-    pub content: MessageContent,
 }

 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PromptMessage {
-    pub role: Role,
-    pub content: MessageContent,
+pub struct SamplingMessage {
+    pub role: SamplingRole,
+    pub content: SamplingContent,
 }

 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
-pub enum Role {
+pub enum SamplingRole {
    User,
    Assistant,
 }

 #[derive(Debug, Serialize, Deserialize)]
 #[serde(tag = "type")]
-pub enum MessageContent {
+pub enum SamplingContent {
    #[serde(rename = "text")]
    Text { text: String },
    #[serde(rename = "image")]
    Image { data: String, mime_type: String },
-    #[serde(rename = "resource")]
-    Resource { resource: ResourceContents },
 }

 #[derive(Debug, Deserialize)]
@@ -218,9 +189,7 @@ pub enum MessageContent {
 pub struct PromptsGetResponse {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub description: Option<String>,
-    pub messages: Vec<PromptMessage>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
+    pub messages: Vec<SamplingMessage>,
 }

 #[derive(Debug, Deserialize)]
@@ -229,16 +198,12 @@ pub struct PromptsListResponse {
    pub prompts: Vec<Prompt>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CompletionCompleteResponse {
    pub completion: CompletionResult,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Deserialize)]
@@ -249,8 +214,6 @@ pub struct CompletionResult {
    pub total: Option<u32>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub has_more: Option<bool>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

 #[derive(Debug, Deserialize, Serialize)]
@@ -280,8 +243,6 @@ pub struct ClientCapabilities {
    pub experimental: Option<HashMap<String, serde_json::Value>>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub sampling: Option<serde_json::Value>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub roots: Option<RootsCapabilities>,
 }

 #[derive(Debug, Serialize, Deserialize)]
@@ -322,13 +283,6 @@ pub struct ToolsCapabilities {
    pub list_changed: Option<bool>,
 }

-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RootsCapabilities {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub list_changed: Option<bool>,
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Tool {
@@ -358,28 +312,14 @@ pub struct Resource {

 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct ResourceContents {
+pub struct ResourceContent {
    pub uri: Url,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub mime_type: Option<String>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct TextResourceContents {
-    pub uri: Url,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    pub text: String,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BlobResourceContents {
-    pub uri: Url,
+    pub text: Option<String>,
    #[serde(skip_serializing_if = "Option::is_none")]
-    pub mime_type: Option<String>,
-    pub blob: String,
+    pub blob: Option<String>,
 }

 #[derive(Debug, Serialize, Deserialize)]
@@ -398,32 +338,8 @@ pub struct ResourceTemplate {
 pub enum LoggingLevel {
    Debug,
    Info,
-    Notice,
    Warning,
    Error,
-    Critical,
-    Alert,
-    Emergency,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ModelPreferences {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub hints: Option<Vec<ModelHint>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub cost_priority: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub speed_priority: Option<f64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub intelligence_priority: Option<f64>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ModelHint {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
 }

 #[derive(Debug, Serialize)]
@@ -436,7 +352,6 @@ pub enum NotificationType {
    ResourcesListChanged,
    ToolsListChanged,
    PromptsListChanged,
-    RootsListChanged,
 }

 impl NotificationType {
@@ -449,7 +364,6 @@ impl NotificationType {
            NotificationType::ResourcesListChanged => "notifications/resources/list_changed",
            NotificationType::ToolsListChanged => "notifications/tools/list_changed",
            NotificationType::PromptsListChanged => "notifications/prompts/list_changed",
-            NotificationType::RootsListChanged => "notifications/roots/list_changed",
        }
    }
 }
@@ -459,14 +373,6 @@ impl NotificationType {
 pub enum ClientNotification {
    Initialized,
    Progress(ProgressParams),
-    RootsListChanged,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum ProgressToken {
-    String(String),
-    Number(f64),
 }

 #[derive(Debug, Serialize)]
@@ -476,10 +382,10 @@ pub struct ProgressParams {
    pub progress: f64,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub total: Option<f64>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
 }

+pub type ProgressToken = String;
+
 pub enum CompletionTotal {
    Exact(u32),
    HasMore,
@@ -504,22 +410,7 @@ pub struct Completion {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CallToolResponse {
-    pub content: Vec<ToolResponseContent>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_error: Option<bool>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(tag = "type")]
-pub enum ToolResponseContent {
-    #[serde(rename = "text")]
-    Text { text: String },
-    #[serde(rename = "image")]
-    Image { data: String, mime_type: String },
-    #[serde(rename = "resource")]
-    Resource { resource: ResourceContents },
+    pub tool_result: serde_json::Value,
 }

 #[derive(Debug, Deserialize)]
@@ -528,22 +419,4 @@ pub struct ListToolsResponse {
    pub tools: Vec<Tool>,
    #[serde(skip_serializing_if = "Option::is_none")]
    pub next_cursor: Option<String>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ListRootsResponse {
-    pub roots: Vec<Root>,
-    #[serde(rename = "_meta", skip_serializing_if = "Option::is_none")]
-    pub meta: Option<HashMap<String, serde_json::Value>>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Root {
-    pub uri: Url,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
 }
--- a/crates/copilot/Cargo.toml
+++ b/crates/copilot/Cargo.toml
@@ -29,14 +29,14 @@ anyhow.workspace = true
 async-compression.workspace = true
 async-tar.workspace = true
 chrono.workspace = true
-client.workspace = true
 collections.workspace = true
+client.workspace = true
 command_palette_hooks.workspace = true
+editor.workspace = true
 fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 http_client.workspace = true
-inline_completion.workspace = true
 language.workspace = true
 lsp.workspace = true
 menu.workspace = true
@@ -44,12 +44,12 @@ node_runtime.workspace = true
 parking_lot.workspace = true
 paths.workspace = true
 project.workspace = true
-schemars = { workspace = true, optional = true }
 serde.workspace = true
 serde_json.workspace = true
+schemars = { workspace = true, optional = true }
+strum.workspace = true
 settings.workspace = true
 smol.workspace = true
-strum.workspace = true
 task.workspace = true
 ui.workspace = true
 util.workspace = true
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -14,7 +14,7 @@ use gpui::{
    actions, AppContext, AsyncAppContext, Context, Entity, EntityId, EventEmitter, Global, Model,
    ModelContext, Task, WeakModel,
 };
-use http_client::github::get_release_by_tag_name;
+use http_client::github::latest_github_release;
 use http_client::HttpClient;
 use language::{
    language_settings::{all_language_settings, language_settings, InlineCompletionProvider},
@@ -38,8 +38,8 @@ use std::{
 };
 use util::{fs::remove_matching, maybe, ResultExt};

-pub use crate::copilot_completion_provider::CopilotCompletionProvider;
-pub use crate::sign_in::{initiate_sign_in, CopilotCodeVerification};
+pub use copilot_completion_provider::CopilotCompletionProvider;
+pub use sign_in::CopilotCodeVerification;

 actions!(
    copilot,
@@ -989,12 +989,12 @@ async fn clear_copilot_dir() {
 }

 async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
-    const SERVER_PATH: &str = "dist/language-server.js";
+    const SERVER_PATH: &str = "dist/agent.js";

    ///Check for the latest copilot language server and download it if we haven't already
    async fn fetch_latest(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
        let release =
-            get_release_by_tag_name("zed-industries/copilot", "v0.7.0", http.clone()).await?;
+            latest_github_release("zed-industries/copilot", true, false, http.clone()).await?;

        let version_dir = &paths::copilot_dir().join(format!("copilot-{}", release.tag_name));

@@ -1229,10 +1229,8 @@ mod tests {
            Some(self)
        }

-        fn disk_state(&self) -> language::DiskState {
-            language::DiskState::Present {
-                mtime: std::time::UNIX_EPOCH,
-            }
+        fn mtime(&self) -> Option<std::time::SystemTime> {
+            unimplemented!()
        }

        fn path(&self) -> &Arc<Path> {
@@ -1247,6 +1245,10 @@ mod tests {
            unimplemented!()
        }

+        fn is_deleted(&self) -> bool {
+            unimplemented!()
+        }
+
        fn as_any(&self) -> &dyn std::any::Any {
            unimplemented!()
        }
--- a/crates/copilot/src/copilot_chat.rs
+++ b/crates/copilot/src/copilot_chat.rs
@@ -1,13 +1,13 @@
 use std::path::PathBuf;
-use std::sync::Arc;
 use std::sync::OnceLock;
+use std::{sync::Arc, time::Duration};

 use anyhow::{anyhow, Result};
 use chrono::DateTime;
 use fs::Fs;
 use futures::{io::BufReader, stream::BoxStream, AsyncBufReadExt, AsyncReadExt, StreamExt};
 use gpui::{AppContext, AsyncAppContext, Global};
-use http_client::{AsyncBody, HttpClient, Method, Request as HttpRequest};
+use http_client::{AsyncBody, HttpClient, HttpRequestExt, Method, Request as HttpRequest};
 use paths::home_dir;
 use serde::{Deserialize, Serialize};
 use settings::watch_config_file;
@@ -254,6 +254,7 @@ impl CopilotChat {

    pub async fn stream_completion(
        request: Request,
+        low_speed_timeout: Option<Duration>,
        mut cx: AsyncAppContext,
    ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
        let Some(this) = cx.update(|cx| Self::global(cx)).ok().flatten() else {
@@ -273,7 +274,8 @@ impl CopilotChat {
        let token = match api_token {
            Some(api_token) if api_token.remaining_seconds() > 5 * 60 => api_token.clone(),
            _ => {
-                let token = request_api_token(&oauth_token, client.clone()).await?;
+                let token =
+                    request_api_token(&oauth_token, client.clone(), low_speed_timeout).await?;
                this.update(&mut cx, |this, cx| {
                    this.api_token = Some(token.clone());
                    cx.notify();
@@ -282,17 +284,25 @@ impl CopilotChat {
            }
        };

-        stream_completion(client.clone(), token.api_key, request).await
+        stream_completion(client.clone(), token.api_key, request, low_speed_timeout).await
    }
 }

-async fn request_api_token(oauth_token: &str, client: Arc<dyn HttpClient>) -> Result<ApiToken> {
-    let request_builder = HttpRequest::builder()
+async fn request_api_token(
+    oauth_token: &str,
+    client: Arc<dyn HttpClient>,
+    low_speed_timeout: Option<Duration>,
+) -> Result<ApiToken> {
+    let mut request_builder = HttpRequest::builder()
        .method(Method::GET)
        .uri(COPILOT_CHAT_AUTH_URL)
        .header("Authorization", format!("token {}", oauth_token))
        .header("Accept", "application/json");

+    if let Some(low_speed_timeout) = low_speed_timeout {
+        request_builder = request_builder.read_timeout(low_speed_timeout);
+    }
+
    let request = request_builder.body(AsyncBody::empty())?;

    let mut response = client.send(request).await?;
@@ -330,8 +340,9 @@ async fn stream_completion(
    client: Arc<dyn HttpClient>,
    api_key: String,
    request: Request,
+    low_speed_timeout: Option<Duration>,
 ) -> Result<BoxStream<'static, Result<ResponseEvent>>> {
-    let request_builder = HttpRequest::builder()
+    let mut request_builder = HttpRequest::builder()
        .method(Method::POST)
        .uri(COPILOT_CHAT_COMPLETION_URL)
        .header(
@@ -345,6 +356,9 @@ async fn stream_completion(
        .header("Content-Type", "application/json")
        .header("Copilot-Integration-Id", "vscode-chat");

+    if let Some(low_speed_timeout) = low_speed_timeout {
+        request_builder = request_builder.read_timeout(low_speed_timeout);
+    }
    let is_streaming = request.stream;

    let request = request_builder.body(AsyncBody::from(serde_json::to_string(&request)?))?;
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -1,8 +1,8 @@
 use crate::{Completion, Copilot};
 use anyhow::Result;
 use client::telemetry::Telemetry;
+use editor::{CompletionProposal, Direction, InlayProposal, InlineCompletionProvider};
 use gpui::{AppContext, EntityId, Model, ModelContext, Task};
-use inline_completion::{CompletionProposal, Direction, InlayProposal, InlineCompletionProvider};
 use language::{
    language_settings::{all_language_settings, AllLanguageSettings},
    Buffer, OffsetRangeExt, ToOffset,
--- a/crates/copilot/src/sign_in.rs
+++ b/crates/copilot/src/sign_in.rs
@@ -5,79 +5,10 @@ use gpui::{
    Styled, Subscription, ViewContext,
 };
 use ui::{prelude::*, Button, Label, Vector, VectorName};
-use util::ResultExt as _;
-use workspace::notifications::NotificationId;
-use workspace::{ModalView, Toast, Workspace};
+use workspace::ModalView;

 const COPILOT_SIGN_UP_URL: &str = "https://github.com/features/copilot";

-struct CopilotStartingToast;
-
-pub fn initiate_sign_in(cx: &mut WindowContext) {
-    let Some(copilot) = Copilot::global(cx) else {
-        return;
-    };
-    let status = copilot.read(cx).status();
-    let Some(workspace) = cx.window_handle().downcast::<Workspace>() else {
-        return;
-    };
-    match status {
-        Status::Starting { task } => {
-            let Some(workspace) = cx.window_handle().downcast::<Workspace>() else {
-                return;
-            };
-
-            let Ok(workspace) = workspace.update(cx, |workspace, cx| {
-                workspace.show_toast(
-                    Toast::new(
-                        NotificationId::unique::<CopilotStartingToast>(),
-                        "Copilot is starting...",
-                    ),
-                    cx,
-                );
-                workspace.weak_handle()
-            }) else {
-                return;
-            };
-
-            cx.spawn(|mut cx| async move {
-                task.await;
-                if let Some(copilot) = cx.update(|cx| Copilot::global(cx)).ok().flatten() {
-                    workspace
-                        .update(&mut cx, |workspace, cx| match copilot.read(cx).status() {
-                            Status::Authorized => workspace.show_toast(
-                                Toast::new(
-                                    NotificationId::unique::<CopilotStartingToast>(),
-                                    "Copilot has started!",
-                                ),
-                                cx,
-                            ),
-                            _ => {
-                                workspace.dismiss_toast(
-                                    &NotificationId::unique::<CopilotStartingToast>(),
-                                    cx,
-                                );
-                                copilot
-                                    .update(cx, |copilot, cx| copilot.sign_in(cx))
-                                    .detach_and_log_err(cx);
-                            }
-                        })
-                        .log_err();
-                }
-            })
-            .detach();
-        }
-        _ => {
-            copilot.update(cx, |this, cx| this.sign_in(cx)).detach();
-            workspace
-                .update(cx, |this, cx| {
-                    this.toggle_modal(cx, |cx| CopilotCodeVerification::new(&copilot, cx));
-                })
-                .ok();
-        }
-    }
-}
-
 pub struct CopilotCodeVerification {
    status: Status,
    connect_clicked: bool,
--- a/crates/dev_server_projects/src/dev_server_projects.rs
+++ b/crates/dev_server_projects/src/dev_server_projects.rs
@@ -0,0 +1 @@
+
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -32,7 +32,6 @@ use std::{
    cmp::Ordering,
    mem,
    ops::Range,
-    sync::Arc,
 };
 use theme::ActiveTheme;
 pub use toolbar_controls::ToolbarControls;
@@ -727,10 +726,6 @@ impl Item for ProjectDiagnosticsEditor {
        self.excerpts.read(cx).is_dirty(cx)
    }

-    fn has_deleted_file(&self, cx: &AppContext) -> bool {
-        self.excerpts.read(cx).has_deleted_file(cx)
-    }
-
    fn has_conflict(&self, cx: &AppContext) -> bool {
        self.excerpts.read(cx).has_conflict(cx)
    }
@@ -776,7 +771,7 @@ impl Item for ProjectDiagnosticsEditor {
        }
    }

-    fn breadcrumb_location(&self, _: &AppContext) -> ToolbarItemLocation {
+    fn breadcrumb_location(&self) -> ToolbarItemLocation {
        ToolbarItemLocation::PrimaryLeft
    }

@@ -795,11 +790,10 @@ const DIAGNOSTIC_HEADER: &str = "diagnostic header";
 fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock {
    let (message, code_ranges) = highlight_diagnostic_message(&diagnostic, None);
    let message: SharedString = message;
-    Arc::new(move |cx| {
+    Box::new(move |cx| {
        let highlight_style: HighlightStyle = cx.theme().colors().text_accent.into();
        h_flex()
            .id(DIAGNOSTIC_HEADER)
-            .block_mouse_down()
            .h(2. * cx.line_height())
            .pl_10()
            .pr_5()
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -46,7 +46,6 @@ git.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 indoc.workspace = true
-inline_completion.workspace = true
 itertools.workspace = true
 language.workspace = true
 linkify.workspace = true
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -271,8 +271,6 @@ gpui::actions!(
        Hover,
        Indent,
        JoinLines,
-        KillRingCut,
-        KillRingYank,
        LineDown,
        LineUp,
        MoveDown,
@@ -299,7 +297,6 @@ gpui::actions!(
        OpenExcerptsSplit,
        OpenProposedChangesEditor,
        OpenFile,
-        OpenDocs,
        OpenPermalinkToLine,
        OpenUrl,
        Outdent,
--- a/crates/editor/src/clangd_ext.rs
+++ b/crates/editor/src/clangd_ext.rs
@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use anyhow::Context as _;
 use gpui::{View, ViewContext, WindowContext};
 use language::Language;
@@ -52,9 +54,9 @@ pub fn switch_source_header(
    cx.spawn(|_editor, mut cx| async move {
        let switch_source_header = switch_source_header_task
            .await
-            .with_context(|| format!("Switch source/header LSP request for path \"{source_file}\" failed"))?;
+            .with_context(|| format!("Switch source/header LSP request for path \"{}\" failed", source_file))?;
        if switch_source_header.0.is_empty() {
-            log::info!("Clangd returned an empty string when requesting to switch source/header from \"{source_file}\"" );
+            log::info!("Clangd returned an empty string when requesting to switch source/header from \"{}\"", source_file);
            return Ok(());
        }

@@ -65,17 +67,14 @@ pub fn switch_source_header(
            )
        })?;

-        let path = goto.to_file_path().map_err(|()| {
-            anyhow::anyhow!("URL conversion to file path failed for \"{goto}\"")
-        })?;
-
        workspace
            .update(&mut cx, |workspace, view_cx| {
-                workspace.open_abs_path(path, false, view_cx)
+                workspace.open_abs_path(PathBuf::from(goto.path()), false, view_cx)
            })
            .with_context(|| {
                format!(
-                    "Switch source/header could not open \"{goto}\" in workspace"
+                    "Switch source/header could not open \"{}\" in workspace",
+                    goto.path()
                )
            })?
            .await
--- a/crates/editor/src/debounced_delay.rs
+++ b/crates/editor/src/debounced_delay.rs
@@ -5,7 +5,6 @@ use gpui::{Task, ViewContext};

 use crate::Editor;

-#[derive(Debug)]
 pub struct DebouncedDelay {
    task: Option<Task<()>>,
    cancel_channel: Option<oneshot::Sender<()>>,
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -36,7 +36,7 @@ use block_map::{BlockRow, BlockSnapshot};
 use collections::{HashMap, HashSet};
 pub use crease_map::*;
 pub use fold_map::{Fold, FoldId, FoldPlaceholder, FoldPoint};
-use fold_map::{FoldMap, FoldSnapshot};
+use fold_map::{FoldMap, FoldMapWriter, FoldOffset, FoldSnapshot};
 use gpui::{
    AnyElement, Font, HighlightStyle, LineLayout, Model, ModelContext, Pixels, UnderlineStyle,
 };
@@ -65,8 +65,8 @@ use std::{
 };
 use sum_tree::{Bias, TreeMap};
 use tab_map::{TabMap, TabSnapshot};
-use text::LineIndent;
-use ui::{px, SharedString, WindowContext};
+use text::{Edit, LineIndent};
+use ui::{div, px, IntoElement, ParentElement, SharedString, Styled, WindowContext};
 use unicode_segmentation::UnicodeSegmentation;
 use wrap_map::{WrapMap, WrapSnapshot};

@@ -197,86 +197,22 @@ impl DisplayMap {
            other
                .folds_in_range(0..other.buffer_snapshot.len())
                .map(|fold| {
-                    Crease::simple(
+                    (
                        fold.range.to_offset(&other.buffer_snapshot),
                        fold.placeholder.clone(),
                    )
-                })
-                .collect(),
+                }),
            cx,
        );
    }

-    /// Creates folds for the given creases.
-    pub fn fold<T: Clone + ToOffset>(
+    /// Creates folds for the given ranges.
+    pub fn fold<T: ToOffset>(
        &mut self,
-        creases: Vec<Crease<T>>,
+        ranges: impl IntoIterator<Item = (Range<T>, FoldPlaceholder)>,
        cx: &mut ModelContext<Self>,
    ) {
-        let buffer_snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(buffer_snapshot.clone(), edits);
-        let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-
-        let inline = creases.iter().filter_map(|crease| {
-            if let Crease::Inline {
-                range, placeholder, ..
-            } = crease
-            {
-                Some((range.clone(), placeholder.clone()))
-            } else {
-                None
-            }
-        });
-        let (snapshot, edits) = fold_map.fold(inline);
-
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        let blocks = creases.into_iter().filter_map(|crease| {
-            if let Crease::Block {
-                range,
-                block_height,
-                render_block,
-                block_style,
-                block_priority,
-                ..
-            } = crease
-            {
-                Some((
-                    range,
-                    render_block,
-                    block_height,
-                    block_style,
-                    block_priority,
-                ))
-            } else {
-                None
-            }
-        });
-        block_map.insert(
-            blocks
-                .into_iter()
-                .map(|(range, render, height, style, priority)| {
-                    let start = buffer_snapshot.anchor_before(range.start);
-                    let end = buffer_snapshot.anchor_after(range.end);
-                    BlockProperties {
-                        placement: BlockPlacement::Replace(start..end),
-                        render,
-                        height,
-                        style,
-                        priority,
-                    }
-                }),
-        );
+        self.update_fold_map(cx, |fold_map| fold_map.fold(ranges))
    }

    /// Removes any folds with the given ranges.
@@ -286,22 +222,7 @@ impl DisplayMap {
        type_id: TypeId,
        cx: &mut ModelContext<Self>,
    ) {
-        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let edits = self.buffer_subscription.consume().into_inner();
-        let tab_size = Self::tab_size(&self.buffer, cx);
-        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
-        let (mut fold_map, snapshot, edits) = self.fold_map.write(snapshot, edits);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.read(snapshot, edits);
-        let (snapshot, edits) = fold_map.remove_folds(ranges, type_id);
-        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
-        let (snapshot, edits) = self
-            .wrap_map
-            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        self.block_map.write(snapshot, edits);
+        self.update_fold_map(cx, |fold_map| fold_map.remove_folds(ranges, type_id))
    }

    /// Removes any folds whose ranges intersect any of the given ranges.
@@ -310,12 +231,18 @@ impl DisplayMap {
        ranges: impl IntoIterator<Item = Range<T>>,
        inclusive: bool,
        cx: &mut ModelContext<Self>,
+    ) {
+        self.update_fold_map(cx, |fold_map| {
+            fold_map.unfold_intersecting(ranges, inclusive)
+        })
+    }
+
+    fn update_fold_map(
+        &mut self,
+        cx: &mut ModelContext<Self>,
+        callback: impl FnOnce(&mut FoldMapWriter) -> (FoldSnapshot, Vec<Edit<FoldOffset>>),
    ) {
        let snapshot = self.buffer.read(cx).snapshot(cx);
-        let offset_ranges = ranges
-            .into_iter()
-            .map(|range| range.start.to_offset(&snapshot)..range.end.to_offset(&snapshot))
-            .collect::<Vec<_>>();
        let edits = self.buffer_subscription.consume().into_inner();
        let tab_size = Self::tab_size(&self.buffer, cx);
        let (snapshot, edits) = self.inlay_map.sync(snapshot, edits);
@@ -325,20 +252,17 @@ impl DisplayMap {
            .wrap_map
            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
        self.block_map.read(snapshot, edits);
-
-        let (snapshot, edits) =
-            fold_map.unfold_intersecting(offset_ranges.iter().cloned(), inclusive);
+        let (snapshot, edits) = callback(&mut fold_map);
        let (snapshot, edits) = self.tab_map.sync(snapshot, edits, tab_size);
        let (snapshot, edits) = self
            .wrap_map
            .update(cx, |map, cx| map.sync(snapshot, edits, cx));
-        let mut block_map = self.block_map.write(snapshot, edits);
-        block_map.remove_intersecting_replace_blocks(offset_ranges, inclusive);
+        self.block_map.read(snapshot, edits);
    }

    pub fn insert_creases(
        &mut self,
-        creases: impl IntoIterator<Item = Crease<Anchor>>,
+        creases: impl IntoIterator<Item = Crease>,
        cx: &mut ModelContext<Self>,
    ) -> Vec<CreaseId> {
        let snapshot = self.buffer.read(cx).snapshot(cx);
@@ -541,17 +465,11 @@ pub struct HighlightStyles {
    pub suggestion: Option<HighlightStyle>,
 }

-#[derive(Clone)]
-pub enum ChunkReplacement {
-    Renderer(ChunkRenderer),
-    Str(SharedString),
-}
-
 pub struct HighlightedChunk<'a> {
    pub text: &'a str,
    pub style: Option<HighlightStyle>,
    pub is_tab: bool,
-    pub replacement: Option<ChunkReplacement>,
+    pub renderer: Option<ChunkRenderer>,
 }

 impl<'a> HighlightedChunk<'a> {
@@ -563,7 +481,7 @@ impl<'a> HighlightedChunk<'a> {
        let mut text = self.text;
        let style = self.style;
        let is_tab = self.is_tab;
-        let renderer = self.replacement;
+        let renderer = self.renderer;
        iter::from_fn(move || {
            let mut prefix_len = 0;
            while let Some(&ch) = chars.peek() {
@@ -579,33 +497,30 @@ impl<'a> HighlightedChunk<'a> {
                        text: prefix,
                        style,
                        is_tab,
-                        replacement: renderer.clone(),
+                        renderer: renderer.clone(),
                    });
                }
                chars.next();
                let (prefix, suffix) = text.split_at(ch.len_utf8());
                text = suffix;
                if let Some(replacement) = replacement(ch) {
-                    let invisible_highlight = HighlightStyle {
-                        background_color: Some(editor_style.status.hint_background),
-                        underline: Some(UnderlineStyle {
-                            color: Some(editor_style.status.hint),
-                            thickness: px(1.),
-                            wavy: false,
-                        }),
-                        ..Default::default()
-                    };
-                    let invisible_style = if let Some(mut style) = style {
-                        style.highlight(invisible_highlight);
-                        style
-                    } else {
-                        invisible_highlight
-                    };
+                    let background = editor_style.status.hint_background;
+                    let underline = editor_style.status.hint;
                    return Some(HighlightedChunk {
                        text: prefix,
-                        style: Some(invisible_style),
+                        style: None,
                        is_tab: false,
-                        replacement: Some(ChunkReplacement::Str(replacement.into())),
+                        renderer: Some(ChunkRenderer {
+                            render: Arc::new(move |_| {
+                                div()
+                                    .child(replacement)
+                                    .bg(background)
+                                    .text_decoration_1()
+                                    .text_decoration_color(underline)
+                                    .into_any_element()
+                            }),
+                            constrain_width: false,
+                        }),
                    });
                } else {
                    let invisible_highlight = HighlightStyle {
@@ -628,7 +543,7 @@ impl<'a> HighlightedChunk<'a> {
                        text: prefix,
                        style: Some(invisible_style),
                        is_tab: false,
-                        replacement: renderer.clone(),
+                        renderer: renderer.clone(),
                    });
                }
            }
@@ -640,7 +555,7 @@ impl<'a> HighlightedChunk<'a> {
                    text: remainder,
                    style,
                    is_tab,
-                    replacement: renderer.clone(),
+                    renderer: renderer.clone(),
                })
            } else {
                None
@@ -681,7 +596,7 @@ impl DisplaySnapshot {
    ) -> impl Iterator<Item = Option<MultiBufferRow>> + '_ {
        self.block_snapshot
            .buffer_rows(BlockRow(start_row.0))
-            .map(|row| row.map(MultiBufferRow))
+            .map(|row| row.map(|row| MultiBufferRow(row.0)))
    }

    pub fn max_buffer_row(&self) -> MultiBufferRow {
@@ -904,7 +819,7 @@ impl DisplaySnapshot {
                text: chunk.text,
                style: highlight_style,
                is_tab: chunk.is_tab,
-                replacement: chunk.renderer.map(ChunkReplacement::Renderer),
+                renderer: chunk.renderer,
            }
            .highlight_invisibles(editor_style)
        })
@@ -1072,12 +987,7 @@ impl DisplaySnapshot {
    }

    pub fn is_line_folded(&self, buffer_row: MultiBufferRow) -> bool {
-        self.block_snapshot.is_line_replaced(buffer_row)
-            || self.fold_snapshot.is_line_folded(buffer_row)
-    }
-
-    pub fn is_line_replaced(&self, buffer_row: MultiBufferRow) -> bool {
-        self.block_snapshot.is_line_replaced(buffer_row)
+        self.fold_snapshot.is_line_folded(buffer_row)
    }

    pub fn is_block_line(&self, display_row: DisplayRow) -> bool {
@@ -1151,42 +1061,19 @@ impl DisplaySnapshot {
            .unwrap_or(false)
    }

-    pub fn crease_for_buffer_row(&self, buffer_row: MultiBufferRow) -> Option<Crease<Point>> {
+    pub fn foldable_range(
+        &self,
+        buffer_row: MultiBufferRow,
+    ) -> Option<(Range<Point>, FoldPlaceholder)> {
        let start = MultiBufferPoint::new(buffer_row.0, self.buffer_snapshot.line_len(buffer_row));
        if let Some(crease) = self
            .crease_snapshot
            .query_row(buffer_row, &self.buffer_snapshot)
        {
-            match crease {
-                Crease::Inline {
-                    range,
-                    placeholder,
-                    render_toggle,
-                    render_trailer,
-                    metadata,
-                } => Some(Crease::Inline {
-                    range: range.to_point(&self.buffer_snapshot),
-                    placeholder: placeholder.clone(),
-                    render_toggle: render_toggle.clone(),
-                    render_trailer: render_trailer.clone(),
-                    metadata: metadata.clone(),
-                }),
-                Crease::Block {
-                    range,
-                    block_height,
-                    block_style,
-                    render_block,
-                    block_priority,
-                    render_toggle,
-                } => Some(Crease::Block {
-                    range: range.to_point(&self.buffer_snapshot),
-                    block_height: *block_height,
-                    block_style: *block_style,
-                    render_block: render_block.clone(),
-                    block_priority: *block_priority,
-                    render_toggle: render_toggle.clone(),
-                }),
-            }
+            Some((
+                crease.range.to_point(&self.buffer_snapshot),
+                crease.placeholder.clone(),
+            ))
        } else if self.starts_indent(MultiBufferRow(start.row))
            && !self.is_line_folded(MultiBufferRow(start.row))
        {
@@ -1223,13 +1110,7 @@ impl DisplaySnapshot {
                    .line_len(MultiBufferRow(row_before_line_breaks.row)),
            );

-            Some(Crease::Inline {
-                range: start..row_before_line_breaks,
-                placeholder: self.fold_placeholder.clone(),
-                render_toggle: None,
-                render_trailer: None,
-                metadata: None,
-            })
+            Some((start..row_before_line_breaks, self.fold_placeholder.clone()))
        } else {
            None
        }
@@ -1537,7 +1418,7 @@ pub mod tests {
                                        placement,
                                        style: BlockStyle::Fixed,
                                        height,
-                                        render: Arc::new(|_| div().into_any()),
+                                        render: Box::new(|_| div().into_any()),
                                        priority,
                                    }
                                })
@@ -1576,8 +1457,7 @@ pub mod tests {
                            map.fold(
                                ranges
                                    .into_iter()
-                                    .map(|range| Crease::simple(range, FoldPlaceholder::test()))
-                                    .collect(),
+                                    .map(|range| (range, FoldPlaceholder::test())),
                                cx,
                            );
                        });
@@ -1952,7 +1832,7 @@ pub mod tests {

        map.update(cx, |map, cx| {
            map.fold(
-                vec![Crease::simple(
+                vec![(
                    MultiBufferPoint::new(0, 6)..MultiBufferPoint::new(3, 2),
                    FoldPlaceholder::test(),
                )],
@@ -2042,7 +1922,7 @@ pub mod tests {
                    ),
                    height: 1,
                    style: BlockStyle::Sticky,
-                    render: Arc::new(|_| div().into_any()),
+                    render: Box::new(|_| div().into_any()),
                    priority: 0,
                }],
                cx,
@@ -2148,7 +2028,7 @@ pub mod tests {
                    ),
                    height: 1,
                    style: BlockStyle::Sticky,
-                    render: Arc::new(|_| div().into_any()),
+                    render: Box::new(|_| div().into_any()),
                    priority: 0,
                }],
                cx,
@@ -2224,7 +2104,7 @@ pub mod tests {
                    ),
                    height: 4,
                    style: BlockStyle::Fixed,
-                    render: Arc::new(|_| div().into_any()),
+                    render: Box::new(|_| div().into_any()),
                    priority: 0,
                }],
                cx,
@@ -2373,7 +2253,7 @@ pub mod tests {

        map.update(cx, |map, cx| {
            map.fold(
-                vec![Crease::simple(
+                vec![(
                    MultiBufferPoint::new(0, 6)..MultiBufferPoint::new(3, 2),
                    FoldPlaceholder::test(),
                )],
@@ -2572,7 +2452,7 @@ pub mod tests {
                snapshot.anchor_before(Point::new(2, 0))..snapshot.anchor_after(Point::new(3, 3));

            map.crease_map.insert(
-                [Crease::inline(
+                [Crease::new(
                    range,
                    FoldPlaceholder::test(),
                    |_row, _status, _toggle, _cx| div(),
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -7,7 +7,7 @@ use collections::{Bound, HashMap, HashSet};
 use gpui::{AnyElement, EntityId, Pixels, WindowContext};
 use language::{Chunk, Patch, Point};
 use multi_buffer::{
-    Anchor, ExcerptId, ExcerptInfo, MultiBufferRow, MultiBufferSnapshot, ToOffset, ToPoint as _,
+    Anchor, ExcerptId, ExcerptInfo, MultiBufferRow, MultiBufferSnapshot, ToPoint as _,
 };
 use parking_lot::Mutex;
 use std::{
@@ -77,7 +77,7 @@ pub struct BlockRow(pub(super) u32);
 #[derive(Copy, Clone, Debug, Default, Eq, Ord, PartialOrd, PartialEq)]
 struct WrapRow(u32);

-pub type RenderBlock = Arc<dyn Send + Sync + Fn(&mut BlockContext) -> AnyElement>;
+pub type RenderBlock = Box<dyn Send + FnMut(&mut BlockContext) -> AnyElement>;

 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum BlockPlacement<T> {
@@ -352,13 +352,6 @@ impl Block {
            Block::ExcerptBoundary { next_excerpt, .. } => next_excerpt.is_none(),
        }
    }
-
-    fn is_replacement(&self) -> bool {
-        match self {
-            Block::Custom(block) => matches!(block.placement, BlockPlacement::Replace(_)),
-            Block::ExcerptBoundary { .. } => false,
-        }
-    }
 }

 impl Debug for Block {
@@ -1126,64 +1119,6 @@ impl<'a> BlockMapWriter<'a> {
            .retain(|id, _| !block_ids.contains(id));
        self.0.sync(wrap_snapshot, edits);
    }
-
-    pub fn remove_intersecting_replace_blocks<T>(
-        &mut self,
-        ranges: impl IntoIterator<Item = Range<T>>,
-        inclusive: bool,
-    ) where
-        T: ToOffset,
-    {
-        let wrap_snapshot = self.0.wrap_snapshot.borrow();
-        let mut blocks_to_remove = HashSet::default();
-        for range in ranges {
-            let range = range.start.to_offset(wrap_snapshot.buffer_snapshot())
-                ..range.end.to_offset(wrap_snapshot.buffer_snapshot());
-            for block in self.blocks_intersecting_buffer_range(range, inclusive) {
-                if matches!(block.placement, BlockPlacement::Replace(_)) {
-                    blocks_to_remove.insert(block.id);
-                }
-            }
-        }
-        drop(wrap_snapshot);
-        self.remove(blocks_to_remove);
-    }
-
-    fn blocks_intersecting_buffer_range(
-        &self,
-        range: Range<usize>,
-        inclusive: bool,
-    ) -> &[Arc<CustomBlock>] {
-        let wrap_snapshot = self.0.wrap_snapshot.borrow();
-        let buffer = wrap_snapshot.buffer_snapshot();
-        let start_block_ix = match self.0.custom_blocks.binary_search_by(|probe| {
-            probe
-                .end()
-                .to_offset(buffer)
-                .cmp(&range.start)
-                .then(if inclusive {
-                    Ordering::Greater
-                } else {
-                    Ordering::Less
-                })
-        }) {
-            Ok(ix) | Err(ix) => ix,
-        };
-        let end_block_ix = match self.0.custom_blocks.binary_search_by(|probe| {
-            probe
-                .start()
-                .to_offset(buffer)
-                .cmp(&range.end)
-                .then(if inclusive {
-                    Ordering::Less
-                } else {
-                    Ordering::Greater
-                })
-        }) {
-            Ok(ix) | Err(ix) => ix,
-        };
-        &self.0.custom_blocks[start_block_ix..end_block_ix]
-    }
 }

 impl BlockSnapshot {
@@ -1363,21 +1298,6 @@ impl BlockSnapshot {
        cursor.item().map_or(false, |t| t.block.is_some())
    }

-    pub(super) fn is_line_replaced(&self, row: MultiBufferRow) -> bool {
-        let wrap_point = self
-            .wrap_snapshot
-            .make_wrap_point(Point::new(row.0, 0), Bias::Left);
-        let mut cursor = self.transforms.cursor::<(WrapRow, BlockRow)>(&());
-        cursor.seek(&WrapRow(wrap_point.row()), Bias::Right, &());
-        cursor.item().map_or(false, |transform| {
-            if let Some(Block::Custom(block)) = transform.block.as_ref() {
-                matches!(block.placement, BlockPlacement::Replace(_))
-            } else {
-                false
-            }
-        })
-    }
-
    pub fn clip_point(&self, point: BlockPoint, bias: Bias) -> BlockPoint {
        let mut cursor = self.transforms.cursor::<(BlockRow, WrapRow)>(&());
        cursor.seek(&BlockRow(point.row), Bias::Right, &());
@@ -1595,7 +1515,7 @@ impl<'a> Iterator for BlockChunks<'a> {
 }

 impl<'a> Iterator for BlockBufferRows<'a> {
-    type Item = Option<u32>;
+    type Item = Option<BlockRow>;

    fn next(&mut self) -> Option<Self::Item> {
        if self.started {
@@ -1618,25 +1538,16 @@ impl<'a> Iterator for BlockBufferRows<'a> {
                }
            }

-            let transform = self.transforms.item()?;
-            if transform
-                .block
-                .as_ref()
-                .map_or(true, |block| block.is_replacement())
-            {
+            if self.transforms.item()?.block.is_none() {
                self.input_buffer_rows.seek(self.transforms.start().1 .0);
            }
        }

        let transform = self.transforms.item()?;
-        if let Some(block) = transform.block.as_ref() {
-            if block.is_replacement() && self.transforms.start().0 == self.output_row {
-                Some(self.input_buffer_rows.next().unwrap())
-            } else {
-                Some(None)
-            }
+        if transform.block.is_some() {
+            Some(None)
        } else {
-            Some(self.input_buffer_rows.next().unwrap())
+            Some(self.input_buffer_rows.next().unwrap().map(BlockRow))
        }
    }
 }
@@ -1798,21 +1709,21 @@ mod tests {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 0))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 2))),
                height: 2,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(3, 3))),
                height: 3,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
        ]);
@@ -1910,7 +1821,10 @@ mod tests {
        );

        assert_eq!(
-            snapshot.buffer_rows(BlockRow(0)).collect::<Vec<_>>(),
+            snapshot
+                .buffer_rows(BlockRow(0))
+                .map(|row| row.map(|r| r.0))
+                .collect::<Vec<_>>(),
            &[
                Some(0),
                None,
@@ -2046,21 +1960,21 @@ mod tests {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 0))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 2))),
                height: 2,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(3, 3))),
                height: 3,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
        ]);
@@ -2148,14 +2062,14 @@ mod tests {
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 12))),
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                height: 1,
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(1, 1))),
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                height: 1,
                priority: 0,
            },
@@ -2195,7 +2109,7 @@ mod tests {
                    ..buffer_snapshot.anchor_before(Point::new(3, 1)),
            ),
            height: 4,
-            render: Arc::new(|_| div().into_any()),
+            render: Box::new(|_| div().into_any()),
            priority: 0,
        }]);

@@ -2248,14 +2162,14 @@ mod tests {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(1, 3))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(6, 2))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
        ]);
@@ -2269,21 +2183,21 @@ mod tests {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Below(buffer_snapshot.anchor_after(Point::new(1, 3))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(2, 1))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
            BlockProperties {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Above(buffer_snapshot.anchor_after(Point::new(6, 1))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            },
        ]);
@@ -2388,7 +2302,7 @@ mod tests {
                                style: BlockStyle::Fixed,
                                placement,
                                height,
-                                render: Arc::new(|_| div().into_any()),
+                                render: Box::new(|_| div().into_any()),
                                priority: 0,
                            }
                        })
@@ -2407,7 +2321,7 @@ mod tests {
                        placement: props.placement.clone(),
                        height: props.height,
                        style: props.style,
-                        render: Arc::new(|_| div().into_any()),
+                        render: Box::new(|_| div().into_any()),
                        priority: 0,
                    }));
                }
@@ -2495,7 +2409,6 @@ mod tests {
            let mut expected_buffer_rows = Vec::new();
            let mut expected_text = String::new();
            let mut expected_block_positions = Vec::new();
-            let mut expected_replaced_buffer_rows = HashSet::default();
            let input_text = wraps_snapshot.text();

            // Loop over the input lines, creating (N - 1) empty lines for
@@ -2509,9 +2422,6 @@ mod tests {
            let mut block_row = 0;
            while let Some((wrap_row, input_line)) = input_text_lines.next() {
                let wrap_row = wrap_row as u32;
-                let multibuffer_row = wraps_snapshot
-                    .to_point(WrapPoint::new(wrap_row, 0), Bias::Left)
-                    .row;

                // Create empty lines for the above block
                while let Some((placement, block)) = sorted_blocks_iter.peek() {
@@ -2541,33 +2451,30 @@ mod tests {
                {
                    if wrap_row >= replace_range.start.0 {
                        is_in_replace_block = true;
-
-                        if wrap_row == replace_range.start.0 {
-                            expected_buffer_rows.push(input_buffer_rows[multibuffer_row as usize]);
-                        }
-
                        if wrap_row == replace_range.end.0 {
                            expected_block_positions.push((block_row, block.id()));
-                            let text = "\n".repeat((block.height() - 1) as usize);
-                            if block_row > 0 {
-                                expected_text.push('\n');
+                            if block.height() > 0 {
+                                let text = "\n".repeat((block.height() - 1) as usize);
+                                if block_row > 0 {
+                                    expected_text.push('\n');
+                                }
+                                expected_text.push_str(&text);
+                                for _ in 0..block.height() {
+                                    expected_buffer_rows.push(None);
+                                }
+                                block_row += block.height();
                            }
-                            expected_text.push_str(&text);
-
-                            for _ in 1..block.height() {
-                                expected_buffer_rows.push(None);
-                            }
-                            block_row += block.height();

                            sorted_blocks_iter.next();
                        }
                    }
                }

-                if is_in_replace_block {
-                    expected_replaced_buffer_rows.insert(MultiBufferRow(multibuffer_row));
-                } else {
-                    let buffer_row = input_buffer_rows[multibuffer_row as usize];
+                if !is_in_replace_block {
+                    let buffer_row = input_buffer_rows[wraps_snapshot
+                        .to_point(WrapPoint::new(wrap_row, 0), Bias::Left)
+                        .row as usize];
+
                    let soft_wrapped = wraps_snapshot
                        .to_tab_point(WrapPoint::new(wrap_row, 0))
                        .column()
@@ -2636,10 +2543,9 @@ mod tests {
                assert_eq!(
                    blocks_snapshot
                        .buffer_rows(BlockRow(start_row as u32))
+                        .map(|row| row.map(|r| r.0))
                        .collect::<Vec<_>>(),
-                    &expected_buffer_rows[start_row..],
-                    "incorrect buffer_rows starting at row {:?}",
-                    start_row
+                    &expected_buffer_rows[start_row..]
                );
            }

@@ -2760,16 +2666,6 @@ mod tests {
                    block_point.column += c.len_utf8() as u32;
                }
            }
-
-            for buffer_row in 0..=buffer_snapshot.max_point().row {
-                let buffer_row = MultiBufferRow(buffer_row);
-                assert_eq!(
-                    blocks_snapshot.is_line_replaced(buffer_row),
-                    expected_replaced_buffer_rows.contains(&buffer_row),
-                    "incorrect is_line_replaced({:?})",
-                    buffer_row
-                );
-            }
        }
    }

--- a/crates/editor/src/display_map/crease_map.rs
+++ b/crates/editor/src/display_map/crease_map.rs
@@ -2,12 +2,12 @@ use collections::HashMap;
 use gpui::{AnyElement, IntoElement};
 use multi_buffer::{Anchor, AnchorRangeExt, MultiBufferRow, MultiBufferSnapshot, ToPoint};
 use serde::{Deserialize, Serialize};
-use std::{cmp::Ordering, fmt::Debug, ops::Range, sync::Arc};
+use std::{cmp::Ordering, ops::Range, sync::Arc};
 use sum_tree::{Bias, SeekTarget, SumTree};
 use text::Point;
 use ui::{IconName, SharedString, WindowContext};

-use crate::{BlockStyle, FoldPlaceholder, RenderBlock};
+use crate::FoldPlaceholder;

 #[derive(Copy, Clone, Default, Debug, Eq, PartialEq, PartialOrd, Ord, Hash)]
 pub struct CreaseId(usize);
@@ -45,15 +45,15 @@ impl CreaseSnapshot {
        &'a self,
        row: MultiBufferRow,
        snapshot: &'a MultiBufferSnapshot,
-    ) -> Option<&'a Crease<Anchor>> {
+    ) -> Option<&'a Crease> {
        let start = snapshot.anchor_before(Point::new(row.0, 0));
        let mut cursor = self.creases.cursor::<ItemSummary>(snapshot);
        cursor.seek(&start, Bias::Left, snapshot);
        while let Some(item) = cursor.item() {
-            match Ord::cmp(&item.crease.range().start.to_point(snapshot).row, &row.0) {
+            match Ord::cmp(&item.crease.range.start.to_point(snapshot).row, &row.0) {
                Ordering::Less => cursor.next(snapshot),
                Ordering::Equal => {
-                    if item.crease.range().start.is_valid(snapshot) {
+                    if item.crease.range.start.is_valid(snapshot) {
                        return Some(&item.crease);
                    } else {
                        cursor.next(snapshot);
@@ -69,7 +69,7 @@ impl CreaseSnapshot {
        &'a self,
        range: Range<MultiBufferRow>,
        snapshot: &'a MultiBufferSnapshot,
-    ) -> impl 'a + Iterator<Item = &'a Crease<Anchor>> {
+    ) -> impl 'a + Iterator<Item = &'a Crease> {
        let start = snapshot.anchor_before(Point::new(range.start.0, 0));
        let mut cursor = self.creases.cursor::<ItemSummary>(snapshot);
        cursor.seek(&start, Bias::Left, snapshot);
@@ -77,9 +77,8 @@ impl CreaseSnapshot {
        std::iter::from_fn(move || {
            while let Some(item) = cursor.item() {
                cursor.next(snapshot);
-                let crease_range = item.crease.range();
-                let crease_start = crease_range.start.to_point(snapshot);
-                let crease_end = crease_range.end.to_point(snapshot);
+                let crease_start = item.crease.range.start.to_point(snapshot);
+                let crease_end = item.crease.range.end.to_point(snapshot);
                if crease_end.row > range.end.0 {
                    continue;
                }
@@ -100,9 +99,8 @@ impl CreaseSnapshot {

        cursor.next(snapshot);
        while let Some(item) = cursor.item() {
-            let crease_range = item.crease.range();
-            let start_point = crease_range.start.to_point(snapshot);
-            let end_point = crease_range.end.to_point(snapshot);
+            let start_point = item.crease.range.start.to_point(snapshot);
+            let end_point = item.crease.range.end.to_point(snapshot);
            results.push((item.id, start_point..end_point));
            cursor.next(snapshot);
        }
@@ -125,22 +123,12 @@ type RenderTrailerFn =
    Arc<dyn Send + Sync + Fn(MultiBufferRow, bool, &mut WindowContext) -> AnyElement>;

 #[derive(Clone)]
-pub enum Crease<T> {
-    Inline {
-        range: Range<T>,
-        placeholder: FoldPlaceholder,
-        render_toggle: Option<RenderToggleFn>,
-        render_trailer: Option<RenderTrailerFn>,
-        metadata: Option<CreaseMetadata>,
-    },
-    Block {
-        range: Range<T>,
-        block_height: u32,
-        block_style: BlockStyle,
-        render_block: RenderBlock,
-        block_priority: usize,
-        render_toggle: Option<RenderToggleFn>,
-    },
+pub struct Crease {
+    pub range: Range<Anchor>,
+    pub placeholder: FoldPlaceholder,
+    pub render_toggle: RenderToggleFn,
+    pub render_trailer: RenderTrailerFn,
+    pub metadata: Option<CreaseMetadata>,
 }

 /// Metadata about a [`Crease`], that is used for serialization.
@@ -150,30 +138,9 @@ pub struct CreaseMetadata {
    pub label: SharedString,
 }

-impl<T> Crease<T> {
-    pub fn simple(range: Range<T>, placeholder: FoldPlaceholder) -> Self {
-        Crease::Inline {
-            range,
-            placeholder,
-            render_toggle: None,
-            render_trailer: None,
-            metadata: None,
-        }
-    }
-
-    pub fn block(range: Range<T>, height: u32, style: BlockStyle, render: RenderBlock) -> Self {
-        Self::Block {
-            range,
-            block_height: height,
-            block_style: style,
-            render_block: render,
-            block_priority: 0,
-            render_toggle: None,
-        }
-    }
-
-    pub fn inline<RenderToggle, ToggleElement, RenderTrailer, TrailerElement>(
-        range: Range<T>,
+impl Crease {
+    pub fn new<RenderToggle, ToggleElement, RenderTrailer, TrailerElement>(
+        range: Range<Anchor>,
        placeholder: FoldPlaceholder,
        render_toggle: RenderToggle,
        render_trailer: RenderTrailer,
@@ -197,76 +164,37 @@ impl<T> Crease<T> {
            + 'static,
        TrailerElement: IntoElement,
    {
-        Crease::Inline {
+        Crease {
            range,
            placeholder,
-            render_toggle: Some(Arc::new(move |row, folded, toggle, cx| {
+            render_toggle: Arc::new(move |row, folded, toggle, cx| {
                render_toggle(row, folded, toggle, cx).into_any_element()
-            })),
-            render_trailer: Some(Arc::new(move |row, folded, cx| {
+            }),
+            render_trailer: Arc::new(move |row, folded, cx| {
                render_trailer(row, folded, cx).into_any_element()
-            })),
+            }),
            metadata: None,
        }
    }

-    pub fn with_metadata(self, metadata: CreaseMetadata) -> Self {
-        match self {
-            Crease::Inline {
-                range,
-                placeholder,
-                render_toggle,
-                render_trailer,
-                ..
-            } => Crease::Inline {
-                range,
-                placeholder,
-                render_toggle,
-                render_trailer,
-                metadata: Some(metadata),
-            },
-            Crease::Block { .. } => self,
-        }
-    }
-
-    pub fn range(&self) -> &Range<T> {
-        match self {
-            Crease::Inline { range, .. } => range,
-            Crease::Block { range, .. } => range,
-        }
+    pub fn with_metadata(mut self, metadata: CreaseMetadata) -> Self {
+        self.metadata = Some(metadata);
+        self
    }
 }

-impl<T> std::fmt::Debug for Crease<T>
-where
-    T: Debug,
-{
+impl std::fmt::Debug for Crease {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Crease::Inline {
-                range, metadata, ..
-            } => f
-                .debug_struct("Crease::Inline")
-                .field("range", range)
-                .field("metadata", metadata)
-                .finish_non_exhaustive(),
-            Crease::Block {
-                range,
-                block_height,
-                ..
-            } => f
-                .debug_struct("Crease::Block")
-                .field("range", range)
-                .field("height", block_height)
-                .finish_non_exhaustive(),
-        }
+        f.debug_struct("Crease")
+            .field("range", &self.range)
+            .finish()
    }
 }

 #[derive(Clone, Debug)]
 struct CreaseItem {
    id: CreaseId,
-    crease: Crease<Anchor>,
+    crease: Crease,
 }

 impl CreaseMap {
@@ -276,7 +204,7 @@ impl CreaseMap {

    pub fn insert(
        &mut self,
-        creases: impl IntoIterator<Item = Crease<Anchor>>,
+        creases: impl IntoIterator<Item = Crease>,
        snapshot: &MultiBufferSnapshot,
    ) -> Vec<CreaseId> {
        let mut new_ids = Vec::new();
@@ -284,12 +212,11 @@ impl CreaseMap {
            let mut new_creases = SumTree::new(snapshot);
            let mut cursor = self.snapshot.creases.cursor::<ItemSummary>(snapshot);
            for crease in creases {
-                let crease_range = crease.range().clone();
-                new_creases.append(cursor.slice(&crease_range, Bias::Left, snapshot), snapshot);
+                new_creases.append(cursor.slice(&crease.range, Bias::Left, snapshot), snapshot);

                let id = self.next_id;
                self.next_id.0 += 1;
-                self.id_to_range.insert(id, crease_range);
+                self.id_to_range.insert(id, crease.range.clone());
                new_creases.push(CreaseItem { crease, id }, snapshot);
                new_ids.push(id);
            }
@@ -366,7 +293,7 @@ impl sum_tree::Item for CreaseItem {

    fn summary(&self, _cx: &MultiBufferSnapshot) -> Self::Summary {
        ItemSummary {
-            range: self.crease.range().clone(),
+            range: self.crease.range.clone(),
        }
    }
 }
@@ -399,13 +326,13 @@ mod test {

        // Insert creases
        let creases = [
-            Crease::inline(
+            Crease::new(
                snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
                |_row, _folded, _cx| div(),
            ),
-            Crease::inline(
+            Crease::new(
                snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_after(Point::new(3, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
@@ -445,19 +372,19 @@ mod test {
        let mut crease_map = CreaseMap::new(&snapshot);

        let creases = [
-            Crease::inline(
+            Crease::new(
                snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
                |_row, _folded, _cx| div(),
            ),
-            Crease::inline(
+            Crease::new(
                snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_after(Point::new(3, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
                |_row, _folded, _cx| div(),
            ),
-            Crease::inline(
+            Crease::new(
                snapshot.anchor_before(Point::new(5, 0))..snapshot.anchor_after(Point::new(5, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
@@ -475,12 +402,12 @@ mod test {
        let range = MultiBufferRow(2)..MultiBufferRow(5);
        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
        assert_eq!(creases.len(), 1);
-        assert_eq!(creases[0].range().start.to_point(&snapshot).row, 3);
+        assert_eq!(creases[0].range.start.to_point(&snapshot).row, 3);

        let range = MultiBufferRow(0)..MultiBufferRow(2);
        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
        assert_eq!(creases.len(), 1);
-        assert_eq!(creases[0].range().start.to_point(&snapshot).row, 1);
+        assert_eq!(creases[0].range.start.to_point(&snapshot).row, 1);

        let range = MultiBufferRow(6)..MultiBufferRow(7);
        let creases: Vec<_> = crease_snapshot.creases_in_range(range, &snapshot).collect();
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
--- a/crates/editor/src/editor_settings.rs
+++ b/crates/editor/src/editor_settings.rs
@@ -279,7 +279,7 @@ pub struct EditorSettingsContent {

    /// Whether to show the signature help pop-up after completions or bracket pairs inserted.
    ///
-    /// Default: false
+    /// Default: true
    pub show_signature_help_after_edits: Option<bool>,

    /// Jupyter REPL settings.
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -596,10 +596,10 @@ fn test_clone(cx: &mut TestAppContext) {

    _ = editor.update(cx, |editor, cx| {
        editor.change_selections(None, cx, |s| s.select_ranges(selection_ranges.clone()));
-        editor.fold_creases(
-            vec![
-                Crease::simple(Point::new(1, 0)..Point::new(2, 0), FoldPlaceholder::test()),
-                Crease::simple(Point::new(3, 0)..Point::new(4, 0), FoldPlaceholder::test()),
+        editor.fold_ranges(
+            [
+                (Point::new(1, 0)..Point::new(2, 0), FoldPlaceholder::test()),
+                (Point::new(3, 0)..Point::new(4, 0), FoldPlaceholder::test()),
            ],
            true,
            cx,
@@ -1283,11 +1283,11 @@ fn test_move_cursor_multibyte(cx: &mut TestAppContext) {
    assert_eq!('α'.len_utf8(), 2);

    _ = view.update(cx, |view, cx| {
-        view.fold_creases(
+        view.fold_ranges(
            vec![
-                Crease::simple(Point::new(0, 6)..Point::new(0, 12), FoldPlaceholder::test()),
-                Crease::simple(Point::new(1, 2)..Point::new(1, 4), FoldPlaceholder::test()),
-                Crease::simple(Point::new(2, 4)..Point::new(2, 8), FoldPlaceholder::test()),
+                (Point::new(0, 6)..Point::new(0, 12), FoldPlaceholder::test()),
+                (Point::new(1, 2)..Point::new(1, 4), FoldPlaceholder::test()),
+                (Point::new(2, 4)..Point::new(2, 8), FoldPlaceholder::test()),
            ],
            true,
            cx,
@@ -1398,15 +1398,6 @@ fn test_move_cursor_different_line_lengths(cx: &mut TestAppContext) {
        view.change_selections(None, cx, |s| {
            s.select_display_ranges([empty_range(0, "ⓐⓑⓒⓓⓔ".len())]);
        });
-
-        // moving above start of document should move selection to start of document,
-        // but the next move down should still be at the original goal_x
-        view.move_up(&MoveUp, cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            &[empty_range(0, "".len())]
-        );
-
        view.move_down(&MoveDown, cx);
        assert_eq!(
            view.selections.display_ranges(cx),
@@ -1431,25 +1422,6 @@ fn test_move_cursor_different_line_lengths(cx: &mut TestAppContext) {
            &[empty_range(4, "ⓐⓑⓒⓓⓔ".len())]
        );

-        // moving past end of document should not change goal_x
-        view.move_down(&MoveDown, cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            &[empty_range(5, "".len())]
-        );
-
-        view.move_down(&MoveDown, cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            &[empty_range(5, "".len())]
-        );
-
-        view.move_up(&MoveUp, cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            &[empty_range(4, "ⓐⓑⓒⓓⓔ".len())]
-        );
-
        view.move_up(&MoveUp, cx);
        assert_eq!(
            view.selections.display_ranges(cx),
@@ -3903,11 +3875,11 @@ fn test_move_line_up_down(cx: &mut TestAppContext) {
        build_editor(buffer, cx)
    });
    _ = view.update(cx, |view, cx| {
-        view.fold_creases(
+        view.fold_ranges(
            vec![
-                Crease::simple(Point::new(0, 2)..Point::new(1, 2), FoldPlaceholder::test()),
-                Crease::simple(Point::new(2, 3)..Point::new(4, 1), FoldPlaceholder::test()),
-                Crease::simple(Point::new(7, 0)..Point::new(8, 4), FoldPlaceholder::test()),
+                (Point::new(0, 2)..Point::new(1, 2), FoldPlaceholder::test()),
+                (Point::new(2, 3)..Point::new(4, 1), FoldPlaceholder::test()),
+                (Point::new(7, 0)..Point::new(8, 4), FoldPlaceholder::test()),
            ],
            true,
            cx,
@@ -4008,7 +3980,7 @@ fn test_move_line_up_down_with_blocks(cx: &mut TestAppContext) {
                style: BlockStyle::Fixed,
                placement: BlockPlacement::Below(snapshot.anchor_after(Point::new(2, 0))),
                height: 1,
-                render: Arc::new(|_| div().into_any()),
+                render: Box::new(|_| div().into_any()),
                priority: 0,
            }],
            Some(Autoscroll::fit()),
@@ -4050,7 +4022,7 @@ async fn test_selections_and_replace_blocks(cx: &mut TestAppContext) {
                placement,
                height: 4,
                style: BlockStyle::Sticky,
-                render: Arc::new(|_| gpui::div().into_any_element()),
+                render: Box::new(|_| gpui::div().into_any_element()),
                priority: 0,
            }],
            None,
@@ -4233,7 +4205,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
        "},
        indoc! {"
-            // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
+            // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
            // auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam
            // tincidunt hendrerit. Praesent semper egestas tellus id dignissim.
@@ -4242,7 +4214,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            // et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum
            // dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu
            // viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis
-            // porttitor id. Aliquam id accumsan eros.
+            // porttitor id. Aliquam id accumsan eros.ˇ
        "},
        language_with_c_comments.clone(),
        &mut cx,
@@ -4254,7 +4226,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            «// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.ˇ»
        "},
        indoc! {"
-            «// Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
+            // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
            // auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam
            // tincidunt hendrerit. Praesent semper egestas tellus id dignissim.
@@ -4263,7 +4235,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            // et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum
            // dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu
            // viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis
-            // porttitor id. Aliquam id accumsan eros.ˇ»
+            // porttitor id. Aliquam id accumsan eros.ˇ
        "},
        language_with_c_comments.clone(),
        &mut cx,
@@ -4278,16 +4250,16 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            // ˇblandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
        "},
        indoc! {"
-            // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. ˇVivamus mollis elit
+            // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
-            // auctor, eu lacinia sapien scelerisque. ˇVivamus sit amet neque et quam
+            // auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam
            // tincidunt hendrerit. Praesent semper egestas tellus id dignissim.
-            // Pellentesque odio lectus, iaculis ac volutpat et, ˇblandit quis urna. Sed
+            // Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed
            // vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam,
            // et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum
            // dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu
            // viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis
-            // porttitor id. Aliquam id accumsan eros.
+            // porttitor id. Aliquam id accumsan eros.ˇ
        "},
        language_with_c_comments.clone(),
        &mut cx,
@@ -4303,17 +4275,17 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            // ˇblandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
        "},
        indoc! {"
-            // ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. ˇVivamus mollis elit
+            // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            // purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus
-            // auctor, eu lacinia sapien scelerisque.
+            // auctor, eu lacinia sapien scelerisque.ˇ
            //
-            // ˇVivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas
+            // Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas
            // tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et,
-            // ˇblandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec
+            // blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec
            // molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque
            // nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas
            // porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id
-            // vulputate turpis porttitor id. Aliquam id accumsan eros.
+            // vulputate turpis porttitor id. Aliquam id accumsan eros.ˇ
        "},
        language_with_c_comments.clone(),
        &mut cx,
@@ -4325,7 +4297,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            # ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis. Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id accumsan eros.
        "},
        indoc! {"
-            # ˇLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
+            # Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            # purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor,
            # eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt
            # hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio
@@ -4334,7 +4306,7 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            # in. Integer sit amet scelerisque nisi. Lorem ipsum dolor sit amet, consectetur
            # adipiscing elit. Cras egestas porta metus, eu viverra ipsum efficitur quis.
            # Donec luctus eros turpis, id vulputate turpis porttitor id. Aliquam id
-            # accumsan eros.
+            # accumsan eros.ˇ
        "},
        language_with_pound_comments.clone(),
        &mut cx,
@@ -4370,13 +4342,13 @@ async fn test_rewrap(cx: &mut TestAppContext) {
        indoc! {"
            # Hello

-            Lorem ipsum dolor sit amet, ˇconsectetur adipiscing elit. Vivamus mollis elit
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor,
            eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt
            hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio
            lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet
            nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in.
-            Integer sit amet scelerisque nisi.
+            Integer sit amet scelerisque nisi.ˇ
        "},
        markdown_language,
        &mut cx,
@@ -4387,13 +4359,13 @@ async fn test_rewrap(cx: &mut TestAppContext) {
            Lorem ipsum dolor sit amet, ˇconsectetur adipiscing elit. Vivamus mollis elit purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor, eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in. Integer sit amet scelerisque nisi.
        "},
        indoc! {"
-            Lorem ipsum dolor sit amet, ˇconsectetur adipiscing elit. Vivamus mollis elit
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus mollis elit
            purus, a ornare lacus gravida vitae. Proin consectetur felis vel purus auctor,
            eu lacinia sapien scelerisque. Vivamus sit amet neque et quam tincidunt
            hendrerit. Praesent semper egestas tellus id dignissim. Pellentesque odio
            lectus, iaculis ac volutpat et, blandit quis urna. Sed vestibulum nisi sit amet
            nisl venenatis tempus. Donec molestie blandit quam, et porta nunc laoreet in.
-            Integer sit amet scelerisque nisi.
+            Integer sit amet scelerisque nisi.ˇ
        "},
        plaintext_language,
        &mut cx,
@@ -4415,9 +4387,9 @@ async fn test_rewrap(cx: &mut TestAppContext) {
        indoc! {"
            fn foo() {
                if true {
-            «        // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
+                    // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
                    // mollis elit purus, a ornare lacus gravida vitae. Praesent semper
-                    // egestas tellus id dignissim.ˇ»
+                    // egestas tellus id dignissim.ˇ
                    do_something();
                } else {
                    //
@@ -4444,9 +4416,9 @@ async fn test_rewrap(cx: &mut TestAppContext) {
        indoc! {"
            fn foo() {
                if true {
-            «ˇ        // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
+                    // Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus
                    // mollis elit purus, a ornare lacus gravida vitae. Praesent semper
-                    // egestas tellus id dignissim.»
+                    // egestas tellus id dignissim.ˇ
                    do_something();
                } else {
                    //
@@ -4745,11 +4717,11 @@ fn test_split_selection_into_lines(cx: &mut TestAppContext) {
        build_editor(buffer, cx)
    });
    _ = view.update(cx, |view, cx| {
-        view.fold_creases(
+        view.fold_ranges(
            vec![
-                Crease::simple(Point::new(0, 2)..Point::new(1, 2), FoldPlaceholder::test()),
-                Crease::simple(Point::new(2, 3)..Point::new(4, 1), FoldPlaceholder::test()),
-                Crease::simple(Point::new(7, 0)..Point::new(8, 4), FoldPlaceholder::test()),
+                (Point::new(0, 2)..Point::new(1, 2), FoldPlaceholder::test()),
+                (Point::new(2, 3)..Point::new(4, 1), FoldPlaceholder::test()),
+                (Point::new(7, 0)..Point::new(8, 4), FoldPlaceholder::test()),
            ],
            true,
            cx,
@@ -5426,13 +5398,13 @@ async fn test_select_larger_smaller_syntax_node(cx: &mut gpui::TestAppContext) {
    // Ensure that we keep expanding the selection if the larger selection starts or ends within
    // a fold.
    editor.update(cx, |view, cx| {
-        view.fold_creases(
+        view.fold_ranges(
            vec![
-                Crease::simple(
+                (
                    Point::new(0, 21)..Point::new(0, 24),
                    FoldPlaceholder::test(),
                ),
-                Crease::simple(
+                (
                    Point::new(3, 20)..Point::new(3, 22),
                    FoldPlaceholder::test(),
                ),
@@ -6579,45 +6551,6 @@ async fn test_auto_replace_emoji_shortcode(cx: &mut gpui::TestAppContext) {
    });
 }

-#[gpui::test]
-async fn test_snippet_placeholder_choices(cx: &mut gpui::TestAppContext) {
-    init_test(cx, |_| {});
-
-    let (text, insertion_ranges) = marked_text_ranges(
-        indoc! {"
-            ˇ
-        "},
-        false,
-    );
-
-    let buffer = cx.update(|cx| MultiBuffer::build_simple(&text, cx));
-    let (editor, cx) = cx.add_window_view(|cx| build_editor(buffer, cx));
-
-    _ = editor.update(cx, |editor, cx| {
-        let snippet = Snippet::parse("type ${1|,i32,u32|} = $2").unwrap();
-
-        editor
-            .insert_snippet(&insertion_ranges, snippet, cx)
-            .unwrap();
-
-        fn assert(editor: &mut Editor, cx: &mut ViewContext<Editor>, marked_text: &str) {
-            let (expected_text, selection_ranges) = marked_text_ranges(marked_text, false);
-            assert_eq!(editor.text(cx), expected_text);
-            assert_eq!(editor.selections.ranges::<usize>(cx), selection_ranges);
-        }
-
-        assert(
-            editor,
-            cx,
-            indoc! {"
-            type «» =•
-            "},
-        );
-
-        assert!(editor.context_menu_visible(), "There should be a matches");
-    });
-}
-
 #[gpui::test]
 async fn test_snippets(cx: &mut gpui::TestAppContext) {
    init_test(cx, |_| {});
@@ -13206,7 +13139,7 @@ fn test_crease_insertion_and_rendering(cx: &mut TestAppContext) {
                callback: Arc<dyn Fn(bool, &mut WindowContext) + Send + Sync>,
            }

-            let crease = Crease::inline(
+            let crease = Crease::new(
                range,
                FoldPlaceholder::test(),
                {
@@ -13225,8 +13158,7 @@ fn test_crease_insertion_and_rendering(cx: &mut TestAppContext) {

            editor.insert_creases(Some(crease), cx);
            let snapshot = editor.snapshot(cx);
-            let _div =
-                snapshot.render_crease_toggle(MultiBufferRow(1), false, cx.view().clone(), cx);
+            let _div = snapshot.render_fold_toggle(MultiBufferRow(1), false, cx.view().clone(), cx);
            snapshot
        })
        .unwrap();
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -16,8 +16,8 @@ use crate::{
    items::BufferSearchHighlights,
    mouse_context_menu::{self, MenuPosition, MouseContextMenu},
    scroll::scroll_amount::ScrollAmount,
-    BlockId, ChunkReplacement, CodeActionsMenu, CursorShape, CustomBlockId, DisplayPoint,
-    DisplayRow, DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode, EditorSettings,
+    BlockId, CodeActionsMenu, CursorShape, CustomBlockId, DisplayPoint, DisplayRow,
+    DocumentHighlightRead, DocumentHighlightWrite, Editor, EditorMode, EditorSettings,
    EditorSnapshot, EditorStyle, ExpandExcerpts, FocusedBlock, GutterDimensions, HalfPageDown,
    HalfPageUp, HandleInput, HoveredCursor, HoveredHunk, JumpData, LineDown, LineUp, OpenExcerpts,
    PageDown, PageUp, Point, RowExt, RowRangeExt, SelectPhase, Selection, SoftWrap, ToPoint,
@@ -34,8 +34,8 @@ use gpui::{
    FontId, GlobalElementId, Hitbox, Hsla, InteractiveElement, IntoElement, Length,
    ModifiersChangedEvent, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, PaintQuad,
    ParentElement, Pixels, ScrollDelta, ScrollWheelEvent, ShapedLine, SharedString, Size,
-    StatefulInteractiveElement, Style, Styled, TextRun, TextStyleRefinement, View, ViewContext,
-    WeakView, WindowContext,
+    StatefulInteractiveElement, Style, Styled, TextRun, TextStyle, TextStyleRefinement, View,
+    ViewContext, WeakView, WindowContext,
 };
 use gpui::{ClickEvent, Subscription};
 use itertools::Itertools;
@@ -217,8 +217,6 @@ impl EditorElement {
        register_action(view, cx, Editor::transpose);
        register_action(view, cx, Editor::rewrap);
        register_action(view, cx, Editor::cut);
-        register_action(view, cx, Editor::kill_ring_cut);
-        register_action(view, cx, Editor::kill_ring_yank);
        register_action(view, cx, Editor::copy);
        register_action(view, cx, Editor::paste);
        register_action(view, cx, Editor::undo);
@@ -1229,9 +1227,9 @@ impl EditorElement {
    }

    #[allow(clippy::too_many_arguments)]
-    fn prepaint_crease_toggles(
+    fn prepaint_gutter_fold_toggles(
        &self,
-        crease_toggles: &mut [Option<AnyElement>],
+        toggles: &mut [Option<AnyElement>],
        line_height: Pixels,
        gutter_dimensions: &GutterDimensions,
        gutter_settings: crate::editor_settings::Gutter,
@@ -1239,25 +1237,25 @@ impl EditorElement {
        gutter_hitbox: &Hitbox,
        cx: &mut WindowContext,
    ) {
-        for (ix, crease_toggle) in crease_toggles.iter_mut().enumerate() {
-            if let Some(crease_toggle) = crease_toggle {
+        for (ix, fold_indicator) in toggles.iter_mut().enumerate() {
+            if let Some(fold_indicator) = fold_indicator {
                debug_assert!(gutter_settings.folds);
                let available_space = size(
                    AvailableSpace::MinContent,
                    AvailableSpace::Definite(line_height * 0.55),
                );
-                let crease_toggle_size = crease_toggle.layout_as_root(available_space, cx);
+                let fold_indicator_size = fold_indicator.layout_as_root(available_space, cx);

                let position = point(
                    gutter_dimensions.width - gutter_dimensions.right_padding,
                    ix as f32 * line_height - (scroll_pixel_position.y % line_height),
                );
                let centering_offset = point(
-                    (gutter_dimensions.fold_area_width() - crease_toggle_size.width) / 2.,
-                    (line_height - crease_toggle_size.height) / 2.,
+                    (gutter_dimensions.fold_area_width() - fold_indicator_size.width) / 2.,
+                    (line_height - fold_indicator_size.height) / 2.,
                );
                let origin = gutter_hitbox.origin + position + centering_offset;
-                crease_toggle.prepaint_as_root(origin, available_space, cx);
+                fold_indicator.prepaint_as_root(origin, available_space, cx);
            }
        }
    }
@@ -1414,7 +1412,7 @@ impl EditorElement {
    }

    #[allow(clippy::too_many_arguments)]
-    fn layout_active_line_trailer(
+    fn layout_inline_blame(
        &self,
        display_row: DisplayRow,
        display_snapshot: &DisplaySnapshot,
@@ -1426,71 +1424,61 @@ impl EditorElement {
        line_height: Pixels,
        cx: &mut WindowContext,
    ) -> Option<AnyElement> {
-        let render_inline_blame = self
+        if !self
            .editor
-            .update(cx, |editor, cx| editor.render_git_blame_inline(cx));
-        if render_inline_blame {
-            let workspace = self
-                .editor
-                .read(cx)
-                .workspace
-                .as_ref()
-                .map(|(w, _)| w.clone());
-
-            let display_point = DisplayPoint::new(display_row, 0);
-            let buffer_row = MultiBufferRow(display_point.to_point(display_snapshot).row);
-
-            let blame = self.editor.read(cx).blame.clone()?;
-            let blame_entry = blame
-                .update(cx, |blame, cx| {
-                    blame.blame_for_rows([Some(buffer_row)], cx).next()
-                })
-                .flatten()?;
-
-            let mut element =
-                render_inline_blame_entry(&blame, blame_entry, &self.style, workspace, cx);
-
-            let start_y = content_origin.y
-                + line_height * (display_row.as_f32() - scroll_pixel_position.y / line_height);
-
-            let start_x = {
-                const INLINE_BLAME_PADDING_EM_WIDTHS: f32 = 6.;
-
-                let line_end = if let Some(crease_trailer) = crease_trailer {
-                    crease_trailer.bounds.right()
-                } else {
-                    content_origin.x - scroll_pixel_position.x + line_layout.width
-                };
-                let padded_line_end = line_end + em_width * INLINE_BLAME_PADDING_EM_WIDTHS;
-
-                let min_column_in_pixels = ProjectSettings::get_global(cx)
-                    .git
-                    .inline_blame
-                    .and_then(|settings| settings.min_column)
-                    .map(|col| self.column_pixels(col as usize, cx))
-                    .unwrap_or(px(0.));
-                let min_start = content_origin.x - scroll_pixel_position.x + min_column_in_pixels;
-
-                cmp::max(padded_line_end, min_start)
-            };
-
-            let absolute_offset = point(start_x, start_y);
-            element.prepaint_as_root(absolute_offset, AvailableSpace::min_size(), cx);
-
-            Some(element)
-        } else if let Some(mut element) = self.editor.update(cx, |editor, cx| {
-            editor.render_active_line_trailer(&self.style, cx)
-        }) {
-            let start_y = content_origin.y
-                + line_height * (display_row.as_f32() - scroll_pixel_position.y / line_height);
-            let start_x = content_origin.x - scroll_pixel_position.x + em_width;
-            let absolute_offset = point(start_x, start_y);
-            element.prepaint_as_root(absolute_offset, AvailableSpace::min_size(), cx);
-
-            Some(element)
-        } else {
-            None
+            .update(cx, |editor, cx| editor.render_git_blame_inline(cx))
+        {
+            return None;
        }
+
+        let workspace = self
+            .editor
+            .read(cx)
+            .workspace
+            .as_ref()
+            .map(|(w, _)| w.clone());
+
+        let display_point = DisplayPoint::new(display_row, 0);
+        let buffer_row = MultiBufferRow(display_point.to_point(display_snapshot).row);
+
+        let blame = self.editor.read(cx).blame.clone()?;
+        let blame_entry = blame
+            .update(cx, |blame, cx| {
+                blame.blame_for_rows([Some(buffer_row)], cx).next()
+            })
+            .flatten()?;
+
+        let mut element =
+            render_inline_blame_entry(&blame, blame_entry, &self.style, workspace, cx);
+
+        let start_y = content_origin.y
+            + line_height * (display_row.as_f32() - scroll_pixel_position.y / line_height);
+
+        let start_x = {
+            const INLINE_BLAME_PADDING_EM_WIDTHS: f32 = 6.;
+
+            let line_end = if let Some(crease_trailer) = crease_trailer {
+                crease_trailer.bounds.right()
+            } else {
+                content_origin.x - scroll_pixel_position.x + line_layout.width
+            };
+            let padded_line_end = line_end + em_width * INLINE_BLAME_PADDING_EM_WIDTHS;
+
+            let min_column_in_pixels = ProjectSettings::get_global(cx)
+                .git
+                .inline_blame
+                .and_then(|settings| settings.min_column)
+                .map(|col| self.column_pixels(col as usize, cx))
+                .unwrap_or(px(0.));
+            let min_start = content_origin.x - scroll_pixel_position.x + min_column_in_pixels;
+
+            cmp::max(padded_line_end, min_start)
+        };
+
+        let absolute_offset = point(start_x, start_y);
+        element.prepaint_as_root(absolute_offset, AvailableSpace::min_size(), cx);
+
+        Some(element)
    }

    #[allow(clippy::too_many_arguments)]
@@ -1927,7 +1915,7 @@ impl EditorElement {
            .collect()
    }

-    fn layout_crease_toggles(
+    fn layout_gutter_fold_toggles(
        &self,
        rows: Range<DisplayRow>,
        buffer_rows: impl IntoIterator<Item = Option<MultiBufferRow>>,
@@ -1946,7 +1934,7 @@ impl EditorElement {
                    if let Some(multibuffer_row) = row {
                        let display_row = DisplayRow(rows.start.0 + ix as u32);
                        let active = active_rows.contains_key(&display_row);
-                        snapshot.render_crease_toggle(
+                        snapshot.render_fold_toggle(
                            multibuffer_row,
                            active,
                            self.editor.clone(),
@@ -2031,7 +2019,7 @@ impl EditorElement {
            let chunks = snapshot.highlighted_chunks(rows.clone(), true, style);
            LineWithInvisibles::from_chunks(
                chunks,
-                &style,
+                &style.text,
                MAX_LINE_LEN,
                rows.len(),
                snapshot.mode,
@@ -2134,7 +2122,9 @@ impl EditorElement {
                        max_width: text_hitbox.size.width.max(*scroll_width),
                        editor_style: &self.style,
                    }))
-                    .into_any()
+                    .cursor(CursorStyle::Arrow)
+                    .on_mouse_down(MouseButton::Left, |_, cx| cx.stop_propagation())
+                    .into_any_element()
            }

            Block::ExcerptBoundary {
@@ -3364,9 +3354,9 @@ impl EditorElement {

    fn paint_gutter_indicators(&self, layout: &mut EditorLayout, cx: &mut WindowContext) {
        cx.paint_layer(layout.gutter_hitbox.bounds, |cx| {
-            cx.with_element_namespace("crease_toggles", |cx| {
-                for crease_toggle in layout.crease_toggles.iter_mut().flatten() {
-                    crease_toggle.paint(cx);
+            cx.with_element_namespace("gutter_fold_toggles", |cx| {
+                for fold_indicator in layout.gutter_fold_toggles.iter_mut().flatten() {
+                    fold_indicator.paint(cx);
                }
            });

@@ -3466,7 +3456,7 @@ impl EditorElement {
                self.paint_lines(&invisible_display_ranges, layout, cx);
                self.paint_redactions(layout, cx);
                self.paint_cursors(layout, cx);
-                self.paint_active_line_trailer(layout, cx);
+                self.paint_inline_blame(layout, cx);
                cx.with_element_namespace("crease_trailers", |cx| {
                    for trailer in layout.crease_trailers.iter_mut().flatten() {
                        trailer.element.paint(cx);
@@ -3948,10 +3938,10 @@ impl EditorElement {
        }
    }

-    fn paint_active_line_trailer(&mut self, layout: &mut EditorLayout, cx: &mut WindowContext) {
-        if let Some(mut element) = layout.active_line_trailer.take() {
+    fn paint_inline_blame(&mut self, layout: &mut EditorLayout, cx: &mut WindowContext) {
+        if let Some(mut inline_blame) = layout.inline_blame.take() {
            cx.paint_layer(layout.text_hitbox.bounds, |cx| {
-                element.paint(cx);
+                inline_blame.paint(cx);
            })
        }
    }
@@ -4384,7 +4374,7 @@ impl LineWithInvisibles {
    #[allow(clippy::too_many_arguments)]
    fn from_chunks<'a>(
        chunks: impl Iterator<Item = HighlightedChunk<'a>>,
-        editor_style: &EditorStyle,
+        text_style: &TextStyle,
        max_line_len: usize,
        max_line_count: usize,
        editor_mode: EditorMode,
@@ -4392,7 +4382,6 @@ impl LineWithInvisibles {
        is_row_soft_wrapped: impl Copy + Fn(usize) -> bool,
        cx: &mut WindowContext,
    ) -> Vec<Self> {
-        let text_style = &editor_style.text;
        let mut layouts = Vec::with_capacity(max_line_count);
        let mut fragments: SmallVec<[LineFragment; 1]> = SmallVec::new();
        let mut line = String::new();
@@ -4411,9 +4400,9 @@ impl LineWithInvisibles {
            text: "\n",
            style: None,
            is_tab: false,
-            replacement: None,
+            renderer: None,
        }]) {
-            if let Some(replacement) = highlighted_chunk.replacement {
+            if let Some(renderer) = highlighted_chunk.renderer {
                if !line.is_empty() {
                    let shaped_line = cx
                        .text_system()
@@ -4426,71 +4415,42 @@ impl LineWithInvisibles {
                    styles.clear();
                }

-                match replacement {
-                    ChunkReplacement::Renderer(renderer) => {
-                        let available_width = if renderer.constrain_width {
-                            let chunk = if highlighted_chunk.text == ellipsis.as_ref() {
-                                ellipsis.clone()
-                            } else {
-                                SharedString::from(Arc::from(highlighted_chunk.text))
-                            };
-                            let shaped_line = cx
-                                .text_system()
-                                .shape_line(
-                                    chunk,
-                                    font_size,
-                                    &[text_style.to_run(highlighted_chunk.text.len())],
-                                )
-                                .unwrap();
-                            AvailableSpace::Definite(shaped_line.width)
-                        } else {
-                            AvailableSpace::MinContent
-                        };
+                let available_width = if renderer.constrain_width {
+                    let chunk = if highlighted_chunk.text == ellipsis.as_ref() {
+                        ellipsis.clone()
+                    } else {
+                        SharedString::from(Arc::from(highlighted_chunk.text))
+                    };
+                    let shaped_line = cx
+                        .text_system()
+                        .shape_line(
+                            chunk,
+                            font_size,
+                            &[text_style.to_run(highlighted_chunk.text.len())],
+                        )
+                        .unwrap();
+                    AvailableSpace::Definite(shaped_line.width)
+                } else {
+                    AvailableSpace::MinContent
+                };

-                        let mut element = (renderer.render)(&mut ChunkRendererContext {
-                            context: cx,
-                            max_width: text_width,
-                        });
-                        let line_height = text_style.line_height_in_pixels(cx.rem_size());
-                        let size = element.layout_as_root(
-                            size(available_width, AvailableSpace::Definite(line_height)),
-                            cx,
-                        );
+                let mut element = (renderer.render)(&mut ChunkRendererContext {
+                    context: cx,
+                    max_width: text_width,
+                });
+                let line_height = text_style.line_height_in_pixels(cx.rem_size());
+                let size = element.layout_as_root(
+                    size(available_width, AvailableSpace::Definite(line_height)),
+                    cx,
+                );

-                        width += size.width;
-                        len += highlighted_chunk.text.len();
-                        fragments.push(LineFragment::Element {
-                            element: Some(element),
-                            size,
-                            len: highlighted_chunk.text.len(),
-                        });
-                    }
-                    ChunkReplacement::Str(x) => {
-                        let text_style = if let Some(style) = highlighted_chunk.style {
-                            Cow::Owned(text_style.clone().highlight(style))
-                        } else {
-                            Cow::Borrowed(text_style)
-                        };
-
-                        let run = TextRun {
-                            len: x.len(),
-                            font: text_style.font(),
-                            color: text_style.color,
-                            background_color: text_style.background_color,
-                            underline: text_style.underline,
-                            strikethrough: text_style.strikethrough,
-                        };
-                        let line_layout = cx
-                            .text_system()
-                            .shape_line(x, font_size, &[run])
-                            .unwrap()
-                            .with_len(highlighted_chunk.text.len());
-
-                        width += line_layout.width;
-                        len += highlighted_chunk.text.len();
-                        fragments.push(LineFragment::Text(line_layout))
-                    }
-                }
+                width += size.width;
+                len += highlighted_chunk.text.len();
+                fragments.push(LineFragment::Element {
+                    element: Some(element),
+                    size,
+                    len: highlighted_chunk.text.len(),
+                });
            } else {
                for (ix, mut line_chunk) in highlighted_chunk.text.split('\n').enumerate() {
                    if ix > 0 {
@@ -5207,15 +5167,16 @@ impl Element for EditorElement {
                        cx,
                    );

-                    let mut crease_toggles = cx.with_element_namespace("crease_toggles", |cx| {
-                        self.layout_crease_toggles(
-                            start_row..end_row,
-                            buffer_rows.iter().copied(),
-                            &active_rows,
-                            &snapshot,
-                            cx,
-                        )
-                    });
+                    let mut gutter_fold_toggles =
+                        cx.with_element_namespace("gutter_fold_toggles", |cx| {
+                            self.layout_gutter_fold_toggles(
+                                start_row..end_row,
+                                buffer_rows.iter().copied(),
+                                &active_rows,
+                                &snapshot,
+                                cx,
+                            )
+                        });
                    let crease_trailers = cx.with_element_namespace("crease_trailers", |cx| {
                        self.layout_crease_trailers(buffer_rows.iter().copied(), &snapshot, cx)
                    });
@@ -5343,14 +5304,14 @@ impl Element for EditorElement {
                        )
                    });

-                    let mut active_line_trailer = None;
+                    let mut inline_blame = None;
                    if let Some(newest_selection_head) = newest_selection_head {
                        let display_row = newest_selection_head.row();
                        if (start_row..end_row).contains(&display_row) {
                            let line_ix = display_row.minus(start_row) as usize;
                            let line_layout = &line_layouts[line_ix];
                            let crease_trailer_layout = crease_trailers[line_ix].as_ref();
-                            active_line_trailer = self.layout_active_line_trailer(
+                            inline_blame = self.layout_inline_blame(
                                display_row,
                                &snapshot.display_snapshot,
                                line_layout,
@@ -5595,9 +5556,9 @@ impl Element for EditorElement {
                    let mouse_context_menu =
                        self.layout_mouse_context_menu(&snapshot, start_row..end_row, cx);

-                    cx.with_element_namespace("crease_toggles", |cx| {
-                        self.prepaint_crease_toggles(
-                            &mut crease_toggles,
+                    cx.with_element_namespace("gutter_fold_toggles", |cx| {
+                        self.prepaint_gutter_fold_toggles(
+                            &mut gutter_fold_toggles,
                            line_height,
                            &gutter_dimensions,
                            gutter_settings,
@@ -5669,7 +5630,7 @@ impl Element for EditorElement {
                        line_elements,
                        line_numbers,
                        blamed_display_rows,
-                        active_line_trailer,
+                        inline_blame,
                        blocks,
                        cursors,
                        visible_cursors,
@@ -5677,7 +5638,7 @@ impl Element for EditorElement {
                        mouse_context_menu,
                        test_indicators,
                        code_actions_indicator,
-                        crease_toggles,
+                        gutter_fold_toggles,
                        crease_trailers,
                        tab_invisible,
                        space_invisible,
@@ -5710,6 +5671,7 @@ impl Element for EditorElement {
            line_height: Some(self.style.text.line_height),
            ..Default::default()
        };
+        let mouse_position = cx.mouse_position();
        let hovered_hunk = layout
            .display_hunks
            .iter()
@@ -5723,7 +5685,7 @@ impl Element for EditorElement {
                } => {
                    if hunk_hitbox
                        .as_ref()
-                        .map(|hitbox| hitbox.is_hovered(cx))
+                        .map(|hitbox| hitbox.contains(&mouse_position))
                        .unwrap_or(false)
                    {
                        Some(HoveredHunk {
@@ -5806,7 +5768,7 @@ pub struct EditorLayout {
    line_numbers: Vec<Option<ShapedLine>>,
    display_hunks: Vec<(DisplayDiffHunk, Option<Hitbox>)>,
    blamed_display_rows: Option<Vec<AnyElement>>,
-    active_line_trailer: Option<AnyElement>,
+    inline_blame: Option<AnyElement>,
    blocks: Vec<BlockLayout>,
    highlighted_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
    highlighted_gutter_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
@@ -5816,7 +5778,7 @@ pub struct EditorLayout {
    selections: Vec<(PlayerColor, Vec<SelectionLayout>)>,
    code_actions_indicator: Option<AnyElement>,
    test_indicators: Vec<AnyElement>,
-    crease_toggles: Vec<Option<AnyElement>>,
+    gutter_fold_toggles: Vec<Option<AnyElement>>,
    crease_trailers: Vec<Option<CreaseTrailerLayout>>,
    mouse_context_menu: Option<AnyElement>,
    tab_invisible: ShapedLine,
@@ -6034,7 +5996,7 @@ fn layout_line(
    let chunks = snapshot.highlighted_chunks(row..row + DisplayRow(1), true, style);
    LineWithInvisibles::from_chunks(
        chunks,
-        &style,
+        &style.text,
        MAX_LINE_LEN,
        1,
        snapshot.mode,
@@ -6661,7 +6623,7 @@ mod tests {
                        style: BlockStyle::Fixed,
                        placement: BlockPlacement::Above(Anchor::min()),
                        height: 3,
-                        render: Arc::new(|cx| div().h(3. * cx.line_height()).into_any()),
+                        render: Box::new(|cx| div().h(3. * cx.line_height()).into_any()),
                        priority: 0,
                    }],
                    None,
--- a/crates/editor/src/hunk_diff.rs
+++ b/crates/editor/src/hunk_diff.rs
@@ -425,7 +425,7 @@ impl Editor {
            height: 1,
            style: BlockStyle::Sticky,
            priority: 0,
-            render: Arc::new({
+            render: Box::new({
                let editor = cx.view().clone();
                let hunk = hunk.clone();

@@ -435,7 +435,6 @@ impl Editor {

                    h_flex()
                        .id(cx.block_id)
-                        .block_mouse_down()
                        .h(cx.line_height())
                        .w_full()
                        .border_t_1()
@@ -708,13 +707,12 @@ impl Editor {
            height,
            style: BlockStyle::Flex,
            priority: 0,
-            render: Arc::new(move |cx| {
+            render: Box::new(move |cx| {
                let width = EditorElement::diff_hunk_strip_width(cx.line_height());
                let gutter_dimensions = editor.read(cx.context).gutter_dimensions;

                h_flex()
                    .id(cx.block_id)
-                    .block_mouse_down()
                    .bg(deleted_hunk_color)
                    .h(height as f32 * cx.line_height())
                    .w_full()
--- a/crates/inline_completion/src/inline_completion.rs
+++ b/crates/inline_completion/src/inline_completion.rs
@@ -1,18 +1,9 @@
+use crate::Direction;
 use gpui::{AppContext, Model, ModelContext};
 use language::Buffer;
 use std::ops::Range;
 use text::{Anchor, Rope};

-// TODO: Find a better home for `Direction`.
-//
-// This should live in an ancestor crate of `editor` and `inline_completion`,
-// but at time of writing there isn't an obvious spot.
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum Direction {
-    Prev,
-    Next,
-}
-
 pub enum InlayProposal {
    Hint(Anchor, project::InlayHint),
    Suggestion(Anchor, Rope),
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -16,10 +16,8 @@ use gpui::{
    VisualContext, WeakView, WindowContext,
 };
 use language::{
-    proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, CharKind, DiskState, Point,
-    SelectionGoal,
+    proto::serialize_anchor as serialize_text_anchor, Bias, Buffer, CharKind, Point, SelectionGoal,
 };
-use lsp::DiagnosticSeverity;
 use multi_buffer::AnchorRangeExt;
 use project::{
    lsp_store::FormatTrigger, project_settings::ProjectSettings, search::SearchQuery, Item as _,
@@ -41,7 +39,7 @@ use std::{
 };
 use text::{BufferId, Selection};
 use theme::{Theme, ThemeSettings};
-use ui::{h_flex, prelude::*, IconDecorationKind, Label};
+use ui::{h_flex, prelude::*, Label};
 use util::{paths::PathExt, ResultExt, TryFutureExt};
 use workspace::item::{BreadcrumbText, FollowEvent};
 use workspace::{
@@ -636,21 +634,12 @@ impl Item for Editor {
            Some(util::truncate_and_trailoff(description, MAX_TAB_TITLE_LEN))
        });

-        // Whether the file was saved in the past but is now deleted.
-        let was_deleted: bool = self
-            .buffer()
-            .read(cx)
-            .as_singleton()
-            .and_then(|buffer| buffer.read(cx).file())
-            .map_or(false, |file| file.disk_state() == DiskState::Deleted);
-
        h_flex()
            .gap_2()
            .child(
                Label::new(self.title(cx).to_string())
                    .color(label_color)
-                    .italic(params.preview)
-                    .strikethrough(was_deleted),
+                    .italic(params.preview),
            )
            .when_some(description, |this, description| {
                this.child(
@@ -710,10 +699,6 @@ impl Item for Editor {
        self.buffer().read(cx).read(cx).is_dirty()
    }

-    fn has_deleted_file(&self, cx: &AppContext) -> bool {
-        self.buffer().read(cx).read(cx).has_deleted_file()
-    }
-
    fn has_conflict(&self, cx: &AppContext) -> bool {
        self.buffer().read(cx).read(cx).has_conflict()
    }
@@ -841,7 +826,7 @@ impl Item for Editor {
        self.pixel_position_of_newest_cursor
    }

-    fn breadcrumb_location(&self, _: &AppContext) -> ToolbarItemLocation {
+    fn breadcrumb_location(&self) -> ToolbarItemLocation {
        if self.show_breadcrumbs {
            ToolbarItemLocation::PrimaryLeft
        } else {
@@ -1530,26 +1515,6 @@ pub fn entry_label_color(selected: bool) -> Color {
    }
 }

-pub fn entry_diagnostic_aware_icon_name_and_color(
-    diagnostic_severity: Option<DiagnosticSeverity>,
-) -> Option<(IconName, Color)> {
-    match diagnostic_severity {
-        Some(DiagnosticSeverity::ERROR) => Some((IconName::X, Color::Error)),
-        Some(DiagnosticSeverity::WARNING) => Some((IconName::Triangle, Color::Warning)),
-        _ => None,
-    }
-}
-
-pub fn entry_diagnostic_aware_icon_decoration_and_color(
-    diagnostic_severity: Option<DiagnosticSeverity>,
-) -> Option<(IconDecorationKind, Color)> {
-    match diagnostic_severity {
-        Some(DiagnosticSeverity::ERROR) => Some((IconDecorationKind::X, Color::Error)),
-        Some(DiagnosticSeverity::WARNING) => Some((IconDecorationKind::Triangle, Color::Warning)),
-        _ => None,
-    }
-}
-
 pub fn entry_git_aware_label_color(
    git_status: Option<GitFileStatus>,
    ignored: bool,
--- a/crates/editor/src/movement.rs
+++ b/crates/editor/src/movement.rs
@@ -3,7 +3,7 @@

 use super::{Bias, DisplayPoint, DisplaySnapshot, SelectionGoal, ToDisplayPoint};
 use crate::{scroll::ScrollAnchor, CharKind, DisplayRow, EditorStyle, RowExt, ToOffset, ToPoint};
-use gpui::{Pixels, WindowTextSystem};
+use gpui::{px, Pixels, WindowTextSystem};
 use language::Point;
 use multi_buffer::{MultiBufferRow, MultiBufferSnapshot};
 use serde::Deserialize;
@@ -120,7 +120,7 @@ pub(crate) fn up_by_rows(
    preserve_column_at_start: bool,
    text_layout_details: &TextLayoutDetails,
 ) -> (DisplayPoint, SelectionGoal) {
-    let goal_x = match goal {
+    let mut goal_x = match goal {
        SelectionGoal::HorizontalPosition(x) => x.into(),
        SelectionGoal::WrappedHorizontalPosition((_, x)) => x.into(),
        SelectionGoal::HorizontalRange { end, .. } => end.into(),
@@ -138,6 +138,7 @@ pub(crate) fn up_by_rows(
        return (start, goal);
    } else {
        point = DisplayPoint::new(DisplayRow(0), 0);
+        goal_x = px(0.);
    }

    let mut clipped_point = map.clip_point(point, Bias::Left);
@@ -158,7 +159,7 @@ pub(crate) fn down_by_rows(
    preserve_column_at_end: bool,
    text_layout_details: &TextLayoutDetails,
 ) -> (DisplayPoint, SelectionGoal) {
-    let goal_x = match goal {
+    let mut goal_x = match goal {
        SelectionGoal::HorizontalPosition(x) => x.into(),
        SelectionGoal::WrappedHorizontalPosition((_, x)) => x.into(),
        SelectionGoal::HorizontalRange { end, .. } => end.into(),
@@ -173,6 +174,7 @@ pub(crate) fn down_by_rows(
        return (start, goal);
    } else {
        point = map.max_point();
+        goal_x = map.x_for_display_point(point, text_layout_details)
    }

    let mut clipped_point = map.clip_point(point, Bias::Right);
@@ -608,7 +610,7 @@ mod tests {
        test::{editor_test_context::EditorTestContext, marked_display_snapshot},
        Buffer, DisplayMap, DisplayRow, ExcerptRange, FoldPlaceholder, InlayId, MultiBuffer,
    };
-    use gpui::{font, px, Context as _};
+    use gpui::{font, Context as _};
    use language::Capability;
    use project::Project;
    use settings::SettingsStore;
@@ -975,7 +977,7 @@ mod tests {
                ),
                (
                    DisplayPoint::new(DisplayRow(2), 0),
-                    SelectionGoal::HorizontalPosition(col_2_x.0),
+                    SelectionGoal::HorizontalPosition(0.0)
                ),
            );
            assert_eq!(
@@ -988,7 +990,7 @@ mod tests {
                ),
                (
                    DisplayPoint::new(DisplayRow(2), 0),
-                    SelectionGoal::HorizontalPosition(0.0),
+                    SelectionGoal::HorizontalPosition(0.0)
                ),
            );

@@ -1057,7 +1059,7 @@ mod tests {
            let max_point_x = snapshot
                .x_for_display_point(DisplayPoint::new(DisplayRow(7), 2), &text_layout_details);

-            // Can't move down off the end, and attempting to do so leaves the selection goal unchanged
+            // Can't move down off the end
            assert_eq!(
                down(
                    &snapshot,
@@ -1068,7 +1070,7 @@ mod tests {
                ),
                (
                    DisplayPoint::new(DisplayRow(7), 2),
-                    SelectionGoal::HorizontalPosition(0.0)
+                    SelectionGoal::HorizontalPosition(max_point_x.0)
                ),
            );
            assert_eq!(
--- a/crates/editor/src/rust_analyzer_ext.rs
+++ b/crates/editor/src/rust_analyzer_ext.rs
@@ -1,5 +1,3 @@
-use std::{fs, path::Path};
-
 use anyhow::Context as _;
 use gpui::{Context, View, ViewContext, VisualContext, WindowContext};
 use language::Language;
@@ -9,7 +7,7 @@ use text::ToPointUtf16;

 use crate::{
    element::register_action, lsp_ext::find_specific_language_server_in_selection, Editor,
-    ExpandMacroRecursively, OpenDocs,
+    ExpandMacroRecursively,
 };

 const RUST_ANALYZER_NAME: &str = "rust-analyzer";
@@ -26,7 +24,6 @@ pub fn apply_related_actions(editor: &View<Editor>, cx: &mut WindowContext) {
        .is_some()
    {
        register_action(editor, cx, expand_macro_recursively);
-        register_action(editor, cx, open_docs);
    }
 }

@@ -97,64 +94,3 @@ pub fn expand_macro_recursively(
    })
    .detach_and_log_err(cx);
 }
-
-pub fn open_docs(editor: &mut Editor, _: &OpenDocs, cx: &mut ViewContext<'_, Editor>) {
-    if editor.selections.count() == 0 {
-        return;
-    }
-    let Some(project) = &editor.project else {
-        return;
-    };
-    let Some(workspace) = editor.workspace() else {
-        return;
-    };
-
-    let Some((trigger_anchor, _rust_language, server_to_query, buffer)) =
-        find_specific_language_server_in_selection(
-            editor,
-            cx,
-            is_rust_language,
-            RUST_ANALYZER_NAME,
-        )
-    else {
-        return;
-    };
-
-    let project = project.clone();
-    let buffer_snapshot = buffer.read(cx).snapshot();
-    let position = trigger_anchor.text_anchor.to_point_utf16(&buffer_snapshot);
-    let open_docs_task = project.update(cx, |project, cx| {
-        project.request_lsp(
-            buffer,
-            project::LanguageServerToQuery::Other(server_to_query),
-            project::lsp_ext_command::OpenDocs { position },
-            cx,
-        )
-    });
-
-    cx.spawn(|_editor, mut cx| async move {
-        let docs_urls = open_docs_task.await.context("open docs")?;
-        if docs_urls.is_empty() {
-            log::debug!("Empty docs urls for position {position:?}");
-            return Ok(());
-        } else {
-            log::debug!("{:?}", docs_urls);
-        }
-
-        workspace.update(&mut cx, |_workspace, cx| {
-            // Check if the local document exists, otherwise fallback to the online document.
-            // Open with the default browser.
-            if let Some(local_url) = docs_urls.local {
-                if fs::metadata(Path::new(&local_url[8..])).is_ok() {
-                    cx.open_url(&local_url);
-                    return;
-                }
-            }
-
-            if let Some(web_url) = docs_urls.web {
-                cx.open_url(&web_url);
-            }
-        })
-    })
-    .detach_and_log_err(cx);
-}
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -234,16 +234,7 @@ impl EditorLspTestContext {
                ..Default::default()
            },
            Some(tree_sitter_html::language()),
-        )
-        .with_queries(LanguageQueries {
-            brackets: Some(Cow::from(indoc! {r#"
-                ("<" @open "/>" @close)
-                ("</" @open ">" @close)
-                ("<" @open ">" @close)
-                ("\"" @open "\"" @close)"#})),
-            ..Default::default()
-        })
-        .expect("Could not parse queries");
+        );
        Self::new(language, Default::default(), cx).await
    }

--- a/crates/evals/Cargo.toml
+++ b/crates/evals/Cargo.toml
@@ -31,9 +31,8 @@ node_runtime.workspace = true
 open_ai.workspace = true
 project.workspace = true
 reqwest_client.workspace = true
-semantic_index.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
 smol.workspace = true
-util.workspace = true
+zed_common.workspace = true
--- a/crates/evals/src/eval.rs
+++ b/crates/evals/src/eval.rs
@@ -13,9 +13,6 @@ use node_runtime::NodeRuntime;
 use open_ai::OpenAiEmbeddingModel;
 use project::Project;
 use reqwest_client::ReqwestClient;
-use semantic_index::{
-    EmbeddingProvider, OpenAiEmbeddingProvider, ProjectIndex, SemanticDb, Status,
-};
 use serde::{Deserialize, Serialize};
 use settings::SettingsStore;
 use smol::channel::bounded;
@@ -27,12 +24,15 @@ use std::time::Duration;
 use std::{
    fs,
    path::Path,
-    process::{exit, Stdio},
+    process::{exit, Command, Stdio},
    sync::{
        atomic::{AtomicUsize, Ordering::SeqCst},
        Arc,
    },
 };
+use zed_common::semantic_index::{
+    EmbeddingProvider, OpenAiEmbeddingProvider, ProjectIndex, SemanticDb, Status,
+};

 const CODESEARCH_NET_DIR: &'static str = "target/datasets/code-search-net";
 const EVAL_REPOS_DIR: &'static str = "target/datasets/eval-repos";
@@ -667,7 +667,7 @@ async fn fetch_eval_repo(
        return;
    }
    if !repo_dir.join(".git").exists() {
-        let init_output = util::command::new_std_command("git")
+        let init_output = Command::new("git")
            .current_dir(&repo_dir)
            .args(&["init"])
            .output()
@@ -682,13 +682,13 @@ async fn fetch_eval_repo(
        }
    }
    let url = format!("https://github.com/{}.git", repo);
-    util::command::new_std_command("git")
+    Command::new("git")
        .current_dir(&repo_dir)
        .args(&["remote", "add", "-f", "origin", &url])
        .stdin(Stdio::null())
        .output()
        .unwrap();
-    let fetch_output = util::command::new_std_command("git")
+    let fetch_output = Command::new("git")
        .current_dir(&repo_dir)
        .args(&["fetch", "--depth", "1", "origin", &sha])
        .stdin(Stdio::null())
@@ -703,7 +703,7 @@ async fn fetch_eval_repo(
        );
        return;
    }
-    let checkout_output = util::command::new_std_command("git")
+    let checkout_output = Command::new("git")
        .current_dir(&repo_dir)
        .args(&["checkout", &sha])
        .output()
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -15,11 +15,9 @@ path = "src/extension.rs"
 anyhow.workspace = true
 async-compression.workspace = true
 async-tar.workspace = true
-async-trait.workspace = true
 collections.workspace = true
 fs.workspace = true
 futures.workspace = true
-gpui.workspace = true
 http_client.workspace = true
 language.workspace = true
 log.workspace = true
@@ -28,7 +26,6 @@ semantic_version.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 toml.workspace = true
-util.workspace = true
 wasm-encoder.workspace = true
 wasmparser.workspace = true
 wit-component.workspace = true
--- a/crates/extension/src/extension.rs
+++ b/crates/extension/src/extension.rs
@@ -1,101 +1,10 @@
 pub mod extension_builder;
 mod extension_manifest;
-mod types;

-use std::path::{Path, PathBuf};
-use std::sync::Arc;
-
-use ::lsp::LanguageServerName;
 use anyhow::{anyhow, bail, Context as _, Result};
-use async_trait::async_trait;
-use fs::normalize_path;
-use gpui::Task;
-use language::LanguageName;
 use semantic_version::SemanticVersion;

 pub use crate::extension_manifest::*;
-pub use crate::types::*;
-
-#[async_trait]
-pub trait WorktreeDelegate: Send + Sync + 'static {
-    fn id(&self) -> u64;
-    fn root_path(&self) -> String;
-    async fn read_text_file(&self, path: PathBuf) -> Result<String>;
-    async fn which(&self, binary_name: String) -> Option<String>;
-    async fn shell_env(&self) -> Vec<(String, String)>;
-}
-
-pub trait KeyValueStoreDelegate: Send + Sync + 'static {
-    fn insert(&self, key: String, docs: String) -> Task<Result<()>>;
-}
-
-#[async_trait]
-pub trait Extension: Send + Sync + 'static {
-    /// Returns the [`ExtensionManifest`] for this extension.
-    fn manifest(&self) -> Arc<ExtensionManifest>;
-
-    /// Returns the path to this extension's working directory.
-    fn work_dir(&self) -> Arc<Path>;
-
-    /// Returns a path relative to this extension's working directory.
-    fn path_from_extension(&self, path: &Path) -> PathBuf {
-        normalize_path(&self.work_dir().join(path))
-    }
-
-    async fn language_server_command(
-        &self,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Command>;
-
-    async fn language_server_initialization_options(
-        &self,
-        language_server_id: LanguageServerName,
-        language_name: LanguageName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>>;
-
-    async fn language_server_workspace_configuration(
-        &self,
-        language_server_id: LanguageServerName,
-        worktree: Arc<dyn WorktreeDelegate>,
-    ) -> Result<Option<String>>;
-
-    async fn labels_for_completions(
-        &self,
-        language_server_id: LanguageServerName,
-        completions: Vec<Completion>,
-    ) -> Result<Vec<Option<CodeLabel>>>;
-
-    async fn labels_for_symbols(
-        &self,
-        language_server_id: LanguageServerName,
-        symbols: Vec<Symbol>,
-    ) -> Result<Vec<Option<CodeLabel>>>;
-
-    async fn complete_slash_command_argument(
-        &self,
-        command: SlashCommand,
-        arguments: Vec<String>,
-    ) -> Result<Vec<SlashCommandArgumentCompletion>>;
-
-    async fn run_slash_command(
-        &self,
-        command: SlashCommand,
-        arguments: Vec<String>,
-        worktree: Option<Arc<dyn WorktreeDelegate>>,
-    ) -> Result<SlashCommandOutput>;
-
-    async fn suggest_docs_packages(&self, provider: Arc<str>) -> Result<Vec<String>>;
-
-    async fn index_docs(
-        &self,
-        provider: Arc<str>,
-        package_name: Arc<str>,
-        kv_store: Arc<dyn KeyValueStoreDelegate>,
-    ) -> Result<()>;
-}

 pub fn parse_wasm_extension_version(
    extension_id: &str,
--- a/crates/extension/src/extension_builder.rs
+++ b/crates/extension/src/extension_builder.rs
@@ -11,7 +11,7 @@ use serde::Deserialize;
 use std::{
    env, fs, mem,
    path::{Path, PathBuf},
-    process::Stdio,
+    process::{Command, Stdio},
    sync::Arc,
 };
 use wasm_encoder::{ComponentSectionId, Encode as _, RawSection, Section as _};
@@ -130,7 +130,7 @@ impl ExtensionBuilder {
            "compiling Rust crate for extension {}",
            extension_dir.display()
        );
-        let output = util::command::new_std_command("cargo")
+        let output = Command::new("cargo")
            .args(["build", "--target", RUST_TARGET])
            .args(options.release.then_some("--release"))
            .arg("--target-dir")
@@ -237,7 +237,7 @@ impl ExtensionBuilder {
        let scanner_path = src_path.join("scanner.c");

        log::info!("compiling {grammar_name} parser");
-        let clang_output = util::command::new_std_command(&clang_path)
+        let clang_output = Command::new(&clang_path)
            .args(["-fPIC", "-shared", "-Os"])
            .arg(format!("-Wl,--export=tree_sitter_{grammar_name}"))
            .arg("-o")
@@ -264,7 +264,7 @@ impl ExtensionBuilder {
        let git_dir = directory.join(".git");

        if directory.exists() {
-            let remotes_output = util::command::new_std_command("git")
+            let remotes_output = Command::new("git")
                .arg("--git-dir")
                .arg(&git_dir)
                .args(["remote", "-v"])
@@ -287,7 +287,7 @@ impl ExtensionBuilder {
            fs::create_dir_all(directory).with_context(|| {
                format!("failed to create grammar directory {}", directory.display(),)
            })?;
-            let init_output = util::command::new_std_command("git")
+            let init_output = Command::new("git")
                .arg("init")
                .current_dir(directory)
                .output()?;
@@ -298,7 +298,7 @@ impl ExtensionBuilder {
                );
            }

-            let remote_add_output = util::command::new_std_command("git")
+            let remote_add_output = Command::new("git")
                .arg("--git-dir")
                .arg(&git_dir)
                .args(["remote", "add", "origin", url])
@@ -312,14 +312,14 @@ impl ExtensionBuilder {
            }
        }

-        let fetch_output = util::command::new_std_command("git")
+        let fetch_output = Command::new("git")
            .arg("--git-dir")
            .arg(&git_dir)
            .args(["fetch", "--depth", "1", "origin", rev])
            .output()
            .context("failed to execute `git fetch`")?;

-        let checkout_output = util::command::new_std_command("git")
+        let checkout_output = Command::new("git")
            .arg("--git-dir")
            .arg(&git_dir)
            .args(["checkout", rev])
@@ -346,7 +346,7 @@ impl ExtensionBuilder {
    }

    fn install_rust_wasm_target_if_needed(&self) -> Result<()> {
-        let rustc_output = util::command::new_std_command("rustc")
+        let rustc_output = Command::new("rustc")
            .arg("--print")
            .arg("sysroot")
            .output()
@@ -363,7 +363,7 @@ impl ExtensionBuilder {
            return Ok(());
        }

-        let output = util::command::new_std_command("rustup")
+        let output = Command::new("rustup")
            .args(["target", "add", RUST_TARGET])
            .stderr(Stdio::piped())
            .stdout(Stdio::inherit())
--- a/crates/extension/src/types.rs
+++ b/crates/extension/src/types.rs
@@ -1,49 +0,0 @@
-mod lsp;
-mod slash_command;
-
-use std::ops::Range;
-
-pub use lsp::*;
-pub use slash_command::*;
-
-/// A list of environment variables.
-pub type EnvVars = Vec<(String, String)>;
-
-/// A command.
-pub struct Command {
-    /// The command to execute.
-    pub command: String,
-    /// The arguments to pass to the command.
-    pub args: Vec<String>,
-    /// The environment variables to set for the command.
-    pub env: EnvVars,
-}
-
-/// A label containing some code.
-#[derive(Debug, Clone)]
-pub struct CodeLabel {
-    /// The source code to parse with Tree-sitter.
-    pub code: String,
-    /// The spans to display in the label.
-    pub spans: Vec<CodeLabelSpan>,
-    /// The range of the displayed label to include when filtering.
-    pub filter_range: Range<usize>,
-}
-
-/// A span within a code label.
-#[derive(Debug, Clone)]
-pub enum CodeLabelSpan {
-    /// A range into the parsed code.
-    CodeRange(Range<usize>),
-    /// A span containing a code literal.
-    Literal(CodeLabelSpanLiteral),
-}
-
-/// A span containing a code literal.
-#[derive(Debug, Clone)]
-pub struct CodeLabelSpanLiteral {
-    /// The literal text.
-    pub text: String,
-    /// The name of the highlight to use for this literal.
-    pub highlight_name: Option<String>,
-}
--- a/crates/extension/src/types/lsp.rs
+++ b/crates/extension/src/types/lsp.rs
@@ -1,96 +0,0 @@
-use std::option::Option;
-
-/// An LSP completion.
-#[derive(Debug, Clone)]
-pub struct Completion {
-    pub label: String,
-    pub label_details: Option<CompletionLabelDetails>,
-    pub detail: Option<String>,
-    pub kind: Option<CompletionKind>,
-    pub insert_text_format: Option<InsertTextFormat>,
-}
-
-/// The kind of an LSP completion.
-#[derive(Debug, Clone, Copy)]
-pub enum CompletionKind {
-    Text,
-    Method,
-    Function,
-    Constructor,
-    Field,
-    Variable,
-    Class,
-    Interface,
-    Module,
-    Property,
-    Unit,
-    Value,
-    Enum,
-    Keyword,
-    Snippet,
-    Color,
-    File,
-    Reference,
-    Folder,
-    EnumMember,
-    Constant,
-    Struct,
-    Event,
-    Operator,
-    TypeParameter,
-    Other(i32),
-}
-
-/// Label details for an LSP completion.
-#[derive(Debug, Clone)]
-pub struct CompletionLabelDetails {
-    pub detail: Option<String>,
-    pub description: Option<String>,
-}
-
-/// Defines how to interpret the insert text in a completion item.
-#[derive(Debug, Clone, Copy)]
-pub enum InsertTextFormat {
-    PlainText,
-    Snippet,
-    Other(i32),
-}
-
-/// An LSP symbol.
-#[derive(Debug, Clone)]
-pub struct Symbol {
-    pub kind: SymbolKind,
-    pub name: String,
-}
-
-/// The kind of an LSP symbol.
-#[derive(Debug, Clone, Copy)]
-pub enum SymbolKind {
-    File,
-    Module,
-    Namespace,
-    Package,
-    Class,
-    Method,
-    Property,
-    Field,
-    Constructor,
-    Enum,
-    Interface,
-    Function,
-    Variable,
-    Constant,
-    String,
-    Number,
-    Boolean,
-    Array,
-    Object,
-    Key,
-    Null,
-    EnumMember,
-    Struct,
-    Event,
-    Operator,
-    TypeParameter,
-    Other(i32),
-}
--- a/crates/extension/src/types/slash_command.rs
+++ b/crates/extension/src/types/slash_command.rs
@@ -1,43 +0,0 @@
-use std::ops::Range;
-
-/// A slash command for use in the Assistant.
-#[derive(Debug, Clone)]
-pub struct SlashCommand {
-    /// The name of the slash command.
-    pub name: String,
-    /// The description of the slash command.
-    pub description: String,
-    /// The tooltip text to display for the run button.
-    pub tooltip_text: String,
-    /// Whether this slash command requires an argument.
-    pub requires_argument: bool,
-}
-
-/// The output of a slash command.
-#[derive(Debug, Clone)]
-pub struct SlashCommandOutput {
-    /// The text produced by the slash command.
-    pub text: String,
-    /// The list of sections to show in the slash command placeholder.
-    pub sections: Vec<SlashCommandOutputSection>,
-}
-
-/// A section in the slash command output.
-#[derive(Debug, Clone)]
-pub struct SlashCommandOutputSection {
-    /// The range this section occupies.
-    pub range: Range<usize>,
-    /// The label to display in the placeholder for this section.
-    pub label: String,
-}
-
-/// A completion for a slash command argument.
-#[derive(Debug, Clone)]
-pub struct SlashCommandArgumentCompletion {
-    /// The label to display for this completion.
-    pub label: String,
-    /// The new text that should be inserted into the command when this completion is accepted.
-    pub new_text: String,
-    /// Whether the command should be run when accepting this completion.
-    pub run_command: bool,
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bennet Bo Fenner	12c9198fcf	port command_palette	2024-11-17 19:04:15 +01:00
Bennet Bo Fenner	10784e3f03	port auto_update	2024-11-16 15:16:44 +01:00
Bennet Bo Fenner	4dc8bef6de	port vcs_menu	2024-11-16 15:12:57 +01:00
Bennet Bo Fenner	69da8bdea7	add a script to benchmark build times	2024-11-16 13:59:12 +01:00
Bennet Bo Fenner	eaf02ef7bd	port theme_selector	2024-11-14 16:39:35 +01:00
Bennet Bo Fenner	b0efc40cb3	port file_finder	2024-11-14 16:36:12 +01:00
Bennet Bo Fenner	f6e642a891	port project_panel	2024-11-14 16:30:40 +01:00
Bennet Bo Fenner	7b22d555e6	inline_completion_button	2024-11-14 16:26:49 +01:00
Bennet Bo Fenner	923b2e1464	port language_tools	2024-11-14 16:23:15 +01:00
Bennet Bo Fenner	a7e8f4face	port outline_panel	2024-11-14 16:19:00 +01:00
Bennet Bo Fenner	74ae682563	port terminal_view	2024-11-14 16:13:58 +01:00
Bennet Bo Fenner	e5fcee943c	port vim	2024-11-14 16:05:20 +01:00
Bennet Bo Fenner	72c6f82b1a	port recent_projects	2024-11-14 15:56:29 +01:00
Bennet Bo Fenner	3256458494	port language_model	2024-11-12 14:33:12 +01:00
Bennet Bo Fenner	9508f33d71	port semantic_index	2024-11-12 14:04:41 +01:00
Bennet Bo Fenner	20a5165f5b	port breadcrumbs	2024-11-12 13:31:09 +01:00
Bennet Bo Fenner	fd7a487c3d	port snippets_ui	2024-11-12 13:28:20 +01:00
Bennet Bo Fenner	f393499076	port activity_indicator	2024-11-12 13:19:49 +01:00
Bennet Bo Fenner	94c77be93e	port toolchain_selector	2024-11-12 13:16:12 +01:00
Bennet Bo Fenner	5e96ecc5bf	port project symbols	2024-11-12 13:13:19 +01:00
Bennet Bo Fenner	226f945a11	port tab_switcher	2024-11-12 09:26:49 +01:00
Bennet Bo Fenner	228a82ce41	port repl	2024-11-12 09:21:45 +01:00
Bennet Bo Fenner	ede4a23fc9	port language_selector	2024-11-12 09:16:23 +01:00
Bennet Bo Fenner	8bea01faf5	port settings_ui	2024-11-12 09:14:22 +01:00
Bennet Bo Fenner	f275145a4c	port assistant_slash_command	2024-11-12 09:07:07 +01:00
Bennet Bo Fenner	99fddd8280	adjust script	2024-11-12 09:06:58 +01:00
Bennet Bo Fenner	28921fd632	port extensions_ui	2024-11-12 00:35:55 +01:00
Bennet Bo Fenner	3da964de05	remove assitant properly	2024-11-12 00:31:32 +01:00
Bennet Bo Fenner	a619bc6f95	adjust script	2024-11-12 00:26:10 +01:00
Bennet Bo Fenner	7b4800407e	move assistant	2024-11-12 00:25:18 +01:00
Bennet Bo Fenner	35e2831c6d	add script to move crate	2024-11-12 00:17:36 +01:00
Bennet Bo Fenner	8abacd5a50	move welcome	2024-11-11 23:49:48 +01:00
Bennet Bo Fenner	4db0e59fb7	move title_bar	2024-11-11 23:46:36 +01:00
Bennet Bo Fenner	d76240d941	move collab_ui	2024-11-11 23:36:26 +01:00
Bennet Bo Fenner	35aefc6580	move	2024-11-11 23:23:59 +01:00
				`@@ -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-blocks"><rect width="7" height="7" x="14" y="3" rx="1"/><path d="M10 21V8a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1H3"/></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-phone-incoming"><polyline points="16 2 16 8 22 8"/><line x1="22" x2="16" y1="2" y2="8"/><path d="M22 16.92v3a2 2 0 0 1-2.18 2 19.79 19.79 0 0 1-8.63-3.07 19.5 19.5 0 0 1-6-6 19.79 19.79 0 0 1-3.07-8.67A2 2 0 0 1 4.11 2h3a2 2 0 0 1 2 1.72 12.84 12.84 0 0 0 .7 2.81 2 2 0 0 1-.45 2.11L8.09 9.91a16 16 0 0 0 6 6l1.27-1.27a2 2 0 0 1 2.11-.45 12.84 12.84 0 0 0 2.81.7A2 2 0 0 1 22 16.92z"/></svg>