WIP: Try to drop outdated key press events

DEBUG
2024-06-07 15:58:46 +02:00 · 2024-06-06 10:46:18 +02:00
309 changed files with 7874 additions and 17333 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -4,11 +4,3 @@ rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]

 [alias]
 xtask = "run --package xtask --"
-
-[target.x86_64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
-
-[target.aarch64-unknown-linux-gnu]
-linker = "clang"
-rustflags = ["-C", "link-arg=-fuse-ld=mold"]
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,8 +74,8 @@ jobs:
          version: v1.29.0
      - uses: bufbuild/buf-breaking-action@v1
        with:
-          input: "crates/proto/proto/"
-          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"
+          input: "crates/rpc/proto/"
+          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/rpc/proto/"

  macos_tests:
    timeout-minutes: 60
@@ -101,6 +101,7 @@ jobs:
      - name: Build other binaries and features
        run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade"

+  # todo(linux): Actually run the tests
  linux_tests:
    timeout-minutes: 60
    name: (Linux) Run Clippy and tests
@@ -119,9 +120,6 @@ jobs:
      - name: cargo clippy
        run: cargo xtask clippy

-      - name: Run tests
-        uses: ./.github/actions/run_tests
-
      - name: Build Zed
        run: cargo build -p zed

@@ -307,6 +305,9 @@ jobs:
            exit 1
          fi

+      - name: Generate license file
+        run: script/generate-licenses
+
      - name: Create and upload Linux .tar.gz bundle
        run: script/bundle-linux

@@ -327,86 +328,3 @@ jobs:
          body: ""
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  bundle-linux-aarch64:
-    timeout-minutes: 60
-    name: Create arm64 Linux bundle
-    runs-on:
-      - hosted-linux-arm-1
-    if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
-    needs: [linux_tests]
-    env:
-      ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          clean: false
-      - name: "Setup jq"
-        uses: dcarbone/install-jq-action@v2
-
-      - name: Set up Clang
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y llvm-10 clang-10 build-essential cmake pkg-config libasound2-dev libfontconfig-dev libwayland-dev libxkbcommon-x11-dev libssl-dev libzstd-dev libvulkan1 libgit2-dev
-          echo "/usr/lib/llvm-10/bin" >> $GITHUB_PATH
-
-      - uses: rui314/setup-mold@v1
-        with:
-          mold-version: 2.32.0
-
-      - name: rustup
-        run: |
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
-
-      - name: Limit target directory size
-        run: script/clear-target-dir-if-larger-than 100
-
-      - name: Determine version and release channel
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          set -eu
-
-          version=$(script/get-crate-version zed)
-          channel=$(cat crates/zed/RELEASE_CHANNEL)
-          echo "Publishing version: ${version} on release channel ${channel}"
-          echo "RELEASE_CHANNEL=${channel}" >> $GITHUB_ENV
-
-          expected_tag_name=""
-          case ${channel} in
-            stable)
-              expected_tag_name="v${version}";;
-            preview)
-              expected_tag_name="v${version}-pre";;
-            nightly)
-              expected_tag_name="v${version}-nightly";;
-            *)
-              echo "can't publish a release on channel ${channel}"
-              exit 1;;
-          esac
-          if [[ $GITHUB_REF_NAME != $expected_tag_name ]]; then
-            echo "invalid release tag ${GITHUB_REF_NAME}. expected ${expected_tag_name}"
-            exit 1
-          fi
-
-      - name: Create and upload Linux .tar.gz bundle
-        run: script/bundle-linux
-
-      - name: Upload Linux bundle to workflow run if main branch or specific label
-        uses: actions/upload-artifact@v4
-        if: ${{ github.ref == 'refs/heads/main' }} || contains(github.event.pull_request.labels.*.name, 'run-bundling') }}
-        with:
-          name: zed-${{ github.event.pull_request.head.sha || github.sha }}-aarch64-unknown-linux-gnu.tar.gz
-          path: target/release/zed-*.tar.gz
-
-      - name: Upload app bundle to release
-        uses: softprops/action-gh-release@v1
-        if: ${{ env.RELEASE_CHANNEL == 'preview' }}
-        with:
-          draft: true
-          prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
-          files: target/release/zed-linux-aarch64.tar.gz
-          body: ""
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -18,7 +18,7 @@ jobs:

      - uses: pnpm/action-setup@v3
        with:
-          version: 9
+          version: 8

      - name: Setup Node
        uses: actions/setup-node@v4
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -359,7 +359,6 @@ dependencies = [
 "log",
 "menu",
 "multi_buffer",
- "ollama",
 "open_ai",
 "ordered-float 2.10.0",
 "parking_lot",
@@ -368,14 +367,12 @@ dependencies = [
 "rand 0.8.5",
 "regex",
 "rope",
- "rustdoc",
 "schemars",
 "search",
 "semantic_index",
 "serde",
 "serde_json",
 "settings",
- "similar",
 "smol",
 "strsim 0.11.1",
 "strum",
@@ -1514,7 +1511,7 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.4.0"
-source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d"
+source = "git+https://github.com/kvark/blade?rev=bdaf8c534fbbc9fbca71d1cf272f45640b3a068d#bdaf8c534fbbc9fbca71d1cf272f45640b3a068d"
 dependencies = [
 "ash",
 "ash-window",
@@ -1544,7 +1541,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.2.1"
-source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d"
+source = "git+https://github.com/kvark/blade?rev=bdaf8c534fbbc9fbca71d1cf272f45640b3a068d#bdaf8c534fbbc9fbca71d1cf272f45640b3a068d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1554,7 +1551,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d"
+source = "git+https://github.com/kvark/blade?rev=bdaf8c534fbbc9fbca71d1cf272f45640b3a068d#bdaf8c534fbbc9fbca71d1cf272f45640b3a068d"
 dependencies = [
 "blade-graphics",
 "bytemuck",
@@ -2151,6 +2148,7 @@ dependencies = [
 "exec",
 "fork",
 "ipc-channel",
+ "libc",
 "once_cell",
 "plist",
 "release_channel",
@@ -2211,14 +2209,11 @@ dependencies = [
 "async-tungstenite",
 "chrono",
 "clock",
- "cocoa",
 "collections",
 "feature_flags",
- "fs",
 "futures 0.3.28",
 "gpui",
 "http 0.1.0",
- "isahc",
 "lazy_static",
 "log",
 "once_cell",
@@ -2242,7 +2237,6 @@ dependencies = [
 "tiny_http",
 "url",
 "util",
- "windows 0.57.0",
 ]

 [[package]]
@@ -2369,7 +2363,6 @@ dependencies = [
 "prometheus",
 "prost",
 "rand 0.8.5",
- "recent_projects",
 "release_channel",
 "reqwest",
 "rpc",
@@ -2460,6 +2453,13 @@ dependencies = [
 "rustc-hash",
 ]

+[[package]]
+name = "color"
+version = "0.1.0"
+dependencies = [
+ "palette",
+]
+
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -3452,7 +3452,6 @@ version = "0.1.0"
 dependencies = [
 "aho-corasick",
 "anyhow",
- "assets",
 "client",
 "clock",
 "collections",
@@ -3834,7 +3833,6 @@ dependencies = [
 "fuzzy",
 "gpui",
 "language",
- "num-format",
 "picker",
 "project",
 "release_channel",
@@ -4050,15 +4048,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"

-[[package]]
-name = "fluent-uri"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "flume"
 version = "0.11.0"
@@ -4239,7 +4228,7 @@ dependencies = [
 "text",
 "time",
 "util",
- "windows 0.57.0",
+ "windows 0.56.0",
 ]

 [[package]]
@@ -4559,7 +4548,7 @@ dependencies = [
 "unindent",
 "url",
 "util",
- "windows 0.57.0",
+ "windows 0.56.0",
 ]

 [[package]]
@@ -4782,8 +4771,8 @@ dependencies = [
 "wayland-cursor",
 "wayland-protocols",
 "wayland-protocols-plasma",
- "windows 0.57.0",
- "windows-core 0.57.0",
+ "windows 0.56.0",
+ "windows-core 0.56.0",
 "x11rb",
 "xim",
 "xkbcommon",
@@ -5938,7 +5927,6 @@ version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
 dependencies = [
- "bindgen 0.64.0",
 "cc",
 "pkg-config",
 "vcpkg",
@@ -6091,26 +6079,25 @@ dependencies = [
 "log",
 "lsp-types",
 "parking_lot",
- "pct-str",
 "postage",
 "release_channel",
 "serde",
 "serde_json",
 "smol",
 "util",
- "windows 0.57.0",
+ "windows 0.56.0",
 ]

 [[package]]
 name = "lsp-types"
-version = "0.97.0"
-source = "git+https://github.com/zed-industries/lsp-types?branch=zed-main#258db672ceab9e66c6da3883d37c4dcf1094c6ac"
+version = "0.95.1"
+source = "git+https://github.com/zed-industries/lsp-types?branch=apply-snippet-edit#853c7881d200777e20799026651ca36727144646"
 dependencies = [
 "bitflags 1.3.2",
- "fluent-uri",
 "serde",
 "serde_json",
 "serde_repr",
+ "url",
 ]

 [[package]]
@@ -6594,7 +6581,7 @@ dependencies = [
 "tempfile",
 "util",
 "walkdir",
- "windows 0.57.0",
+ "windows 0.56.0",
 ]

 [[package]]
@@ -6748,16 +6735,6 @@ dependencies = [
 "syn 1.0.109",
 ]

-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec",
- "itoa",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -6932,19 +6909,6 @@ dependencies = [
 "cc",
 ]

-[[package]]
-name = "ollama"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.28",
- "http 0.1.0",
- "isahc",
- "schemars",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.19.0"
@@ -7051,9 +7015,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-src"
-version = "300.3.0+3.3.0"
+version = "300.2.3+3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1"
+checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
 dependencies = [
 "cc",
 ]
@@ -7144,6 +7108,7 @@ dependencies = [
 "project",
 "rope",
 "serde_json",
+ "settings",
 "smol",
 "theme",
 "tree-sitter-rust",
@@ -7153,31 +7118,6 @@ dependencies = [
 "workspace",
 ]

-[[package]]
-name = "outline_panel"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "db",
- "editor",
- "file_icons",
- "futures 0.3.28",
- "gpui",
- "itertools 0.11.0",
- "language",
- "log",
- "menu",
- "project",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "util",
- "workspace",
- "worktree",
-]
-
 [[package]]
 name = "outref"
 version = "0.5.1"
@@ -7336,16 +7276,6 @@ dependencies = [
 "hmac 0.12.1",
 ]

-[[package]]
-name = "pct-str"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf1bdcc492c285a50bed60860dfa00b50baf1f60c73c7d6b435b01a2a11fd6ff"
-dependencies = [
- "thiserror",
- "utf8-decode",
-]
-
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
@@ -7864,7 +7794,6 @@ dependencies = [
 "tempfile",
 "terminal",
 "text",
- "unicase",
 "unindent",
 "util",
 "which 6.0.0",
@@ -7895,6 +7824,7 @@ dependencies = [
 "settings",
 "theme",
 "ui",
+ "unicase",
 "util",
 "workspace",
 "worktree",
@@ -7990,17 +7920,6 @@ dependencies = [
 "prost",
 ]

-[[package]]
-name = "proto"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "collections",
- "prost",
- "prost-build",
- "serde",
-]
-
 [[package]]
 name = "protobuf"
 version = "2.28.0"
@@ -8584,7 +8503,8 @@ dependencies = [
 "futures 0.3.28",
 "gpui",
 "parking_lot",
- "proto",
+ "prost",
+ "prost-build",
 "rand 0.8.5",
 "rsa 0.4.0",
 "serde",
@@ -8709,30 +8629,6 @@ dependencies = [
 "semver",
 ]

-[[package]]
-name = "rustdoc"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "derive_more",
- "fs",
- "futures 0.3.28",
- "fuzzy",
- "gpui",
- "heed",
- "html_to_markdown",
- "http 0.1.0",
- "indexmap 1.9.3",
- "indoc",
- "parking_lot",
- "pretty_assertions",
- "serde",
- "strum",
- "util",
-]
-
 [[package]]
 name = "rustix"
 version = "0.37.23"
@@ -10442,7 +10338,7 @@ dependencies = [
 "theme",
 "thiserror",
 "util",
- "windows 0.57.0",
+ "windows 0.56.0",
 ]

 [[package]]
@@ -10511,6 +10407,7 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
+ "color",
 "derive_more",
 "fs",
 "futures 0.3.28",
@@ -11370,7 +11267,7 @@ dependencies = [
 "story",
 "strum",
 "theme",
- "windows 0.57.0",
+ "windows 0.56.0",
 ]

 [[package]]
@@ -11526,12 +11423,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"

-[[package]]
-name = "utf8-decode"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca61eb27fa339aa08826a29f03e87b99b4d8f0fc2255306fd266bb1b6a9de498"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -12514,11 +12405,11 @@ dependencies = [

 [[package]]
 name = "windows"
-version = "0.57.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
+checksum = "1de69df01bdf1ead2f4ac895dc77c9351aefff65b2f3db429a343f9cbf05e132"
 dependencies = [
- "windows-core 0.57.0",
+ "windows-core 0.56.0",
 "windows-targets 0.52.5",
 ]

@@ -12533,9 +12424,9 @@ dependencies = [

 [[package]]
 name = "windows-core"
-version = "0.57.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+checksum = "4698e52ed2d08f8658ab0c39512a7c00ee5fe2688c65f8c0a4f06750d729f2a6"
 dependencies = [
 "windows-implement",
 "windows-interface",
@@ -12545,9 +12436,9 @@ dependencies = [

 [[package]]
 name = "windows-implement"
-version = "0.57.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -12556,9 +12447,9 @@ dependencies = [

 [[package]]
 name = "windows-interface"
-version = "0.57.0"
+version = "0.56.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -12996,6 +12887,7 @@ name = "worktree"
 version = "0.1.0"
 dependencies = [
 "anyhow",
+ "client",
 "clock",
 "collections",
 "env_logger",
@@ -13007,8 +12899,10 @@ dependencies = [
 "gpui",
 "http 0.1.0",
 "ignore",
+ "itertools 0.11.0",
 "language",
 "log",
+ "lsp",
 "parking_lot",
 "postage",
 "pretty_assertions",
@@ -13257,11 +13151,10 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.141.0"
+version = "0.140.0"
 dependencies = [
 "activity_indicator",
 "anyhow",
- "ashpd",
 "assets",
 "assistant",
 "audio",
@@ -13314,7 +13207,6 @@ dependencies = [
 "node_runtime",
 "notifications",
 "outline",
- "outline_panel",
 "parking_lot",
 "profiling",
 "project",
@@ -13324,14 +13216,12 @@ dependencies = [
 "recent_projects",
 "release_channel",
 "rope",
- "rpc",
 "search",
 "serde",
 "serde_json",
 "settings",
 "simplelog",
 "smol",
- "sqlez",
 "supermaven",
 "tab_switcher",
 "task",
@@ -13340,7 +13230,6 @@ dependencies = [
 "terminal_view",
 "theme",
 "theme_selector",
- "tree-sitter-markdown",
 "tree-sitter-rust",
 "urlencoding",
 "util",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,16 +61,13 @@ members = [
    "crates/multi_buffer",
    "crates/node_runtime",
    "crates/notifications",
-    "crates/ollama",
    "crates/open_ai",
    "crates/outline",
-    "crates/outline_panel",
    "crates/picker",
    "crates/prettier",
    "crates/project",
    "crates/project_panel",
    "crates/project_symbols",
-    "crates/proto",
    "crates/quick_action_bar",
    "crates/recent_projects",
    "crates/refineable",
@@ -80,7 +77,6 @@ members = [
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
-    "crates/rustdoc",
    "crates/task",
    "crates/tasks_ui",
    "crates/search",
@@ -167,6 +163,7 @@ clock = { path = "crates/clock" }
 collab = { path = "crates/collab" }
 collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections" }
+color = { path = "crates/color" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
 copilot = { path = "crates/copilot" }
@@ -210,16 +207,13 @@ menu = { path = "crates/menu" }
 multi_buffer = { path = "crates/multi_buffer" }
 node_runtime = { path = "crates/node_runtime" }
 notifications = { path = "crates/notifications" }
-ollama = { path = "crates/ollama" }
 open_ai = { path = "crates/open_ai" }
 outline = { path = "crates/outline" }
-outline_panel = { path = "crates/outline_panel" }
 picker = { path = "crates/picker" }
 plugin = { path = "crates/plugin" }
 plugin_macros = { path = "crates/plugin_macros" }
 prettier = { path = "crates/prettier" }
 project = { path = "crates/project" }
-proto = { path = "crates/proto" }
 worktree = { path = "crates/worktree" }
 project_panel = { path = "crates/project_panel" }
 project_symbols = { path = "crates/project_symbols" }
@@ -230,7 +224,6 @@ dev_server_projects = { path = "crates/dev_server_projects" }
 rich_text = { path = "crates/rich_text" }
 rope = { path = "crates/rope" }
 rpc = { path = "crates/rpc" }
-rustdoc = { path = "crates/rustdoc" }
 task = { path = "crates/task" }
 tasks_ui = { path = "crates/tasks_ui" }
 search = { path = "crates/search" }
@@ -274,15 +267,14 @@ async-tar = "0.4.2"
 async-trait = "0.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 bitflags = "2.4.2"
-blade-graphics = { git = "https://github.com/zed-industries/blade", rev = "33fd51359d113c03b785e28f4a6cf75bacb0b26d" }
-blade-macros = { git = "https://github.com/zed-industries/blade", rev =  "33fd51359d113c03b785e28f4a6cf75bacb0b26d" }
-blade-util = { git = "https://github.com/zed-industries/blade", rev = "33fd51359d113c03b785e28f4a6cf75bacb0b26d"  }
+blade-graphics = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
+blade-macros = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
+blade-util = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
 cap-std = "3.0"
 cargo_toml = "0.20"
 chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.4", features = ["derive"] }
 clickhouse = { version = "0.11.6" }
-cocoa = "0.25"
 ctor = "0.2.6"
 signal-hook = "0.3.17"
 core-foundation = { version = "0.9.3" }
@@ -301,10 +293,12 @@ heed = { version = "0.20.1", features = ["read-txn-no-tls"] }
 hex = "0.4.3"
 html5ever = "0.27.0"
 ignore = "0.4.22"
-indexmap = { version = "1.6.2", features = ["serde"] }
 indoc = "1"
 # We explicitly disable http2 support in isahc.
-isahc = { version = "1.7.2", default-features = false, features = [ "text-decoding" ] }
+isahc = { version = "1.7.2", default-features = false, features = [
+    "static-curl",
+    "text-decoding",
+] }
 itertools = "0.11.0"
 lazy_static = "1.4.0"
 libc = "0.2"
@@ -313,7 +307,6 @@ log = { version = "0.4.16", features = ["kv_unstable_serde"] }
 markup5ever_rcdom = "0.3.0"
 nanoid = "0.4"
 nix = "0.28"
-num-format = "0.4.4"
 once_cell = "1.19.0"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
@@ -345,7 +338,6 @@ serde_repr = "0.1"
 sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
-similar = "1.3"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "1.2"
 strum = { version = "0.25.0", features = ["derive"] }
@@ -407,13 +399,12 @@ wit-component = "0.201"
 sys-locale = "0.3.1"

 [workspace.dependencies.windows]
-version = "0.57"
+version = "0.56.0"
 features = [
    "implement",
    "Foundation_Numerics",
    "System",
    "System_Threading",
-    "UI_ViewManagement",
    "Wdk_System_SystemServices",
    "Win32_Globalization",
    "Win32_Graphics_Direct2D",
@@ -472,6 +463,12 @@ codegen-units = 1
 [profile.release.package]
 zed = { codegen-units = 16 }

+[profile.profiling]
+inherits = "release"
+debug = true
+lto = false
+codegen-units = 16
+
 [workspace.lints.clippy]
 dbg_macro = "deny"
 todo = "deny"
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

-FROM rust:1.79-bookworm as builder
+FROM rust:1.78-bookworm as builder
 WORKDIR app
 COPY . .

--- a/assets/icons/context.svg
+++ b/assets/icons/context.svg
@@ -1,6 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.6667 2H3.33333C2.59695 2 2 2.59695 2 3.33333V12.6667C2 13.403 2.59695 14 3.33333 14H12.6667C13.403 14 14 13.403 14 12.6667V3.33333C14 2.59695 13.403 2 12.6667 2Z" stroke="#888888" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 5H5" stroke="#888888" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M10.5 8H5" stroke="#888888" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9 10.9502H5" stroke="#888888" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/icons/list_tree.svg
+++ b/assets/icons/list_tree.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-list-tree"><path d="M21 12h-8"/><path d="M21 6H8"/><path d="M21 18h-8"/><path d="M3 6v4c0 1.1.9 2 2 2h3"/><path d="M3 10v6c0 1.1.9 2 2 2h3"/></svg>
--- a/assets/icons/rotate_cw.svg
+++ b/assets/icons/rotate_cw.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-rotate-cw"><path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8"/><path d="M21 3v5h-5"/></svg>
--- a/assets/icons/stop.svg
+++ b/assets/icons/stop.svg
@@ -1,3 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.88889 1H2.11111C1.49746 1 1 1.49746 1 2.11111V9.88889C1 10.5025 1.49746 11 2.11111 11H9.88889C10.5025 11 11 10.5025 11 9.88889V2.11111C11 1.49746 10.5025 1 9.88889 1Z" stroke="#C56757" stroke-width="1.25" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -51,11 +51,10 @@
      // "alt-h": "editor::DeleteToPreviousWordStart",
      // "alt-d": "editor::DeleteToNextWordEnd",
      "ctrl-x": "editor::Cut",
-      "ctrl-insert": "editor::Copy",
      "ctrl-c": "editor::Copy",
-      "shift-insert": "editor::Paste",
+      "ctrl-insert": "editor::Copy",
      "ctrl-v": "editor::Paste",
-      "ctrl-y": "editor::Redo",
+      "shift-insert": "editor::Paste",
      "ctrl-z": "editor::Undo",
      "ctrl-shift-z": "editor::Redo",
      "up": "editor::MoveUp",
@@ -420,7 +419,7 @@
      "alt-8": ["workspace::ActivatePane", 7],
      "alt-9": ["workspace::ActivatePane", 8],
      "ctrl-alt-b": "workspace::ToggleLeftDock",
-      "ctrl-b": "workspace::ToggleLeftDock",
+      "ctrl-b": "workspace::ToggleRightDock",
      "ctrl-j": "workspace::ToggleBottomDock",
      "ctrl-alt-y": "workspace::CloseAllDocks",
      "ctrl-shift-f": "pane::DeploySearch",
@@ -440,7 +439,6 @@
      "ctrl-shift-p": "command_palette::Toggle",
      "ctrl-shift-m": "diagnostics::Deploy",
      "ctrl-shift-e": "project_panel::ToggleFocus",
-      "ctrl-shift-b": "outline_panel::ToggleFocus",
      "ctrl-?": "assistant::ToggleFocus",
      "ctrl-alt-s": "workspace::SaveAll",
      "ctrl-k m": "language_selector::Toggle",
@@ -547,7 +545,7 @@
    }
  },
  {
-    "context": "ContextEditor > Editor",
+    "context": "ConversationEditor > Editor",
    "bindings": {
      "ctrl-enter": "assistant::Assist",
      "ctrl-s": "workspace::Save",
@@ -564,19 +562,6 @@
      "ctrl-enter": "project_search::SearchInNew"
    }
  },
-  {
-    "context": "OutlinePanel",
-    "bindings": {
-      "left": "outline_panel::CollapseSelectedEntry",
-      "right": "outline_panel::ExpandSelectedEntry",
-      "ctrl-alt-c": "outline_panel::CopyPath",
-      "alt-ctrl-shift-c": "outline_panel::CopyRelativePath",
-      "alt-ctrl-r": "outline_panel::RevealInFinder",
-      "space": "outline_panel::Open",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev"
-    }
-  },
  {
    "context": "ProjectPanel",
    "bindings": {
@@ -598,10 +583,7 @@
      "ctrl-backspace": ["project_panel::Delete", { "skip_prompt": false }],
      "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }],
      "alt-ctrl-r": "project_panel::RevealInFinder",
-      "alt-shift-f": "project_panel::NewSearchInDirectory",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev",
-      "escape": "menu::Cancel"
+      "alt-shift-f": "project_panel::NewSearchInDirectory"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -228,7 +228,7 @@
    }
  },
  {
-    "context": "ContextEditor > Editor",
+    "context": "ConversationEditor > Editor",
    "bindings": {
      "cmd-enter": "assistant::Assist",
      "cmd-s": "workspace::Save",
@@ -475,7 +475,6 @@
      "cmd-shift-p": "command_palette::Toggle",
      "cmd-shift-m": "diagnostics::Deploy",
      "cmd-shift-e": "project_panel::ToggleFocus",
-      "cmd-shift-b": "outline_panel::ToggleFocus",
      "cmd-?": "assistant::ToggleFocus",
      "cmd-alt-s": "workspace::SaveAll",
      "cmd-k m": "language_selector::Toggle",
@@ -585,19 +584,6 @@
      "cmd-enter": "project_search::SearchInNew"
    }
  },
-  {
-    "context": "OutlinePanel",
-    "bindings": {
-      "left": "outline_panel::CollapseSelectedEntry",
-      "right": "outline_panel::ExpandSelectedEntry",
-      "cmd-alt-c": "outline_panel::CopyPath",
-      "alt-cmd-shift-c": "outline_panel::CopyRelativePath",
-      "alt-cmd-r": "outline_panel::RevealInFinder",
-      "space": "outline_panel::Open",
-      "shift-down": "menu::SelectNext",
-      "shift-up": "menu::SelectPrev"
-    }
-  },
  {
    "context": "ProjectPanel",
    "bindings": {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -80,7 +80,6 @@
      "g shift-e": ["vim::PreviousWordEnd", { "ignorePunctuation": true }],

      "/": "vim::Search",
-      "g /": "pane::DeploySearch",
      "?": [
        "vim::Search",
        {
@@ -246,10 +245,9 @@
          "displayLines": true
        }
      ],
-      "g v": "vim::RestoreVisualSelection",
      "g ]": "editor::GoToDiagnostic",
      "g [": "editor::GoToPrevDiagnostic",
-      "g i": "vim::InsertAtPrevious",
+      "g i": ["workspace::SendKeystrokes", "` ^ i"],
      "g ,": "vim::ChangeListNewer",
      "g ;": "vim::ChangeListOlder",
      "shift-h": "vim::WindowTop",
@@ -383,10 +381,6 @@
      "shift-s": "vim::SubstituteLine",
      ">": ["vim::PushOperator", "Indent"],
      "<": ["vim::PushOperator", "Outdent"],
-      "g u": ["vim::PushOperator", "Lowercase"],
-      "g shift-u": ["vim::PushOperator", "Uppercase"],
-      "g ~": ["vim::PushOperator", "OppositeCase"],
-      "\"": ["vim::PushOperator", "Register"],
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      // tree-sitter related commands
@@ -401,7 +395,6 @@
  {
    "context": "Editor && vim_mode == visual && vim_operator == none && !VimWaiting",
    "bindings": {
-      "\"": ["vim::PushOperator", "Register"],
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
      "] x": "editor::SelectSmallerSyntaxNode"
@@ -437,27 +430,6 @@
      "d": "vim::CurrentLine"
    }
  },
-  {
-    "context": "Editor && vim_operator == gu",
-    "bindings": {
-      "g u": "vim::CurrentLine",
-      "u": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "Editor && vim_operator == gU",
-    "bindings": {
-      "g shift-u": "vim::CurrentLine",
-      "shift-u": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "Editor && vim_operator == g~",
-    "bindings": {
-      "g ~": "vim::CurrentLine",
-      "~": "vim::CurrentLine"
-    }
-  },
  {
    "context": "Editor && vim_mode == normal && vim_operator == d",
    "bindings": {
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -119,10 +119,10 @@
  // The debounce delay before re-querying the language server for completion
  // documentation when not included in original completion list.
  "completion_documentation_secondary_query_debounce": 300,
-  // 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 softwrap is set to 'preferred_line_length', and will show any
-  // additional guides as specified by the 'wrap_guides' setting.
+  // Whether to show wrap guides 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 additional guides as specified
+  // by the 'wrap_guides' setting.
  "show_wrap_guides": true,
  // Character counts at which to show wrap guides in the editor.
  "wrap_guides": [],
@@ -295,29 +295,6 @@
    /// when a directory has only one directory inside.
    "auto_fold_dirs": false
  },
-  "outline_panel": {
-    // Whether to show the outline panel button in the status bar
-    "button": true,
-    // Default width of the outline panel.
-    "default_width": 300,
-    // Where to dock the outline panel. Can be 'left' or 'right'.
-    "dock": "left",
-    // Whether to show file icons in the outline panel.
-    "file_icons": true,
-    // Whether to show folder icons or chevrons for directories in the outline panel.
-    "folder_icons": true,
-    // Whether to show the git status in the outline panel.
-    "git_status": true,
-    // Amount of indentation for nested items.
-    "indent_size": 20,
-    // Whether to reveal it in the outline panel automatically,
-    // when a corresponding outline entry becomes active.
-    // Gitignored entries are never auto revealed.
-    "auto_reveal_entries": true,
-    /// Whether to fold directories automatically
-    /// when a directory has only one directory inside.
-    "auto_fold_dirs": true
-  },
  "collaboration_panel": {
    // Whether to show the collaboration panel button in the status bar.
    "button": true,
@@ -377,9 +354,6 @@
  "show_call_status_icon": true,
  // Whether to use language servers to provide code intelligence.
  "enable_language_server": true,
-  // Whether to perform linked edits of associated ranges, if the language server supports it.
-  // For example, when editing opening <html> tag, the contents of the closing </html> tag will be edited as well.
-  "linked_edits": true,
  // The list of language servers to use (or disable) for all languages.
  //
  // This is typically customized on a per-language basis.
--- a/crates/activity_indicator/src/activity_indicator.rs
+++ b/crates/activity_indicator/src/activity_indicator.rs
@@ -62,16 +62,16 @@ impl ActivityIndicator {
                    this.update(&mut cx, |this, cx| {
                        this.statuses.retain(|s| s.name != name);
                        this.statuses.push(LspStatus { name, status });
-                        cx.notify();
+                        cx.notify(); // commented back in
                    })?;
                }
                anyhow::Ok(())
            })
            .detach();
-            cx.observe(&project, |_, _, cx| cx.notify()).detach();
+            cx.observe(&project, |_, _, cx| cx.notify()).detach(); // commented back in

            if let Some(auto_updater) = auto_updater.as_ref() {
-                cx.observe(auto_updater, |_, _, cx| cx.notify()).detach();
+                cx.observe(auto_updater, |_, _, cx| cx.notify()).detach(); // commented back in
            }

            Self {
@@ -285,10 +285,10 @@ impl ActivityIndicator {
                    icon: None,
                    message: "Click to restart and update Zed".to_string(),
                    on_click: Some(Arc::new({
-                        let reload = workspace::Reload {
+                        let restart = workspace::Restart {
                            binary_path: Some(binary_path.clone()),
                        };
-                        move |_, cx| workspace::reload(&reload, cx)
+                        move |_, cx| workspace::restart(&restart, cx)
                    })),
                },
                AutoUpdateStatus::Errored => Content {
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -35,21 +35,18 @@ language.workspace = true
 log.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
 project.workspace = true
 regex.workspace = true
 rope.workspace = true
-rustdoc.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
 smol.workspace = true
 strsim = "0.11"
 strum.workspace = true
--- a/crates/assistant/src/assistant.rs
+++ b/crates/assistant/src/assistant.rs
@@ -1,7 +1,7 @@
 pub mod assistant_panel;
 pub mod assistant_settings;
 mod completion_provider;
-mod context_store;
+mod conversation_store;
 mod inline_assistant;
 mod model_selector;
 mod prompt_library;
@@ -12,22 +12,21 @@ mod streaming_diff;

 pub use assistant_panel::AssistantPanel;

-use assistant_settings::{AnthropicModel, AssistantSettings, CloudModel, OllamaModel, OpenAiModel};
+use assistant_settings::{AnthropicModel, AssistantSettings, CloudModel, OpenAiModel};
 use assistant_slash_command::SlashCommandRegistry;
 use client::{proto, Client};
 use command_palette_hooks::CommandPaletteFilter;
 pub(crate) use completion_provider::*;
-pub(crate) use context_store::*;
+pub(crate) use conversation_store::*;
 use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
 pub(crate) use inline_assistant::*;
 pub(crate) use model_selector::*;
-use rustdoc::RustdocStore;
 use semantic_index::{CloudEmbeddingProvider, SemanticIndex};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore};
 use slash_command::{
-    active_command, default_command, diagnostics_command, fetch_command, file_command, now_command,
-    project_command, prompt_command, rustdoc_command, search_command, tabs_command,
+    active_command, default_command, fetch_command, file_command, project_command, prompt_command,
+    rustdoc_command, search_command, tabs_command,
 };
 use std::{
    fmt::{self, Display},
@@ -92,7 +91,6 @@ pub enum LanguageModel {
    Cloud(CloudModel),
    OpenAi(OpenAiModel),
    Anthropic(AnthropicModel),
-    Ollama(OllamaModel),
 }

 impl Default for LanguageModel {
@@ -107,7 +105,6 @@ impl LanguageModel {
            LanguageModel::OpenAi(model) => format!("openai/{}", model.id()),
            LanguageModel::Anthropic(model) => format!("anthropic/{}", model.id()),
            LanguageModel::Cloud(model) => format!("zed.dev/{}", model.id()),
-            LanguageModel::Ollama(model) => format!("ollama/{}", model.id()),
        }
    }

@@ -116,7 +113,6 @@ impl LanguageModel {
            LanguageModel::OpenAi(model) => model.display_name().into(),
            LanguageModel::Anthropic(model) => model.display_name().into(),
            LanguageModel::Cloud(model) => model.display_name().into(),
-            LanguageModel::Ollama(model) => model.display_name().into(),
        }
    }

@@ -125,7 +121,6 @@ impl LanguageModel {
            LanguageModel::OpenAi(model) => model.max_token_count(),
            LanguageModel::Anthropic(model) => model.max_token_count(),
            LanguageModel::Cloud(model) => model.max_token_count(),
-            LanguageModel::Ollama(model) => model.max_token_count(),
        }
    }

@@ -134,7 +129,6 @@ impl LanguageModel {
            LanguageModel::OpenAi(model) => model.id(),
            LanguageModel::Anthropic(model) => model.id(),
            LanguageModel::Cloud(model) => model.id(),
-            LanguageModel::Ollama(model) => model.id(),
        }
    }
 }
@@ -185,7 +179,6 @@ impl LanguageModelRequest {
        match &self.model {
            LanguageModel::OpenAi(_) => {}
            LanguageModel::Anthropic(_) => {}
-            LanguageModel::Ollama(_) => {}
            LanguageModel::Cloud(model) => match model {
                CloudModel::Claude3Opus | CloudModel::Claude3Sonnet | CloudModel::Claude3Haiku => {
                    preprocess_anthropic_request(self);
@@ -287,7 +280,6 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
    register_slash_commands(cx);
    assistant_panel::init(cx);
    inline_assistant::init(client.telemetry().clone(), cx);
-    RustdocStore::init_global(cx);

    CommandPaletteFilter::update_global(cx, |filter, _cx| {
        filter.hide_namespace(Assistant::NAMESPACE);
@@ -315,8 +307,6 @@ fn register_slash_commands(cx: &mut AppContext) {
    slash_command_registry.register_command(search_command::SearchSlashCommand, true);
    slash_command_registry.register_command(prompt_command::PromptSlashCommand, true);
    slash_command_registry.register_command(default_command::DefaultSlashCommand, true);
-    slash_command_registry.register_command(now_command::NowSlashCommand, true);
-    slash_command_registry.register_command(diagnostics_command::DiagnosticsCommand, true);
    slash_command_registry.register_command(rustdoc_command::RustdocSlashCommand, false);
    slash_command_registry.register_command(fetch_command::FetchSlashCommand, false);
 }
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
--- a/crates/assistant/src/assistant_settings.rs
+++ b/crates/assistant/src/assistant_settings.rs
@@ -2,7 +2,6 @@ use std::fmt;

 pub use anthropic::Model as AnthropicModel;
 use gpui::Pixels;
-pub use ollama::Model as OllamaModel;
 pub use open_ai::Model as OpenAiModel;
 use schemars::{
    schema::{InstanceType, Metadata, Schema, SchemaObject},
@@ -169,11 +168,6 @@ pub enum AssistantProvider {
        api_url: String,
        low_speed_timeout_in_seconds: Option<u64>,
    },
-    Ollama {
-        model: OllamaModel,
-        api_url: String,
-        low_speed_timeout_in_seconds: Option<u64>,
-    },
 }

 impl Default for AssistantProvider {
@@ -203,12 +197,6 @@ pub enum AssistantProviderContent {
        api_url: Option<String>,
        low_speed_timeout_in_seconds: Option<u64>,
    },
-    #[serde(rename = "ollama")]
-    Ollama {
-        default_model: Option<OllamaModel>,
-        api_url: Option<String>,
-        low_speed_timeout_in_seconds: Option<u64>,
-    },
 }

 #[derive(Debug, Default)]
@@ -340,13 +328,6 @@ impl AssistantSettingsContent {
                                low_speed_timeout_in_seconds: None,
                            })
                        }
-                        LanguageModel::Ollama(model) => {
-                            *provider = Some(AssistantProviderContent::Ollama {
-                                default_model: Some(model),
-                                api_url: None,
-                                low_speed_timeout_in_seconds: None,
-                            })
-                        }
                    },
                },
            },
@@ -491,27 +472,6 @@ impl Settings for AssistantSettings {
                                Some(low_speed_timeout_in_seconds_override);
                        }
                    }
-                    (
-                        AssistantProvider::Ollama {
-                            model,
-                            api_url,
-                            low_speed_timeout_in_seconds,
-                        },
-                        AssistantProviderContent::Ollama {
-                            default_model: model_override,
-                            api_url: api_url_override,
-                            low_speed_timeout_in_seconds: low_speed_timeout_in_seconds_override,
-                        },
-                    ) => {
-                        merge(model, model_override);
-                        merge(api_url, api_url_override);
-                        if let Some(low_speed_timeout_in_seconds_override) =
-                            low_speed_timeout_in_seconds_override
-                        {
-                            *low_speed_timeout_in_seconds =
-                                Some(low_speed_timeout_in_seconds_override);
-                        }
-                    }
                    (
                        AssistantProvider::Anthropic {
                            model,
@@ -559,15 +519,6 @@ impl Settings for AssistantSettings {
                                    .unwrap_or_else(|| anthropic::ANTHROPIC_API_URL.into()),
                                low_speed_timeout_in_seconds,
                            },
-                            AssistantProviderContent::Ollama {
-                                default_model: model,
-                                api_url,
-                                low_speed_timeout_in_seconds,
-                            } => AssistantProvider::Ollama {
-                                model: model.unwrap_or_default(),
-                                api_url: api_url.unwrap_or_else(|| ollama::OLLAMA_API_URL.into()),
-                                low_speed_timeout_in_seconds,
-                            },
                        };
                    }
                }
--- a/crates/assistant/src/completion_provider.rs
+++ b/crates/assistant/src/completion_provider.rs
@@ -2,14 +2,12 @@ mod anthropic;
 mod cloud;
 #[cfg(test)]
 mod fake;
-mod ollama;
 mod open_ai;

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

 use crate::{
@@ -52,18 +50,6 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
            low_speed_timeout_in_seconds.map(Duration::from_secs),
            settings_version,
        )),
-        AssistantProvider::Ollama {
-            model,
-            api_url,
-            low_speed_timeout_in_seconds,
-        } => CompletionProvider::Ollama(OllamaCompletionProvider::new(
-            model.clone(),
-            api_url.clone(),
-            client.http_client(),
-            low_speed_timeout_in_seconds.map(Duration::from_secs),
-            settings_version,
-            cx,
-        )),
    };
    cx.set_global(provider);

@@ -101,24 +87,6 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                        settings_version,
                    );
                }
-
-                (
-                    CompletionProvider::Ollama(provider),
-                    AssistantProvider::Ollama {
-                        model,
-                        api_url,
-                        low_speed_timeout_in_seconds,
-                    },
-                ) => {
-                    provider.update(
-                        model.clone(),
-                        api_url.clone(),
-                        low_speed_timeout_in_seconds.map(Duration::from_secs),
-                        settings_version,
-                        cx,
-                    );
-                }
-
                (CompletionProvider::Cloud(provider), AssistantProvider::ZedDotDev { model }) => {
                    provider.update(model.clone(), settings_version);
                }
@@ -162,23 +130,6 @@ pub fn init(client: Arc<Client>, cx: &mut AppContext) {
                        settings_version,
                    ));
                }
-                (
-                    _,
-                    AssistantProvider::Ollama {
-                        model,
-                        api_url,
-                        low_speed_timeout_in_seconds,
-                    },
-                ) => {
-                    *provider = CompletionProvider::Ollama(OllamaCompletionProvider::new(
-                        model.clone(),
-                        api_url.clone(),
-                        client.http_client(),
-                        low_speed_timeout_in_seconds.map(Duration::from_secs),
-                        settings_version,
-                        cx,
-                    ));
-                }
            }
        })
    })
@@ -191,7 +142,6 @@ pub enum CompletionProvider {
    Cloud(CloudCompletionProvider),
    #[cfg(test)]
    Fake(FakeCompletionProvider),
-    Ollama(OllamaCompletionProvider),
 }

 impl gpui::Global for CompletionProvider {}
@@ -215,10 +165,6 @@ impl CompletionProvider {
                .available_models()
                .map(LanguageModel::Cloud)
                .collect(),
-            CompletionProvider::Ollama(provider) => provider
-                .available_models()
-                .map(|model| LanguageModel::Ollama(model.clone()))
-                .collect(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
        }
@@ -229,7 +175,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.settings_version(),
            CompletionProvider::Anthropic(provider) => provider.settings_version(),
            CompletionProvider::Cloud(provider) => provider.settings_version(),
-            CompletionProvider::Ollama(provider) => provider.settings_version(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
        }
@@ -240,7 +185,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.is_authenticated(),
            CompletionProvider::Anthropic(provider) => provider.is_authenticated(),
            CompletionProvider::Cloud(provider) => provider.is_authenticated(),
-            CompletionProvider::Ollama(provider) => provider.is_authenticated(),
            #[cfg(test)]
            CompletionProvider::Fake(_) => true,
        }
@@ -251,7 +195,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.authenticate(cx),
            CompletionProvider::Anthropic(provider) => provider.authenticate(cx),
            CompletionProvider::Cloud(provider) => provider.authenticate(cx),
-            CompletionProvider::Ollama(provider) => provider.authenticate(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => Task::ready(Ok(())),
        }
@@ -262,7 +205,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.authentication_prompt(cx),
            CompletionProvider::Anthropic(provider) => provider.authentication_prompt(cx),
            CompletionProvider::Cloud(provider) => provider.authentication_prompt(cx),
-            CompletionProvider::Ollama(provider) => provider.authentication_prompt(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => unimplemented!(),
        }
@@ -273,7 +215,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.reset_credentials(cx),
            CompletionProvider::Anthropic(provider) => provider.reset_credentials(cx),
            CompletionProvider::Cloud(_) => Task::ready(Ok(())),
-            CompletionProvider::Ollama(provider) => provider.reset_credentials(cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => Task::ready(Ok(())),
        }
@@ -284,7 +225,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => LanguageModel::OpenAi(provider.model()),
            CompletionProvider::Anthropic(provider) => LanguageModel::Anthropic(provider.model()),
            CompletionProvider::Cloud(provider) => LanguageModel::Cloud(provider.model()),
-            CompletionProvider::Ollama(provider) => LanguageModel::Ollama(provider.model()),
            #[cfg(test)]
            CompletionProvider::Fake(_) => LanguageModel::default(),
        }
@@ -299,7 +239,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.count_tokens(request, cx),
            CompletionProvider::Anthropic(provider) => provider.count_tokens(request, cx),
            CompletionProvider::Cloud(provider) => provider.count_tokens(request, cx),
-            CompletionProvider::Ollama(provider) => provider.count_tokens(request, cx),
            #[cfg(test)]
            CompletionProvider::Fake(_) => futures::FutureExt::boxed(futures::future::ready(Ok(0))),
        }
@@ -313,7 +252,6 @@ impl CompletionProvider {
            CompletionProvider::OpenAi(provider) => provider.complete(request),
            CompletionProvider::Anthropic(provider) => provider.complete(request),
            CompletionProvider::Cloud(provider) => provider.complete(request),
-            CompletionProvider::Ollama(provider) => provider.complete(request),
            #[cfg(test)]
            CompletionProvider::Fake(provider) => provider.complete(),
        }
--- a/crates/assistant/src/completion_provider/anthropic.rs
+++ b/crates/assistant/src/completion_provider/anthropic.rs
@@ -349,7 +349,7 @@ impl Render for AuthenticationPrompt {
                h_flex()
                    .gap_2()
                    .child(Label::new("Click on").size(LabelSize::Small))
-                    .child(Icon::new(IconName::ZedAssistant).size(IconSize::XSmall))
+                    .child(Icon::new(IconName::Ai).size(IconSize::XSmall))
                    .child(
                        Label::new("in the status bar to close this panel.").size(LabelSize::Small),
                    ),
--- a/crates/assistant/src/completion_provider/ollama.rs
+++ b/crates/assistant/src/completion_provider/ollama.rs
@@ -1,348 +0,0 @@
-use crate::{
-    assistant_settings::OllamaModel, CompletionProvider, LanguageModel, LanguageModelRequest, Role,
-};
-use anyhow::Result;
-use futures::StreamExt as _;
-use futures::{future::BoxFuture, stream::BoxStream, FutureExt};
-use gpui::{AnyView, AppContext, Task};
-use http::HttpClient;
-use ollama::{
-    get_models, preload_model, stream_chat_completion, ChatMessage, ChatOptions, ChatRequest,
-    Role as OllamaRole,
-};
-use std::sync::Arc;
-use std::time::Duration;
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-
-const OLLAMA_DOWNLOAD_URL: &str = "https://ollama.com/download";
-const OLLAMA_LIBRARY_URL: &str = "https://ollama.com/library";
-
-pub struct OllamaCompletionProvider {
-    api_url: String,
-    model: OllamaModel,
-    http_client: Arc<dyn HttpClient>,
-    low_speed_timeout: Option<Duration>,
-    settings_version: usize,
-    available_models: Vec<OllamaModel>,
-}
-
-impl OllamaCompletionProvider {
-    pub fn new(
-        model: OllamaModel,
-        api_url: String,
-        http_client: Arc<dyn HttpClient>,
-        low_speed_timeout: Option<Duration>,
-        settings_version: usize,
-        cx: &AppContext,
-    ) -> Self {
-        cx.spawn({
-            let api_url = api_url.clone();
-            let client = http_client.clone();
-            let model = model.name.clone();
-
-            |_| async move {
-                if model.is_empty() {
-                    return Ok(());
-                }
-                preload_model(client.as_ref(), &api_url, &model).await
-            }
-        })
-        .detach_and_log_err(cx);
-
-        Self {
-            api_url,
-            model,
-            http_client,
-            low_speed_timeout,
-            settings_version,
-            available_models: Default::default(),
-        }
-    }
-
-    pub fn update(
-        &mut self,
-        model: OllamaModel,
-        api_url: String,
-        low_speed_timeout: Option<Duration>,
-        settings_version: usize,
-        cx: &AppContext,
-    ) {
-        cx.spawn({
-            let api_url = api_url.clone();
-            let client = self.http_client.clone();
-            let model = model.name.clone();
-
-            |_| async move { preload_model(client.as_ref(), &api_url, &model).await }
-        })
-        .detach_and_log_err(cx);
-
-        if model.name.is_empty() {
-            self.select_first_available_model()
-        } else {
-            self.model = model;
-        }
-
-        self.api_url = api_url;
-        self.low_speed_timeout = low_speed_timeout;
-        self.settings_version = settings_version;
-    }
-
-    pub fn available_models(&self) -> impl Iterator<Item = &OllamaModel> {
-        self.available_models.iter()
-    }
-
-    pub fn select_first_available_model(&mut self) {
-        if let Some(model) = self.available_models.first() {
-            self.model = model.clone();
-        }
-    }
-
-    pub fn settings_version(&self) -> usize {
-        self.settings_version
-    }
-
-    pub fn is_authenticated(&self) -> bool {
-        !self.available_models.is_empty()
-    }
-
-    pub fn authenticate(&self, cx: &AppContext) -> Task<Result<()>> {
-        if self.is_authenticated() {
-            Task::ready(Ok(()))
-        } else {
-            self.fetch_models(cx)
-        }
-    }
-
-    pub fn reset_credentials(&self, cx: &AppContext) -> Task<Result<()>> {
-        self.fetch_models(cx)
-    }
-
-    pub fn fetch_models(&self, cx: &AppContext) -> Task<Result<()>> {
-        let http_client = self.http_client.clone();
-        let api_url = self.api_url.clone();
-
-        // As a proxy for the server being "authenticated", we'll check if its up by fetching the models
-        cx.spawn(|mut cx| async move {
-            let models = get_models(http_client.as_ref(), &api_url, None).await?;
-
-            let mut models: Vec<OllamaModel> = models
-                .into_iter()
-                // Since there is no metadata from the Ollama API
-                // indicating which models are embedding models,
-                // simply filter out models with "-embed" in their name
-                .filter(|model| !model.name.contains("-embed"))
-                .map(|model| OllamaModel::new(&model.name))
-                .collect();
-
-            models.sort_by(|a, b| a.name.cmp(&b.name));
-
-            cx.update_global::<CompletionProvider, _>(|provider, _cx| {
-                if let CompletionProvider::Ollama(provider) = provider {
-                    provider.available_models = models;
-
-                    if !provider.available_models.is_empty() && provider.model.name.is_empty() {
-                        provider.select_first_available_model()
-                    }
-                }
-            })
-        })
-    }
-
-    pub fn authentication_prompt(&self, cx: &mut WindowContext) -> AnyView {
-        let fetch_models = Box::new(move |cx: &mut WindowContext| {
-            cx.update_global::<CompletionProvider, _>(|provider, cx| {
-                if let CompletionProvider::Ollama(provider) = provider {
-                    provider.fetch_models(cx)
-                } else {
-                    Task::ready(Ok(()))
-                }
-            })
-        });
-
-        cx.new_view(|cx| DownloadOllamaMessage::new(fetch_models, cx))
-            .into()
-    }
-
-    pub fn model(&self) -> OllamaModel {
-        self.model.clone()
-    }
-
-    pub fn count_tokens(
-        &self,
-        request: LanguageModelRequest,
-        _cx: &AppContext,
-    ) -> BoxFuture<'static, Result<usize>> {
-        // There is no endpoint for this _yet_ in Ollama
-        // see: https://github.com/ollama/ollama/issues/1716 and https://github.com/ollama/ollama/issues/3582
-        let token_count = request
-            .messages
-            .iter()
-            .map(|msg| msg.content.chars().count())
-            .sum::<usize>()
-            / 4;
-
-        async move { Ok(token_count) }.boxed()
-    }
-
-    pub fn complete(
-        &self,
-        request: LanguageModelRequest,
-    ) -> BoxFuture<'static, Result<BoxStream<'static, Result<String>>>> {
-        let request = self.to_ollama_request(request);
-
-        let http_client = self.http_client.clone();
-        let api_url = self.api_url.clone();
-        let low_speed_timeout = self.low_speed_timeout;
-        async move {
-            let request =
-                stream_chat_completion(http_client.as_ref(), &api_url, request, low_speed_timeout);
-            let response = request.await?;
-            let stream = response
-                .filter_map(|response| async move {
-                    match response {
-                        Ok(delta) => {
-                            let content = match delta.message {
-                                ChatMessage::User { content } => content,
-                                ChatMessage::Assistant { content } => content,
-                                ChatMessage::System { content } => content,
-                            };
-                            Some(Ok(content))
-                        }
-                        Err(error) => Some(Err(error)),
-                    }
-                })
-                .boxed();
-            Ok(stream)
-        }
-        .boxed()
-    }
-
-    fn to_ollama_request(&self, request: LanguageModelRequest) -> ChatRequest {
-        let model = match request.model {
-            LanguageModel::Ollama(model) => model,
-            _ => self.model(),
-        };
-
-        ChatRequest {
-            model: model.name,
-            messages: request
-                .messages
-                .into_iter()
-                .map(|msg| match msg.role {
-                    Role::User => ChatMessage::User {
-                        content: msg.content,
-                    },
-                    Role::Assistant => ChatMessage::Assistant {
-                        content: msg.content,
-                    },
-                    Role::System => ChatMessage::System {
-                        content: msg.content,
-                    },
-                })
-                .collect(),
-            keep_alive: model.keep_alive.unwrap_or_default(),
-            stream: true,
-            options: Some(ChatOptions {
-                num_ctx: Some(model.max_tokens),
-                stop: Some(request.stop),
-                temperature: Some(request.temperature),
-                ..Default::default()
-            }),
-        }
-    }
-}
-
-impl From<Role> for ollama::Role {
-    fn from(val: Role) -> Self {
-        match val {
-            Role::User => OllamaRole::User,
-            Role::Assistant => OllamaRole::Assistant,
-            Role::System => OllamaRole::System,
-        }
-    }
-}
-
-struct DownloadOllamaMessage {
-    retry_connection: Box<dyn Fn(&mut WindowContext) -> Task<Result<()>>>,
-}
-
-impl DownloadOllamaMessage {
-    pub fn new(
-        retry_connection: Box<dyn Fn(&mut WindowContext) -> Task<Result<()>>>,
-        _cx: &mut ViewContext<Self>,
-    ) -> Self {
-        Self { retry_connection }
-    }
-
-    fn render_download_button(&self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        ButtonLike::new("download_ollama_button")
-            .style(ButtonStyle::Filled)
-            .size(ButtonSize::Large)
-            .layer(ElevationIndex::ModalSurface)
-            .child(Label::new("Get Ollama"))
-            .on_click(move |_, cx| cx.open_url(OLLAMA_DOWNLOAD_URL))
-    }
-
-    fn render_retry_button(&self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        ButtonLike::new("retry_ollama_models")
-            .style(ButtonStyle::Filled)
-            .size(ButtonSize::Large)
-            .layer(ElevationIndex::ModalSurface)
-            .child(Label::new("Retry"))
-            .on_click(cx.listener(move |this, _, cx| {
-                let connected = (this.retry_connection)(cx);
-
-                cx.spawn(|_this, _cx| async move {
-                    connected.await?;
-                    anyhow::Ok(())
-                })
-                .detach_and_log_err(cx)
-            }))
-    }
-
-    fn render_next_steps(&self, _cx: &mut ViewContext<Self>) -> impl IntoElement {
-        v_flex()
-            .p_4()
-            .size_full()
-            .gap_2()
-            .child(
-                Label::new("Once Ollama is on your machine, make sure to download a model or two.")
-                    .size(LabelSize::Large),
-            )
-            .child(
-                h_flex().w_full().p_4().justify_center().gap_2().child(
-                    ButtonLike::new("view-models")
-                        .style(ButtonStyle::Filled)
-                        .size(ButtonSize::Large)
-                        .layer(ElevationIndex::ModalSurface)
-                        .child(Label::new("View Available Models"))
-                        .on_click(move |_, cx| cx.open_url(OLLAMA_LIBRARY_URL)),
-                ),
-            )
-    }
-}
-
-impl Render for DownloadOllamaMessage {
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
-        v_flex()
-            .p_4()
-            .size_full()
-            .gap_2()
-            .child(Label::new("To use Ollama models via the assistant, Ollama must be running on your machine with at least one model downloaded.").size(LabelSize::Large))
-            .child(
-                h_flex()
-                    .w_full()
-                    .p_4()
-                    .justify_center()
-                    .gap_2()
-                    .child(
-                        self.render_download_button(cx)
-                    )
-                    .child(
-                        self.render_retry_button(cx)
-                    )
-            )
-            .child(self.render_next_steps(cx))
-            .into_any()
-    }
-}
--- a/crates/assistant/src/completion_provider/open_ai.rs
+++ b/crates/assistant/src/completion_provider/open_ai.rs
@@ -336,7 +336,7 @@ impl Render for AuthenticationPrompt {
                h_flex()
                    .gap_2()
                    .child(Label::new("Click on").size(LabelSize::Small))
-                    .child(Icon::new(IconName::ZedAssistant).size(IconSize::XSmall))
+                    .child(Icon::new(IconName::Ai).size(IconSize::XSmall))
                    .child(
                        Label::new("in the status bar to close this panel.").size(LabelSize::Small),
                    ),
--- a/crates/assistant/src/conversation_store.rs
+++ b/crates/assistant/src/conversation_store.rs
@@ -9,7 +9,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::{cmp::Reverse, ffi::OsStr, path::PathBuf, sync::Arc, time::Duration};
 use ui::Context;
-use util::{paths::CONTEXTS_DIR, ResultExt, TryFutureExt};
+use util::{paths::CONVERSATIONS_DIR, ResultExt, TryFutureExt};

 #[derive(Serialize, Deserialize)]
 pub struct SavedMessage {
@@ -18,7 +18,7 @@ pub struct SavedMessage {
 }

 #[derive(Serialize, Deserialize)]
-pub struct SavedContext {
+pub struct SavedConversation {
    pub id: Option<String>,
    pub zed: String,
    pub version: String,
@@ -28,12 +28,12 @@ pub struct SavedContext {
    pub summary: String,
 }

-impl SavedContext {
+impl SavedConversation {
    pub const VERSION: &'static str = "0.2.0";
 }

 #[derive(Serialize, Deserialize)]
-struct SavedContextV0_1_0 {
+struct SavedConversationV0_1_0 {
    id: Option<String>,
    zed: String,
    version: String,
@@ -46,26 +46,28 @@ struct SavedContextV0_1_0 {
 }

 #[derive(Clone)]
-pub struct SavedContextMetadata {
+pub struct SavedConversationMetadata {
    pub title: String,
    pub path: PathBuf,
    pub mtime: chrono::DateTime<chrono::Local>,
 }

-pub struct ContextStore {
-    contexts_metadata: Vec<SavedContextMetadata>,
+pub struct ConversationStore {
+    conversations_metadata: Vec<SavedConversationMetadata>,
    fs: Arc<dyn Fs>,
    _watch_updates: Task<Option<()>>,
 }

-impl ContextStore {
+impl ConversationStore {
    pub fn new(fs: Arc<dyn Fs>, cx: &mut AppContext) -> Task<Result<Model<Self>>> {
        cx.spawn(|mut cx| async move {
-            const CONTEXT_WATCH_DURATION: Duration = Duration::from_millis(100);
-            let (mut events, _) = fs.watch(&CONTEXTS_DIR, CONTEXT_WATCH_DURATION).await;
+            const CONVERSATION_WATCH_DURATION: Duration = Duration::from_millis(100);
+            let (mut events, _) = fs
+                .watch(&CONVERSATIONS_DIR, CONVERSATION_WATCH_DURATION)
+                .await;

            let this = cx.new_model(|cx: &mut ModelContext<Self>| Self {
-                contexts_metadata: Vec::new(),
+                conversations_metadata: Vec::new(),
                fs,
                _watch_updates: cx.spawn(|this, mut cx| {
                    async move {
@@ -86,41 +88,46 @@ impl ContextStore {
        })
    }

-    pub fn load(&self, path: PathBuf, cx: &AppContext) -> Task<Result<SavedContext>> {
+    pub fn load(&self, path: PathBuf, cx: &AppContext) -> Task<Result<SavedConversation>> {
        let fs = self.fs.clone();
        cx.background_executor().spawn(async move {
-            let saved_context = fs.load(&path).await?;
-            let saved_context_json = serde_json::from_str::<serde_json::Value>(&saved_context)?;
-            match saved_context_json
+            let saved_conversation = fs.load(&path).await?;
+            let saved_conversation_json =
+                serde_json::from_str::<serde_json::Value>(&saved_conversation)?;
+            match saved_conversation_json
                .get("version")
                .ok_or_else(|| anyhow!("version not found"))?
            {
                serde_json::Value::String(version) => match version.as_str() {
-                    SavedContext::VERSION => {
-                        Ok(serde_json::from_value::<SavedContext>(saved_context_json)?)
-                    }
+                    SavedConversation::VERSION => Ok(serde_json::from_value::<SavedConversation>(
+                        saved_conversation_json,
+                    )?),
                    "0.1.0" => {
-                        let saved_context =
-                            serde_json::from_value::<SavedContextV0_1_0>(saved_context_json)?;
-                        Ok(SavedContext {
-                            id: saved_context.id,
-                            zed: saved_context.zed,
-                            version: saved_context.version,
-                            text: saved_context.text,
-                            messages: saved_context.messages,
-                            message_metadata: saved_context.message_metadata,
-                            summary: saved_context.summary,
+                        let saved_conversation = serde_json::from_value::<SavedConversationV0_1_0>(
+                            saved_conversation_json,
+                        )?;
+                        Ok(SavedConversation {
+                            id: saved_conversation.id,
+                            zed: saved_conversation.zed,
+                            version: saved_conversation.version,
+                            text: saved_conversation.text,
+                            messages: saved_conversation.messages,
+                            message_metadata: saved_conversation.message_metadata,
+                            summary: saved_conversation.summary,
                        })
                    }
-                    _ => Err(anyhow!("unrecognized saved context version: {}", version)),
+                    _ => Err(anyhow!(
+                        "unrecognized saved conversation version: {}",
+                        version
+                    )),
                },
-                _ => Err(anyhow!("version not found on saved context")),
+                _ => Err(anyhow!("version not found on saved conversation")),
            }
        })
    }

-    pub fn search(&self, query: String, cx: &AppContext) -> Task<Vec<SavedContextMetadata>> {
-        let metadata = self.contexts_metadata.clone();
+    pub fn search(&self, query: String, cx: &AppContext) -> Task<Vec<SavedConversationMetadata>> {
+        let metadata = self.conversations_metadata.clone();
        let executor = cx.background_executor().clone();
        cx.background_executor().spawn(async move {
            if query.is_empty() {
@@ -152,10 +159,10 @@ impl ContextStore {
    fn reload(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
        let fs = self.fs.clone();
        cx.spawn(|this, mut cx| async move {
-            fs.create_dir(&CONTEXTS_DIR).await?;
+            fs.create_dir(&CONVERSATIONS_DIR).await?;

-            let mut paths = fs.read_dir(&CONTEXTS_DIR).await?;
-            let mut contexts = Vec::<SavedContextMetadata>::new();
+            let mut paths = fs.read_dir(&CONVERSATIONS_DIR).await?;
+            let mut conversations = Vec::<SavedConversationMetadata>::new();
            while let Some(path) = paths.next().await {
                let path = path?;
                if path.extension() != Some(OsStr::new("json")) {
@@ -171,13 +178,13 @@ impl ContextStore {
                    .and_then(|name| name.to_str())
                    .zip(metadata)
                {
-                    // This is used to filter out contexts saved by the new assistant.
+                    // This is used to filter out conversations saved by the new assistant.
                    if !re.is_match(file_name) {
                        continue;
                    }

                    if let Some(title) = re.replace(file_name, "").lines().next() {
-                        contexts.push(SavedContextMetadata {
+                        conversations.push(SavedConversationMetadata {
                            title: title.to_string(),
                            path,
                            mtime: metadata.mtime.into(),
@@ -185,10 +192,10 @@ impl ContextStore {
                    }
                }
            }
-            contexts.sort_unstable_by_key(|context| Reverse(context.mtime));
+            conversations.sort_unstable_by_key(|conversation| Reverse(conversation.mtime));

            this.update(&mut cx, |this, cx| {
-                this.contexts_metadata = contexts;
+                this.conversations_metadata = conversations;
                cx.notify();
            })
        })
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
--- a/crates/assistant/src/prompt_library.rs
+++ b/crates/assistant/src/prompt_library.rs
@@ -13,9 +13,10 @@ use futures::{
 };
 use fuzzy::StringMatchCandidate;
 use gpui::{
-    actions, percentage, point, size, Animation, AnimationExt, AppContext, BackgroundExecutor,
-    Bounds, EventEmitter, Global, PromptLevel, ReadGlobal, Subscription, Task, TitlebarOptions,
-    Transformation, UpdateGlobal, View, WindowBounds, WindowHandle, WindowOptions,
+    actions, percentage, point, size, Animation, AnimationExt, AnyElement, AppContext,
+    BackgroundExecutor, Bounds, DevicePixels, EventEmitter, Global, PromptLevel, ReadGlobal,
+    Subscription, Task, TitlebarOptions, Transformation, UpdateGlobal, View, WindowBounds,
+    WindowHandle, WindowOptions,
 };
 use heed::{types::SerdeBincode, Database, RoTxn};
 use language::{language_settings::SoftWrap, Buffer, LanguageRegistry};
@@ -25,7 +26,6 @@ use rope::Rope;
 use serde::{Deserialize, Serialize};
 use settings::Settings;
 use std::{
-    cmp::Reverse,
    future::Future,
    path::PathBuf,
    sync::{atomic::AtomicBool, Arc},
@@ -33,8 +33,8 @@ use std::{
 };
 use theme::ThemeSettings;
 use ui::{
-    div, prelude::*, IconButtonShape, ListItem, ListItemSpacing, ParentElement, Render,
-    SharedString, Styled, TitleBar, Tooltip, ViewContext, VisualContext,
+    div, prelude::*, IconButtonShape, ListHeader, ListItem, ListItemSpacing, ListSubHeader,
+    ParentElement, Render, SharedString, Styled, TitleBar, Tooltip, ViewContext, VisualContext,
 };
 use util::{paths::PROMPTS_DIR, ResultExt, TryFutureExt};
 use uuid::Uuid;
@@ -80,7 +80,11 @@ pub fn open_prompt_library(
        cx.spawn(|cx| async move {
            let store = store.await?;
            cx.update(|cx| {
-                let bounds = Bounds::centered(None, size(px(1024.0), px(768.0)), cx);
+                let bounds = Bounds::centered(
+                    None,
+                    size(DevicePixels::from(1024), DevicePixels::from(768)),
+                    cx,
+                );
                cx.open_window(
                    WindowOptions {
                        titlebar: Some(TitlebarOptions {
@@ -93,7 +97,7 @@ pub fn open_prompt_library(
                    },
                    |cx| cx.new_view(|cx| PromptLibrary::new(store, language_registry, cx)),
                )
-            })?
+            })
        })
    }
 }
@@ -120,23 +124,41 @@ struct PromptEditor {
 struct PromptPickerDelegate {
    store: Arc<PromptStore>,
    selected_index: usize,
-    matches: Vec<PromptMetadata>,
+    entries: Vec<PromptPickerEntry>,
 }

 enum PromptPickerEvent {
-    Selected { prompt_id: PromptId },
+    Selected { prompt_id: Option<PromptId> },
    Confirmed { prompt_id: PromptId },
    Deleted { prompt_id: PromptId },
    ToggledDefault { prompt_id: PromptId },
 }

+#[derive(Debug)]
+enum PromptPickerEntry {
+    DefaultPromptsHeader,
+    DefaultPromptsEmpty,
+    AllPromptsHeader,
+    AllPromptsEmpty,
+    Prompt(PromptMetadata),
+}
+
+impl PromptPickerEntry {
+    fn prompt_id(&self) -> Option<PromptId> {
+        match self {
+            PromptPickerEntry::Prompt(metadata) => Some(metadata.id),
+            _ => None,
+        }
+    }
+}
+
 impl EventEmitter<PromptPickerEvent> for Picker<PromptPickerDelegate> {}

 impl PickerDelegate for PromptPickerDelegate {
-    type ListItem = ListItem;
+    type ListItem = AnyElement;

    fn match_count(&self) -> usize {
-        self.matches.len()
+        self.entries.len()
    }

    fn selected_index(&self) -> usize {
@@ -145,11 +167,14 @@ impl PickerDelegate for PromptPickerDelegate {

    fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
        self.selected_index = ix;
-        if let Some(prompt) = self.matches.get(self.selected_index) {
-            cx.emit(PromptPickerEvent::Selected {
-                prompt_id: prompt.id,
-            });
-        }
+        let prompt_id = if let Some(PromptPickerEntry::Prompt(prompt)) =
+            self.entries.get(self.selected_index)
+        {
+            Some(prompt.id)
+        } else {
+            None
+        };
+        cx.emit(PromptPickerEvent::Selected { prompt_id });
    }

    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
@@ -158,24 +183,48 @@ impl PickerDelegate for PromptPickerDelegate {

    fn update_matches(&mut self, query: String, cx: &mut ViewContext<Picker<Self>>) -> Task<()> {
        let search = self.store.search(query);
-        let prev_prompt_id = self.matches.get(self.selected_index).map(|mat| mat.id);
+        let prev_prompt_id = self
+            .entries
+            .get(self.selected_index)
+            .and_then(|mat| mat.prompt_id());
        cx.spawn(|this, mut cx| async move {
-            let (matches, selected_index) = cx
+            let (entries, selected_index) = cx
                .background_executor()
                .spawn(async move {
-                    let matches = search.await;
+                    let prompts = search.await;
+                    let (default_prompts, prompts) = prompts
+                        .into_iter()
+                        .partition::<Vec<_>, _>(|prompt| prompt.default);
+
+                    let mut entries = Vec::new();
+                    entries.push(PromptPickerEntry::DefaultPromptsHeader);
+                    if default_prompts.is_empty() {
+                        entries.push(PromptPickerEntry::DefaultPromptsEmpty);
+                    } else {
+                        entries.extend(default_prompts.into_iter().map(PromptPickerEntry::Prompt));
+                    }
+
+                    entries.push(PromptPickerEntry::AllPromptsHeader);
+                    if prompts.is_empty() {
+                        entries.push(PromptPickerEntry::AllPromptsEmpty);
+                    } else {
+                        entries.extend(prompts.into_iter().map(PromptPickerEntry::Prompt));
+                    }

                    let selected_index = prev_prompt_id
                        .and_then(|prev_prompt_id| {
-                            matches.iter().position(|entry| entry.id == prev_prompt_id)
+                            entries
+                                .iter()
+                                .position(|entry| entry.prompt_id() == Some(prev_prompt_id))
                        })
+                        .or_else(|| entries.iter().position(|entry| entry.prompt_id().is_some()))
                        .unwrap_or(0);
-                    (matches, selected_index)
+                    (entries, selected_index)
                })
                .await;

            this.update(&mut cx, |this, cx| {
-                this.delegate.matches = matches;
+                this.delegate.entries = entries;
                this.delegate.set_selected_index(selected_index, cx);
                cx.notify();
            })
@@ -184,7 +233,7 @@ impl PickerDelegate for PromptPickerDelegate {
    }

    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        if let Some(prompt) = self.matches.get(self.selected_index) {
+        if let Some(PromptPickerEntry::Prompt(prompt)) = self.entries.get(self.selected_index) {
            cx.emit(PromptPickerEvent::Confirmed {
                prompt_id: prompt.id,
            });
@@ -199,59 +248,82 @@ impl PickerDelegate for PromptPickerDelegate {
        selected: bool,
        cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        let prompt = self.matches.get(ix)?;
-        let default = prompt.default;
-        let prompt_id = prompt.id;
-        let element = ListItem::new(ix)
-            .inset(true)
-            .spacing(ListItemSpacing::Sparse)
-            .selected(selected)
-            .child(h_flex().h_5().line_height(relative(1.)).child(Label::new(
-                prompt.title.clone().unwrap_or("Untitled".into()),
-            )))
-            .end_slot::<IconButton>(default.then(|| {
-                IconButton::new("toggle-default-prompt", IconName::SparkleFilled)
-                    .selected(true)
-                    .icon_color(Color::Accent)
-                    .shape(IconButtonShape::Square)
-                    .tooltip(move |cx| Tooltip::text("Remove from Default Prompt", cx))
-                    .on_click(cx.listener(move |_, _, cx| {
-                        cx.emit(PromptPickerEvent::ToggledDefault { prompt_id })
-                    }))
-            }))
-            .end_hover_slot(
-                h_flex()
-                    .gap_2()
-                    .child(
-                        IconButton::new("delete-prompt", IconName::Trash)
-                            .icon_color(Color::Muted)
-                            .shape(IconButtonShape::Square)
-                            .tooltip(move |cx| Tooltip::text("Delete Prompt", cx))
-                            .on_click(cx.listener(move |_, _, cx| {
-                                cx.emit(PromptPickerEvent::Deleted { prompt_id })
-                            })),
+        let prompt = self.entries.get(ix)?;
+        let element = match prompt {
+            PromptPickerEntry::DefaultPromptsHeader => ListHeader::new("Default Prompts")
+                .inset(true)
+                .start_slot(
+                    Icon::new(IconName::Sparkle)
+                        .color(Color::Muted)
+                        .size(IconSize::XSmall),
+                )
+                .selected(selected)
+                .into_any_element(),
+            PromptPickerEntry::DefaultPromptsEmpty => {
+                ListSubHeader::new("Star a prompt to add it to the default context")
+                    .inset(true)
+                    .selected(selected)
+                    .into_any_element()
+            }
+            PromptPickerEntry::AllPromptsHeader => ListHeader::new("All Prompts")
+                .inset(true)
+                .start_slot(
+                    Icon::new(IconName::Library)
+                        .color(Color::Muted)
+                        .size(IconSize::XSmall),
+                )
+                .selected(selected)
+                .into_any_element(),
+            PromptPickerEntry::AllPromptsEmpty => ListSubHeader::new("No prompts")
+                .inset(true)
+                .selected(selected)
+                .into_any_element(),
+            PromptPickerEntry::Prompt(prompt) => {
+                let default = prompt.default;
+                let prompt_id = prompt.id;
+                ListItem::new(ix)
+                    .inset(true)
+                    .spacing(ListItemSpacing::Sparse)
+                    .selected(selected)
+                    .child(h_flex().h_5().line_height(relative(1.)).child(Label::new(
+                        prompt.title.clone().unwrap_or("Untitled".into()),
+                    )))
+                    .end_hover_slot(
+                        h_flex()
+                            .gap_2()
+                            .child(
+                                IconButton::new("delete-prompt", IconName::Trash)
+                                    .icon_color(Color::Muted)
+                                    .shape(IconButtonShape::Square)
+                                    .tooltip(move |cx| Tooltip::text("Delete Prompt", cx))
+                                    .on_click(cx.listener(move |_, _, cx| {
+                                        cx.emit(PromptPickerEvent::Deleted { prompt_id })
+                                    })),
+                            )
+                            .child(
+                                IconButton::new("toggle-default-prompt", IconName::Sparkle)
+                                    .selected(default)
+                                    .selected_icon(IconName::SparkleFilled)
+                                    .icon_color(if default { Color::Accent } else { Color::Muted })
+                                    .shape(IconButtonShape::Square)
+                                    .tooltip(move |cx| {
+                                        Tooltip::text(
+                                            if default {
+                                                "Remove from Default Prompt"
+                                            } else {
+                                                "Add to Default Prompt"
+                                            },
+                                            cx,
+                                        )
+                                    })
+                                    .on_click(cx.listener(move |_, _, cx| {
+                                        cx.emit(PromptPickerEvent::ToggledDefault { prompt_id })
+                                    })),
+                            ),
                    )
-                    .child(
-                        IconButton::new("toggle-default-prompt", IconName::Sparkle)
-                            .selected(default)
-                            .selected_icon(IconName::SparkleFilled)
-                            .icon_color(if default { Color::Accent } else { Color::Muted })
-                            .shape(IconButtonShape::Square)
-                            .tooltip(move |cx| {
-                                Tooltip::text(
-                                    if default {
-                                        "Remove from Default Prompt"
-                                    } else {
-                                        "Add to Default Prompt"
-                                    },
-                                    cx,
-                                )
-                            })
-                            .on_click(cx.listener(move |_, _, cx| {
-                                cx.emit(PromptPickerEvent::ToggledDefault { prompt_id })
-                            })),
-                    ),
-            );
+                    .into_any_element()
+            }
+        };
        Some(element)
    }

@@ -277,13 +349,11 @@ impl PromptLibrary {
        let delegate = PromptPickerDelegate {
            store: store.clone(),
            selected_index: 0,
-            matches: Vec::new(),
+            entries: Vec::new(),
        };

        let picker = cx.new_view(|cx| {
-            let picker = Picker::uniform_list(delegate, cx)
-                .modal(false)
-                .max_height(None);
+            let picker = Picker::list(delegate, cx).modal(false).max_height(None);
            picker.focus(cx);
            picker
        });
@@ -306,7 +376,11 @@ impl PromptLibrary {
    ) {
        match event {
            PromptPickerEvent::Selected { prompt_id } => {
-                self.load_prompt(*prompt_id, false, cx);
+                if let Some(prompt_id) = *prompt_id {
+                    self.load_prompt(prompt_id, false, cx);
+                } else {
+                    self.focus_picker(&Default::default(), cx);
+                }
            }
            PromptPickerEvent::Confirmed { prompt_id } => {
                self.load_prompt(*prompt_id, true, cx);
@@ -450,7 +524,6 @@ impl PromptLibrary {
                            editor.set_show_gutter(false, cx);
                            editor.set_show_wrap_guides(false, cx);
                            editor.set_show_indent_guides(false, cx);
-                            editor.set_use_modal_editing(false);
                            editor.set_current_line_highlight(Some(CurrentLineHighlight::None));
                            editor.set_completion_provider(Box::new(
                                SlashCommandCompletionProvider::new(commands, None, None),
@@ -494,23 +567,21 @@ impl PromptLibrary {
            if let Some(prompt_id) = prompt_id {
                if picker
                    .delegate
-                    .matches
+                    .entries
                    .get(picker.delegate.selected_index())
                    .map_or(true, |old_selected_prompt| {
-                        old_selected_prompt.id != prompt_id
+                        old_selected_prompt.prompt_id() != Some(prompt_id)
                    })
                {
                    if let Some(ix) = picker
                        .delegate
-                        .matches
+                        .entries
                        .iter()
-                        .position(|mat| mat.id == prompt_id)
+                        .position(|mat| mat.prompt_id() == Some(prompt_id))
                    {
                        picker.set_selected_index(ix, true, cx);
                    }
                }
-            } else {
-                picker.focus(cx);
            }
        });
        cx.notify();
@@ -589,6 +660,19 @@ impl PromptLibrary {
        }
    }

+    fn cancel_last_inline_assist(
+        &mut self,
+        _: &editor::actions::Cancel,
+        cx: &mut ViewContext<Self>,
+    ) {
+        let canceled = InlineAssistant::update_global(cx, |assistant, cx| {
+            assistant.cancel_last_inline_assist(cx)
+        });
+        if !canceled {
+            cx.propagate();
+        }
+    }
+
    fn handle_prompt_editor_event(
        &mut self,
        prompt_id: PromptId,
@@ -727,6 +811,7 @@ impl PromptLibrary {
                            div()
                                .on_action(cx.listener(Self::focus_picker))
                                .on_action(cx.listener(Self::inline_assist))
+                                .on_action(cx.listener(Self::cancel_last_inline_assist))
                                .flex_grow()
                                .h_full()
                                .pt(Spacing::XXLarge.rems(cx))
@@ -1020,7 +1105,7 @@ impl PromptStore {
        let cached_metadata = self.metadata_cache.read().metadata.clone();
        let executor = self.executor.clone();
        self.executor.spawn(async move {
-            let mut matches = if query.is_empty() {
+            if query.is_empty() {
                cached_metadata
            } else {
                let candidates = cached_metadata
@@ -1046,9 +1131,7 @@ impl PromptStore {
                    .into_iter()
                    .map(|mat| cached_metadata[mat.candidate_id].clone())
                    .collect()
-            };
-            matches.sort_by_key(|metadata| Reverse(metadata.default));
-            matches
+            }
        })
    }

--- a/crates/assistant/src/slash_command.rs
+++ b/crates/assistant/src/slash_command.rs
@@ -1,4 +1,4 @@
-use crate::assistant_panel::ContextEditor;
+use crate::assistant_panel::ConversationEditor;
 use anyhow::Result;
 pub use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandRegistry};
 use editor::{CompletionProvider, Editor};
@@ -18,10 +18,8 @@ use workspace::Workspace;

 pub mod active_command;
 pub mod default_command;
-pub mod diagnostics_command;
 pub mod fetch_command;
 pub mod file_command;
-pub mod now_command;
 pub mod project_command;
 pub mod prompt_command;
 pub mod rustdoc_command;
@@ -31,7 +29,7 @@ pub mod tabs_command;
 pub(crate) struct SlashCommandCompletionProvider {
    commands: Arc<SlashCommandRegistry>,
    cancel_flag: Mutex<Arc<AtomicBool>>,
-    editor: Option<WeakView<ContextEditor>>,
+    editor: Option<WeakView<ConversationEditor>>,
    workspace: Option<WeakView<Workspace>>,
 }

@@ -45,7 +43,7 @@ pub(crate) struct SlashCommandLine {
 impl SlashCommandCompletionProvider {
    pub fn new(
        commands: Arc<SlashCommandRegistry>,
-        editor: Option<WeakView<ContextEditor>>,
+        editor: Option<WeakView<ConversationEditor>>,
        workspace: Option<WeakView<Workspace>>,
    ) -> Self {
        Self {
@@ -218,7 +216,6 @@ impl CompletionProvider for SlashCommandCompletionProvider {
        &self,
        buffer: &Model<Buffer>,
        buffer_position: Anchor,
-        _: editor::CompletionContext,
        cx: &mut ViewContext<Editor>,
    ) -> Task<Result<Vec<project::Completion>>> {
        let Some((name, argument, command_range, argument_range)) =
--- a/crates/assistant/src/slash_command/diagnostics_command.rs
+++ b/crates/assistant/src/slash_command/diagnostics_command.rs
@@ -1,444 +0,0 @@
-use super::{SlashCommand, SlashCommandOutput};
-use anyhow::{anyhow, Result};
-use assistant_slash_command::SlashCommandOutputSection;
-use fuzzy::{PathMatch, StringMatchCandidate};
-use gpui::{svg, AppContext, Model, RenderOnce, Task, View, WeakView};
-use language::{
-    Anchor, BufferSnapshot, DiagnosticEntry, DiagnosticSeverity, LspAdapterDelegate,
-    OffsetRangeExt, ToOffset,
-};
-use project::{DiagnosticSummary, PathMatchCandidateSet, Project};
-use rope::Point;
-use std::fmt::Write;
-use std::{
-    ops::Range,
-    sync::{atomic::AtomicBool, Arc},
-};
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-use util::paths::PathMatcher;
-use util::ResultExt;
-use workspace::Workspace;
-
-pub(crate) struct DiagnosticsCommand;
-
-impl DiagnosticsCommand {
-    fn search_paths(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: &View<Workspace>,
-        cx: &mut AppContext,
-    ) -> Task<Vec<PathMatch>> {
-        if query.is_empty() {
-            let workspace = workspace.read(cx);
-            let entries = workspace.recent_navigation_history(Some(10), cx);
-            let path_prefix: Arc<str> = "".into();
-            Task::ready(
-                entries
-                    .into_iter()
-                    .map(|(entry, _)| PathMatch {
-                        score: 0.,
-                        positions: Vec::new(),
-                        worktree_id: entry.worktree_id.to_usize(),
-                        path: entry.path.clone(),
-                        path_prefix: path_prefix.clone(),
-                        distance_to_relative_ancestor: 0,
-                    })
-                    .collect(),
-            )
-        } else {
-            let worktrees = workspace.read(cx).visible_worktrees(cx).collect::<Vec<_>>();
-            let candidate_sets = worktrees
-                .into_iter()
-                .map(|worktree| {
-                    let worktree = worktree.read(cx);
-                    PathMatchCandidateSet {
-                        snapshot: worktree.snapshot(),
-                        include_ignored: worktree
-                            .root_entry()
-                            .map_or(false, |entry| entry.is_ignored),
-                        include_root_name: false,
-                        candidates: project::Candidates::Entries,
-                    }
-                })
-                .collect::<Vec<_>>();
-
-            let executor = cx.background_executor().clone();
-            cx.foreground_executor().spawn(async move {
-                fuzzy::match_path_sets(
-                    candidate_sets.as_slice(),
-                    query.as_str(),
-                    None,
-                    false,
-                    100,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await
-            })
-        }
-    }
-}
-
-impl SlashCommand for DiagnosticsCommand {
-    fn name(&self) -> String {
-        "diagnostics".into()
-    }
-
-    fn description(&self) -> String {
-        "Insert diagnostics".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert Diagnostics".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        &self,
-        query: String,
-        cancellation_flag: Arc<AtomicBool>,
-        workspace: Option<WeakView<Workspace>>,
-        cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        let Some(workspace) = workspace.and_then(|workspace| workspace.upgrade()) else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-        let query = query.split_whitespace().last().unwrap_or("").to_string();
-
-        let paths = self.search_paths(query.clone(), cancellation_flag.clone(), &workspace, cx);
-        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
-            let mut matches: Vec<String> = paths
-                .await
-                .into_iter()
-                .map(|path_match| {
-                    format!(
-                        "{}{}",
-                        path_match.path_prefix,
-                        path_match.path.to_string_lossy()
-                    )
-                })
-                .collect();
-
-            matches.extend(
-                fuzzy::match_strings(
-                    &Options::match_candidates_for_args(),
-                    &query,
-                    false,
-                    10,
-                    &cancellation_flag,
-                    executor,
-                )
-                .await
-                .into_iter()
-                .map(|candidate| candidate.string),
-            );
-
-            Ok(matches)
-        })
-    }
-
-    fn run(
-        self: Arc<Self>,
-        argument: Option<&str>,
-        workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let Some(workspace) = workspace.upgrade() else {
-            return Task::ready(Err(anyhow!("workspace was dropped")));
-        };
-
-        let options = Options::parse(argument);
-
-        let task = collect_diagnostics(workspace.read(cx).project().clone(), options, cx);
-        cx.spawn(move |_| async move {
-            let (text, sections) = task.await?;
-            Ok(SlashCommandOutput {
-                text,
-                sections: sections
-                    .into_iter()
-                    .map(|(range, placeholder_type)| SlashCommandOutputSection {
-                        range,
-                        render_placeholder: Arc::new(move |id, unfold, _cx| {
-                            DiagnosticsPlaceholder {
-                                id,
-                                unfold,
-                                placeholder_type: placeholder_type.clone(),
-                            }
-                            .into_any_element()
-                        }),
-                    })
-                    .collect(),
-                run_commands_in_text: false,
-            })
-        })
-    }
-}
-
-#[derive(Default)]
-struct Options {
-    include_warnings: bool,
-    path_matcher: Option<PathMatcher>,
-}
-
-const INCLUDE_WARNINGS_ARGUMENT: &str = "--include-warnings";
-
-impl Options {
-    pub fn parse(arguments_line: Option<&str>) -> Self {
-        arguments_line
-            .map(|arguments_line| {
-                let args = arguments_line.split_whitespace().collect::<Vec<_>>();
-                let mut include_warnings = false;
-                let mut path_matcher = None;
-                for arg in args {
-                    if arg == INCLUDE_WARNINGS_ARGUMENT {
-                        include_warnings = true;
-                    } else {
-                        path_matcher = PathMatcher::new(arg).log_err();
-                    }
-                }
-                Self {
-                    include_warnings,
-                    path_matcher,
-                }
-            })
-            .unwrap_or_default()
-    }
-
-    fn match_candidates_for_args() -> [StringMatchCandidate; 1] {
-        [StringMatchCandidate::new(
-            0,
-            INCLUDE_WARNINGS_ARGUMENT.to_string(),
-        )]
-    }
-}
-
-fn collect_diagnostics(
-    project: Model<Project>,
-    options: Options,
-    cx: &mut AppContext,
-) -> Task<Result<(String, Vec<(Range<usize>, PlaceholderType)>)>> {
-    let header = if let Some(path_matcher) = &options.path_matcher {
-        format!("diagnostics: {}", path_matcher.source())
-    } else {
-        "diagnostics".to_string()
-    };
-
-    let project_handle = project.downgrade();
-    let diagnostic_summaries: Vec<_> = project.read(cx).diagnostic_summaries(false, cx).collect();
-
-    cx.spawn(|mut cx| async move {
-        let mut text = String::new();
-        writeln!(text, "{}", &header).unwrap();
-        let mut sections: Vec<(Range<usize>, PlaceholderType)> = Vec::new();
-
-        let mut project_summary = DiagnosticSummary::default();
-        for (project_path, _, summary) in diagnostic_summaries {
-            if let Some(path_matcher) = &options.path_matcher {
-                if !path_matcher.is_match(&project_path.path) {
-                    continue;
-                }
-            }
-
-            project_summary.error_count += summary.error_count;
-            if options.include_warnings {
-                project_summary.warning_count += summary.warning_count;
-            } else if summary.error_count == 0 {
-                continue;
-            }
-
-            let last_end = text.len();
-            let file_path = project_path.path.to_string_lossy().to_string();
-            writeln!(&mut text, "{file_path}").unwrap();
-
-            if let Some(buffer) = project_handle
-                .update(&mut cx, |project, cx| project.open_buffer(project_path, cx))?
-                .await
-                .log_err()
-            {
-                collect_buffer_diagnostics(
-                    &mut text,
-                    &mut sections,
-                    cx.read_model(&buffer, |buffer, _| buffer.snapshot())?,
-                    options.include_warnings,
-                );
-            }
-
-            sections.push((
-                last_end..text.len().saturating_sub(1),
-                PlaceholderType::File(file_path),
-            ))
-        }
-        sections.push((
-            0..text.len(),
-            PlaceholderType::Root(project_summary, header),
-        ));
-
-        Ok((text, sections))
-    })
-}
-
-fn collect_buffer_diagnostics(
-    text: &mut String,
-    sections: &mut Vec<(Range<usize>, PlaceholderType)>,
-    snapshot: BufferSnapshot,
-    include_warnings: bool,
-) {
-    for (_, group) in snapshot.diagnostic_groups(None) {
-        let entry = &group.entries[group.primary_ix];
-        collect_diagnostic(text, sections, entry, &snapshot, include_warnings)
-    }
-}
-
-fn collect_diagnostic(
-    text: &mut String,
-    sections: &mut Vec<(Range<usize>, PlaceholderType)>,
-    entry: &DiagnosticEntry<Anchor>,
-    snapshot: &BufferSnapshot,
-    include_warnings: bool,
-) {
-    const EXCERPT_EXPANSION_SIZE: u32 = 2;
-    const MAX_MESSAGE_LENGTH: usize = 2000;
-
-    let ty = match entry.diagnostic.severity {
-        DiagnosticSeverity::WARNING => {
-            if !include_warnings {
-                return;
-            }
-            DiagnosticType::Warning
-        }
-        DiagnosticSeverity::ERROR => DiagnosticType::Error,
-        _ => return,
-    };
-    let prev_len = text.len();
-
-    let range = entry.range.to_point(snapshot);
-    let diagnostic_row_number = range.start.row + 1;
-
-    let start_row = range.start.row.saturating_sub(EXCERPT_EXPANSION_SIZE);
-    let end_row = (range.end.row + EXCERPT_EXPANSION_SIZE).min(snapshot.max_point().row) + 1;
-    let excerpt_range =
-        Point::new(start_row, 0).to_offset(&snapshot)..Point::new(end_row, 0).to_offset(&snapshot);
-
-    text.push_str("```");
-    if let Some(language_name) = snapshot.language().map(|l| l.code_fence_block_name()) {
-        text.push_str(&language_name);
-    }
-    text.push('\n');
-
-    let mut buffer_text = String::new();
-    for chunk in snapshot.text_for_range(excerpt_range) {
-        buffer_text.push_str(chunk);
-    }
-
-    for (i, line) in buffer_text.lines().enumerate() {
-        let line_number = start_row + i as u32 + 1;
-        writeln!(text, "{}", line).unwrap();
-
-        if line_number == diagnostic_row_number {
-            text.push_str("//");
-            let prev_len = text.len();
-            write!(text, " {}: ", ty.as_str()).unwrap();
-            let padding = text.len() - prev_len;
-
-            let message = util::truncate(&entry.diagnostic.message, MAX_MESSAGE_LENGTH)
-                .replace('\n', format!("\n//{:padding$}", "").as_str());
-
-            writeln!(text, "{message}").unwrap();
-        }
-    }
-
-    writeln!(text, "```").unwrap();
-    sections.push((
-        prev_len..text.len().saturating_sub(1),
-        PlaceholderType::Diagnostic(ty, entry.diagnostic.message.clone()),
-    ))
-}
-
-#[derive(Clone)]
-pub enum PlaceholderType {
-    Root(DiagnosticSummary, String),
-    File(String),
-    Diagnostic(DiagnosticType, String),
-}
-
-#[derive(Copy, Clone, IntoElement)]
-pub enum DiagnosticType {
-    Warning,
-    Error,
-}
-
-impl DiagnosticType {
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            DiagnosticType::Warning => "warning",
-            DiagnosticType::Error => "error",
-        }
-    }
-}
-
-#[derive(IntoElement)]
-pub struct DiagnosticsPlaceholder {
-    pub id: ElementId,
-    pub placeholder_type: PlaceholderType,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-}
-
-impl RenderOnce for DiagnosticsPlaceholder {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        let unfold = self.unfold;
-        let (icon, content) = match self.placeholder_type {
-            PlaceholderType::Root(summary, title) => (
-                h_flex()
-                    .w_full()
-                    .gap_0p5()
-                    .when(summary.error_count > 0, |this| {
-                        this.child(DiagnosticType::Error)
-                            .child(Label::new(summary.error_count.to_string()))
-                    })
-                    .when(summary.warning_count > 0, |this| {
-                        this.child(DiagnosticType::Warning)
-                            .child(Label::new(summary.warning_count.to_string()))
-                    })
-                    .into_any_element(),
-                Label::new(title),
-            ),
-            PlaceholderType::File(file) => (
-                Icon::new(IconName::File).into_any_element(),
-                Label::new(file),
-            ),
-            PlaceholderType::Diagnostic(diagnostic_type, message) => (
-                diagnostic_type.into_any_element(),
-                Label::new(message).single_line(),
-            ),
-        };
-
-        ButtonLike::new(self.id)
-            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(icon)
-            .child(content)
-            .on_click(move |_, cx| unfold(cx))
-    }
-}
-
-impl RenderOnce for DiagnosticType {
-    fn render(self, cx: &mut WindowContext) -> impl IntoElement {
-        svg()
-            .size(cx.text_style().font_size)
-            .flex_none()
-            .map(|icon| match self {
-                DiagnosticType::Error => icon
-                    .path(IconName::XCircle.path())
-                    .text_color(Color::Error.color(cx)),
-                DiagnosticType::Warning => icon
-                    .path(IconName::ExclamationTriangle.path())
-                    .text_color(Color::Warning.color(cx)),
-            })
-    }
-}
--- a/crates/assistant/src/slash_command/fetch_command.rs
+++ b/crates/assistant/src/slash_command/fetch_command.rs
@@ -1,5 +1,3 @@
-use std::cell::RefCell;
-use std::rc::Rc;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

@@ -7,19 +5,12 @@ use anyhow::{anyhow, bail, Context, Result};
 use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandOutputSection};
 use futures::AsyncReadExt;
 use gpui::{AppContext, Task, WeakView};
-use html_to_markdown::{convert_html_to_markdown, markdown, TagHandler};
+use html_to_markdown::convert_html_to_markdown;
 use http::{AsyncBody, HttpClient, HttpClientWithUrl};
 use language::LspAdapterDelegate;
 use ui::{prelude::*, ButtonLike, ElevationIndex};
 use workspace::Workspace;

-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy)]
-enum ContentType {
-    Html,
-    Plaintext,
-    Json,
-}
-
 pub(crate) struct FetchSlashCommand;

 impl FetchSlashCommand {
@@ -46,52 +37,7 @@ impl FetchSlashCommand {
            );
        }

-        let Some(content_type) = response.headers().get("content-type") else {
-            bail!("missing Content-Type header");
-        };
-        let content_type = content_type
-            .to_str()
-            .context("invalid Content-Type header")?;
-        let content_type = match content_type {
-            "text/html" => ContentType::Html,
-            "text/plain" => ContentType::Plaintext,
-            "application/json" => ContentType::Json,
-            _ => ContentType::Html,
-        };
-
-        match content_type {
-            ContentType::Html => {
-                let mut handlers: Vec<TagHandler> = vec![
-                    Rc::new(RefCell::new(markdown::ParagraphHandler)),
-                    Rc::new(RefCell::new(markdown::HeadingHandler)),
-                    Rc::new(RefCell::new(markdown::ListHandler)),
-                    Rc::new(RefCell::new(markdown::TableHandler::new())),
-                    Rc::new(RefCell::new(markdown::StyledTextHandler)),
-                ];
-                if url.contains("wikipedia.org") {
-                    use html_to_markdown::structure::wikipedia;
-
-                    handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaChromeRemover)));
-                    handlers.push(Rc::new(RefCell::new(wikipedia::WikipediaInfoboxHandler)));
-                    handlers.push(Rc::new(
-                        RefCell::new(wikipedia::WikipediaCodeHandler::new()),
-                    ));
-                } else {
-                    handlers.push(Rc::new(RefCell::new(markdown::CodeHandler)));
-                }
-
-                convert_html_to_markdown(&body[..], &mut handlers)
-            }
-            ContentType::Plaintext => Ok(std::str::from_utf8(&body)?.to_owned()),
-            ContentType::Json => {
-                let json: serde_json::Value = serde_json::from_slice(&body)?;
-
-                Ok(format!(
-                    "```json\n{}\n```",
-                    serde_json::to_string_pretty(&json)?
-                ))
-            }
-        }
+        convert_html_to_markdown(&body[..])
    }
 }

--- a/crates/assistant/src/slash_command/file_command.rs
+++ b/crates/assistant/src/slash_command/file_command.rs
@@ -58,7 +58,7 @@ impl FileSlashCommand {
                            .root_entry()
                            .map_or(false, |entry| entry.is_ignored),
                        include_root_name: true,
-                        candidates: project::Candidates::Files,
+                        directories_only: false,
                    }
                })
                .collect::<Vec<_>>();
--- a/crates/assistant/src/slash_command/now_command.rs
+++ b/crates/assistant/src/slash_command/now_command.rs
@@ -1,83 +0,0 @@
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-
-use anyhow::Result;
-use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandOutputSection};
-use chrono::{DateTime, Local};
-use gpui::{AppContext, Task, WeakView};
-use language::LspAdapterDelegate;
-use ui::{prelude::*, ButtonLike, ElevationIndex};
-use workspace::Workspace;
-
-pub(crate) struct NowSlashCommand;
-
-impl SlashCommand for NowSlashCommand {
-    fn name(&self) -> String {
-        "now".into()
-    }
-
-    fn description(&self) -> String {
-        "insert the current date and time".into()
-    }
-
-    fn menu_text(&self) -> String {
-        "Insert current date and time".into()
-    }
-
-    fn requires_argument(&self) -> bool {
-        false
-    }
-
-    fn complete_argument(
-        &self,
-        _query: String,
-        _cancel: Arc<AtomicBool>,
-        _workspace: Option<WeakView<Workspace>>,
-        _cx: &mut AppContext,
-    ) -> Task<Result<Vec<String>>> {
-        Task::ready(Ok(Vec::new()))
-    }
-
-    fn run(
-        self: Arc<Self>,
-        _argument: Option<&str>,
-        _workspace: WeakView<Workspace>,
-        _delegate: Arc<dyn LspAdapterDelegate>,
-        _cx: &mut WindowContext,
-    ) -> Task<Result<SlashCommandOutput>> {
-        let now = Local::now();
-        let text = format!("Today is {now}.", now = now.to_rfc3339());
-        let range = 0..text.len();
-
-        Task::ready(Ok(SlashCommandOutput {
-            text,
-            sections: vec![SlashCommandOutputSection {
-                range,
-                render_placeholder: Arc::new(move |id, unfold, _cx| {
-                    NowPlaceholder { id, unfold, now }.into_any_element()
-                }),
-            }],
-            run_commands_in_text: false,
-        }))
-    }
-}
-
-#[derive(IntoElement)]
-struct NowPlaceholder {
-    pub id: ElementId,
-    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
-    pub now: DateTime<Local>,
-}
-
-impl RenderOnce for NowPlaceholder {
-    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
-        let unfold = self.unfold;
-
-        ButtonLike::new(self.id)
-            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(IconName::CountdownTimer))
-            .child(Label::new(self.now.to_rfc3339()))
-            .on_click(move |_, cx| unfold(cx))
-    }
-}
--- a/crates/assistant/src/slash_command/rustdoc_command.rs
+++ b/crates/assistant/src/slash_command/rustdoc_command.rs
@@ -7,13 +7,11 @@ use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandOutp
 use fs::Fs;
 use futures::AsyncReadExt;
 use gpui::{AppContext, Model, Task, WeakView};
+use html_to_markdown::convert_rustdoc_to_markdown;
 use http::{AsyncBody, HttpClient, HttpClientWithUrl};
 use language::LspAdapterDelegate;
 use project::{Project, ProjectPath};
-use rustdoc::{convert_rustdoc_to_markdown, RustdocStore};
-use rustdoc::{CrateName, LocalProvider};
 use ui::{prelude::*, ButtonLike, ElevationIndex};
-use util::{maybe, ResultExt};
 use workspace::Workspace;

 #[derive(Debug, Clone, Copy)]
@@ -30,23 +28,24 @@ impl RustdocSlashCommand {
    async fn build_message(
        fs: Arc<dyn Fs>,
        http_client: Arc<HttpClientWithUrl>,
-        crate_name: CrateName,
+        crate_name: String,
        module_path: Vec<String>,
        path_to_cargo_toml: Option<&Path>,
    ) -> Result<(RustdocSource, String)> {
        let cargo_workspace_root = path_to_cargo_toml.and_then(|path| path.parent());
        if let Some(cargo_workspace_root) = cargo_workspace_root {
            let mut local_cargo_doc_path = cargo_workspace_root.join("target/doc");
-            local_cargo_doc_path.push(crate_name.as_ref());
+            local_cargo_doc_path.push(&crate_name);
            if !module_path.is_empty() {
                local_cargo_doc_path.push(module_path.join("/"));
            }
            local_cargo_doc_path.push("index.html");

            if let Ok(contents) = fs.load(&local_cargo_doc_path).await {
-                let (markdown, _items) = convert_rustdoc_to_markdown(contents.as_bytes())?;
-
-                return Ok((RustdocSource::Local, markdown));
+                return Ok((
+                    RustdocSource::Local,
+                    convert_rustdoc_to_markdown(contents.as_bytes())?,
+                ));
            }
        }

@@ -79,9 +78,10 @@ impl RustdocSlashCommand {
            );
        }

-        let (markdown, _items) = convert_rustdoc_to_markdown(&body[..])?;
-
-        Ok((RustdocSource::DocsDotRs, markdown))
+        Ok((
+            RustdocSource::DocsDotRs,
+            convert_rustdoc_to_markdown(&body[..])?,
+        ))
    }

    fn path_to_cargo_toml(project: Model<Project>, cx: &mut AppContext) -> Option<Arc<Path>> {
@@ -117,41 +117,12 @@ impl SlashCommand for RustdocSlashCommand {

    fn complete_argument(
        &self,
-        query: String,
+        _query: String,
        _cancel: Arc<AtomicBool>,
-        workspace: Option<WeakView<Workspace>>,
-        cx: &mut AppContext,
+        _workspace: Option<WeakView<Workspace>>,
+        _cx: &mut AppContext,
    ) -> Task<Result<Vec<String>>> {
-        let index_provider_deps = maybe!({
-            let workspace = workspace.ok_or_else(|| anyhow!("no workspace"))?;
-            let workspace = workspace
-                .upgrade()
-                .ok_or_else(|| anyhow!("workspace was dropped"))?;
-            let project = workspace.read(cx).project().clone();
-            let fs = project.read(cx).fs().clone();
-            let cargo_workspace_root = Self::path_to_cargo_toml(project, cx)
-                .and_then(|path| path.parent().map(|path| path.to_path_buf()))
-                .ok_or_else(|| anyhow!("no Cargo workspace root found"))?;
-
-            anyhow::Ok((fs, cargo_workspace_root))
-        });
-
-        let store = RustdocStore::global(cx);
-        cx.background_executor().spawn(async move {
-            if let Some((crate_name, rest)) = query.split_once(':') {
-                if rest.is_empty() {
-                    if let Some((fs, cargo_workspace_root)) = index_provider_deps.log_err() {
-                        let provider = Box::new(LocalProvider::new(fs, cargo_workspace_root));
-                        // We don't need to hold onto this task, as the `RustdocStore` will hold it
-                        // until it completes.
-                        let _ = store.clone().index(crate_name.into(), provider);
-                    }
-                }
-            }
-
-            let items = store.search(query).await;
-            Ok(items)
-        })
+        Task::ready(Ok(Vec::new()))
    }

    fn run(
@@ -171,46 +142,37 @@ impl SlashCommand for RustdocSlashCommand {
        let project = workspace.read(cx).project().clone();
        let fs = project.read(cx).fs().clone();
        let http_client = workspace.read(cx).client().http_client();
-        let path_to_cargo_toml = Self::path_to_cargo_toml(project, cx);
-
        let mut path_components = argument.split("::");
        let crate_name = match path_components
            .next()
            .ok_or_else(|| anyhow!("missing crate name"))
        {
-            Ok(crate_name) => CrateName::from(crate_name),
+            Ok(crate_name) => crate_name.to_string(),
            Err(err) => return Task::ready(Err(err)),
        };
-        let item_path = path_components.map(ToString::to_string).collect::<Vec<_>>();
+        let module_path = path_components.map(ToString::to_string).collect::<Vec<_>>();
+        let path_to_cargo_toml = Self::path_to_cargo_toml(project, cx);

        let text = cx.background_executor().spawn({
-            let rustdoc_store = RustdocStore::global(cx);
            let crate_name = crate_name.clone();
-            let item_path = item_path.clone();
+            let module_path = module_path.clone();
            async move {
-                let item_docs = rustdoc_store
-                    .load(crate_name.clone(), Some(item_path.join("::")))
-                    .await;
-
-                if let Ok(item_docs) = item_docs {
-                    anyhow::Ok((RustdocSource::Local, item_docs.docs().to_owned()))
-                } else {
-                    Self::build_message(
-                        fs,
-                        http_client,
-                        crate_name,
-                        item_path,
-                        path_to_cargo_toml.as_deref(),
-                    )
-                    .await
-                }
+                Self::build_message(
+                    fs,
+                    http_client,
+                    crate_name,
+                    module_path,
+                    path_to_cargo_toml.as_deref(),
+                )
+                .await
            }
        });

-        let module_path = if item_path.is_empty() {
+        let crate_name = SharedString::from(crate_name);
+        let module_path = if module_path.is_empty() {
            None
        } else {
-            Some(SharedString::from(item_path.join("::")))
+            Some(SharedString::from(module_path.join("::")))
        };
        cx.foreground_executor().spawn(async move {
            let (source, text) = text.await?;
@@ -241,7 +203,7 @@ struct RustdocPlaceholder {
    pub id: ElementId,
    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
    pub source: RustdocSource,
-    pub crate_name: CrateName,
+    pub crate_name: SharedString,
    pub module_path: Option<SharedString>,
 }

--- a/crates/channel/src/channel_store_tests.rs
+++ b/crates/channel/src/channel_store_tests.rs
@@ -3,7 +3,7 @@ use crate::channel_chat::ChannelChatEvent;
 use super::*;
 use client::{test::FakeServer, Client, UserStore};
 use clock::FakeSystemClock;
-use gpui::{AppContext, Context, Model, SemanticVersion, TestAppContext};
+use gpui::{AppContext, Context, Model, TestAppContext};
 use http::FakeHttpClient;
 use rpc::proto::{self};
 use settings::SettingsStore;
@@ -340,7 +340,7 @@ async fn test_channel_messages(cx: &mut TestAppContext) {
 fn init_test(cx: &mut AppContext) -> Model<ChannelStore> {
    let settings_store = SettingsStore::test(cx);
    cx.set_global(settings_store);
-    release_channel::init(SemanticVersion::default(), cx);
+    release_channel::init("0.0.0", cx);
    client::init_settings(cx);

    let clock = Arc::new(FakeSystemClock::default());
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -19,6 +19,7 @@ path = "src/main.rs"
 [dependencies]
 anyhow.workspace = true
 clap.workspace = true
+libc.workspace = true
 ipc-channel = "0.18"
 once_cell.workspace = true
 release_channel.workspace = true
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -161,7 +161,10 @@ mod linux {
        env,
        ffi::OsString,
        io,
-        os::unix::net::{SocketAddr, UnixDatagram},
+        os::{
+            linux::net::SocketAddrExt,
+            unix::net::{SocketAddr, UnixDatagram},
+        },
        path::{Path, PathBuf},
        process::{self, ExitStatus},
        thread,
@@ -172,7 +175,6 @@ mod linux {
    use cli::FORCE_CLI_MODE_ENV_VAR_NAME;
    use fork::Fork;
    use once_cell::sync::Lazy;
-    use util::paths;

    use crate::{Detect, InstalledApp};

@@ -221,9 +223,12 @@ mod linux {
        }

        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
-            let sock_path = paths::SUPPORT_DIR.join(format!("zed-{}.sock", *RELEASE_CHANNEL));
+            let uid: u32 = unsafe { libc::getuid() };
+            let sock_addr =
+                SocketAddr::from_abstract_name(format!("zed-{}-{}", *RELEASE_CHANNEL, uid))?;
+
            let sock = UnixDatagram::unbound()?;
-            if sock.connect(&sock_path).is_err() {
+            if sock.connect_addr(&sock_addr).is_err() {
                self.boot_background(ipc_url)?;
            } else {
                sock.send(ipc_url.as_bytes())?;
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -13,25 +13,17 @@ path = "src/client.rs"
 doctest = false

 [features]
-default = ["static-libraries"]
 test-support = ["clock/test-support", "collections/test-support", "gpui/test-support", "rpc/test-support"]
-static-libraries = ["async-native-tls", "isahc"]
-dynamic-libraries = []
-
-# Revert the changes
-# Reintroduce them, but with a feature flag.

 [dependencies]
 anyhow.workspace = true
 async-recursion = "0.3"
 async-tungstenite = { version = "0.16", features = ["async-std", "async-native-tls"] }
-async-native-tls = { version = "0.5.0", features = ["vendored"], optional = true}
-isahc = { workspace = true, features = ["static-curl"], optional = true}
+async-native-tls = { version = "0.5.0", features = ["vendored"] }
 chrono = { workspace = true, features = ["serde"] }
 clock.workspace = true
 collections.workspace = true
 feature_flags.workspace = true
-fs.workspace = true
 futures.workspace = true
 gpui.workspace = true
 http.workspace = true
@@ -68,8 +60,9 @@ settings = { workspace = true, features = ["test-support"] }
 util = { workspace = true, features = ["test-support"] }
 http = { workspace = true, features = ["test-support"] }

-[target.'cfg(target_os = "windows")'.dependencies]
-windows.workspace = true
-
-[target.'cfg(target_os = "macos")'.dependencies]
-cocoa.workspace = true
+[target.'cfg(target_os = "linux")'.dependencies]
+async-native-tls = {"version" = "0.5.0", features = ["vendored"]}
+# This is an indirect dependency of async-tungstenite that is included
+# here so we can vendor libssl with the feature flag.
+[package.metadata.cargo-machete]
+ignored = ["async-native-tls"]
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1429,31 +1429,6 @@ impl Client {
        }
    }

-    pub fn request_dynamic(
-        &self,
-        envelope: proto::Envelope,
-        request_type: &'static str,
-    ) -> impl Future<Output = Result<proto::Envelope>> {
-        let client_id = self.id();
-        log::debug!(
-            "rpc request start. client_id:{}. name:{}",
-            client_id,
-            request_type
-        );
-        let response = self
-            .connection_id()
-            .map(|conn_id| self.peer.request_dynamic(conn_id, envelope, request_type));
-        async move {
-            let response = response?.await;
-            log::debug!(
-                "rpc request finish. client_id:{}. name:{}",
-                client_id,
-                request_type
-            );
-            Ok(response?.0)
-        }
-    }
-
    fn respond<T: RequestMessage>(&self, receipt: Receipt<T>, response: T::Response) -> Result<()> {
        log::debug!("rpc respond. client_id:{}. name:{}", self.id(), T::NAME);
        self.peer.respond(receipt, response)
@@ -1729,7 +1704,6 @@ mod tests {
    use gpui::{BackgroundExecutor, Context, TestAppContext};
    use http::FakeHttpClient;
    use parking_lot::Mutex;
-    use proto::TypedEnvelope;
    use settings::SettingsStore;
    use std::future;

--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -4,7 +4,7 @@ use crate::{ChannelId, TelemetrySettings};
 use chrono::{DateTime, Utc};
 use clock::SystemClock;
 use futures::Future;
-use gpui::{AppContext, BackgroundExecutor, Task};
+use gpui::{AppContext, AppMetadata, BackgroundExecutor, Task};
 use http::{self, HttpClient, HttpClientWithUrl, Method};
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
@@ -39,6 +39,7 @@ struct TelemetryState {
    installation_id: Option<Arc<str>>, // Per app installation (different for dev, nightly, preview, and stable)
    session_id: Option<String>,        // Per app launch
    release_channel: Option<&'static str>,
+    app_metadata: AppMetadata,
    architecture: &'static str,
    events_queue: Vec<EventWrapper>,
    flush_events_task: Option<Task<()>>,
@@ -47,10 +48,6 @@ struct TelemetryState {
    first_event_date_time: Option<DateTime<Utc>>,
    event_coalescer: EventCoalescer,
    max_queue_size: usize,
-
-    os_name: String,
-    app_version: String,
-    os_version: Option<String>,
 }

 #[cfg(debug_assertions)]
@@ -74,87 +71,6 @@ static ZED_CLIENT_CHECKSUM_SEED: Lazy<Option<Vec<u8>>> = Lazy::new(|| {
        })
 });

-pub fn os_name() -> String {
-    #[cfg(target_os = "macos")]
-    {
-        "macOS".to_string()
-    }
-    #[cfg(target_os = "linux")]
-    {
-        format!("Linux {}", gpui::guess_compositor())
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        "Windows".to_string()
-    }
-}
-
-/// Note: This might do blocking IO! Only call from background threads
-pub fn os_version() -> String {
-    #[cfg(target_os = "macos")]
-    {
-        use cocoa::base::nil;
-        use cocoa::foundation::NSProcessInfo;
-
-        unsafe {
-            let process_info = cocoa::foundation::NSProcessInfo::processInfo(nil);
-            let version = process_info.operatingSystemVersion();
-            gpui::SemanticVersion::new(
-                version.majorVersion as usize,
-                version.minorVersion as usize,
-                version.patchVersion as usize,
-            )
-            .to_string()
-        }
-    }
-    #[cfg(target_os = "linux")]
-    {
-        use std::path::Path;
-
-        let content = if let Ok(file) = std::fs::read_to_string(&Path::new("/etc/os-release")) {
-            file
-        } else if let Ok(file) = std::fs::read_to_string(&Path::new("/usr/lib/os-release")) {
-            file
-        } else {
-            log::error!("Failed to load /etc/os-release, /usr/lib/os-release");
-            "".to_string()
-        };
-        let mut name = "unknown".to_string();
-        let mut version = "unknown".to_string();
-
-        for line in content.lines() {
-            if line.starts_with("ID=") {
-                name = line.trim_start_matches("ID=").trim_matches('"').to_string();
-            }
-            if line.starts_with("VERSION_ID=") {
-                version = line
-                    .trim_start_matches("VERSION_ID=")
-                    .trim_matches('"')
-                    .to_string();
-            }
-        }
-
-        format!("{} {}", name, version)
-    }
-
-    #[cfg(target_os = "windows")]
-    {
-        let mut info = unsafe { std::mem::zeroed() };
-        let status = unsafe { windows::Wdk::System::SystemServices::RtlGetVersion(&mut info) };
-        if status.is_ok() {
-            gpui::SemanticVersion::new(
-                info.dwMajorVersion as _,
-                info.dwMinorVersion as _,
-                info.dwBuildNumber as _,
-            )
-            .to_string()
-        } else {
-            "unknown".to_string()
-        }
-    }
-}
-
 impl Telemetry {
    pub fn new(
        clock: Arc<dyn SystemClock>,
@@ -168,6 +84,7 @@ impl Telemetry {

        let state = Arc::new(Mutex::new(TelemetryState {
            settings: *TelemetrySettings::get_global(cx),
+            app_metadata: cx.app_metadata(),
            architecture: env::consts::ARCH,
            release_channel,
            installation_id: None,
@@ -180,10 +97,6 @@ impl Telemetry {
            first_event_date_time: None,
            event_coalescer: EventCoalescer::new(clock.clone()),
            max_queue_size: MAX_QUEUE_LEN,
-
-            os_version: None,
-            os_name: os_name(),
-            app_version: release_channel::AppVersion::global(cx).to_string(),
        }));

        #[cfg(not(debug_assertions))]
@@ -255,9 +168,6 @@ impl Telemetry {
        let mut state = self.state.lock();
        state.installation_id = installation_id.map(|id| id.into());
        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();
@@ -535,14 +445,20 @@ impl Telemetry {

                    {
                        let state = this.state.lock();
-
                        let request_body = EventRequestBody {
                            installation_id: state.installation_id.as_deref().map(Into::into),
                            session_id: state.session_id.clone(),
                            is_staff: state.is_staff,
-                            app_version: state.app_version.clone(),
-                            os_name: state.os_name.clone(),
-                            os_version: state.os_version.clone(),
+                            app_version: state
+                                .app_metadata
+                                .app_version
+                                .unwrap_or_default()
+                                .to_string(),
+                            os_name: state.app_metadata.os_name.to_string(),
+                            os_version: state
+                                .app_metadata
+                                .os_version
+                                .map(|version| version.to_string()),
                            architecture: state.architecture.to_string(),

                            release_channel: state.release_channel.map(Into::into),
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -96,7 +96,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
 dev_server_projects.workspace = true
 rpc = { workspace = true, features = ["test-support"] }
--- a/crates/collab/src/api/events.rs
+++ b/crates/collab/src/api/events.rs
@@ -308,14 +308,6 @@ pub async fn post_panic(
        .map_err(|_| Error::Http(StatusCode::BAD_REQUEST, "invalid json".into()))?;
    let panic = report.panic;

-    // better OS reporting for linux (because linux is hard):
-    // - Remove os_version/app_version/os_name from the gpui platform trait
-    // - Move platform processing data into client/telemetry
-    // - Duplicate some small code in macOS platform for a version check
-    // - Add GPUI API for reporting the selected platform integration
-    //  - macos-blade, macos-metal, linux-X11, linux-headless
-    // if cfg(macos( { "Macos" } else { "Linux-{cx.compositor_name()"} ))
-
    tracing::error!(
        service = "client",
        version = %panic.app_version,
@@ -724,25 +716,25 @@ impl EditorEventRow {

 #[derive(Serialize, Debug, clickhouse::Row)]
 pub struct InlineCompletionEventRow {
-    installation_id: String,
-    provider: String,
-    suggestion_accepted: bool,
-    app_version: String,
-    file_extension: String,
-    os_name: String,
-    os_version: String,
-    release_channel: String,
-    signed_in: bool,
+    pub installation_id: String,
+    pub provider: String,
+    pub suggestion_accepted: bool,
+    pub app_version: String,
+    pub file_extension: String,
+    pub os_name: String,
+    pub os_version: String,
+    pub release_channel: String,
+    pub signed_in: bool,
    #[serde(serialize_with = "serialize_country_code")]
-    country_code: String,
-    region_code: String,
-    city: String,
-    time: i64,
-    is_staff: Option<bool>,
-    session_id: Option<String>,
-    major: Option<i32>,
-    minor: Option<i32>,
-    patch: Option<i32>,
+    pub country_code: String,
+    pub region_code: String,
+    pub city: String,
+    pub time: i64,
+    pub is_staff: Option<bool>,
+    pub session_id: Option<String>,
+    pub major: Option<i32>,
+    pub minor: Option<i32>,
+    pub patch: Option<i32>,
 }

 impl InlineCompletionEventRow {
@@ -788,8 +780,6 @@ pub struct CallEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: String,
@@ -820,8 +810,6 @@ impl CallEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone().unwrap_or_default(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -841,8 +829,6 @@ pub struct AssistantEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -875,8 +861,6 @@ impl AssistantEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -894,20 +878,18 @@ impl AssistantEventRow {

 #[derive(Debug, clickhouse::Row, Serialize)]
 pub struct CpuEventRow {
-    installation_id: Option<String>,
-    is_staff: Option<bool>,
-    usage_as_percentage: f32,
-    core_count: u32,
-    app_version: String,
-    release_channel: String,
-    os_name: String,
-    os_version: String,
-    time: i64,
-    session_id: Option<String>,
+    pub installation_id: Option<String>,
+    pub is_staff: Option<bool>,
+    pub usage_as_percentage: f32,
+    pub core_count: u32,
+    pub app_version: String,
+    pub release_channel: String,
+    pub time: i64,
+    pub session_id: Option<String>,
    // pub normalized_cpu_usage: f64, MATERIALIZED
-    major: Option<i32>,
-    minor: Option<i32>,
-    patch: Option<i32>,
+    pub major: Option<i32>,
+    pub minor: Option<i32>,
+    pub patch: Option<i32>,
 }

 impl CpuEventRow {
@@ -927,8 +909,6 @@ impl CpuEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -947,8 +927,6 @@ pub struct MemoryEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -978,8 +956,6 @@ impl MemoryEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -998,8 +974,6 @@ pub struct AppEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1028,8 +1002,6 @@ impl AppEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -1047,8 +1019,6 @@ pub struct SettingEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1077,8 +1047,6 @@ impl SettingEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -1097,8 +1065,6 @@ pub struct ExtensionEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1132,8 +1098,6 @@ impl ExtensionEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -1163,8 +1127,6 @@ pub struct EditEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1200,8 +1162,6 @@ impl EditEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
@@ -1221,8 +1181,6 @@ pub struct ActionEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
-    os_name: String,
-    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1253,8 +1211,6 @@ impl ActionEventRow {
            minor: semver.map(|v| v.minor() as i32),
            patch: semver.map(|v| v.patch() as i32),
            release_channel: body.release_channel.clone().unwrap_or_default(),
-            os_name: body.os_name.clone(),
-            os_version: body.os_version.clone().unwrap_or_default(),
            installation_id: body.installation_id.clone(),
            session_id: body.session_id.clone(),
            is_staff: body.is_staff,
--- a/crates/collab/src/auth.rs
+++ b/crates/collab/src/auth.rs
@@ -277,7 +277,7 @@ mod test {

    #[gpui::test]
    async fn test_verify_access_token(cx: &mut gpui::TestAppContext) {
-        let test_db = crate::db::TestDb::sqlite(cx.executor().clone());
+        let test_db = crate::db::TestDb::postgres(cx.executor().clone());
        let db = test_db.db();

        let user = db
--- a/crates/collab/src/db/tests.rs
+++ b/crates/collab/src/db/tests.rs
@@ -2,8 +2,6 @@ mod buffer_tests;
 mod channel_tests;
 mod contributor_tests;
 mod db_tests;
-// we only run postgres tests on macos right now
-#[cfg(target_os = "macos")]
 mod embedding_tests;
 mod extension_tests;
 mod feature_flag_tests;
@@ -110,7 +108,6 @@ impl TestDb {
 #[macro_export]
 macro_rules! test_both_dbs {
    ($test_name:ident, $postgres_test_name:ident, $sqlite_test_name:ident) => {
-        #[cfg(target_os = "macos")]
        #[gpui::test]
        async fn $postgres_test_name(cx: &mut gpui::TestAppContext) {
            let test_db = $crate::db::TestDb::postgres(cx.executor().clone());
--- a/crates/collab/src/db/tests/db_tests.rs
+++ b/crates/collab/src/db/tests/db_tests.rs
@@ -1,7 +1,9 @@
 use super::*;
 use crate::test_both_dbs;
+use gpui::TestAppContext;
 use pretty_assertions::{assert_eq, assert_ne};
 use std::sync::Arc;
+use tests::TestDb;

 test_both_dbs!(
    test_get_users,
@@ -562,10 +564,9 @@ fn test_fuzzy_like_string() {
    assert_eq!(Database::fuzzy_like_string(" z  "), "%z%");
 }

-#[cfg(target = "macos")]
 #[gpui::test]
-async fn test_fuzzy_search_users(cx: &mut gpui::TestAppContext) {
-    let test_db = tests::TestDb::postgres(cx.executor());
+async fn test_fuzzy_search_users(cx: &mut TestAppContext) {
+    let test_db = TestDb::postgres(cx.executor());
    let db = test_db.db();
    for (i, github_login) in [
        "California",
--- a/crates/collab/src/rpc.rs
+++ b/crates/collab/src/rpc.rs
@@ -548,9 +548,6 @@ impl Server {
            .add_request_handler(user_handler(
                forward_mutating_project_request::<proto::RestartLanguageServers>,
            ))
-            .add_request_handler(user_handler(
-                forward_mutating_project_request::<proto::LinkedEditingRange>,
-            ))
            .add_message_handler(create_buffer_for_peer)
            .add_request_handler(update_buffer)
            .add_message_handler(broadcast_project_message_from_host::<proto::RefreshInlayHints>)
--- a/crates/collab/src/tests/dev_server_tests.rs
+++ b/crates/collab/src/tests/dev_server_tests.rs
@@ -68,7 +68,6 @@ async fn test_dev_server(cx: &mut gpui::TestAppContext, cx2: &mut gpui::TestAppC
            assert_eq!(projects.len(), 1);
            assert_eq!(projects[0].path, "/remote");
            workspace::join_dev_server_project(
-                projects[0].id,
                projects[0].project_id.unwrap(),
                client.app_state.clone(),
                None,
@@ -208,7 +207,6 @@ async fn create_dev_server_project(
            assert_eq!(projects.len(), 1);
            assert_eq!(projects[0].path, "/remote");
            workspace::join_dev_server_project(
-                projects[0].id,
                projects[0].project_id.unwrap(),
                client_app_state,
                None,
@@ -493,7 +491,6 @@ async fn test_dev_server_reconnect(
        .update(cx2, |store, cx| {
            let projects = store.dev_server_projects();
            workspace::join_dev_server_project(
-                projects[0].id,
                projects[0].project_id.unwrap(),
                client2.app_state.clone(),
                None,
@@ -575,8 +572,7 @@ async fn test_save_as_remote(cx1: &mut gpui::TestAppContext, cx2: &mut gpui::Tes

    let title = remote_workspace
        .update(&mut cx, |ws, cx| {
-            let active_item = ws.active_item(cx).unwrap();
-            active_item.tab_description(0, &cx).unwrap()
+            ws.active_item(cx).unwrap().tab_description(0, &cx).unwrap()
        })
        .unwrap();

--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -30,7 +30,6 @@ use project::{
    project_settings::{InlineBlameSettings, ProjectSettings},
    SERVER_PROGRESS_DEBOUNCE_TIMEOUT,
 };
-use recent_projects::disconnected_overlay::DisconnectedOverlay;
 use rpc::RECEIVE_TIMEOUT;
 use serde_json::json;
 use settings::SettingsStore;
@@ -60,7 +59,6 @@ async fn test_host_disconnect(
        .await;

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

    client_a
        .fs()
@@ -85,7 +83,7 @@ async fn test_host_disconnect(
    let project_b = client_b.build_dev_server_project(project_id, cx_b).await;
    cx_a.background_executor.run_until_parked();

-    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| tree.as_local().unwrap().is_shared()));

    let workspace_b = cx_b
        .add_window(|cx| Workspace::new(None, project_b.clone(), client_b.app_state.clone(), cx));
@@ -122,13 +120,14 @@ async fn test_host_disconnect(

    project_b.read_with(cx_b, |project, _| project.is_read_only());

-    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.as_local().unwrap().is_shared()));

    // Ensure client B's edited state is reset and that the whole window is blurred.
+
    workspace_b
        .update(cx_b, |workspace, cx| {
-            assert!(workspace.active_modal::<DisconnectedOverlay>(cx).is_some());
-            assert!(!workspace.is_edited());
+            assert_eq!(cx.focused(), None);
+            assert!(!workspace.is_edited())
        })
        .unwrap();

@@ -344,7 +343,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
        .handle_request::<lsp::request::Completion, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                lsp::Url::from_file_path("/a/main.rs").unwrap(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -461,7 +460,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
        .handle_request::<lsp::request::Completion, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                lsp::Url::from_file_path("/a/main.rs").unwrap(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -585,7 +584,7 @@ async fn test_collaborating_with_code_actions(
        .handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                lsp::Url::from_file_path("/a/main.rs").unwrap(),
            );
            assert_eq!(params.range.start, lsp::Position::new(0, 0));
            assert_eq!(params.range.end, lsp::Position::new(0, 0));
@@ -607,7 +606,7 @@ async fn test_collaborating_with_code_actions(
        .handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                lsp::Url::from_file_path("/a/main.rs").unwrap(),
            );
            assert_eq!(params.range.start, lsp::Position::new(1, 31));
            assert_eq!(params.range.end, lsp::Position::new(1, 31));
@@ -619,7 +618,7 @@ async fn test_collaborating_with_code_actions(
                        changes: Some(
                            [
                                (
-                                    lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                                    lsp::Url::from_file_path("/a/main.rs").unwrap(),
                                    vec![lsp::TextEdit::new(
                                        lsp::Range::new(
                                            lsp::Position::new(1, 22),
@@ -629,7 +628,7 @@ async fn test_collaborating_with_code_actions(
                                    )],
                                ),
                                (
-                                    lsp::Uri::from_file_path("/a/other.rs").unwrap().into(),
+                                    lsp::Url::from_file_path("/a/other.rs").unwrap(),
                                    vec![lsp::TextEdit::new(
                                        lsp::Range::new(
                                            lsp::Position::new(0, 0),
@@ -689,7 +688,7 @@ async fn test_collaborating_with_code_actions(
                    changes: Some(
                        [
                            (
-                                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                                lsp::Url::from_file_path("/a/main.rs").unwrap(),
                                vec![lsp::TextEdit::new(
                                    lsp::Range::new(
                                        lsp::Position::new(1, 22),
@@ -699,7 +698,7 @@ async fn test_collaborating_with_code_actions(
                                )],
                            ),
                            (
-                                lsp::Uri::from_file_path("/a/other.rs").unwrap().into(),
+                                lsp::Url::from_file_path("/a/other.rs").unwrap(),
                                vec![lsp::TextEdit::new(
                                    lsp::Range::new(
                                        lsp::Position::new(0, 0),
@@ -897,14 +896,14 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
                changes: Some(
                    [
                        (
-                            lsp::Uri::from_file_path("/dir/one.rs").unwrap().into(),
+                            lsp::Url::from_file_path("/dir/one.rs").unwrap(),
                            vec![lsp::TextEdit::new(
                                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                                "THREE".to_string(),
                            )],
                        ),
                        (
-                            lsp::Uri::from_file_path("/dir/two.rs").unwrap().into(),
+                            lsp::Url::from_file_path("/dir/two.rs").unwrap(),
                            vec![
                                lsp::TextEdit::new(
                                    lsp::Range::new(
@@ -1313,7 +1312,7 @@ async fn test_on_input_format_from_host_to_guest(
        |params, _| async move {
            assert_eq!(
                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                lsp::Url::from_file_path("/a/main.rs").unwrap(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -1441,7 +1440,7 @@ async fn test_on_input_format_from_guest_to_host(
        .handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document_position.text_document.uri,
-                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                lsp::Url::from_file_path("/a/main.rs").unwrap(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -1610,7 +1609,7 @@ async fn test_mutual_editor_inlay_hint_cache_update(
            async move {
                assert_eq!(
                    params.text_document.uri,
-                    lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                    lsp::Url::from_file_path("/a/main.rs").unwrap(),
                );
                let edits_made = task_edits_made.load(atomic::Ordering::Acquire);
                Ok(Some(vec![lsp::InlayHint {
@@ -1873,7 +1872,7 @@ async fn test_inlay_hint_refresh_is_forwarded(
            async move {
                assert_eq!(
                    params.text_document.uri,
-                    lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                    lsp::Url::from_file_path("/a/main.rs").unwrap(),
                );
                let other_hints = task_other_hints.load(atomic::Ordering::Acquire);
                let character = if other_hints { 0 } else { 2 };
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -1378,7 +1378,7 @@ async fn test_unshare_project(
    let project_b = client_b.build_dev_server_project(project_id, cx_b).await;
    executor.run_until_parked();

-    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| tree.as_local().unwrap().is_shared()));

    project_b
        .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
@@ -1403,7 +1403,7 @@ async fn test_unshare_project(
        .unwrap();
    executor.run_until_parked();

-    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.as_local().unwrap().is_shared()));

    assert!(project_c.read_with(cx_c, |project, _| project.is_disconnected()));

@@ -1415,7 +1415,7 @@ async fn test_unshare_project(
    let project_c2 = client_c.build_dev_server_project(project_id, cx_c).await;
    executor.run_until_parked();

-    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| tree.as_local().unwrap().is_shared()));
    project_c2
        .update(cx_c, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
        .await
@@ -1522,7 +1522,7 @@ async fn test_project_reconnect(
    executor.run_until_parked();

    let worktree1_id = worktree_a1.read_with(cx_a, |worktree, _| {
-        assert!(worktree.has_update_observer());
+        assert!(worktree.as_local().unwrap().is_shared());
        worktree.id()
    });
    let (worktree_a2, _) = project_a1
@@ -1534,7 +1534,7 @@ async fn test_project_reconnect(
    executor.run_until_parked();

    let worktree2_id = worktree_a2.read_with(cx_a, |tree, _| {
-        assert!(tree.has_update_observer());
+        assert!(tree.as_local().unwrap().is_shared());
        tree.id()
    });
    executor.run_until_parked();
@@ -1567,7 +1567,9 @@ async fn test_project_reconnect(
        assert_eq!(project.collaborators().len(), 1);
    });

-    worktree_a1.read_with(cx_a, |tree, _| assert!(tree.has_update_observer()));
+    worktree_a1.read_with(cx_a, |tree, _| {
+        assert!(tree.as_local().unwrap().is_shared())
+    });

    // While client A is disconnected, add and remove files from client A's project.
    client_a
@@ -1609,7 +1611,7 @@ async fn test_project_reconnect(
        .await;

    let worktree3_id = worktree_a3.read_with(cx_a, |tree, _| {
-        assert!(!tree.has_update_observer());
+        assert!(!tree.as_local().unwrap().is_shared());
        tree.id()
    });
    executor.run_until_parked();
@@ -1632,7 +1634,7 @@ async fn test_project_reconnect(

    project_a1.read_with(cx_a, |project, cx| {
        assert!(project.is_shared());
-        assert!(worktree_a1.read(cx).has_update_observer());
+        assert!(worktree_a1.read(cx).as_local().unwrap().is_shared());
        assert_eq!(
            worktree_a1
                .read(cx)
@@ -1650,7 +1652,7 @@ async fn test_project_reconnect(
                "subdir2/i.txt"
            ]
        );
-        assert!(worktree_a3.read(cx).has_update_observer());
+        assert!(worktree_a3.read(cx).as_local().unwrap().is_shared());
        assert_eq!(
            worktree_a3
                .read(cx)
@@ -1731,7 +1733,7 @@ async fn test_project_reconnect(
    executor.run_until_parked();

    let worktree4_id = worktree_a4.read_with(cx_a, |tree, _| {
-        assert!(tree.has_update_observer());
+        assert!(tree.as_local().unwrap().is_shared());
        tree.id()
    });
    project_a1.update(cx_a, |project, cx| {
@@ -3897,7 +3899,7 @@ async fn test_collaborating_with_diagnostics(
        .await;
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
+            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
                severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -3917,7 +3919,7 @@ async fn test_collaborating_with_diagnostics(
        .unwrap();
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
+            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
                severity: Some(lsp::DiagnosticSeverity::ERROR),
@@ -3991,7 +3993,7 @@ async fn test_collaborating_with_diagnostics(
    // Simulate a language server reporting more errors for a file.
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
+            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![
                lsp::Diagnostic {
@@ -4085,7 +4087,7 @@ async fn test_collaborating_with_diagnostics(
    // Simulate a language server reporting no errors for a file.
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
        lsp::PublishDiagnosticsParams {
-            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
+            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
            version: None,
            diagnostics: vec![],
        },
@@ -4189,9 +4191,7 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
    for file_name in file_names {
        fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
            lsp::PublishDiagnosticsParams {
-                uri: lsp::Uri::from_file_path(Path::new("/test").join(file_name))
-                    .unwrap()
-                    .into(),
+                uri: lsp::Url::from_file_path(Path::new("/test").join(file_name)).unwrap(),
                version: None,
                diagnostics: vec![lsp::Diagnostic {
                    severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -4609,7 +4609,7 @@ async fn test_definition(
    fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
        Ok(Some(lsp::GotoDefinitionResponse::Scalar(
            lsp::Location::new(
-                lsp::Uri::from_file_path("/root/dir-2/b.rs").unwrap().into(),
+                lsp::Url::from_file_path("/root/dir-2/b.rs").unwrap(),
                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
            ),
        )))
@@ -4638,7 +4638,7 @@ async fn test_definition(
    fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
        Ok(Some(lsp::GotoDefinitionResponse::Scalar(
            lsp::Location::new(
-                lsp::Uri::from_file_path("/root/dir-2/b.rs").unwrap().into(),
+                lsp::Url::from_file_path("/root/dir-2/b.rs").unwrap(),
                lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)),
            ),
        )))
@@ -4674,7 +4674,7 @@ async fn test_definition(
            );
            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
                lsp::Location::new(
-                    lsp::Uri::from_file_path("/root/dir-2/c.rs").unwrap().into(),
+                    lsp::Url::from_file_path("/root/dir-2/c.rs").unwrap(),
                    lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)),
                ),
            )))
@@ -4786,21 +4786,15 @@ async fn test_references(
    lsp_response_tx
        .unbounded_send(Ok(Some(vec![
            lsp::Location {
-                uri: lsp::Uri::from_file_path("/root/dir-1/two.rs")
-                    .unwrap()
-                    .into(),
+                uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(),
                range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)),
            },
            lsp::Location {
-                uri: lsp::Uri::from_file_path("/root/dir-1/two.rs")
-                    .unwrap()
-                    .into(),
+                uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(),
                range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)),
            },
            lsp::Location {
-                uri: lsp::Uri::from_file_path("/root/dir-2/three.rs")
-                    .unwrap()
-                    .into(),
+                uri: lsp::Url::from_file_path("/root/dir-2/three.rs").unwrap(),
                range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)),
            },
        ])))
@@ -5300,9 +5294,7 @@ async fn test_project_symbols(
            lsp::SymbolInformation {
                name: "TWO".into(),
                location: lsp::Location {
-                    uri: lsp::Uri::from_file_path("/code/crate-2/two.rs")
-                        .unwrap()
-                        .into(),
+                    uri: lsp::Url::from_file_path("/code/crate-2/two.rs").unwrap(),
                    range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                },
                kind: lsp::SymbolKind::CONSTANT,
@@ -5392,7 +5384,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
    fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
        Ok(Some(lsp::GotoDefinitionResponse::Scalar(
            lsp::Location::new(
-                lsp::Uri::from_file_path("/root/b.rs").unwrap().into(),
+                lsp::Url::from_file_path("/root/b.rs").unwrap(),
                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
            ),
        )))
--- a/crates/collab/src/tests/random_project_collaboration_tests.rs
+++ b/crates/collab/src/tests/random_project_collaboration_tests.rs
@@ -14,9 +14,7 @@ use language::{
 };
 use lsp::FakeLanguageServer;
 use pretty_assertions::assert_eq;
-use project::{
-    search::SearchQuery, Project, ProjectPath, SearchResult, DEFAULT_COMPLETION_CONTEXT,
-};
+use project::{search::SearchQuery, Project, ProjectPath, SearchResult};
 use rand::{
    distributions::{Alphanumeric, DistString},
    prelude::*,
@@ -305,7 +303,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    .filter(|worktree| {
                                        let worktree = worktree.read(cx);
                                        worktree.is_visible()
-                                            && worktree.entries(false, 0).any(|e| e.is_file())
+                                            && worktree.entries(false).any(|e| e.is_file())
                                            && worktree.root_entry().map_or(false, |e| e.is_dir())
                                    })
                                    .choose(rng)
@@ -427,14 +425,14 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    .filter(|worktree| {
                                        let worktree = worktree.read(cx);
                                        worktree.is_visible()
-                                            && worktree.entries(false, 0).any(|e| e.is_file())
+                                            && worktree.entries(false).any(|e| e.is_file())
                                    })
                                    .choose(rng)
                            });
                            let Some(worktree) = worktree else { continue };
                            let full_path = worktree.read_with(cx, |worktree, _| {
                                let entry = worktree
-                                    .entries(false, 0)
+                                    .entries(false)
                                    .filter(|e| e.is_file())
                                    .choose(rng)
                                    .unwrap();
@@ -831,7 +829,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                        .map_ok(|_| ())
                        .boxed(),
                    LspRequestKind::Completion => project
-                        .completions(&buffer, offset, DEFAULT_COMPLETION_CONTEXT, cx)
+                        .completions(&buffer, offset, cx)
                        .map_ok(|_| ())
                        .boxed(),
                    LspRequestKind::CodeAction => project
@@ -1101,7 +1099,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                        files
                                            .into_iter()
                                            .map(|file| lsp::Location {
-                                                uri: lsp::Uri::from_file_path(file).unwrap().into(),
+                                                uri: lsp::Url::from_file_path(file).unwrap(),
                                                range: Default::default(),
                                            })
                                            .collect(),
@@ -1206,8 +1204,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                                        guest_project.remote_id(),
                                    );
                                    assert_eq!(
-                                        guest_snapshot.entries(false, 0).collect::<Vec<_>>(),
-                                        host_snapshot.entries(false, 0).collect::<Vec<_>>(),
+                                        guest_snapshot.entries(false).collect::<Vec<_>>(),
+                                        host_snapshot.entries(false).collect::<Vec<_>>(),
                                        "{} has different snapshot than the host for worktree {:?} ({:?}) and project {:?}",
                                        client.username,
                                        host_snapshot.abs_path(),
--- a/crates/collab/src/tests/randomized_test_helpers.rs
+++ b/crates/collab/src/tests/randomized_test_helpers.rs
@@ -69,6 +69,7 @@ struct TestPlan<T: RandomizedTest> {
 pub struct UserTestPlan {
    pub user_id: UserId,
    pub username: String,
+    pub allow_client_reconnection: bool,
    pub allow_client_disconnection: bool,
    next_root_id: usize,
    operation_ix: usize,
@@ -236,6 +237,7 @@ impl<T: RandomizedTest> TestPlan<T> {
                next_root_id: 0,
                operation_ix: 0,
                allow_client_disconnection,
+                allow_client_reconnection,
            });
        }

--- a/crates/collab/src/tests/test_server.rs
+++ b/crates/collab/src/tests/test_server.rs
@@ -161,7 +161,7 @@ impl TestServer {
            }
            let settings = SettingsStore::test(cx);
            cx.set_global(settings);
-            release_channel::init(SemanticVersion::default(), cx);
+            release_channel::init("0.0.0", cx);
            client::init_settings(cx);
        });

@@ -277,7 +277,11 @@ impl TestServer {
            node_runtime: FakeNodeRuntime::new(),
        });

-        let os_keymap = "keymaps/default-macos.json";
+        let os_keymap = if cfg!(target_os = "linux") {
+            "keymaps/default-linux.json"
+        } else {
+            "keymaps/default-macos.json"
+        };

        cx.update(|cx| {
            theme::init(theme::LoadThemes::JustBase, cx);
@@ -323,7 +327,7 @@ impl TestServer {
            }
            let settings = SettingsStore::test(cx);
            cx.set_global(settings);
-            release_channel::init(SemanticVersion::default(), cx);
+            release_channel::init("0.0.0", cx);
            client::init_settings(cx);
        });
        let (dev_server_id, _) = split_dev_server_token(&access_token).unwrap();
--- a/crates/collab_ui/src/channel_view.rs
+++ b/crates/collab_ui/src/channel_view.rs
@@ -228,11 +228,11 @@ impl ChannelView {
            &self.editor,
            move |this, _, e: &EditorEvent, cx| {
                match e {
-                    EditorEvent::Reparsed(_) => {
+                    EditorEvent::Reparsed => {
                        this.focus_position_from_link(position.clone(), false, cx);
                        this._reparse_subscription.take();
                    }
-                    EditorEvent::Edited { .. } | EditorEvent::SelectionsChanged { local: true } => {
+                    EditorEvent::Edited | EditorEvent::SelectionsChanged { local: true } => {
                        this._reparse_subscription.take();
                    }
                    _ => {}
--- a/crates/collab_ui/src/chat_panel/message_editor.rs
+++ b/crates/collab_ui/src/chat_panel/message_editor.rs
@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use channel::{ChannelChat, ChannelStore, MessageParams};
 use client::{UserId, UserStore};
 use collections::HashSet;
@@ -46,7 +46,6 @@ impl CompletionProvider for MessageEditorCompletionProvider {
        &self,
        buffer: &Model<Buffer>,
        buffer_position: language::Anchor,
-        _: editor::CompletionContext,
        cx: &mut ViewContext<Editor>,
    ) -> Task<anyhow::Result<Vec<Completion>>> {
        let Some(handle) = self.0.upgrade() else {
@@ -133,7 +132,7 @@ impl MessageEditor {

        let markdown = language_registry.language_for_name("Markdown");
        cx.spawn(|_, mut cx| async move {
-            let markdown = markdown.await.context("failed to load Markdown language")?;
+            let markdown = markdown.await?;
            buffer.update(&mut cx, |buffer, cx| {
                buffer.set_language(Some(markdown), cx)
            })
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -58,8 +58,6 @@ impl Render for CollabTitlebarItem {
        let project_id = self.project.read(cx).remote_id();
        let workspace = self.workspace.upgrade();

-        let platform_supported = cfg!(target_os = "macos");
-
        TitleBar::new("collab-titlebar", Box::new(workspace::CloseWindow))
            // note: on windows titlebar behaviour is handled by the platform implementation
            .when(cfg!(not(windows)), |this| {
@@ -245,9 +243,7 @@ impl Render for CollabTitlebarItem {
                                )
                                .tooltip(move |cx| {
                                    Tooltip::text(
-                                        if !platform_supported {
-                                            "Cannot share microphone"
-                                        } else if is_muted {
+                                        if is_muted {
                                            "Unmute microphone"
                                        } else {
                                            "Mute microphone"
@@ -257,8 +253,7 @@ impl Render for CollabTitlebarItem {
                                })
                                .style(ButtonStyle::Subtle)
                                .icon_size(IconSize::Small)
-                                .selected(platform_supported && is_muted)
-                                .disabled(!platform_supported)
+                                .selected(is_muted)
                                .selected_style(ButtonStyle::Tinted(TintColor::Negative))
                                .on_click(move |_, cx| crate::toggle_mute(&Default::default(), cx)),
                            )
@@ -276,11 +271,8 @@ impl Render for CollabTitlebarItem {
                            .selected_style(ButtonStyle::Tinted(TintColor::Negative))
                            .icon_size(IconSize::Small)
                            .selected(is_deafened)
-                            .disabled(!platform_supported)
                            .tooltip(move |cx| {
-                                if !platform_supported {
-                                    Tooltip::text("Cannot share microphone", cx)
-                                } else if can_use_microphone {
+                                if can_use_microphone {
                                    Tooltip::with_meta(
                                        "Deafen Audio",
                                        None,
@@ -299,13 +291,10 @@ impl Render for CollabTitlebarItem {
                                    .style(ButtonStyle::Subtle)
                                    .icon_size(IconSize::Small)
                                    .selected(is_screen_sharing)
-                                    .disabled(!platform_supported)
                                    .selected_style(ButtonStyle::Tinted(TintColor::Accent))
                                    .tooltip(move |cx| {
                                        Tooltip::text(
-                                            if !platform_supported {
-                                                "Cannot share screen"
-                                            } else if is_screen_sharing {
+                                            if is_screen_sharing {
                                                "Stop Sharing Screen"
                                            } else {
                                                "Share Screen"
@@ -424,17 +413,6 @@ impl CollabTitlebarItem {
            );
        }

-        if self.project.read(cx).is_disconnected() {
-            return Some(
-                Button::new("disconnected", "Disconnected")
-                    .disabled(true)
-                    .color(Color::Disabled)
-                    .style(ButtonStyle::Subtle)
-                    .label_size(LabelSize::Small)
-                    .into_any_element(),
-            );
-        }
-
        let host = self.project.read(cx).host()?;
        let host_user = self.user_store.read(cx).get_cached_user(host.user_id)?;
        let participant_index = self
@@ -708,7 +686,7 @@ impl CollabTitlebarItem {
                        .on_click(|_, cx| {
                            if let Some(auto_updater) = auto_update::AutoUpdater::get(cx) {
                                if auto_updater.read(cx).status().is_updated() {
-                                    workspace::reload(&Default::default(), cx);
+                                    workspace::restart(&Default::default(), cx);
                                    return;
                                }
                            }
--- a/crates/collab_ui/src/collab_ui.rs
+++ b/crates/collab_ui/src/collab_ui.rs
@@ -13,8 +13,8 @@ use call::{report_call_event_for_room, ActiveCall};
 pub use collab_panel::CollabPanel;
 pub use collab_titlebar_item::CollabTitlebarItem;
 use gpui::{
-    actions, point, AppContext, Pixels, PlatformDisplay, Size, Task, WindowBackgroundAppearance,
-    WindowBounds, WindowContext, WindowKind, WindowOptions,
+    actions, point, AppContext, DevicePixels, Pixels, PlatformDisplay, Size, Task,
+    WindowBackgroundAppearance, WindowBounds, WindowContext, WindowKind, WindowOptions,
 };
 use panel_settings::MessageEditorSettings;
 pub use panel_settings::{
@@ -22,7 +22,6 @@ pub use panel_settings::{
 };
 use release_channel::ReleaseChannel;
 use settings::Settings;
-use ui::px;
 use workspace::{notifications::DetachAndPromptErr, AppState};

 actions!(
@@ -97,19 +96,22 @@ pub fn toggle_deafen(_: &ToggleDeafen, cx: &mut AppContext) {

 fn notification_window_options(
    screen: Rc<dyn PlatformDisplay>,
-    size: Size<Pixels>,
+    window_size: Size<Pixels>,
    cx: &AppContext,
 ) -> WindowOptions {
-    let notification_margin_width = px(16.);
-    let notification_margin_height = px(-48.);
+    let notification_margin_width = DevicePixels::from(16);
+    let notification_margin_height = DevicePixels::from(-0) - DevicePixels::from(48);

-    let bounds = gpui::Bounds::<Pixels> {
-        origin: screen.bounds().upper_right()
+    let screen_bounds = screen.bounds();
+    let size: Size<DevicePixels> = window_size.into();
+
+    let bounds = gpui::Bounds::<DevicePixels> {
+        origin: screen_bounds.upper_right()
            - point(
                size.width + notification_margin_width,
                notification_margin_height,
            ),
-        size,
+        size: window_size.into(),
    };

    let app_id = ReleaseChannel::global(cx).app_id();
--- a/crates/collab_ui/src/notifications/project_shared_notification.rs
+++ b/crates/collab_ui/src/notifications/project_shared_notification.rs
@@ -8,7 +8,6 @@ use settings::Settings;
 use std::sync::{Arc, Weak};
 use theme::ThemeSettings;
 use ui::{prelude::*, Button, Label};
-use util::ResultExt;
 use workspace::AppState;

 pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {
@@ -28,21 +27,16 @@ pub fn init(app_state: &Arc<AppState>, cx: &mut AppContext) {

            for screen in cx.displays() {
                let options = notification_window_options(screen, window_size, cx);
-                let Some(window) = cx
-                    .open_window(options, |cx| {
-                        cx.new_view(|_| {
-                            ProjectSharedNotification::new(
-                                owner.clone(),
-                                *project_id,
-                                worktree_root_names.clone(),
-                                app_state.clone(),
-                            )
-                        })
+                let window = cx.open_window(options, |cx| {
+                    cx.new_view(|_| {
+                        ProjectSharedNotification::new(
+                            owner.clone(),
+                            *project_id,
+                            worktree_root_names.clone(),
+                            app_state.clone(),
+                        )
                    })
-                    .log_err()
-                else {
-                    continue;
-                };
+                });
                notification_windows
                    .entry(*project_id)
                    .or_insert(Vec::new())
--- a/crates/color/Cargo.toml
+++ b/crates/color/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "color"
+version = "0.1.0"
+edition = "2021"
+publish = false
+license = "GPL-3.0-or-later"
+
+[lints]
+workspace = true
+
+[features]
+default = []
+
+[lib]
+path = "src/color.rs"
+doctest = true
+
+[dependencies]
+palette.workspace = true
--- a/crates/ollama/LICENSE-GPL
+++ b/crates/ollama/LICENSE-GPL
--- a/crates/color/src/color.rs
+++ b/crates/color/src/color.rs
@@ -0,0 +1,227 @@
+//! # Color
+//!
+//! The `color` crate provides a set utilities for working with colors. It is a wrapper around the [`palette`](https://docs.rs/palette) crate with some additional functionality.
+//!
+//! It is used to create a manipulate colors when building themes.
+//!
+//! === In development note ===
+//!
+//! This crate is meant to sit between gpui and the theme/ui for all the color related stuff.
+//!
+//! It could be folded into gpui, ui or theme potentially but for now we'll continue
+//! to develop it in isolation.
+//!
+//! Once we have a good idea of the needs of the theme system and color in gpui in general I see 3 paths:
+//! 1. Use `palette` (or another color library) directly in gpui and everywhere else, rather than rolling our own color system.
+//! 2. Keep this crate as a thin wrapper around `palette` and use it everywhere except gpui, and convert to gpui's color system when needed.
+//! 3. Build the needed functionality into gpui and keep using its color system everywhere.
+//!
+//! I'm leaning towards 2 in the short term and 1 in the long term, but we'll need to discuss it more.
+//!
+//! === End development note ===
+use palette::{
+    blend::Blend, convert::FromColorUnclamped, encoding, rgb::Rgb, Clamp, Mix, Srgb, WithAlpha,
+};
+
+/// The types of blend modes supported
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum BlendMode {
+    /// Multiplies the colors, resulting in a darker color. This mode is useful for creating shadows.
+    Multiply,
+    /// Lightens the color by adding the source and destination colors. It results in a lighter color.
+    Screen,
+    /// Combines Multiply and Screen blend modes. Parts of the image that are lighter than 50% gray are lightened, and parts that are darker are darkened.
+    Overlay,
+    /// Selects the darker of the base or blend color as the resulting color. Useful for darkening images without affecting the overall contrast.
+    Darken,
+    /// Selects the lighter of the base or blend color as the resulting color. Useful for lightening images without affecting the overall contrast.
+    Lighten,
+    /// Brightens the base color to reflect the blend color. The result is a lightened image.
+    Dodge,
+    /// Darkens the base color to reflect the blend color. The result is a darkened image.
+    Burn,
+    /// Similar to Overlay, but with a stronger effect. Hard Light can either multiply or screen colors, depending on the blend color.
+    HardLight,
+    /// A softer version of Hard Light. Soft Light either darkens or lightens colors, depending on the blend color.
+    SoftLight,
+    /// Subtracts the darker of the two constituent colors from the lighter color. Difference mode is useful for creating more vivid colors.
+    Difference,
+    /// Similar to Difference, but with a lower contrast. Exclusion mode produces an effect similar to Difference but with less intensity.
+    Exclusion,
+}
+
+/// Converts a hexadecimal color string to a `palette::Hsla` color.
+///
+/// This function supports the following hex formats:
+/// `#RGB`, `#RGBA`, `#RRGGBB`, `#RRGGBBAA`.
+pub fn hex_to_hsla(s: &str) -> Result<RGBAColor, String> {
+    let hex = s.trim_start_matches('#');
+
+    // Expand shorthand formats #RGB and #RGBA to #RRGGBB and #RRGGBBAA
+    let h = hex.as_bytes();
+    let arr: [u8; 8] = match h.len() {
+        // #RGB => #RRGGBBAA
+        3 => [h[0], h[0], h[1], h[1], h[2], h[2], b'f', b'f'],
+        // #RGBA => #RRGGBBAA
+        4 => [h[0], h[0], h[1], h[1], h[2], h[2], h[3], h[3]],
+        // #RRGGBB => #RRGGBBAA
+        6 => [h[0], h[1], h[2], h[3], h[4], h[5], b'f', b'f'],
+        // Already in #RRGGBBAA
+        8 => h.try_into().unwrap(),
+        _ => return Err("Invalid hexadecimal string length".to_string()),
+    };
+
+    let hex =
+        std::str::from_utf8(&arr).map_err(|_| format!("Invalid hexadecimal string: {}", s))?;
+    let hex_val =
+        u32::from_str_radix(hex, 16).map_err(|_| format!("Invalid hexadecimal string: {}", s))?;
+
+    Ok(RGBAColor {
+        r: ((hex_val >> 24) & 0xFF) as f32 / 255.0,
+        g: ((hex_val >> 16) & 0xFF) as f32 / 255.0,
+        b: ((hex_val >> 8) & 0xFF) as f32 / 255.0,
+        a: (hex_val & 0xFF) as f32 / 255.0,
+    })
+}
+
+// These derives implement to and from palette's color types.
+#[derive(FromColorUnclamped, WithAlpha, Debug, Clone)]
+#[palette(skip_derives(Rgb), rgb_standard = "encoding::Srgb")]
+pub struct RGBAColor {
+    r: f32,
+    g: f32,
+    b: f32,
+    // Let Palette know this is our alpha channel.
+    #[palette(alpha)]
+    a: f32,
+}
+
+impl FromColorUnclamped<RGBAColor> for RGBAColor {
+    fn from_color_unclamped(color: RGBAColor) -> RGBAColor {
+        color
+    }
+}
+
+impl<S> FromColorUnclamped<Rgb<S, f32>> for RGBAColor
+where
+    Srgb: FromColorUnclamped<Rgb<S, f32>>,
+{
+    fn from_color_unclamped(color: Rgb<S, f32>) -> RGBAColor {
+        let srgb = Srgb::from_color_unclamped(color);
+        RGBAColor {
+            r: srgb.red,
+            g: srgb.green,
+            b: srgb.blue,
+            a: 1.0,
+        }
+    }
+}
+
+impl<S> FromColorUnclamped<RGBAColor> for Rgb<S, f32>
+where
+    Rgb<S, f32>: FromColorUnclamped<Srgb>,
+{
+    fn from_color_unclamped(color: RGBAColor) -> Self {
+        Self::from_color_unclamped(Srgb::new(color.r, color.g, color.b))
+    }
+}
+
+impl Clamp for RGBAColor {
+    fn clamp(self) -> Self {
+        RGBAColor {
+            r: self.r.min(1.0).max(0.0),
+            g: self.g.min(1.0).max(0.0),
+            b: self.b.min(1.0).max(0.0),
+            a: self.a.min(1.0).max(0.0),
+        }
+    }
+}
+
+impl RGBAColor {
+    /// Creates a new color from the given RGBA values.
+    ///
+    /// This color can be used to convert to any [`palette::Color`] type.
+    pub fn new(r: f32, g: f32, b: f32, a: f32) -> Self {
+        RGBAColor { r, g, b, a }
+    }
+
+    /// Returns a set of states for this color.
+    pub fn states(self, is_light: bool) -> ColorStates {
+        states_for_color(self, is_light)
+    }
+
+    /// Mixes this color with another [`palette::Hsl`] color at the given `mix_ratio`.
+    pub fn mixed(&self, other: RGBAColor, mix_ratio: f32) -> Self {
+        let srgb_self = Srgb::new(self.r, self.g, self.b);
+        let srgb_other = Srgb::new(other.r, other.g, other.b);
+
+        // Directly mix the colors as sRGB values
+        let mixed = srgb_self.mix(srgb_other, mix_ratio);
+        RGBAColor::from_color_unclamped(mixed)
+    }
+
+    pub fn blend(&self, other: RGBAColor, blend_mode: BlendMode) -> Self {
+        let srgb_self = Srgb::new(self.r, self.g, self.b);
+        let srgb_other = Srgb::new(other.r, other.g, other.b);
+
+        let blended = match blend_mode {
+            // replace hsl methods with the respective sRGB methods
+            BlendMode::Multiply => srgb_self.multiply(srgb_other),
+            _ => unimplemented!(),
+        };
+
+        Self {
+            r: blended.red,
+            g: blended.green,
+            b: blended.blue,
+            a: self.a,
+        }
+    }
+}
+
+/// A set of colors for different states of an element.
+#[derive(Debug, Clone)]
+pub struct ColorStates {
+    /// The default color.
+    pub default: RGBAColor,
+    /// The color when the mouse is hovering over the element.
+    pub hover: RGBAColor,
+    /// The color when the mouse button is held down on the element.
+    pub active: RGBAColor,
+    /// The color when the element is focused with the keyboard.
+    pub focused: RGBAColor,
+    /// The color when the element is disabled.
+    pub disabled: RGBAColor,
+}
+
+/// Returns a set of colors for different states of an element.
+///
+/// todo("This should take a theme and use appropriate colors from it")
+pub fn states_for_color(color: RGBAColor, is_light: bool) -> ColorStates {
+    let adjustment_factor = if is_light { 0.1 } else { -0.1 };
+    let hover_adjustment = 1.0 - adjustment_factor;
+    let active_adjustment = 1.0 - 2.0 * adjustment_factor;
+    let focused_adjustment = 1.0 - 3.0 * adjustment_factor;
+    let disabled_adjustment = 1.0 - 4.0 * adjustment_factor;
+
+    let make_adjustment = |color: RGBAColor, adjustment: f32| -> RGBAColor {
+        // Adjust lightness for each state
+        // Note: Adjustment logic may differ; simplify as needed for sRGB
+        RGBAColor::new(
+            color.r * adjustment,
+            color.g * adjustment,
+            color.b * adjustment,
+            color.a,
+        )
+    };
+
+    let color = color.clamp();
+
+    ColorStates {
+        default: color.clone(),
+        hover: make_adjustment(color.clone(), hover_adjustment),
+        active: make_adjustment(color.clone(), active_adjustment),
+        focused: make_adjustment(color.clone(), focused_adjustment),
+        disabled: make_adjustment(color.clone(), disabled_adjustment),
+    }
+}
--- a/crates/copilot/src/copilot.rs
+++ b/crates/copilot/src/copilot.rs
@@ -188,7 +188,7 @@ impl Status {
 }

 struct RegisteredBuffer {
-    uri: lsp::RawUri,
+    uri: lsp::Url,
    language_id: String,
    snapshot: BufferSnapshot,
    snapshot_version: i32,
@@ -644,7 +644,7 @@ impl Copilot {
            registered_buffers
                .entry(buffer.entity_id())
                .or_insert_with(|| {
-                    let uri = uri_for_buffer(buffer, cx);
+                    let uri: lsp::Url = uri_for_buffer(buffer, cx);
                    let language_id = id_for_language(buffer.read(cx).language());
                    let snapshot = buffer.read(cx).snapshot();
                    server
@@ -959,9 +959,9 @@ fn id_for_language(language: Option<&Arc<Language>>) -> String {
        .unwrap_or_else(|| "plaintext".to_string())
 }

-fn uri_for_buffer(buffer: &Model<Buffer>, cx: &AppContext) -> lsp::RawUri {
+fn uri_for_buffer(buffer: &Model<Buffer>, cx: &AppContext) -> lsp::Url {
    if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
-        lsp::Uri::from_file_path(file.abs_path(cx)).unwrap().into()
+        lsp::Url::from_file_path(file.abs_path(cx)).unwrap()
    } else {
        format!("buffer://{}", buffer.entity_id()).parse().unwrap()
    }
@@ -1042,18 +1042,18 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {

 #[cfg(test)]
 mod tests {
-    use std::str::FromStr;
-
    use super::*;
    use gpui::TestAppContext;
+    use language::BufferId;

    #[gpui::test(iterations = 10)]
    async fn test_buffer_management(cx: &mut TestAppContext) {
        let (copilot, mut lsp) = Copilot::fake(cx);

        let buffer_1 = cx.new_model(|cx| Buffer::local("Hello", cx));
-        let buffer_1_uri =
-            lsp::RawUri::from_str(&format!("buffer://{}", buffer_1.entity_id().as_u64())).unwrap();
+        let buffer_1_uri: lsp::Url = format!("buffer://{}", buffer_1.entity_id().as_u64())
+            .parse()
+            .unwrap();
        copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_1, cx));
        assert_eq!(
            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
@@ -1069,8 +1069,9 @@ mod tests {
        );

        let buffer_2 = cx.new_model(|cx| Buffer::local("Goodbye", cx));
-        let buffer_2_uri =
-            lsp::RawUri::from_str(&format!("buffer://{}", buffer_2.entity_id().as_u64())).unwrap();
+        let buffer_2_uri: lsp::Url = format!("buffer://{}", buffer_2.entity_id().as_u64())
+            .parse()
+            .unwrap();
        copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_2, cx));
        assert_eq!(
            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
@@ -1119,9 +1120,7 @@ mod tests {
                text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri),
            }
        );
-        let buffer_1_uri: lsp::RawUri = lsp::Uri::from_file_path("/root/child/buffer-1")
-            .unwrap()
-            .into();
+        let buffer_1_uri = lsp::Url::from_file_path("/root/child/buffer-1").unwrap();
        assert_eq!(
            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
                .await,
@@ -1259,5 +1258,16 @@ mod tests {
        fn load(&self, _: &AppContext) -> Task<Result<String>> {
            unimplemented!()
        }
+
+        fn buffer_reloaded(
+            &self,
+            _: BufferId,
+            _: &clock::Global,
+            _: language::LineEnding,
+            _: Option<std::time::SystemTime>,
+            _: &mut AppContext,
+        ) {
+            unimplemented!()
+        }
    }
 }
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -1121,10 +1121,7 @@ mod tests {
            cx.handle_request::<lsp::request::Completion, _, _>(move |url, params, _| {
                let completions = completions.clone();
                async move {
-                    assert_eq!(
-                        params.text_document_position.text_document.uri,
-                        url.clone().into()
-                    );
+                    assert_eq!(params.text_document_position.text_document.uri, url.clone());
                    assert_eq!(
                        params.text_document_position.position,
                        complete_from_position
--- a/crates/copilot/src/request.rs
+++ b/crates/copilot/src/request.rs
@@ -102,7 +102,7 @@ pub struct GetCompletionsDocument {
    pub tab_size: u32,
    pub indent_size: u32,
    pub insert_spaces: bool,
-    pub uri: lsp::RawUri,
+    pub uri: lsp::Url,
    pub relative_path: String,
    pub position: lsp::Position,
    pub version: usize,
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -867,12 +867,10 @@ fn compare_diagnostics(
    snapshot: &language::BufferSnapshot,
 ) -> Ordering {
    use language::ToOffset;
-
-    // The diagnostics may point to a previously open Buffer for this file.
-    if !old.range.start.is_valid(snapshot) || !new.range.start.is_valid(snapshot) {
+    // The old diagnostics may point to a previously open Buffer for this file.
+    if !old.range.start.is_valid(snapshot) {
        return Ordering::Greater;
    }
-
    old.range
        .start
        .to_offset(snapshot)
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -30,7 +30,6 @@ test-support = [
 [dependencies]
 aho-corasick = "1.1"
 anyhow.workspace = true
-assets.workspace = true
 client.workspace = true
 clock.workspace = true
 collections.workspace = true
--- a/crates/editor/src/actions.rs
+++ b/crates/editor/src/actions.rs
@@ -125,11 +125,6 @@ pub struct ExpandExcerptsDown {
    #[serde(default)]
    pub(super) lines: u32,
 }
-#[derive(PartialEq, Clone, Deserialize, Default)]
-pub struct ShowCompletions {
-    #[serde(default)]
-    pub(super) trigger: Option<char>,
-}

 impl_actions!(
    editor,
@@ -152,7 +147,6 @@ impl_actions!(
        SelectToBeginningOfLine,
        SelectToEndOfLine,
        SelectUpByLines,
-        ShowCompletions,
        ToggleCodeActions,
        ToggleComments,
        UnfoldAt,
@@ -280,6 +274,7 @@ gpui::actions!(
        SelectToStartOfParagraph,
        SelectUp,
        ShowCharacterPalette,
+        ShowCompletions,
        ShowInlineCompletion,
        ShuffleLines,
        SortLinesCaseInsensitive,
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -52,14 +52,8 @@ use multi_buffer::{
    ToOffset, ToPoint,
 };
 use serde::Deserialize;
-use std::{
-    any::TypeId,
-    borrow::Cow,
-    fmt::Debug,
-    num::NonZeroU32,
-    ops::{Add, Range, Sub},
-    sync::Arc,
-};
+use std::ops::Add;
+use std::{any::TypeId, borrow::Cow, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc};
 use sum_tree::{Bias, TreeMap};
 use tab_map::{TabMap, TabSnapshot};
 use text::LineIndent;
@@ -1033,14 +1027,6 @@ impl Add for DisplayRow {
    }
 }

-impl Sub for DisplayRow {
-    type Output = Self;
-
-    fn sub(self, other: Self) -> Self::Output {
-        DisplayRow(self.0 - other.0)
-    }
-}
-
 impl DisplayPoint {
    pub fn new(row: DisplayRow, column: u32) -> Self {
        Self(BlockPoint(Point::new(row.0, column)))
@@ -1111,11 +1097,14 @@ impl ToDisplayPoint for Anchor {
 #[cfg(test)]
 pub mod tests {
    use super::*;
-    use crate::{movement, test::marked_display_snapshot};
+    use crate::{
+        movement,
+        test::{editor_test_context::EditorTestContext, marked_display_snapshot},
+    };
    use gpui::{div, font, observe, px, AppContext, BorrowAppContext, Context, Element, Hsla};
    use language::{
        language_settings::{AllLanguageSettings, AllLanguageSettingsContent},
-        Buffer, Language, LanguageConfig, LanguageMatcher,
+        Buffer, Language, LanguageConfig, LanguageMatcher, SelectionGoal,
    };
    use project::Project;
    use rand::{prelude::*, Rng};
@@ -1390,7 +1379,6 @@ pub mod tests {
        }
    }

-    #[cfg(target_os = "macos")]
    #[gpui::test(retries = 5)]
    async fn test_soft_wraps(cx: &mut gpui::TestAppContext) {
        cx.background_executor
@@ -1399,7 +1387,7 @@ pub mod tests {
            init_test(cx, |_| {});
        });

-        let mut cx = crate::test::editor_test_context::EditorTestContext::new(cx).await;
+        let mut cx = EditorTestContext::new(cx).await;
        let editor = cx.editor.clone();
        let window = cx.window;

@@ -1455,39 +1443,39 @@ pub mod tests {
                movement::up(
                    &snapshot,
                    DisplayPoint::new(DisplayRow(1), 10),
-                    language::SelectionGoal::None,
+                    SelectionGoal::None,
                    false,
                    &text_layout_details,
                ),
                (
                    DisplayPoint::new(DisplayRow(0), 7),
-                    language::SelectionGoal::HorizontalPosition(x.0)
+                    SelectionGoal::HorizontalPosition(x.0)
                )
            );
            assert_eq!(
                movement::down(
                    &snapshot,
                    DisplayPoint::new(DisplayRow(0), 7),
-                    language::SelectionGoal::HorizontalPosition(x.0),
+                    SelectionGoal::HorizontalPosition(x.0),
                    false,
                    &text_layout_details
                ),
                (
                    DisplayPoint::new(DisplayRow(1), 10),
-                    language::SelectionGoal::HorizontalPosition(x.0)
+                    SelectionGoal::HorizontalPosition(x.0)
                )
            );
            assert_eq!(
                movement::down(
                    &snapshot,
                    DisplayPoint::new(DisplayRow(1), 10),
-                    language::SelectionGoal::HorizontalPosition(x.0),
+                    SelectionGoal::HorizontalPosition(x.0),
                    false,
                    &text_layout_details
                ),
                (
                    DisplayPoint::new(DisplayRow(2), 4),
-                    language::SelectionGoal::HorizontalPosition(x.0)
+                    SelectionGoal::HorizontalPosition(x.0)
                )
            );

@@ -1677,8 +1665,6 @@ pub mod tests {
        );
    }

-    // todo(linux) fails due to pixel differences in text rendering
-    #[cfg(target_os = "macos")]
    #[gpui::test]
    async fn test_chunks_with_soft_wrapping(cx: &mut gpui::TestAppContext) {
        use unindent::Unindent as _;
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -1157,7 +1157,7 @@ mod tests {
    use super::*;
    use crate::display_map::inlay_map::InlayMap;
    use crate::display_map::{fold_map::FoldMap, tab_map::TabMap, wrap_map::WrapMap};
-    use gpui::{div, font, px, AssetSource, Element};
+    use gpui::{div, font, px, Element};
    use multi_buffer::MultiBuffer;
    use rand::prelude::*;
    use settings::SettingsStore;
@@ -1452,7 +1452,6 @@ mod tests {
        }
    }

-    #[cfg(target_os = "macos")]
    #[gpui::test]
    fn test_blocks_on_wrapped_lines(cx: &mut gpui::TestAppContext) {
        cx.update(|cx| init_test(cx));
@@ -1941,12 +1940,6 @@ mod tests {
        let settings = SettingsStore::test(cx);
        cx.set_global(settings);
        theme::init(theme::LoadThemes::JustBase, cx);
-        cx.text_system()
-            .add_fonts(vec![assets::Assets
-                .load("fonts/zed-mono/zed-mono-extended.ttf")
-                .unwrap()
-                .unwrap()])
-            .unwrap();
    }

    impl TransformBlock {
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -28,7 +28,6 @@ mod indent_guides;
 mod inlay_hint_cache;
 mod inline_completion_provider;
 pub mod items;
-mod linked_editing_ranges;
 mod mouse_context_menu;
 pub mod movement;
 mod persistence;
@@ -89,12 +88,10 @@ use language::{
    Point, Selection, SelectionGoal, TransactionId,
 };
 use language::{BufferRow, Runnable, RunnableRange};
-use linked_editing_ranges::refresh_linked_ranges;
 use task::{ResolvedTask, TaskTemplate, TaskVariables};

 use hover_links::{HoverLink, HoveredLinkState, InlayHighlight};
-pub use lsp::CompletionContext;
-use lsp::{CompletionTriggerKind, DiagnosticSeverity, LanguageServerId};
+use lsp::{DiagnosticSeverity, LanguageServerId};
 use mouse_context_menu::MouseContextMenu;
 use movement::TextLayoutDetails;
 pub use multi_buffer::{
@@ -117,16 +114,15 @@ use serde::{Deserialize, Serialize};
 use settings::{update_settings_file, Settings, SettingsStore};
 use smallvec::SmallVec;
 use snippet::Snippet;
+use std::ops::Not as _;
 use std::{
    any::TypeId,
    borrow::Cow,
-    cell::RefCell,
    cmp::{self, Ordering, Reverse},
    mem,
    num::NonZeroU32,
-    ops::{ControlFlow, Deref, DerefMut, Not as _, Range, RangeInclusive},
+    ops::{ControlFlow, Deref, DerefMut, Range, RangeInclusive},
    path::Path,
-    rc::Rc,
    sync::Arc,
    time::{Duration, Instant},
 };
@@ -138,8 +134,8 @@ use theme::{
    ThemeColors, ThemeSettings,
 };
 use ui::{
-    h_flex, prelude::*, ButtonSize, ButtonStyle, Disclosure, IconButton, IconName, IconSize,
-    ListItem, Popover, Tooltip,
+    h_flex, prelude::*, ButtonSize, ButtonStyle, IconButton, IconName, IconSize, ListItem, Popover,
+    Tooltip,
 };
 use util::{defer, maybe, post_inc, RangeExt, ResultExt, TryFutureExt};
 use workspace::item::{ItemHandle, PreviewTabsSettings};
@@ -151,9 +147,6 @@ use workspace::{OpenInTerminal, OpenTerminal, TabBarSettings, Toast};

 use crate::hover_links::find_url;

-pub const FILE_HEADER_HEIGHT: u8 = 1;
-pub const MULTI_BUFFER_EXCERPT_HEADER_HEIGHT: u8 = 1;
-pub const MULTI_BUFFER_EXCERPT_FOOTER_HEIGHT: u8 = 1;
 pub const DEFAULT_MULTIBUFFER_CONTEXT: u32 = 2;
 const CURSOR_BLINK_INTERVAL: Duration = Duration::from_millis(500);
 const MAX_LINE_LEN: usize = 1024;
@@ -379,24 +372,10 @@ impl Default for EditorStyle {

 type CompletionId = usize;

-#[derive(Copy, Clone, Eq, PartialEq, PartialOrd, Ord, Debug, Default)]
-struct EditorActionId(usize);
-
-impl EditorActionId {
-    pub fn post_inc(&mut self) -> Self {
-        let answer = self.0;
-
-        *self = Self(answer + 1);
-
-        Self(answer)
-    }
-}
-
 // type GetFieldEditorTheme = dyn Fn(&theme::Theme) -> theme::FieldEditor;
 // type OverrideTextStyle = dyn Fn(&EditorStyle) -> Option<HighlightStyle>;

 type BackgroundHighlight = (fn(&ThemeColors) -> Hsla, Arc<[Range<Anchor>]>);
-type GutterHighlight = (fn(&AppContext) -> Hsla, Arc<[Range<Anchor>]>);

 struct ScrollbarMarkerState {
    scrollbar_size: Size<Pixels>,
@@ -485,7 +464,6 @@ pub struct Editor {
    highlight_order: usize,
    highlighted_rows: HashMap<TypeId, Vec<RowHighlight>>,
    background_highlights: TreeMap<TypeId, BackgroundHighlight>,
-    gutter_highlights: TreeMap<TypeId, GutterHighlight>,
    scrollbar_marker_state: ScrollbarMarkerState,
    active_indent_guides_state: ActiveIndentGuidesState,
    nav_history: Option<ItemNavHistory>,
@@ -498,8 +476,6 @@ pub struct Editor {
    available_code_actions: Option<(Location, Arc<[CodeAction]>)>,
    code_actions_task: Option<Task<()>>,
    document_highlights_task: Option<Task<()>>,
-    linked_editing_range_task: Option<Task<Option<()>>>,
-    linked_edit_ranges: linked_editing_ranges::LinkedEditingRanges,
    pending_rename: Option<RenameState>,
    searchable: bool,
    cursor_shape: CursorShape,
@@ -527,8 +503,7 @@ pub struct Editor {
    gutter_dimensions: GutterDimensions,
    pub vim_replace_map: HashMap<Range<usize>, String>,
    style: Option<EditorStyle>,
-    next_editor_action_id: EditorActionId,
-    editor_actions: Rc<RefCell<BTreeMap<EditorActionId, Box<dyn Fn(&mut ViewContext<Self>)>>>>,
+    editor_actions: Vec<Box<dyn Fn(&mut ViewContext<Self>)>>,
    use_autoclose: bool,
    auto_replace_emoji_shortcode: bool,
    show_git_blame_gutter: bool,
@@ -548,7 +523,6 @@ pub struct Editor {
    tasks: BTreeMap<(BufferId, BufferRow), RunnableTasks>,
    tasks_update_task: Option<Task<()>>,
    previous_search_ranges: Option<Arc<[Range<Anchor>]>>,
-    file_header_size: u8,
 }

 #[derive(Clone)]
@@ -1522,7 +1496,7 @@ struct ActiveDiagnosticGroup {
    is_valid: bool,
 }

-#[derive(Serialize, Deserialize, Clone, Debug)]
+#[derive(Serialize, Deserialize)]
 pub struct ClipboardSelection {
    pub len: usize,
    pub is_entire_line: bool,
@@ -1671,8 +1645,9 @@ impl Editor {
            }),
            merge_adjacent: true,
        };
-        let file_header_size = if show_excerpt_controls { 3 } else { 2 };
        let display_map = cx.new_model(|cx| {
+            let file_header_size = if show_excerpt_controls { 3 } else { 2 };
+
            DisplayMap::new(
                buffer.clone(),
                style.font(),
@@ -1680,8 +1655,8 @@ impl Editor {
                None,
                show_excerpt_controls,
                file_header_size,
-                MULTI_BUFFER_EXCERPT_HEADER_HEIGHT,
-                MULTI_BUFFER_EXCERPT_FOOTER_HEIGHT,
+                1,
+                1,
                fold_placeholder,
                cx,
            )
@@ -1777,7 +1752,6 @@ impl Editor {
            highlight_order: 0,
            highlighted_rows: HashMap::default(),
            background_highlights: Default::default(),
-            gutter_highlights: TreeMap::default(),
            scrollbar_marker_state: ScrollbarMarkerState::default(),
            active_indent_guides_state: ActiveIndentGuidesState::default(),
            nav_history: None,
@@ -1791,7 +1765,6 @@ impl Editor {
            available_code_actions: Default::default(),
            code_actions_task: Default::default(),
            document_highlights_task: Default::default(),
-            linked_editing_range_task: Default::default(),
            pending_rename: Default::default(),
            searchable: true,
            cursor_shape: Default::default(),
@@ -1821,8 +1794,7 @@ impl Editor {
            style: None,
            show_cursor_names: false,
            hovered_cursors: Default::default(),
-            next_editor_action_id: EditorActionId::default(),
-            editor_actions: Rc::default(),
+            editor_actions: Default::default(),
            vim_replace_map: Default::default(),
            show_inline_completions: mode == EditorMode::Full,
            custom_context_menu: None,
@@ -1832,7 +1804,6 @@ impl Editor {
            git_blame_inline_enabled: ProjectSettings::get_global(cx).git.inline_blame_enabled(),
            blame: None,
            blame_subscription: None,
-            file_header_size,
            tasks: Default::default(),
            _subscriptions: vec![
                cx.observe(&buffer, Self::on_buffer_changed),
@@ -1854,7 +1825,6 @@ impl Editor {
                }),
            ],
            tasks_update_task: None,
-            linked_edit_ranges: Default::default(),
            previous_search_ranges: None,
        };
        this.tasks_update_task = Some(this.refresh_runnables(cx));
@@ -2235,6 +2205,7 @@ impl Editor {
                )
            });
        }
+
        let display_map = self
            .display_map
            .update(cx, |display_map, cx| display_map.snapshot(cx));
@@ -2301,7 +2272,7 @@ impl Editor {
                    .detach();

                    if show_completions {
-                        self.show_completions(&ShowCompletions { trigger: None }, cx);
+                        self.show_completions(&ShowCompletions, cx);
                    }
                } else {
                    drop(context_menu);
@@ -2322,7 +2293,6 @@ impl Editor {
            self.refresh_document_highlights(cx);
            refresh_matching_bracket_highlights(self, cx);
            self.discard_inline_completion(false, cx);
-            linked_editing_ranges::refresh_linked_ranges(self, cx);
            if self.git_blame_inline_enabled {
                self.start_inline_blame_timer(cx);
            }
@@ -2334,6 +2304,7 @@ impl Editor {
        if self.selections.disjoint_anchors().len() == 1 {
            cx.emit(SearchEvent::ActiveMatchChanged)
        }
+
        cx.notify();
    }

@@ -2746,9 +2717,7 @@ impl Editor {
            Some(Selection { start, end, .. }) => start != end,
            None => false,
        };
-
-        pending_nonempty_selection
-            || (self.columnar_selection_tail.is_some() && self.selections.disjoint.len() > 1)
+        pending_nonempty_selection || self.columnar_selection_tail.is_some()
    }

    pub fn has_pending_selection(&self) -> bool {
@@ -2805,49 +2774,6 @@ impl Editor {
        false
    }

-    fn linked_editing_ranges_for(
-        &self,
-        selection: Range<text::Anchor>,
-        cx: &AppContext,
-    ) -> Option<HashMap<Model<Buffer>, Vec<Range<text::Anchor>>>> {
-        if self.linked_edit_ranges.is_empty() {
-            return None;
-        }
-        let ((base_range, linked_ranges), buffer_snapshot, buffer) =
-            selection.end.buffer_id.and_then(|end_buffer_id| {
-                if selection.start.buffer_id != Some(end_buffer_id) {
-                    return None;
-                }
-                let buffer = self.buffer.read(cx).buffer(end_buffer_id)?;
-                let snapshot = buffer.read(cx).snapshot();
-                self.linked_edit_ranges
-                    .get(end_buffer_id, selection.start..selection.end, &snapshot)
-                    .map(|ranges| (ranges, snapshot, buffer))
-            })?;
-        use text::ToOffset as TO;
-        // find offset from the start of current range to current cursor position
-        let start_byte_offset = TO::to_offset(&base_range.start, &buffer_snapshot);
-
-        let start_offset = TO::to_offset(&selection.start, &buffer_snapshot);
-        let start_difference = start_offset - start_byte_offset;
-        let end_offset = TO::to_offset(&selection.end, &buffer_snapshot);
-        let end_difference = end_offset - start_byte_offset;
-        // Current range has associated linked ranges.
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
-        for range in linked_ranges.iter() {
-            let start_offset = TO::to_offset(&range.start, &buffer_snapshot);
-            let end_offset = start_offset + end_difference;
-            let start_offset = start_offset + start_difference;
-            let start = buffer_snapshot.anchor_after(start_offset);
-            let end = buffer_snapshot.anchor_after(end_offset);
-            linked_edits
-                .entry(buffer.clone())
-                .or_default()
-                .push(start..end);
-        }
-        Some(linked_edits)
-    }
-
    pub fn handle_input(&mut self, text: &str, cx: &mut ViewContext<Self>) {
        let text: Arc<str> = text.into();

@@ -2858,7 +2784,6 @@ impl Editor {
        let selections = self.selections.all_adjusted(cx);
        let mut brace_inserted = false;
        let mut edits = Vec::new();
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
        let mut new_selections = Vec::with_capacity(selections.len());
        let mut new_autoclose_regions = Vec::new();
        let snapshot = self.buffer.read(cx).read(cx);
@@ -3039,46 +2964,16 @@ impl Editor {
            // text with the given input and move the selection to the end of the
            // newly inserted text.
            let anchor = snapshot.anchor_after(selection.end);
-            if !self.linked_edit_ranges.is_empty() {
-                let start_anchor = snapshot.anchor_before(selection.start);
-                if let Some(ranges) =
-                    self.linked_editing_ranges_for(start_anchor.text_anchor..anchor.text_anchor, cx)
-                {
-                    for (buffer, edits) in ranges {
-                        linked_edits
-                            .entry(buffer.clone())
-                            .or_default()
-                            .extend(edits.into_iter().map(|range| (range, text.clone())));
-                    }
-                }
-            }
-
            new_selections.push((selection.map(|_| anchor), 0));
            edits.push((selection.start..selection.end, text.clone()));
        }

        drop(snapshot);
-
        self.transact(cx, |this, cx| {
            this.buffer.update(cx, |buffer, cx| {
                buffer.edit(edits, this.autoindent_mode.clone(), cx);
            });
-            for (buffer, edits) in linked_edits {
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    let edits = edits
-                        .into_iter()
-                        .map(|(range, text)| {
-                            use text::ToPoint as TP;
-                            let end_point = TP::to_point(&range.end, &snapshot);
-                            let start_point = TP::to_point(&range.start, &snapshot);
-                            (start_point..end_point, text)
-                        })
-                        .sorted_by_key(|(range, _)| range.start)
-                        .collect::<Vec<_>>();
-                    buffer.edit(edits, None, cx);
-                })
-            }
+
            let new_anchor_selections = new_selections.iter().map(|e| &e.0);
            let new_selection_deltas = new_selections.iter().map(|e| e.1);
            let snapshot = this.buffer.read(cx).read(cx);
@@ -3135,7 +3030,6 @@ impl Editor {

            let trigger_in_words = !had_active_inline_completion;
            this.trigger_completion_on_input(&text, trigger_in_words, cx);
-            linked_editing_ranges::refresh_linked_ranges(this, cx);
            this.refresh_inline_completion(true, cx);
        });
    }
@@ -3497,12 +3391,7 @@ impl Editor {
        cx: &mut ViewContext<Self>,
    ) {
        if self.is_completion_trigger(text, trigger_in_words, cx) {
-            self.show_completions(
-                &ShowCompletions {
-                    trigger: text.chars().last(),
-                },
-                cx,
-            );
+            self.show_completions(&ShowCompletions, cx);
        } else {
            self.hide_context_menu(cx);
        }
@@ -3898,7 +3787,7 @@ impl Editor {
        }))
    }

-    pub fn show_completions(&mut self, options: &ShowCompletions, cx: &mut ViewContext<Self>) {
+    pub fn show_completions(&mut self, _: &ShowCompletions, cx: &mut ViewContext<Self>) {
        if self.pending_rename.is_some() {
            return;
        }
@@ -3916,29 +3805,7 @@ impl Editor {
            };

        let query = Self::completion_query(&self.buffer.read(cx).read(cx), position);
-        let is_followup_invoke = {
-            let context_menu_state = self.context_menu.read();
-            matches!(
-                context_menu_state.deref(),
-                Some(ContextMenu::Completions(_))
-            )
-        };
-        let trigger_kind = match (options.trigger, is_followup_invoke) {
-            (_, true) => CompletionTriggerKind::TRIGGER_FOR_INCOMPLETE_COMPLETIONS,
-            (Some(_), _) => CompletionTriggerKind::TRIGGER_CHARACTER,
-            _ => CompletionTriggerKind::INVOKED,
-        };
-        let completion_context = CompletionContext {
-            trigger_character: options.trigger.and_then(|c| {
-                if trigger_kind == CompletionTriggerKind::TRIGGER_CHARACTER {
-                    Some(String::from(c))
-                } else {
-                    None
-                }
-            }),
-            trigger_kind,
-        };
-        let completions = provider.completions(&buffer, buffer_position, completion_context, cx);
+        let completions = provider.completions(&buffer, buffer_position, cx);

        let id = post_inc(&mut self.next_completion_id);
        let task = cx.spawn(|this, mut cx| {
@@ -4100,7 +3967,6 @@ impl Editor {
        let snapshot = self.buffer.read(cx).snapshot(cx);
        let mut range_to_replace: Option<Range<isize>> = None;
        let mut ranges = Vec::new();
-        let mut linked_edits = HashMap::<_, Vec<_>>::default();
        for selection in &selections {
            if snapshot.contains_str_at(selection.start.saturating_sub(lookbehind), &old_text) {
                let start = selection.start.saturating_sub(lookbehind);
@@ -4130,21 +3996,6 @@ impl Editor {
                }));
                break;
            }
-            if !self.linked_edit_ranges.is_empty() {
-                let start_anchor = snapshot.anchor_before(selection.head());
-                let end_anchor = snapshot.anchor_after(selection.tail());
-                if let Some(ranges) = self
-                    .linked_editing_ranges_for(start_anchor.text_anchor..end_anchor.text_anchor, cx)
-                {
-                    for (buffer, edits) in ranges {
-                        linked_edits.entry(buffer.clone()).or_default().extend(
-                            edits
-                                .into_iter()
-                                .map(|range| (range, text[common_prefix_len..].to_owned())),
-                        );
-                    }
-                }
-            }
        }
        let text = &text[common_prefix_len..];

@@ -4171,22 +4022,6 @@ impl Editor {
                    );
                });
            }
-            for (buffer, edits) in linked_edits {
-                buffer.update(cx, |buffer, cx| {
-                    let snapshot = buffer.snapshot();
-                    let edits = edits
-                        .into_iter()
-                        .map(|(range, text)| {
-                            use text::ToPoint as TP;
-                            let end_point = TP::to_point(&range.end, &snapshot);
-                            let start_point = TP::to_point(&range.start, &snapshot);
-                            (start_point..end_point, text)
-                        })
-                        .sorted_by_key(|(range, _)| range.start)
-                        .collect::<Vec<_>>();
-                    buffer.edit(edits, None, cx);
-                })
-            }

            this.refresh_inline_completion(true, cx);
        });
@@ -4196,7 +4031,7 @@ impl Editor {
        }

        if completion.show_new_completions_on_confirm {
-            self.show_completions(&ShowCompletions { trigger: None }, cx);
+            self.show_completions(&ShowCompletions, cx);
        }

        let provider = self.completion_provider.as_ref()?;
@@ -4915,8 +4750,8 @@ impl Editor {
        if self.available_code_actions.is_some() {
            Some(
                IconButton::new("code_actions_indicator", ui::IconName::Bolt)
-                    .shape(ui::IconButtonShape::Square)
                    .icon_size(IconSize::XSmall)
+                    .size(ui::ButtonSize::None)
                    .icon_color(Color::Muted)
                    .selected(is_active)
                    .on_click(cx.listener(move |editor, _e, cx| {
@@ -4953,8 +4788,8 @@ impl Editor {
        cx: &mut ViewContext<Self>,
    ) -> IconButton {
        IconButton::new(("run_indicator", row.0 as usize), ui::IconName::Play)
-            .shape(ui::IconButtonShape::Square)
            .icon_size(IconSize::XSmall)
+            .size(ui::ButtonSize::None)
            .icon_color(Color::Muted)
            .selected(is_active)
            .on_click(cx.listener(move |editor, _e, cx| {
@@ -5171,27 +5006,6 @@ impl Editor {
    pub fn backspace(&mut self, _: &Backspace, cx: &mut ViewContext<Self>) {
        self.transact(cx, |this, cx| {
            this.select_autoclose_pair(cx);
-            let mut linked_ranges = HashMap::<_, Vec<_>>::default();
-            if !this.linked_edit_ranges.is_empty() {
-                let selections = this.selections.all::<MultiBufferPoint>(cx);
-                let snapshot = this.buffer.read(cx).snapshot(cx);
-
-                for selection in selections.iter() {
-                    let selection_start = snapshot.anchor_before(selection.start).text_anchor;
-                    let selection_end = snapshot.anchor_after(selection.end).text_anchor;
-                    if selection_start.buffer_id != selection_end.buffer_id {
-                        continue;
-                    }
-                    if let Some(ranges) =
-                        this.linked_editing_ranges_for(selection_start..selection_end, cx)
-                    {
-                        for (buffer, entries) in ranges {
-                            linked_ranges.entry(buffer).or_default().extend(entries);
-                        }
-                    }
-                }
-            }
-
            let mut selections = this.selections.all::<MultiBufferPoint>(cx);
            if !this.selections.line_mode {
                let display_map = this.display_map.update(cx, |map, cx| map.snapshot(cx));
@@ -5232,33 +5046,7 @@ impl Editor {

            this.change_selections(Some(Autoscroll::fit()), cx, |s| s.select(selections));
            this.insert("", cx);
-            let empty_str: Arc<str> = Arc::from("");
-            for (buffer, edits) in linked_ranges {
-                let snapshot = buffer.read(cx).snapshot();
-                use text::ToPoint as TP;
-
-                let edits = edits
-                    .into_iter()
-                    .map(|range| {
-                        let end_point = TP::to_point(&range.end, &snapshot);
-                        let mut start_point = TP::to_point(&range.start, &snapshot);
-
-                        if end_point == start_point {
-                            let offset = text::ToOffset::to_offset(&range.start, &snapshot)
-                                .saturating_sub(1);
-                            start_point = TP::to_point(&offset, &snapshot);
-                        };
-
-                        (start_point..end_point, empty_str.clone())
-                    })
-                    .sorted_by_key(|(range, _)| range.start)
-                    .collect::<Vec<_>>();
-                buffer.update(cx, |this, cx| {
-                    this.edit(edits, None, cx);
-                })
-            }
            this.refresh_inline_completion(true, cx);
-            linked_editing_ranges::refresh_linked_ranges(this, cx);
        });
    }

@@ -6494,10 +6282,8 @@ impl Editor {
            return;
        }

-        if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.undo(cx)) {
-            if let Some((selections, _)) =
-                self.selection_history.transaction(transaction_id).cloned()
-            {
+        if let Some(tx_id) = self.buffer.update(cx, |buffer, cx| buffer.undo(cx)) {
+            if let Some((selections, _)) = self.selection_history.transaction(tx_id).cloned() {
                self.change_selections(None, cx, |s| {
                    s.select_anchors(selections.to_vec());
                });
@@ -6505,8 +6291,10 @@ impl Editor {
            self.request_autoscroll(Autoscroll::fit(), cx);
            self.unmark_text(cx);
            self.refresh_inline_completion(true, cx);
-            cx.emit(EditorEvent::Edited { transaction_id });
-            cx.emit(EditorEvent::TransactionUndone { transaction_id });
+            cx.emit(EditorEvent::Edited);
+            cx.emit(EditorEvent::TransactionUndone {
+                transaction_id: tx_id,
+            });
        }
    }

@@ -6515,9 +6303,8 @@ impl Editor {
            return;
        }

-        if let Some(transaction_id) = self.buffer.update(cx, |buffer, cx| buffer.redo(cx)) {
-            if let Some((_, Some(selections))) =
-                self.selection_history.transaction(transaction_id).cloned()
+        if let Some(tx_id) = self.buffer.update(cx, |buffer, cx| buffer.redo(cx)) {
+            if let Some((_, Some(selections))) = self.selection_history.transaction(tx_id).cloned()
            {
                self.change_selections(None, cx, |s| {
                    s.select_anchors(selections.to_vec());
@@ -6526,7 +6313,7 @@ impl Editor {
            self.request_autoscroll(Autoscroll::fit(), cx);
            self.unmark_text(cx);
            self.refresh_inline_completion(true, cx);
-            cx.emit(EditorEvent::Edited { transaction_id });
+            cx.emit(EditorEvent::Edited);
        }
    }

@@ -6591,8 +6378,6 @@ impl Editor {
        }

        let text_layout_details = &self.text_layout_details(cx);
-        let selection_count = self.selections.count();
-        let first_selection = self.selections.first_anchor();

        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
            let line_mode = s.line_mode;
@@ -6609,12 +6394,7 @@ impl Editor {
                );
                selection.collapse_to(cursor, goal);
            });
-        });
-
-        if selection_count == 1 && first_selection.range() == self.selections.first_anchor().range()
-        {
-            cx.propagate();
-        }
+        })
    }

    pub fn move_up_by_lines(&mut self, action: &MoveUpByLines, cx: &mut ViewContext<Self>) {
@@ -6758,9 +6538,6 @@ impl Editor {
        }

        let text_layout_details = &self.text_layout_details(cx);
-        let selection_count = self.selections.count();
-        let first_selection = self.selections.first_anchor();
-
        self.change_selections(Some(Autoscroll::fit()), cx, |s| {
            let line_mode = s.line_mode;
            s.move_with(|map, selection| {
@@ -6777,11 +6554,6 @@ impl Editor {
                selection.collapse_to(cursor, goal);
            });
        });
-
-        if selection_count == 1 && first_selection.range() == self.selections.first_anchor().range()
-        {
-            cx.propagate();
-        }
    }

    pub fn move_page_down(&mut self, action: &MovePageDown, cx: &mut ViewContext<Self>) {
@@ -8950,7 +8722,7 @@ impl Editor {
                        });
                    language_server_name.map(|language_server_name| {
                        project.open_local_buffer_via_lsp(
-                            lsp::Uri::from(lsp_location.uri.clone()),
+                            lsp_location.uri.clone(),
                            server_id,
                            language_server_name,
                            cx,
@@ -9637,20 +9409,18 @@ impl Editor {
        now: Instant,
        cx: &mut ViewContext<Self>,
    ) -> Option<TransactionId> {
-        if let Some(transaction_id) = self
+        if let Some(tx_id) = self
            .buffer
            .update(cx, |buffer, cx| buffer.end_transaction_at(now, cx))
        {
-            if let Some((_, end_selections)) =
-                self.selection_history.transaction_mut(transaction_id)
-            {
+            if let Some((_, end_selections)) = self.selection_history.transaction_mut(tx_id) {
                *end_selections = Some(self.selections.disjoint_anchors());
            } else {
                log::error!("unexpectedly ended a transaction that wasn't started by this editor");
            }

-            cx.emit(EditorEvent::Edited { transaction_id });
-            Some(transaction_id)
+            cx.emit(EditorEvent::Edited);
+            Some(tx_id)
        } else {
            None
        }
@@ -10493,25 +10263,6 @@ impl Editor {
        Some(text_highlights)
    }

-    pub fn highlight_gutter<T: 'static>(
-        &mut self,
-        ranges: &[Range<Anchor>],
-        color_fetcher: fn(&AppContext) -> Hsla,
-        cx: &mut ViewContext<Self>,
-    ) {
-        self.gutter_highlights
-            .insert(TypeId::of::<T>(), (color_fetcher, Arc::from(ranges)));
-        cx.notify();
-    }
-
-    pub fn clear_gutter_highlights<T: 'static>(
-        &mut self,
-        cx: &mut ViewContext<Self>,
-    ) -> Option<GutterHighlight> {
-        cx.notify();
-        self.gutter_highlights.remove(&TypeId::of::<T>())
-    }
-
    #[cfg(feature = "test-support")]
    pub fn all_text_background_highlights(
        &mut self,
@@ -10701,44 +10452,6 @@ impl Editor {
        results
    }

-    pub fn gutter_highlights_in_range(
-        &self,
-        search_range: Range<Anchor>,
-        display_snapshot: &DisplaySnapshot,
-        cx: &AppContext,
-    ) -> Vec<(Range<DisplayPoint>, Hsla)> {
-        let mut results = Vec::new();
-        for (color_fetcher, ranges) in self.gutter_highlights.values() {
-            let color = color_fetcher(cx);
-            let start_ix = match ranges.binary_search_by(|probe| {
-                let cmp = probe
-                    .end
-                    .cmp(&search_range.start, &display_snapshot.buffer_snapshot);
-                if cmp.is_gt() {
-                    Ordering::Greater
-                } else {
-                    Ordering::Less
-                }
-            }) {
-                Ok(i) | Err(i) => i,
-            };
-            for range in &ranges[start_ix..] {
-                if range
-                    .start
-                    .cmp(&search_range.end, &display_snapshot.buffer_snapshot)
-                    .is_ge()
-                {
-                    break;
-                }
-
-                let start = range.start.to_display_point(&display_snapshot);
-                let end = range.end.to_display_point(&display_snapshot);
-                results.push((start..end, color))
-            }
-        }
-        results
-    }
-
    /// Get the text ranges corresponding to the redaction query
    pub fn redacted_ranges(
        &self,
@@ -10831,6 +10544,7 @@ impl Editor {
                }
                cx.emit(EditorEvent::BufferEdited);
                cx.emit(SearchEvent::MatchesInvalidated);
+
                if *singleton_buffer_edited {
                    if let Some(project) = &self.project {
                        let project = project.read(cx);
@@ -10862,7 +10576,6 @@ impl Editor {

                let Some(project) = &self.project else { return };
                let telemetry = project.read(cx).client().telemetry().clone();
-                refresh_linked_ranges(self, cx);
                telemetry.log_edit_event("editor");
            }
            multi_buffer::Event::ExcerptsAdded {
@@ -10882,20 +10595,13 @@ impl Editor {
                self.refresh_inlay_hints(InlayHintRefreshReason::ExcerptsRemoved(ids.clone()), cx);
                cx.emit(EditorEvent::ExcerptsRemoved { ids: ids.clone() })
            }
-            multi_buffer::Event::ExcerptsEdited { ids } => {
-                cx.emit(EditorEvent::ExcerptsEdited { ids: ids.clone() })
-            }
-            multi_buffer::Event::ExcerptsExpanded { ids } => {
-                cx.emit(EditorEvent::ExcerptsExpanded { ids: ids.clone() })
-            }
-            multi_buffer::Event::Reparsed(buffer_id) => {
+            multi_buffer::Event::Reparsed => {
                self.tasks_update_task = Some(self.refresh_runnables(cx));

-                cx.emit(EditorEvent::Reparsed(*buffer_id));
+                cx.emit(EditorEvent::Reparsed);
            }
-            multi_buffer::Event::LanguageChanged(buffer_id) => {
-                linked_editing_ranges::refresh_linked_ranges(self, cx);
-                cx.emit(EditorEvent::Reparsed(*buffer_id));
+            multi_buffer::Event::LanguageChanged => {
+                cx.emit(EditorEvent::Reparsed);
                cx.notify();
            }
            multi_buffer::Event::DirtyChanged => cx.emit(EditorEvent::DirtyChanged),
@@ -11342,32 +11048,21 @@ impl Editor {
    pub fn register_action<A: Action>(
        &mut self,
        listener: impl Fn(&A, &mut WindowContext) + 'static,
-    ) -> Subscription {
-        let id = self.next_editor_action_id.post_inc();
+    ) -> &mut Self {
        let listener = Arc::new(listener);
-        self.editor_actions.borrow_mut().insert(
-            id,
-            Box::new(move |cx| {
-                let _view = cx.view().clone();
-                let cx = cx.window_context();
-                let listener = listener.clone();
-                cx.on_action(TypeId::of::<A>(), move |action, phase, cx| {
-                    let action = action.downcast_ref().unwrap();
-                    if phase == DispatchPhase::Bubble {
-                        listener(action, cx)
-                    }
-                })
-            }),
-        );

-        let editor_actions = self.editor_actions.clone();
-        Subscription::new(move || {
-            editor_actions.borrow_mut().remove(&id);
-        })
-    }
-
-    pub fn file_header_size(&self) -> u8 {
-        self.file_header_size
+        self.editor_actions.push(Box::new(move |cx| {
+            let _view = cx.view().clone();
+            let cx = cx.window_context();
+            let listener = listener.clone();
+            cx.on_action(TypeId::of::<A>(), move |action, phase, cx| {
+                let action = action.downcast_ref().unwrap();
+                if phase == DispatchPhase::Bubble {
+                    listener(action, cx)
+                }
+            })
+        }));
+        self
    }
 }

@@ -11458,7 +11153,6 @@ pub trait CompletionProvider {
        &self,
        buffer: &Model<Buffer>,
        buffer_position: text::Anchor,
-        trigger: CompletionContext,
        cx: &mut ViewContext<Editor>,
    ) -> Task<Result<Vec<Completion>>>;

@@ -11493,11 +11187,10 @@ impl CompletionProvider for Model<Project> {
        &self,
        buffer: &Model<Buffer>,
        buffer_position: text::Anchor,
-        options: CompletionContext,
        cx: &mut ViewContext<Editor>,
    ) -> Task<Result<Vec<Completion>>> {
        self.update(cx, |project, cx| {
-            project.completions(&buffer, buffer_position, options, cx)
+            project.completions(&buffer, buffer_position, cx)
        })
    }

@@ -11754,16 +11447,23 @@ impl EditorSnapshot {
            || (self.starts_indent(buffer_row) && (row_contains_cursor || self.gutter_hovered))
        {
            Some(
-                Disclosure::new(("indent-fold-indicator", buffer_row.0), !folded)
-                    .selected(folded)
-                    .on_click(cx.listener_for(&editor, move |this, _e, cx| {
-                        if folded {
-                            this.unfold_at(&UnfoldAt { buffer_row }, cx);
-                        } else {
-                            this.fold_at(&FoldAt { buffer_row }, cx);
-                        }
-                    }))
-                    .into_any_element(),
+                IconButton::new(
+                    ("indent-fold-indicator", buffer_row.0),
+                    ui::IconName::ChevronDown,
+                )
+                .on_click(cx.listener_for(&editor, move |this, _e, cx| {
+                    if folded {
+                        this.unfold_at(&UnfoldAt { buffer_row }, cx);
+                    } else {
+                        this.fold_at(&FoldAt { buffer_row }, cx);
+                    }
+                }))
+                .icon_color(ui::Color::Muted)
+                .icon_size(ui::IconSize::Small)
+                .selected(folded)
+                .selected_icon(ui::IconName::ChevronRight)
+                .size(ui::ButtonSize::None)
+                .into_any_element(),
            )
        } else {
            None
@@ -11808,17 +11508,9 @@ pub enum EditorEvent {
    ExcerptsRemoved {
        ids: Vec<ExcerptId>,
    },
-    ExcerptsEdited {
-        ids: Vec<ExcerptId>,
-    },
-    ExcerptsExpanded {
-        ids: Vec<ExcerptId>,
-    },
    BufferEdited,
-    Edited {
-        transaction_id: clock::Lamport,
-    },
-    Reparsed(BufferId),
+    Edited,
+    Reparsed,
    Focused,
    Blurred,
    DirtyChanged,
@@ -12016,6 +11708,7 @@ impl ViewInputHandler for Editor {
        cx: &mut ViewContext<Self>,
    ) {
        if !self.input_enabled {
+            cx.emit(EditorEvent::InputIgnored { text: text.into() });
            return;
        }

--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -9,10 +9,7 @@ use crate::{
    JoinLines,
 };
 use futures::StreamExt;
-use gpui::{
-    div, AssetSource, SemanticVersion, TestAppContext, UpdateGlobal, VisualTestContext,
-    WindowBounds, WindowOptions,
-};
+use gpui::{div, TestAppContext, UpdateGlobal, VisualTestContext, WindowBounds, WindowOptions};
 use indoc::indoc;
 use language::{
    language_settings::{
@@ -57,10 +54,10 @@ fn test_edit_events(cx: &mut TestAppContext) {
        let events = events.clone();
        |cx| {
            let view = cx.view().clone();
-            cx.subscribe(&view, move |_, _, event: &EditorEvent, _| match event {
-                EditorEvent::Edited { .. } => events.borrow_mut().push(("editor1", "edited")),
-                EditorEvent::BufferEdited => events.borrow_mut().push(("editor1", "buffer edited")),
-                _ => {}
+            cx.subscribe(&view, move |_, _, event: &EditorEvent, _| {
+                if matches!(event, EditorEvent::Edited | EditorEvent::BufferEdited) {
+                    events.borrow_mut().push(("editor1", event.clone()));
+                }
            })
            .detach();
            Editor::for_buffer(buffer.clone(), None, cx)
@@ -70,16 +67,11 @@ fn test_edit_events(cx: &mut TestAppContext) {
    let editor2 = cx.add_window({
        let events = events.clone();
        |cx| {
-            cx.subscribe(
-                &cx.view().clone(),
-                move |_, _, event: &EditorEvent, _| match event {
-                    EditorEvent::Edited { .. } => events.borrow_mut().push(("editor2", "edited")),
-                    EditorEvent::BufferEdited => {
-                        events.borrow_mut().push(("editor2", "buffer edited"))
-                    }
-                    _ => {}
-                },
-            )
+            cx.subscribe(&cx.view().clone(), move |_, _, event: &EditorEvent, _| {
+                if matches!(event, EditorEvent::Edited | EditorEvent::BufferEdited) {
+                    events.borrow_mut().push(("editor2", event.clone()));
+                }
+            })
            .detach();
            Editor::for_buffer(buffer.clone(), None, cx)
        }
@@ -92,9 +84,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor1", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
+            ("editor1", EditorEvent::Edited),
+            ("editor1", EditorEvent::BufferEdited),
+            ("editor2", EditorEvent::BufferEdited),
        ]
    );

@@ -103,9 +95,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor2", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
+            ("editor2", EditorEvent::Edited),
+            ("editor1", EditorEvent::BufferEdited),
+            ("editor2", EditorEvent::BufferEdited),
        ]
    );

@@ -114,9 +106,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor1", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
+            ("editor1", EditorEvent::Edited),
+            ("editor1", EditorEvent::BufferEdited),
+            ("editor2", EditorEvent::BufferEdited),
        ]
    );

@@ -125,9 +117,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor1", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
+            ("editor1", EditorEvent::Edited),
+            ("editor1", EditorEvent::BufferEdited),
+            ("editor2", EditorEvent::BufferEdited),
        ]
    );

@@ -136,9 +128,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor2", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
+            ("editor2", EditorEvent::Edited),
+            ("editor1", EditorEvent::BufferEdited),
+            ("editor2", EditorEvent::BufferEdited),
        ]
    );

@@ -147,9 +139,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor2", "edited"),
-            ("editor1", "buffer edited"),
-            ("editor2", "buffer edited"),
+            ("editor2", EditorEvent::Edited),
+            ("editor1", EditorEvent::BufferEdited),
+            ("editor2", EditorEvent::BufferEdited),
        ]
    );

@@ -481,42 +473,6 @@ fn test_canceling_pending_selection(cx: &mut TestAppContext) {
    });
 }

-#[gpui::test]
-fn test_movement_actions_with_pending_selection(cx: &mut TestAppContext) {
-    init_test(cx, |_| {});
-
-    let view = cx.add_window(|cx| {
-        let buffer = MultiBuffer::build_simple("aaaaaa\nbbbbbb\ncccccc\ndddddd\n", cx);
-        build_editor(buffer, cx)
-    });
-
-    _ = view.update(cx, |view, cx| {
-        view.begin_selection(DisplayPoint::new(DisplayRow(2), 2), false, 1, cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)]
-        );
-
-        view.move_down(&Default::default(), cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(3), 2)..DisplayPoint::new(DisplayRow(3), 2)]
-        );
-
-        view.begin_selection(DisplayPoint::new(DisplayRow(2), 2), false, 1, cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(2), 2)..DisplayPoint::new(DisplayRow(2), 2)]
-        );
-
-        view.move_up(&Default::default(), cx);
-        assert_eq!(
-            view.selections.display_ranges(cx),
-            [DisplayPoint::new(DisplayRow(1), 2)..DisplayPoint::new(DisplayRow(1), 2)]
-        );
-    });
-}
-
 #[gpui::test]
 fn test_clone(cx: &mut TestAppContext) {
    init_test(cx, |_| {});
@@ -553,7 +509,6 @@ fn test_clone(cx: &mut TestAppContext) {
        .update(cx, |editor, cx| {
            cx.open_window(Default::default(), |cx| cx.new_view(|cx| editor.clone(cx)))
        })
-        .unwrap()
        .unwrap();

    let snapshot = editor.update(cx, |e, cx| e.snapshot(cx)).unwrap();
@@ -936,8 +891,6 @@ fn test_move_cursor(cx: &mut TestAppContext) {
    });
 }

-// TODO: Re-enable this test
-#[cfg(target_os = "macos")]
 #[gpui::test]
 fn test_move_cursor_multibyte(cx: &mut TestAppContext) {
    init_test(cx, |_| {});
@@ -5861,7 +5814,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
        .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/file.rs").unwrap().into()
+                lsp::Url::from_file_path("/file.rs").unwrap()
            );
            assert_eq!(params.options.tab_size, 4);
            Ok(Some(vec![lsp::TextEdit::new(
@@ -5887,7 +5840,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
    fake_server.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
        assert_eq!(
            params.text_document.uri,
-            lsp::Uri::from_file_path("/file.rs").unwrap().into()
+            lsp::Url::from_file_path("/file.rs").unwrap()
        );
        futures::future::pending::<()>().await;
        unreachable!()
@@ -5936,7 +5889,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
        .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/file.rs").unwrap().into()
+                lsp::Url::from_file_path("/file.rs").unwrap()
            );
            assert_eq!(params.options.tab_size, 8);
            Ok(Some(vec![]))
@@ -6139,7 +6092,7 @@ async fn test_multibuffer_format_during_save(cx: &mut gpui::TestAppContext) {
        .on_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
            Ok(Some(vec![lsp::TextEdit::new(
                lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
-                format!("[{} formatted]", params.text_document.uri.as_str()),
+                format!("[{} formatted]", params.text_document.uri),
            )]))
        })
        .detach();
@@ -6213,7 +6166,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
        .handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/file.rs").unwrap().into()
+                lsp::Url::from_file_path("/file.rs").unwrap()
            );
            assert_eq!(params.options.tab_size, 4);
            Ok(Some(vec![lsp::TextEdit::new(
@@ -6239,7 +6192,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
        move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/file.rs").unwrap().into()
+                lsp::Url::from_file_path("/file.rs").unwrap()
            );
            futures::future::pending::<()>().await;
            unreachable!()
@@ -6289,7 +6242,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
        .handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/file.rs").unwrap().into()
+                lsp::Url::from_file_path("/file.rs").unwrap()
            );
            assert_eq!(params.options.tab_size, 8);
            Ok(Some(vec![]))
@@ -6363,7 +6316,7 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
        .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Uri::from_file_path("/file.rs").unwrap().into()
+                lsp::Url::from_file_path("/file.rs").unwrap()
            );
            assert_eq!(params.options.tab_size, 4);
            Ok(Some(vec![lsp::TextEdit::new(
@@ -6385,7 +6338,7 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
    fake_server.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
        assert_eq!(
            params.text_document.uri,
-            lsp::Uri::from_file_path("/file.rs").unwrap().into()
+            lsp::Url::from_file_path("/file.rs").unwrap()
        );
        futures::future::pending::<()>().await;
        unreachable!()
@@ -6743,7 +6696,7 @@ async fn test_completion(cx: &mut gpui::TestAppContext) {
    cx.assert_editor_state("editor.cloˇ");
    assert!(cx.editor(|e, _| e.context_menu.read().is_none()));
    cx.update_editor(|editor, cx| {
-        editor.show_completions(&ShowCompletions { trigger: None }, cx);
+        editor.show_completions(&ShowCompletions, cx);
    });
    handle_completion_request(
        &mut cx,
@@ -7697,14 +7650,13 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
        cx.open_window(
            WindowOptions {
                window_bounds: Some(WindowBounds::Windowed(Bounds::from_corners(
-                    gpui::Point::new(px(0.), px(0.)),
-                    gpui::Point::new(px(10.), px(80.)),
+                    gpui::Point::new(0.into(), 0.into()),
+                    gpui::Point::new(10.into(), 80.into()),
                ))),
                ..Default::default()
            },
            |cx| cx.new_view(|cx| build_editor(buffer.clone(), cx)),
        )
-        .unwrap()
    });

    let is_still_following = Rc::new(RefCell::new(true));
@@ -8028,7 +7980,7 @@ async fn go_to_prev_overlapping_diagnostic(
                .update_diagnostics(
                    LanguageServerId(0),
                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Uri::from_file_path("/root/file").unwrap().into(),
+                        uri: lsp::Url::from_file_path("/root/file").unwrap(),
                        version: None,
                        diagnostics: vec![
                            lsp::Diagnostic {
@@ -8400,7 +8352,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
    fake_server.handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
        assert_eq!(
            params.text_document_position.text_document.uri,
-            lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+            lsp::Url::from_file_path("/a/main.rs").unwrap(),
        );
        assert_eq!(
            params.text_document_position.position,
@@ -12151,10 +12103,7 @@ pub fn handle_completion_request(
        let completions = completions.clone();
        counter.fetch_add(1, atomic::Ordering::Release);
        async move {
-            assert_eq!(
-                params.text_document_position.text_document.uri,
-                url.clone().into()
-            );
+            assert_eq!(params.text_document_position.text_document.uri, url.clone());
            assert_eq!(
                params.text_document_position.position,
                complete_from_position
@@ -12235,16 +12184,10 @@ pub(crate) fn update_test_project_settings(

 pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) {
    _ = cx.update(|cx| {
-        cx.text_system()
-            .add_fonts(vec![assets::Assets
-                .load("fonts/zed-mono/zed-mono-extended.ttf")
-                .unwrap()
-                .unwrap()])
-            .unwrap();
        let store = SettingsStore::test(cx);
        cx.set_global(store);
        theme::init(theme::LoadThemes::JustBase, cx);
-        release_channel::init(SemanticVersion::default(), cx);
+        release_channel::init("0.0.0", cx);
        client::init_settings(cx);
        language::init(cx);
        Project::init_settings(cx);
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -153,7 +153,7 @@ impl EditorElement {
    fn register_actions(&self, cx: &mut WindowContext) {
        let view = &self.editor;
        view.update(cx, |editor, cx| {
-            for action in editor.editor_actions.borrow().values() {
+            for action in editor.editor_actions.iter() {
                (action)(cx)
            }
        });
@@ -586,7 +586,7 @@ impl EditorElement {
            editor.handle_click_hovered_link(point, event.modifiers, cx);

            cx.stop_propagation();
-        } else if end_selection && pending_nonempty_selections {
+        } else if end_selection {
            cx.stop_propagation();
        } else if cfg!(target_os = "linux") && event.button == MouseButton::Middle {
            if !text_hitbox.is_hovered(cx) || editor.read_only(cx) {
@@ -594,7 +594,7 @@ impl EditorElement {
            }

            #[cfg(target_os = "linux")]
-            if let Some(item) = cx.read_from_primary() {
+            if let Some(item) = cx.read_from_clipboard() {
                let point_for_position =
                    position_map.point_for_position(text_hitbox.bounds, event.position);
                let position = point_for_position.previous_valid;
@@ -2837,8 +2837,6 @@ impl EditorElement {
            Self::paint_diff_hunks(layout.gutter_hitbox.bounds, layout, cx)
        }

-        self.paint_gutter_highlights(layout, cx);
-
        if layout.blamed_display_rows.is_some() {
            self.paint_blamed_display_rows(layout, cx);
        }
@@ -3008,37 +3006,6 @@ impl EditorElement {
        }
    }

-    fn paint_gutter_highlights(&self, layout: &EditorLayout, cx: &mut WindowContext) {
-        let highlight_width = 0.275 * layout.position_map.line_height;
-        let highlight_corner_radii = Corners::all(0.05 * layout.position_map.line_height);
-        cx.paint_layer(layout.gutter_hitbox.bounds, |cx| {
-            for (range, color) in &layout.highlighted_gutter_ranges {
-                let start_row = if range.start.row() < layout.visible_display_row_range.start {
-                    layout.visible_display_row_range.start - DisplayRow(1)
-                } else {
-                    range.start.row()
-                };
-                let end_row = if range.end.row() > layout.visible_display_row_range.end {
-                    layout.visible_display_row_range.end + DisplayRow(1)
-                } else {
-                    range.end.row()
-                };
-
-                let start_y = layout.gutter_hitbox.top()
-                    + start_row.0 as f32 * layout.position_map.line_height
-                    - layout.position_map.scroll_pixel_position.y;
-                let end_y = layout.gutter_hitbox.top()
-                    + (end_row.0 + 1) as f32 * layout.position_map.line_height
-                    - layout.position_map.scroll_pixel_position.y;
-                let bounds = Bounds::from_corners(
-                    point(layout.gutter_hitbox.left(), start_y),
-                    point(layout.gutter_hitbox.left() + highlight_width, end_y),
-                );
-                cx.paint_quad(fill(bounds, *color).corner_radii(highlight_corner_radii));
-            }
-        });
-    }
-
    fn paint_blamed_display_rows(&self, layout: &mut EditorLayout, cx: &mut WindowContext) {
        let Some(blamed_display_rows) = layout.blamed_display_rows.take() else {
            return;
@@ -4664,12 +4631,6 @@ impl Element for EditorElement {
                        &snapshot.display_snapshot,
                        cx.theme().colors(),
                    );
-                    let highlighted_gutter_ranges =
-                        self.editor.read(cx).gutter_highlights_in_range(
-                            start_anchor..end_anchor,
-                            &snapshot.display_snapshot,
-                            cx,
-                        );

                    let redacted_ranges = self.editor.read(cx).redacted_ranges(
                        start_anchor..end_anchor,
@@ -5030,7 +4991,6 @@ impl Element for EditorElement {
                        active_rows,
                        highlighted_rows,
                        highlighted_ranges,
-                        highlighted_gutter_ranges,
                        redacted_ranges,
                        line_elements,
                        line_numbers,
@@ -5161,7 +5121,6 @@ pub struct EditorLayout {
    inline_blame: Option<AnyElement>,
    blocks: Vec<BlockLayout>,
    highlighted_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
-    highlighted_gutter_ranges: Vec<(Range<DisplayPoint>, Hsla)>,
    redacted_ranges: Vec<Range<DisplayPoint>>,
    cursors: Vec<(DisplayPoint, Hsla)>,
    visible_cursors: Vec<CursorLayout>,
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -322,6 +322,7 @@ pub fn update_inlay_link_and_hover_points(
                                    hover_popover::hover_at_inlay(
                                        editor,
                                        InlayHover {
+                                            excerpt: excerpt_id,
                                            tooltip: match tooltip {
                                                InlayHintTooltip::String(text) => HoverBlock {
                                                    text,
@@ -369,6 +370,7 @@ pub fn update_inlay_link_and_hover_points(
                                        hover_popover::hover_at_inlay(
                                            editor,
                                            InlayHover {
+                                                excerpt: excerpt_id,
                                                tooltip: match tooltip {
                                                    InlayHintLabelPartTooltip::String(text) => {
                                                        HoverBlock {
@@ -741,20 +743,16 @@ mod tests {
                Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![
                    lsp::LocationLink {
                        origin_selection_range: Some(symbol_range),
-                        target_uri: url.clone().into(),
+                        target_uri: url.clone(),
                        target_range,
                        target_selection_range: target_range,
                    },
                ])))
            });

-        let modifiers = if cfg!(target_os = "macos") {
-            Modifiers::command_shift()
-        } else {
-            Modifiers::control_shift()
-        };
-
-        cx.simulate_mouse_move(screen_coord.unwrap(), None, modifiers);
+        cx.cx
+            .cx
+            .simulate_mouse_move(screen_coord.unwrap(), None, Modifiers::command_shift());

        requests.next().await;
        cx.run_until_parked();
@@ -771,7 +769,9 @@ mod tests {
            let variable = A;
        "});

-        cx.simulate_click(screen_coord.unwrap(), modifiers);
+        cx.cx
+            .cx
+            .simulate_click(screen_coord.unwrap(), Modifiers::command_shift());

        cx.assert_editor_state(indoc! {"
            struct «Aˇ»;
@@ -815,7 +815,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: Some(symbol_range),
-                    target_uri: url.clone().into(),
+                    target_uri: url.clone(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -841,7 +841,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: Some(symbol_range),
-                    target_uri: url.clone().into(),
+                    target_uri: url.clone(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -904,7 +904,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: Some(symbol_range),
-                    target_uri: url.into(),
+                    target_uri: url,
                    target_range,
                    target_selection_range: target_range,
                },
@@ -980,7 +980,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: None,
-                    target_uri: url.into(),
+                    target_uri: url,
                    target_range,
                    target_selection_range: target_range,
                },
@@ -1008,7 +1008,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: None,
-                    target_uri: url.into(),
+                    target_uri: url,
                    target_range,
                    target_selection_range: target_range,
                },
@@ -1088,7 +1088,7 @@ mod tests {
        let hint_label = ": TestStruct";
        cx.lsp
            .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let expected_uri = expected_uri.clone().into();
+                let expected_uri = expected_uri.clone();
                async move {
                    assert_eq!(params.text_document.uri, expected_uri);
                    Ok(Some(vec![lsp::InlayHint {
--- a/crates/editor/src/hover_popover.rs
+++ b/crates/editor/src/hover_popover.rs
@@ -3,7 +3,7 @@ use crate::{
    hover_links::{InlayHighlight, RangeInEditor},
    scroll::ScrollAmount,
    Anchor, AnchorRangeExt, DisplayPoint, DisplayRow, Editor, EditorSettings, EditorSnapshot,
-    EditorStyle, Hover, RangeToAnchorExt,
+    EditorStyle, ExcerptId, Hover, RangeToAnchorExt,
 };
 use futures::{stream::FuturesUnordered, FutureExt};
 use gpui::{
@@ -49,6 +49,7 @@ pub fn hover_at(editor: &mut Editor, anchor: Option<Anchor>, cx: &mut ViewContex
 }

 pub struct InlayHover {
+    pub excerpt: ExcerptId,
    pub range: InlayHighlight,
    pub tooltip: HoverBlock,
 }
@@ -1376,7 +1377,7 @@ mod tests {
        let closure_uri = uri.clone();
        cx.lsp
            .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let task_uri = closure_uri.clone().into();
+                let task_uri = closure_uri.clone();
                async move {
                    assert_eq!(params.text_document.uri, task_uri);
                    Ok(Some(vec![lsp::InlayHint {
@@ -1467,7 +1468,7 @@ mod tests {
                            lsp::InlayHintLabelPart {
                                value: new_type_label.to_string(),
                                location: Some(lsp::Location {
-                                    uri: task_uri.clone().into(),
+                                    uri: task_uri.clone(),
                                    range: new_type_target_range,
                                }),
                                tooltip: Some(lsp::InlayHintLabelPartTooltip::String(format!(
@@ -1482,7 +1483,7 @@ mod tests {
                            lsp::InlayHintLabelPart {
                                value: struct_label.to_string(),
                                location: Some(lsp::Location {
-                                    uri: task_uri.into(),
+                                    uri: task_uri,
                                    range: struct_target_range,
                                }),
                                tooltip: Some(lsp::InlayHintLabelPartTooltip::MarkupContent(
--- a/crates/editor/src/hunk_diff.rs
+++ b/crates/editor/src/hunk_diff.rs
@@ -615,36 +615,32 @@ fn editor_with_deleted_text(
        ]);
        let original_multi_buffer_range = hunk.multi_buffer_range.clone();
        let diff_base_range = hunk.diff_base_byte_range.clone();
-        editor
-            .register_action::<RevertSelectedHunks>(move |_, cx| {
-                parent_editor
-                    .update(cx, |editor, cx| {
-                        let Some((buffer, original_text)) =
-                            editor.buffer().update(cx, |buffer, cx| {
-                                let (_, buffer, _) = buffer
-                                    .excerpt_containing(original_multi_buffer_range.start, cx)?;
-                                let original_text =
-                                    buffer.read(cx).diff_base()?.slice(diff_base_range.clone());
-                                Some((buffer, Arc::from(original_text.to_string())))
-                            })
-                        else {
-                            return;
-                        };
-                        buffer.update(cx, |buffer, cx| {
-                            buffer.edit(
-                                Some((
-                                    original_multi_buffer_range.start.text_anchor
-                                        ..original_multi_buffer_range.end.text_anchor,
-                                    original_text,
-                                )),
-                                None,
-                                cx,
-                            )
-                        });
-                    })
-                    .ok();
-            })
-            .detach();
+        editor.register_action::<RevertSelectedHunks>(move |_, cx| {
+            parent_editor
+                .update(cx, |editor, cx| {
+                    let Some((buffer, original_text)) = editor.buffer().update(cx, |buffer, cx| {
+                        let (_, buffer, _) =
+                            buffer.excerpt_containing(original_multi_buffer_range.start, cx)?;
+                        let original_text =
+                            buffer.read(cx).diff_base()?.slice(diff_base_range.clone());
+                        Some((buffer, Arc::from(original_text.to_string())))
+                    }) else {
+                        return;
+                    };
+                    buffer.update(cx, |buffer, cx| {
+                        buffer.edit(
+                            Some((
+                                original_multi_buffer_range.start.text_anchor
+                                    ..original_multi_buffer_range.end.text_anchor,
+                                original_text,
+                            )),
+                            None,
+                            cx,
+                        )
+                    });
+                })
+                .ok();
+        });
        editor
    });

--- a/crates/editor/src/inlay_hint_cache.rs
+++ b/crates/editor/src/inlay_hint_cache.rs
@@ -1268,7 +1268,7 @@ pub mod tests {
        ExcerptRange,
    };
    use futures::StreamExt;
-    use gpui::{Context, SemanticVersion, TestAppContext, WindowHandle};
+    use gpui::{Context, TestAppContext, WindowHandle};
    use itertools::Itertools;
    use language::{
        language_settings::AllLanguageSettingsContent, Capability, FakeLspAdapter, Language,
@@ -1307,7 +1307,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
+                        lsp::Url::from_file_path(file_with_hints).unwrap(),
                    );
                    let current_call_id =
                        Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
@@ -1439,7 +1439,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
+                        lsp::Url::from_file_path(file_with_hints).unwrap(),
                    );
                    let current_call_id =
                        Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
@@ -1613,7 +1613,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                        lsp::Url::from_file_path("/a/main.rs").unwrap(),
                    );
                    let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
                    Ok(Some(vec![lsp::InlayHint {
@@ -1666,7 +1666,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path("/a/other.md").unwrap().into(),
+                        lsp::Url::from_file_path("/a/other.md").unwrap(),
                    );
                    let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
                    Ok(Some(vec![lsp::InlayHint {
@@ -1790,7 +1790,7 @@ pub mod tests {
                    Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
+                        lsp::Url::from_file_path(file_with_hints).unwrap(),
                    );
                    Ok(Some(vec![
                        lsp::InlayHint {
@@ -2136,7 +2136,7 @@ pub mod tests {
                    let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
+                        lsp::Url::from_file_path(file_with_hints).unwrap(),
                    );
                    Ok(Some(vec![lsp::InlayHint {
                        position: lsp::Position::new(0, i),
@@ -2305,7 +2305,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                        lsp::Url::from_file_path("/a/main.rs").unwrap(),
                    );

                    task_lsp_request_ranges.lock().push(params.range);
@@ -2673,11 +2673,11 @@ pub mod tests {
                let task_editor_edited = Arc::clone(&closure_editor_edited);
                async move {
                    let hint_text = if params.text_document.uri
-                        == lsp::Uri::from_file_path("/a/main.rs").unwrap().into()
+                        == lsp::Url::from_file_path("/a/main.rs").unwrap()
                    {
                        "main hint"
                    } else if params.text_document.uri
-                        == lsp::Uri::from_file_path("/a/other.rs").unwrap().into()
+                        == lsp::Url::from_file_path("/a/other.rs").unwrap()
                    {
                        "other hint"
                    } else {
@@ -2981,11 +2981,11 @@ pub mod tests {
                let task_editor_edited = Arc::clone(&closure_editor_edited);
                async move {
                    let hint_text = if params.text_document.uri
-                        == lsp::Uri::from_file_path("/a/main.rs").unwrap().into()
+                        == lsp::Url::from_file_path("/a/main.rs").unwrap()
                    {
                        "main hint"
                    } else if params.text_document.uri
-                        == lsp::Uri::from_file_path("/a/other.rs").unwrap().into()
+                        == lsp::Url::from_file_path("/a/other.rs").unwrap()
                    {
                        "other hint"
                    } else {
@@ -3177,7 +3177,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
+                        lsp::Url::from_file_path("/a/main.rs").unwrap(),
                    );
                    let query_start = params.range.start;
                    let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::Release) + 1;
@@ -3244,7 +3244,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
+                        lsp::Url::from_file_path(file_with_hints).unwrap(),
                    );

                    let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
@@ -3361,7 +3361,7 @@ pub mod tests {
            let settings_store = SettingsStore::test(cx);
            cx.set_global(settings_store);
            theme::init(theme::LoadThemes::JustBase, cx);
-            release_channel::init(SemanticVersion::default(), cx);
+            release_channel::init("0.0.0", cx);
            client::init_settings(cx);
            language::init(cx);
            Project::init_settings(cx);
--- a/crates/editor/src/items.rs
+++ b/crates/editor/src/items.rs
@@ -234,7 +234,7 @@ impl FollowableItem for Editor {

    fn to_follow_event(event: &EditorEvent) -> Option<workspace::item::FollowEvent> {
        match event {
-            EditorEvent::Edited { .. } => Some(FollowEvent::Unfollow),
+            EditorEvent::Edited => Some(FollowEvent::Unfollow),
            EditorEvent::SelectionsChanged { local }
            | EditorEvent::ScrollPositionChanged { local, .. } => {
                if *local {
@@ -903,7 +903,7 @@ impl Item for Editor {
                f(ItemEvent::UpdateBreadcrumbs);
            }

-            EditorEvent::Reparsed(_) => {
+            EditorEvent::Reparsed => {
                f(ItemEvent::UpdateBreadcrumbs);
            }

--- a/crates/editor/src/linked_editing_ranges.rs
+++ b/crates/editor/src/linked_editing_ranges.rs
@@ -1,150 +0,0 @@
-use std::ops::Range;
-
-use collections::HashMap;
-use itertools::Itertools;
-use text::{AnchorRangeExt, BufferId, ToPoint};
-use ui::ViewContext;
-use util::ResultExt;
-
-use crate::Editor;
-
-#[derive(Clone, Default)]
-pub(super) struct LinkedEditingRanges(
-    /// Ranges are non-overlapping and sorted by .0 (thus, [x + 1].start > [x].end must hold)
-    pub HashMap<BufferId, Vec<(Range<text::Anchor>, Vec<Range<text::Anchor>>)>>,
-);
-
-impl LinkedEditingRanges {
-    pub(super) fn get(
-        &self,
-        id: BufferId,
-        anchor: Range<text::Anchor>,
-        snapshot: &text::BufferSnapshot,
-    ) -> Option<&(Range<text::Anchor>, Vec<Range<text::Anchor>>)> {
-        let ranges_for_buffer = self.0.get(&id)?;
-        let lower_bound = ranges_for_buffer
-            .partition_point(|(range, _)| range.start.cmp(&anchor.start, snapshot).is_le());
-        if lower_bound == 0 {
-            // None of the linked ranges contains `anchor`.
-            return None;
-        }
-        ranges_for_buffer
-            .get(lower_bound - 1)
-            .filter(|(range, _)| range.end.cmp(&anchor.end, snapshot).is_ge())
-    }
-    pub(super) fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-}
-pub(super) fn refresh_linked_ranges(this: &mut Editor, cx: &mut ViewContext<Editor>) -> Option<()> {
-    if this.pending_rename.is_some() {
-        return None;
-    }
-    let project = this.project.clone()?;
-    let buffer = this.buffer.read(cx);
-    let mut applicable_selections = vec![];
-    let selections = this.selections.all::<usize>(cx);
-    let snapshot = buffer.snapshot(cx);
-    for selection in selections {
-        let cursor_position = selection.head();
-        let start_position = snapshot.anchor_before(cursor_position);
-        let end_position = snapshot.anchor_after(selection.tail());
-        if start_position.buffer_id != end_position.buffer_id || end_position.buffer_id.is_none() {
-            // Throw away selections spanning multiple buffers.
-            continue;
-        }
-        if let Some(buffer) = end_position.buffer_id.and_then(|id| buffer.buffer(id)) {
-            applicable_selections.push((
-                buffer,
-                start_position.text_anchor,
-                end_position.text_anchor,
-            ));
-        }
-    }
-    if applicable_selections.is_empty() {
-        return None;
-    }
-    this.linked_editing_range_task = Some(cx.spawn(|this, mut cx| async move {
-        let highlights = project
-            .update(&mut cx, |project, cx| {
-                let mut linked_edits_tasks = vec![];
-
-                for (buffer, start, end) in &applicable_selections {
-                    let snapshot = buffer.read(cx).snapshot();
-                    let buffer_id = buffer.read(cx).remote_id();
-
-                    let linked_edits_task = project.linked_edit(&buffer, *start, cx);
-                    let highlights = move || async move {
-                        let edits = linked_edits_task.await.log_err()?;
-                        // Find the range containing our current selection.
-                        // We might not find one, because the selection contains both the start and end of the contained range
-                        // (think of selecting <`html>foo`</html> - even though there's a matching closing tag, the selection goes beyond the range of the opening tag)
-                        // or the language server may not have returned any ranges.
-
-                        let start_point = start.to_point(&snapshot);
-                        let end_point = end.to_point(&snapshot);
-                        let _current_selection_contains_range = edits.iter().find(|range| {
-                            range.start.to_point(&snapshot) <= start_point
-                                && range.end.to_point(&snapshot) >= end_point
-                        });
-                        if _current_selection_contains_range.is_none() {
-                            return None;
-                        }
-                        // Now link every range as each-others sibling.
-                        let mut siblings: HashMap<Range<text::Anchor>, Vec<_>> = Default::default();
-                        let mut insert_sorted_anchor =
-                            |key: &Range<text::Anchor>, value: &Range<text::Anchor>| {
-                                siblings.entry(key.clone()).or_default().push(value.clone());
-                            };
-                        for items in edits.into_iter().combinations(2) {
-                            let Ok([first, second]): Result<[_; 2], _> = items.try_into() else {
-                                unreachable!()
-                            };
-
-                            insert_sorted_anchor(&first, &second);
-                            insert_sorted_anchor(&second, &first);
-                        }
-                        let mut siblings: Vec<(_, _)> = siblings.into_iter().collect();
-                        siblings.sort_by(|lhs, rhs| lhs.0.cmp(&rhs.0, &snapshot));
-                        Some((buffer_id, siblings))
-                    };
-                    linked_edits_tasks.push(highlights());
-                }
-                linked_edits_tasks
-            })
-            .log_err()?;
-
-        let highlights = futures::future::join_all(highlights).await;
-
-        this.update(&mut cx, |this, cx| {
-            this.linked_edit_ranges.0.clear();
-            if this.pending_rename.is_some() {
-                return;
-            }
-            for (buffer_id, ranges) in highlights.into_iter().flatten() {
-                this.linked_edit_ranges
-                    .0
-                    .entry(buffer_id)
-                    .or_default()
-                    .extend(ranges);
-            }
-            for (buffer_id, values) in this.linked_edit_ranges.0.iter_mut() {
-                let Some(snapshot) = this
-                    .buffer
-                    .read(cx)
-                    .buffer(*buffer_id)
-                    .map(|buffer| buffer.read(cx).snapshot())
-                else {
-                    continue;
-                };
-                values.sort_by(|lhs, rhs| lhs.0.cmp(&rhs.0, &snapshot));
-            }
-
-            cx.notify();
-        })
-        .log_err();
-
-        Some(())
-    }));
-    None
-}
--- a/crates/editor/src/selections_collection.rs
+++ b/crates/editor/src/selections_collection.rs
@@ -256,10 +256,7 @@ impl SelectionsCollection {
    }

    pub fn first_anchor(&self) -> Selection<Anchor> {
-        self.pending
-            .as_ref()
-            .map(|pending| pending.selection.clone())
-            .unwrap_or_else(|| self.disjoint.first().cloned().unwrap())
+        self.disjoint[0].clone()
    }

    pub fn first<D: TextDimension + Ord + Sub<D, Output = D>>(
--- a/crates/editor/src/test.rs
+++ b/crates/editor/src/test.rs
@@ -25,7 +25,7 @@ pub fn marked_display_snapshot(
    let (unmarked_text, markers) = marked_text_offsets(text);

    let font = Font {
-        family: "Zed Mono".into(),
+        family: "Courier".into(),
        features: FontFeatures::default(),
        weight: FontWeight::default(),
        style: FontStyle::default(),
--- a/crates/editor/src/test/editor_lsp_test_context.rs
+++ b/crates/editor/src/test/editor_lsp_test_context.rs
@@ -10,7 +10,7 @@ use serde_json::json;
 use crate::{Editor, ToPoint};
 use collections::HashSet;
 use futures::Future;
-use gpui::{AssetSource, View, ViewContext, VisualTestContext};
+use gpui::{View, ViewContext, VisualTestContext};
 use indoc::indoc;
 use language::{
    point_to_lsp, FakeLspAdapter, Language, LanguageConfig, LanguageMatcher, LanguageQueries,
@@ -27,7 +27,7 @@ pub struct EditorLspTestContext {
    pub cx: EditorTestContext,
    pub lsp: lsp::FakeLanguageServer,
    pub workspace: View<Workspace>,
-    pub buffer_lsp_url: lsp::Uri,
+    pub buffer_lsp_url: lsp::Url,
 }

 impl EditorLspTestContext {
@@ -39,12 +39,6 @@ impl EditorLspTestContext {
        let app_state = cx.update(AppState::test);

        cx.update(|cx| {
-            cx.text_system()
-                .add_fonts(vec![assets::Assets
-                    .load("fonts/zed-mono/zed-mono-extended.ttf")
-                    .unwrap()
-                    .unwrap()])
-                .unwrap();
            language::init(cx);
            crate::init(cx);
            workspace::init(app_state.clone(), cx);
@@ -113,7 +107,7 @@ impl EditorLspTestContext {
            },
            lsp,
            workspace,
-            buffer_lsp_url: lsp::Uri::from_file_path(format!("/root/dir/{file_name}")).unwrap(),
+            buffer_lsp_url: lsp::Url::from_file_path(format!("/root/dir/{file_name}")).unwrap(),
        }
    }

@@ -299,7 +293,7 @@ impl EditorLspTestContext {
    where
        T: 'static + request::Request,
        T::Params: 'static + Send,
-        F: 'static + Send + FnMut(lsp::Uri, T::Params, gpui::AsyncAppContext) -> Fut,
+        F: 'static + Send + FnMut(lsp::Url, T::Params, gpui::AsyncAppContext) -> Fut,
        Fut: 'static + Send + Future<Output = Result<T::Result>>,
    {
        let url = self.buffer_lsp_url.clone();
--- a/crates/extension/src/extension_store_test.rs
+++ b/crates/extension/src/extension_store_test.rs
@@ -10,12 +10,12 @@ use async_compression::futures::bufread::GzipEncoder;
 use collections::BTreeMap;
 use fs::{FakeFs, Fs, RealFs};
 use futures::{io::BufReader, AsyncReadExt, StreamExt};
-use gpui::{Context, SemanticVersion, TestAppContext};
+use gpui::{Context, TestAppContext};
 use http::{FakeHttpClient, Response};
 use language::{LanguageMatcher, LanguageRegistry, LanguageServerBinaryStatus, LanguageServerName};
 use node_runtime::FakeNodeRuntime;
 use parking_lot::Mutex;
-use project::{Project, DEFAULT_COMPLETION_CONTEXT};
+use project::Project;
 use serde_json::json;
 use settings::{Settings as _, SettingsStore};
 use std::{
@@ -510,14 +510,6 @@ async fn test_extension_store_with_gleam_extension(cx: &mut TestAppContext) {
                                    {
                                        "name": format!("gleam-{version}-aarch64-apple-darwin.tar.gz"),
                                        "browser_download_url": asset_download_uri
-                                    },
-                                    {
-                                        "name": format!("gleam-{version}-x86_64-unknown-linux-musl.tar.gz"),
-                                        "browser_download_url": asset_download_uri
-                                    },
-                                    {
-                                        "name": format!("gleam-{version}-aarch64-unknown-linux-musl.tar.gz"),
-                                        "browser_download_url": asset_download_uri
                                    }
                                ]
                            }
@@ -665,9 +657,7 @@ async fn test_extension_store_with_gleam_extension(cx: &mut TestAppContext) {
    });

    let completion_labels = project
-        .update(cx, |project, cx| {
-            project.completions(&buffer, 0, DEFAULT_COMPLETION_CONTEXT, cx)
-        })
+        .update(cx, |project, cx| project.completions(&buffer, 0, cx))
        .await
        .unwrap()
        .into_iter()
@@ -733,7 +723,7 @@ fn init_test(cx: &mut TestAppContext) {
    cx.update(|cx| {
        let store = SettingsStore::test(cx);
        cx.set_global(store);
-        release_channel::init(SemanticVersion::default(), cx);
+        release_channel::init("0.0.0", cx);
        theme::init(theme::LoadThemes::JustBase, cx);
        Project::init_settings(cx);
        ExtensionSettings::register(cx);
--- a/crates/extension_api/Cargo.toml
+++ b/crates/extension_api/Cargo.toml
@@ -8,10 +8,6 @@ keywords = ["zed", "extension"]
 edition = "2021"
 license = "Apache-2.0"

-# Don't publish v0.0.7 until we're ready to commit to the breaking API changes
-# Marshall is DRI on this.
-publish = false
-
 [lints]
 workspace = true

--- a/crates/extensions_ui/Cargo.toml
+++ b/crates/extensions_ui/Cargo.toml
@@ -24,7 +24,6 @@ fs.workspace = true
 fuzzy.workspace = true
 gpui.workspace = true
 language.workspace = true
-num-format.workspace = true
 picker.workspace = true
 project.workspace = true
 release_channel.workspace = true
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -16,7 +16,6 @@ use gpui::{
    InteractiveElement, KeyContext, ParentElement, Render, Styled, Task, TextStyle,
    UniformListScrollHandle, View, ViewContext, VisualContext, WeakView, WhiteSpace, WindowContext,
 };
-use num_format::{Locale, ToFormattedString};
 use release_channel::ReleaseChannel;
 use settings::Settings;
 use std::ops::DerefMut;
@@ -488,11 +487,8 @@ impl ExtensionsPage {
                        .size(LabelSize::Small),
                    )
                    .child(
-                        Label::new(format!(
-                            "Downloads: {}",
-                            extension.download_count.to_formatted_string(&Locale::en)
-                        ))
-                        .size(LabelSize::Small),
+                        Label::new(format!("Downloads: {}", extension.download_count))
+                            .size(LabelSize::Small),
                    ),
            )
            .child(
@@ -773,7 +769,7 @@ impl ExtensionsPage {
        event: &editor::EditorEvent,
        cx: &mut ViewContext<Self>,
    ) {
-        if let editor::EditorEvent::Edited { .. } = event {
+        if let editor::EditorEvent::Edited = event {
            self.query_contains_error = false;
            self.fetch_extensions_debounced(cx);
        }
--- a/crates/feedback/src/feedback.rs
+++ b/crates/feedback/src/feedback.rs
@@ -1,6 +1,5 @@
 use gpui::{actions, AppContext, ClipboardItem, PromptLevel};
 use system_specs::SystemSpecs;
-use util::ResultExt;
 use workspace::Workspace;

 pub mod feedback_modal;
@@ -39,38 +38,25 @@ pub fn init(cx: &mut AppContext) {
        feedback_modal::FeedbackModal::register(workspace, cx);
        workspace
            .register_action(|_, _: &CopySystemSpecsIntoClipboard, cx| {
-                let specs = SystemSpecs::new(&cx);
+                let specs = SystemSpecs::new(&cx).to_string();

-                cx.spawn(|_, mut cx| async move {
-                    let specs = specs.await.to_string();
-
-                    cx.update(|cx| cx.write_to_clipboard(ClipboardItem::new(specs.clone())))
-                        .log_err();
-
-                    cx.prompt(
-                        PromptLevel::Info,
-                        "Copied into clipboard",
-                        Some(&specs),
-                        &["OK"],
-                    )
-                    .await
-                    .ok();
+                let prompt = cx.prompt(
+                    PromptLevel::Info,
+                    "Copied into clipboard",
+                    Some(&specs),
+                    &["OK"],
+                );
+                cx.spawn(|_, _cx| async move {
+                    prompt.await.ok();
                })
                .detach();
+                cx.write_to_clipboard(ClipboardItem::new(specs.clone()));
            })
            .register_action(|_, _: &RequestFeature, cx| {
                cx.open_url(request_feature_url());
            })
            .register_action(move |_, _: &FileBugReport, cx| {
-                let specs = SystemSpecs::new(&cx);
-                cx.spawn(|_, mut cx| async move {
-                    let specs = specs.await;
-                    cx.update(|cx| {
-                        cx.open_url(&file_bug_report_url(&specs));
-                    })
-                    .log_err();
-                })
-                .detach();
+                cx.open_url(&file_bug_report_url(&SystemSpecs::new(&cx)));
            })
            .register_action(move |_, _: &OpenZedRepo, cx| {
                cx.open_url(zed_repo_url());
--- a/crates/feedback/src/feedback_modal.rs
+++ b/crates/feedback/src/feedback_modal.rs
@@ -141,15 +141,15 @@ impl FeedbackModal {
                return;
            }

-            let system_specs = SystemSpecs::new(cx);
            cx.spawn(|workspace, mut cx| async move {
                let markdown = markdown.await.log_err();
                let buffer = project.update(&mut cx, |project, cx| {
                    project.create_local_buffer("", markdown, cx)
                })?;
-                let system_specs = system_specs.await;

                workspace.update(&mut cx, |workspace, cx| {
+                    let system_specs = SystemSpecs::new(cx);
+
                    workspace.toggle_modal(cx, move |cx| {
                        FeedbackModal::new(system_specs, project, buffer, cx)
                    });
@@ -193,7 +193,7 @@ impl FeedbackModal {
        });

        cx.subscribe(&feedback_editor, |this, editor, event: &EditorEvent, cx| {
-            if matches!(event, EditorEvent::Edited { .. }) {
+            if *event == EditorEvent::Edited {
                this.character_count = editor
                    .read(cx)
                    .buffer()
--- a/crates/feedback/src/system_specs.rs
+++ b/crates/feedback/src/system_specs.rs
@@ -1,5 +1,4 @@
-use client::telemetry;
-use gpui::{AppContext, Task};
+use gpui::AppContext;
 use human_bytes::human_bytes;
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use serde::Serialize;
@@ -10,23 +9,27 @@ use sysinfo::{MemoryRefreshKind, RefreshKind, System};
 pub struct SystemSpecs {
    app_version: String,
    release_channel: &'static str,
-    os_name: String,
-    os_version: String,
+    os_name: &'static str,
+    os_version: Option<String>,
    memory: u64,
    architecture: &'static str,
    commit_sha: Option<String>,
 }

 impl SystemSpecs {
-    pub fn new(cx: &AppContext) -> Task<Self> {
+    pub fn new(cx: &AppContext) -> Self {
        let app_version = AppVersion::global(cx).to_string();
        let release_channel = ReleaseChannel::global(cx);
-        let os_name = telemetry::os_name();
+        let os_name = cx.app_metadata().os_name;
        let system = System::new_with_specifics(
            RefreshKind::new().with_memory(MemoryRefreshKind::everything()),
        );
        let memory = system.total_memory();
        let architecture = env::consts::ARCH;
+        let os_version = cx
+            .app_metadata()
+            .os_version
+            .map(|os_version| os_version.to_string());
        let commit_sha = match release_channel {
            ReleaseChannel::Dev | ReleaseChannel::Nightly => {
                AppCommitSha::try_global(cx).map(|sha| sha.0.clone())
@@ -34,24 +37,24 @@ impl SystemSpecs {
            _ => None,
        };

-        cx.background_executor().spawn(async move {
-            let os_version = telemetry::os_version();
-            SystemSpecs {
-                app_version,
-                release_channel: release_channel.display_name(),
-                os_name,
-                os_version,
-                memory,
-                architecture,
-                commit_sha,
-            }
-        })
+        SystemSpecs {
+            app_version,
+            release_channel: release_channel.display_name(),
+            os_name,
+            os_version,
+            memory,
+            architecture,
+            commit_sha,
+        }
    }
 }

 impl Display for SystemSpecs {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let os_information = format!("OS: {} {}", self.os_name, self.os_version);
+        let os_information = match &self.os_version {
+            Some(os_version) => format!("OS: {} {}", self.os_name, os_version),
+            None => format!("OS: {}", self.os_name),
+        };
        let app_version_information = format!(
            "Zed: v{} ({})",
            self.app_version,
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -37,7 +37,6 @@ editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 gpui = { workspace = true, features = ["test-support"] }
 language = { workspace = true, features = ["test-support"] }
-picker = { workspace = true, features = ["test-support"] }
 serde_json.workspace = true
 theme = { workspace = true, features = ["test-support"] }
 workspace = { workspace = true, features = ["test-support"] }
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -483,7 +483,7 @@ impl FileFinderDelegate {
                        .root_entry()
                        .map_or(false, |entry| entry.is_ignored),
                    include_root_name,
-                    candidates: project::Candidates::Files,
+                    directories_only: false,
                }
            })
            .collect::<Vec<_>>();
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1747,45 +1747,6 @@ async fn test_extending_modifiers_does_not_confirm_selection(cx: &mut gpui::Test
    active_file_picker(&workspace, cx);
 }

-#[gpui::test]
-async fn test_repeat_toggle_action(cx: &mut gpui::TestAppContext) {
-    let app_state = init_test(cx);
-    app_state
-        .fs
-        .as_fake()
-        .insert_tree(
-            "/test",
-            json!({
-                "00.txt": "",
-                "01.txt": "",
-                "02.txt": "",
-                "03.txt": "",
-                "04.txt": "",
-                "05.txt": "",
-            }),
-        )
-        .await;
-
-    let project = Project::test(app_state.fs.clone(), ["/test".as_ref()], cx).await;
-    let (workspace, cx) = cx.add_window_view(|cx| Workspace::test_new(project, cx));
-
-    cx.dispatch_action(Toggle::default());
-    let picker = active_file_picker(&workspace, cx);
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.selected_index, 0);
-        assert_eq!(picker.logical_scroll_top_index(), 0);
-    });
-
-    // When toggling repeatedly, the picker scrolls to reveal the selected item.
-    cx.dispatch_action(Toggle::default());
-    cx.dispatch_action(Toggle::default());
-    cx.dispatch_action(Toggle::default());
-    picker.update(cx, |picker, _| {
-        assert_eq!(picker.delegate.selected_index, 3);
-        assert_eq!(picker.logical_scroll_top_index(), 3);
-    });
-}
-
 async fn open_close_queried_buffer(
    input: &str,
    expected_matches: usize,
--- a/crates/file_finder/src/new_path_prompt.rs
+++ b/crates/file_finder/src/new_path_prompt.rs
@@ -278,7 +278,7 @@ impl PickerDelegate for NewPathDelegate {
                        .root_entry()
                        .map_or(false, |entry| entry.is_ignored),
                    include_root_name,
-                    candidates: project::Candidates::Directories,
+                    directories_only: true,
                }
            })
            .collect::<Vec<_>>();
--- a/crates/fuzzy/src/char_bag.rs
+++ b/crates/fuzzy/src/char_bag.rs
@@ -1,6 +1,6 @@
 use std::iter::FromIterator;

-#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub struct CharBag(u64);

 impl CharBag {
--- a/crates/git/src/repository.rs
+++ b/crates/git/src/repository.rs
@@ -316,7 +316,7 @@ fn check_path_to_repo_path_errors(relative_file_path: &Path) -> Result<()> {
    }
 }

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub enum GitFileStatus {
    Added,
    Modified,
--- a/crates/go_to_line/src/go_to_line.rs
+++ b/crates/go_to_line/src/go_to_line.rs
@@ -42,19 +42,17 @@ enum GoToLineRowHighlights {}
 impl GoToLine {
    fn register(editor: &mut Editor, cx: &mut ViewContext<Editor>) {
        let handle = cx.view().downgrade();
-        editor
-            .register_action(move |_: &Toggle, cx| {
-                let Some(editor) = handle.upgrade() else {
-                    return;
-                };
-                let Some(workspace) = editor.read(cx).workspace() else {
-                    return;
-                };
-                workspace.update(cx, |workspace, cx| {
-                    workspace.toggle_modal(cx, move |cx| GoToLine::new(editor, cx));
-                })
+        editor.register_action(move |_: &Toggle, cx| {
+            let Some(editor) = handle.upgrade() else {
+                return;
+            };
+            let Some(workspace) = editor.read(cx).workspace() else {
+                return;
+            };
+            workspace.update(cx, |workspace, cx| {
+                workspace.toggle_modal(cx, move |cx| GoToLine::new(editor, cx));
            })
-            .detach();
+        });
    }

    pub fn new(active_editor: View<Editor>, cx: &mut ViewContext<Self>) -> Self {
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -87,7 +87,7 @@ cbindgen = "0.26.0"

 [target.'cfg(target_os = "macos")'.dependencies]
 block = "0.1"
-cocoa.workspace = true
+cocoa = "0.25"
 core-foundation.workspace = true
 core-graphics = "0.23"
 core-text = "20.1"
@@ -136,11 +136,10 @@ xim = { git = "https://github.com/npmania/xim-rs", rev = "27132caffc5b9bc9c432ca
    "x11rb-xcb",
    "x11rb-client",
 ] }
-font-kit = { git = "https://github.com/zed-industries/font-kit", rev = "5a5c4d4", features = ["source-fontconfig-dlopen"] }

 [target.'cfg(windows)'.dependencies]
 windows.workspace = true
-windows-core = "0.57"
+windows-core = "0.56"

 [target.'cfg(windows)'.build-dependencies]
 embed-resource = "2.4"
--- a/crates/gpui/examples/animation.rs
+++ b/crates/gpui/examples/animation.rs
@@ -76,7 +76,6 @@ fn main() {
            cx.open_window(options, |cx| {
                cx.activate(false);
                cx.new_view(|_cx| AnimationExample {})
-            })
-            .unwrap();
+            });
        });
 }
--- a/crates/gpui/examples/hello_world.rs
+++ b/crates/gpui/examples/hello_world.rs
@@ -34,7 +34,6 @@ fn main() {
                    text: "World".into(),
                })
            },
-        )
-        .unwrap();
+        );
    });
 }
--- a/crates/gpui/examples/image/image.rs
+++ b/crates/gpui/examples/image/image.rs
@@ -80,8 +80,8 @@ fn main() {
            }),

            window_bounds: Some(WindowBounds::Windowed(Bounds {
-                size: size(px(1100.), px(600.)),
-                origin: Point::new(px(200.), px(200.)),
+                size: size(px(1100.), px(600.)).into(),
+                origin: Point::new(DevicePixels::from(200), DevicePixels::from(200)),
            })),

            ..Default::default()
@@ -93,7 +93,6 @@ fn main() {
                local_resource: Arc::new(PathBuf::from_str("examples/image/app-icon.png").unwrap()),
                remote_resource: "https://picsum.photos/512/512".into(),
            })
-        })
-        .unwrap();
+        });
    });
 }
--- a/crates/gpui/examples/set_menus.rs
+++ b/crates/gpui/examples/set_menus.rs
@@ -29,8 +29,7 @@ fn main() {
        }]);
        cx.open_window(WindowOptions::default(), |cx| {
            cx.new_view(|_cx| SetMenus {})
-        })
-        .unwrap();
+        });
    });
 }

--- a/crates/gpui/examples/window_positioning.rs
+++ b/crates/gpui/examples/window_positioning.rs
@@ -24,18 +24,21 @@ fn main() {

        for screen in cx.displays() {
            let options = {
-                let margin_right = px(16.);
-                let margin_height = px(-48.);
+                let popup_margin_width = DevicePixels::from(16);
+                let popup_margin_height = DevicePixels::from(-0) - DevicePixels::from(48);

-                let size = Size {
+                let window_size = Size {
                    width: px(400.),
                    height: px(72.),
                };

-                let bounds = gpui::Bounds::<Pixels> {
-                    origin: screen.bounds().upper_right()
-                        - point(size.width + margin_right, margin_height),
-                    size,
+                let screen_bounds = screen.bounds();
+                let size: Size<DevicePixels> = window_size.into();
+
+                let bounds = gpui::Bounds::<DevicePixels> {
+                    origin: screen_bounds.upper_right()
+                        - point(size.width + popup_margin_width, popup_margin_height),
+                    size: window_size.into(),
                };

                WindowOptions {
@@ -58,8 +61,7 @@ fn main() {
                cx.new_view(|_| WindowContent {
                    text: format!("{:?}", screen.id()).into(),
                })
-            })
-            .unwrap();
+            });
        }
    });
 }
--- a/crates/gpui/src/app.rs
+++ b/crates/gpui/src/app.rs
@@ -27,12 +27,13 @@ use util::ResultExt;

 use crate::{
    current_platform, init_app_menus, Action, ActionRegistry, Any, AnyView, AnyWindowHandle,
-    AssetCache, AssetSource, BackgroundExecutor, ClipboardItem, Context, DispatchPhase, DisplayId,
-    Entity, EventEmitter, ForegroundExecutor, Global, KeyBinding, Keymap, Keystroke, LayoutId,
-    Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform, PlatformDisplay, Point,
-    PromptBuilder, PromptHandle, PromptLevel, Render, RenderablePromptHandle, Reservation,
-    SharedString, SubscriberSet, Subscription, SvgRenderer, Task, TextSystem, View, ViewContext,
-    Window, WindowAppearance, WindowContext, WindowHandle, WindowId,
+    AppMetadata, AssetCache, AssetSource, BackgroundExecutor, ClipboardItem, Context,
+    DispatchPhase, DisplayId, Entity, EventEmitter, ForegroundExecutor, Global, KeyBinding, Keymap,
+    Keystroke, LayoutId, Menu, MenuItem, OwnedMenu, PathPromptOptions, Pixels, Platform,
+    PlatformDisplay, Point, PromptBuilder, PromptHandle, PromptLevel, Render,
+    RenderablePromptHandle, Reservation, SharedString, SubscriberSet, Subscription, SvgRenderer,
+    Task, TextSystem, View, ViewContext, Window, WindowAppearance, WindowContext, WindowHandle,
+    WindowId,
 };

 mod async_context;
@@ -168,6 +169,11 @@ impl App {
        self
    }

+    /// Returns metadata associated with the application
+    pub fn metadata(&self) -> AppMetadata {
+        self.0.borrow().app_metadata.clone()
+    }
+
    /// Returns a handle to the [`BackgroundExecutor`] associated with this app, which can be used to spawn futures in the background.
    pub fn background_executor(&self) -> BackgroundExecutor {
        self.0.borrow().background_executor.clone()
@@ -202,6 +208,7 @@ type NewViewListener = Box<dyn FnMut(AnyView, &mut WindowContext) + 'static>;
 pub struct AppContext {
    pub(crate) this: Weak<AppCell>,
    pub(crate) platform: Rc<dyn Platform>,
+    app_metadata: AppMetadata,
    text_system: Arc<TextSystem>,
    flushing_effects: bool,
    pending_updates: usize,
@@ -254,10 +261,17 @@ impl AppContext {
        let text_system = Arc::new(TextSystem::new(platform.text_system()));
        let entities = EntityMap::new();

+        let app_metadata = AppMetadata {
+            os_name: platform.os_name(),
+            os_version: platform.os_version().ok(),
+            app_version: platform.app_version().ok(),
+        };
+
        let app = Rc::new_cyclic(|this| AppCell {
            app: RefCell::new(AppContext {
                this: this.clone(),
                platform: platform.clone(),
+                app_metadata,
                text_system,
                actions: Rc::new(ActionRegistry::default()),
                flushing_effects: false,
@@ -332,6 +346,11 @@ impl AppContext {
        self.platform.quit();
    }

+    /// Get metadata about the app and platform.
+    pub fn app_metadata(&self) -> AppMetadata {
+        self.app_metadata.clone()
+    }
+
    /// Schedules all windows in the application to be redrawn. This can be called
    /// multiple times in an update cycle and still result in a single redraw.
    pub fn refresh(&mut self) {
@@ -471,26 +490,26 @@ impl AppContext {
        &mut self,
        options: crate::WindowOptions,
        build_root_view: impl FnOnce(&mut WindowContext) -> View<V>,
-    ) -> anyhow::Result<WindowHandle<V>> {
+    ) -> WindowHandle<V> {
        self.update(|cx| {
            let id = cx.windows.insert(None);
            let handle = WindowHandle::new(id);
-            match Window::new(handle.into(), options, cx) {
-                Ok(mut window) => {
-                    let root_view = build_root_view(&mut WindowContext::new(cx, &mut window));
-                    window.root_view.replace(root_view.into());
-                    cx.window_handles.insert(id, window.handle);
-                    cx.windows.get_mut(id).unwrap().replace(window);
-                    Ok(handle)
-                }
-                Err(e) => {
-                    cx.windows.remove(id);
-                    return Err(e);
-                }
-            }
+            let mut window = Window::new(handle.into(), options, cx);
+            let root_view = build_root_view(&mut WindowContext::new(cx, &mut window));
+            window.root_view.replace(root_view.into());
+            cx.window_handles.insert(id, window.handle);
+            cx.windows.get_mut(id).unwrap().replace(window);
+            handle
        })
    }

+    /// Returns Ok() if the platform supports opening windows.
+    /// This returns false (for example) on linux when we could
+    /// not establish a connection to X or Wayland.
+    pub fn can_open_windows(&self) -> anyhow::Result<()> {
+        self.platform.can_open_windows()
+    }
+
    /// Instructs the platform to activate the application by bringing it to the foreground.
    pub fn activate(&self, ignoring_other_apps: bool) {
        self.platform.activate(ignoring_other_apps);
@@ -597,12 +616,6 @@ impl AppContext {
        self.platform.app_path()
    }

-    /// On Linux, returns the name of the compositor in use.
-    /// Is blank on other platforms.
-    pub fn compositor_name(&self) -> &'static str {
-        self.platform.compositor_name()
-    }
-
    /// Returns the file URL of the executable with the specified name in the application bundle
    pub fn path_for_auxiliary_executable(&self, name: &str) -> Result<PathBuf> {
        self.platform.path_for_auxiliary_executable(name)
@@ -722,7 +735,11 @@ impl AppContext {
                    })
                    .collect::<Vec<_>>()
                {
-                    self.update_window(window, |_, cx| cx.draw()).unwrap();
+                    self.update_window(window, |_, cx| {
+                        println!("flush_effects. cx.draw()");
+                        cx.draw()
+                    })
+                    .unwrap();
                }

                if self.pending_effects.is_empty() {
--- a/crates/gpui/src/app/async_context.rs
+++ b/crates/gpui/src/app/async_context.rs
@@ -151,7 +151,7 @@ impl AsyncAppContext {
            .upgrade()
            .ok_or_else(|| anyhow!("app was released"))?;
        let mut lock = app.borrow_mut();
-        lock.open_window(options, build_root_view)
+        Ok(lock.open_window(options, build_root_view))
    }

    /// Schedule a future to be polled in the background.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thorsten Ball	804b00c12a	WIP: Try to drop outdated key press events	2024-06-07 15:58:46 +02:00
Thorsten Ball	f724b2c171	DEBUG	2024-06-06 10:46:18 +02: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-list-tree"><path d="M21 12h-8"/><path d="M21 6H8"/><path d="M21 18h-8"/><path d="M3 6v4c0 1.1.9 2 2 2h3"/><path d="M3 10v6c0 1.1.9 2 2 2h3"/></svg>`