break example

Revert "boop"
This reverts commit 28bdc3ad66.
2024-06-17 15:31:12 -06:00 · 2024-06-17 15:30:37 -06:00 · 2024-06-17 15:30:19 -06:00 · 2024-06-17 11:47:24 -06:00 · 2024-06-17 16:58:59 +02:00 · 2024-06-17 10:51:29 -04:00
320 changed files with 17624 additions and 7013 deletions
--- a/.cargo/ci-config.toml
+++ b/.cargo/ci-config.toml
@@ -1,15 +0,0 @@
-# This config is different from config.toml in this directory, as the latter is recognized by Cargo.
-# This file is placed in $HOME/.cargo/config.toml on CI runs. Cargo then merges Zeds .cargo/config.toml with $HOME/.cargo/config.toml
-# with preference for settings from Zeds config.toml.
-# TL;DR: If a value is set in both ci-config.toml and config.toml, config.toml value takes precedence.
-# Arrays are merged together though. See: https://doc.rust-lang.org/cargo/reference/config.html#hierarchical-structure
-# The intent for this file is to configure CI build process with a divergance from Zed developers experience; for example, in this config file
-# we use `-D warnings` for rustflags (which makes compilation fail in presence of warnings during build process). Placing that in developers `config.toml`
-# would be incovenient.
-# We *could* override things like RUSTFLAGS manually by setting them as environment variables, but that is less DRY; worse yet, if you forget to set proper environment variables
-# in one spot, that's going to trigger a rebuild of all of the artifacts. Using ci-config.toml we can define these overrides for CI in one spot and not worry about it.
-[build]
-rustflags = ["-D", "warnings"]
-
-[alias]
-xtask = "run --package xtask --"
--- a/.cargo/collab-config.toml
+++ b/.cargo/collab-config.toml
@@ -0,0 +1,5 @@
+# This file is used to build collab in a Docker image.
+# In particular, we don't use clang.
+[build]
+# v0 mangling scheme provides more detailed backtraces around closures
+rustflags = ["-C", "symbol-mangling-version=v0", "--cfg", "tokio_unstable"]
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -4,3 +4,11 @@ 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
@@ -38,9 +38,6 @@ jobs:
      - name: Remove untracked files
        run: git clean -df

-      - name: Set up default .cargo/config.toml
-        run: cp ./.cargo/ci-config.toml ~/.cargo/config.toml
-
      - name: Check spelling
        run: |
          if ! which typos > /dev/null; then
@@ -74,8 +71,8 @@ jobs:
          version: v1.29.0
      - uses: bufbuild/buf-breaking-action@v1
        with:
-          input: "crates/rpc/proto/"
-          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/rpc/proto/"
+          input: "crates/proto/proto/"
+          against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"

  macos_tests:
    timeout-minutes: 60
@@ -101,7 +98,6 @@ 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
@@ -120,6 +116,9 @@ jobs:
      - name: cargo clippy
        run: cargo xtask clippy

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

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

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

@@ -328,3 +324,86 @@ 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: 8
+          version: 9

      - name: Setup Node
        uses: actions/setup-node@v4
--- a/.github/workflows/deploy_collab.yml
+++ b/.github/workflows/deploy_collab.yml
@@ -75,6 +75,9 @@ jobs:
        with:
          clean: false

+      - name: Set up default .cargo/config.toml
+        run: cp ./.cargo/collab-config.toml ./.cargo/config.toml
+
      - name: Build docker image
        run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA

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

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

-[[package]]
-name = "color"
-version = "0.1.0"
-dependencies = [
- "palette",
-]
-
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -2727,14 +2726,13 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c578f2b9abb4d5f3fbb12aba4008084d435dc6a8425c195cfe0b3594bfea0c25"
+source = "git+https://github.com/pop-os/cosmic-text?rev=542b20c#542b20ca4376a3b5de5fa629db1a4ace44e18e0c"
 dependencies = [
 "bitflags 2.4.2",
 "fontdb",
- "libm",
 "log",
 "rangemap",
+ "rayon",
 "rustc-hash",
 "rustybuzz",
 "self_cell",
@@ -3452,6 +3450,7 @@ version = "0.1.0"
 dependencies = [
 "aho-corasick",
 "anyhow",
+ "assets",
 "client",
 "clock",
 "collections",
@@ -3833,6 +3832,7 @@ dependencies = [
 "fuzzy",
 "gpui",
 "language",
+ "num-format",
 "picker",
 "project",
 "release_channel",
@@ -4048,6 +4048,15 @@ 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"
@@ -4092,9 +4101,12 @@ dependencies = [

 [[package]]
 name = "font-types"
-version = "0.4.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd7f3ea17572640b606b35df42cfb6ecdf003704b062580e59918692190b73d"
+checksum = "34fd7136aca682873d859ef34494ab1a7d3f57ecd485ed40eb6437ee8c85aa29"
+dependencies = [
+ "bytemuck",
+]

 [[package]]
 name = "fontconfig-parser"
@@ -4107,9 +4119,9 @@ dependencies = [

 [[package]]
 name = "fontdb"
-version = "0.16.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
+checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770"
 dependencies = [
 "fontconfig-parser",
 "log",
@@ -4228,7 +4240,7 @@ dependencies = [
 "text",
 "time",
 "util",
- "windows 0.56.0",
+ "windows 0.57.0",
 ]

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

 [[package]]
@@ -4771,8 +4783,8 @@ dependencies = [
 "wayland-cursor",
 "wayland-protocols",
 "wayland-protocols-plasma",
- "windows 0.56.0",
- "windows-core 0.56.0",
+ "windows 0.57.0",
+ "windows-core 0.57.0",
 "x11rb",
 "xim",
 "xkbcommon",
@@ -6079,25 +6091,26 @@ dependencies = [
 "log",
 "lsp-types",
 "parking_lot",
+ "pct-str",
 "postage",
 "release_channel",
 "serde",
 "serde_json",
 "smol",
 "util",
- "windows 0.56.0",
+ "windows 0.57.0",
 ]

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

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

 [[package]]
@@ -6735,6 +6748,16 @@ 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"
@@ -6909,6 +6932,19 @@ 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"
@@ -7108,7 +7144,6 @@ dependencies = [
 "project",
 "rope",
 "serde_json",
- "settings",
 "smol",
 "theme",
 "tree-sitter-rust",
@@ -7118,6 +7153,30 @@ dependencies = [
 "workspace",
 ]

+[[package]]
+name = "outline_panel"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "db",
+ "editor",
+ "file_icons",
+ "gpui",
+ "itertools 0.11.0",
+ "language",
+ "log",
+ "menu",
+ "project",
+ "schemars",
+ "serde",
+ "serde_json",
+ "settings",
+ "util",
+ "workspace",
+ "worktree",
+]
+
 [[package]]
 name = "outref"
 version = "0.5.1"
@@ -7276,6 +7335,16 @@ 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"
@@ -7794,6 +7863,7 @@ dependencies = [
 "tempfile",
 "terminal",
 "text",
+ "unicase",
 "unindent",
 "util",
 "which 6.0.0",
@@ -7824,7 +7894,6 @@ dependencies = [
 "settings",
 "theme",
 "ui",
- "unicase",
 "util",
 "workspace",
 "worktree",
@@ -7920,6 +7989,17 @@ dependencies = [
 "prost",
 ]

+[[package]]
+name = "proto"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "prost",
+ "prost-build",
+ "serde",
+]
+
 [[package]]
 name = "protobuf"
 version = "2.28.0"
@@ -8135,10 +8215,11 @@ dependencies = [

 [[package]]
 name = "read-fonts"
-version = "0.15.3"
+version = "0.19.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1362980db95801b70031dd592dc052a44b1810ca9da8fbcf7b25983f3174ed0"
+checksum = "e8b8af39d1f23869711ad4cea5e7835a20daa987f80232f7f2a2374d648ca64d"
 dependencies = [
+ "bytemuck",
 "font-types",
 ]

@@ -8503,8 +8584,7 @@ dependencies = [
 "futures 0.3.28",
 "gpui",
 "parking_lot",
- "prost",
- "prost-build",
+ "proto",
 "rand 0.8.5",
 "rsa 0.4.0",
 "serde",
@@ -8629,6 +8709,30 @@ 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"
@@ -8720,9 +8824,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"

 [[package]]
 name = "rustybuzz"
-version = "0.12.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c"
+checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
 "bitflags 2.4.2",
 "bytemuck",
@@ -9383,6 +9487,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"

+[[package]]
+name = "skrifa"
+version = "0.19.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -10091,11 +10205,11 @@ dependencies = [

 [[package]]
 name = "swash"
-version = "0.1.12"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7"
+checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6"
 dependencies = [
- "read-fonts",
+ "skrifa",
 "yazi",
 "zeno",
 ]
@@ -10338,7 +10452,7 @@ dependencies = [
 "theme",
 "thiserror",
 "util",
- "windows 0.56.0",
+ "windows 0.57.0",
 ]

 [[package]]
@@ -10407,12 +10521,12 @@ version = "0.1.0"
 dependencies = [
 "anyhow",
 "collections",
- "color",
 "derive_more",
 "fs",
 "futures 0.3.28",
 "gpui",
 "indexmap 1.9.3",
+ "log",
 "palette",
 "parking_lot",
 "refineable",
@@ -11188,9 +11302,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"

 [[package]]
 name = "ttf-parser"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"

 [[package]]
 name = "tungstenite"
@@ -11267,7 +11381,7 @@ dependencies = [
 "story",
 "strum",
 "theme",
- "windows 0.56.0",
+ "windows 0.57.0",
 ]

 [[package]]
@@ -11298,15 +11412,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"

 [[package]]
 name = "unicode-bidi-mirroring"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694"
+checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86"

 [[package]]
 name = "unicode-ccc"
-version = "0.1.2"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1"
+checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656"

 [[package]]
 name = "unicode-ident"
@@ -11423,6 +11537,12 @@ 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"
@@ -12405,11 +12525,11 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "windows-interface"
-version = "0.56.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -12898,7 +13018,6 @@ dependencies = [
 "gpui",
 "http 0.1.0",
 "ignore",
- "itertools 0.11.0",
 "language",
 "log",
 "parking_lot",
@@ -13149,10 +13268,11 @@ dependencies = [

 [[package]]
 name = "zed"
-version = "0.140.0"
+version = "0.141.0"
 dependencies = [
 "activity_indicator",
 "anyhow",
+ "ashpd",
 "assets",
 "assistant",
 "audio",
@@ -13205,6 +13325,7 @@ dependencies = [
 "node_runtime",
 "notifications",
 "outline",
+ "outline_panel",
 "parking_lot",
 "profiling",
 "project",
@@ -13228,7 +13349,9 @@ dependencies = [
 "terminal_view",
 "theme",
 "theme_selector",
+ "tree-sitter-markdown",
 "tree-sitter-rust",
+ "ui",
 "urlencoding",
 "util",
 "uuid",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,13 +61,16 @@ 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",
@@ -77,6 +80,7 @@ members = [
    "crates/rich_text",
    "crates/rope",
    "crates/rpc",
+    "crates/rustdoc",
    "crates/task",
    "crates/tasks_ui",
    "crates/search",
@@ -163,7 +167,6 @@ 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" }
@@ -207,13 +210,16 @@ 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" }
@@ -224,6 +230,7 @@ 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" }
@@ -267,14 +274,15 @@ async-tar = "0.4.2"
 async-trait = "0.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
 bitflags = "2.4.2"
-blade-graphics = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
-blade-macros = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
-blade-util = { git = "https://github.com/kvark/blade", rev = "bdaf8c534fbbc9fbca71d1cf272f45640b3a068d" }
+blade-graphics = { git = "https://github.com/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"  }
 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" }
@@ -293,6 +301,7 @@ 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 = [
@@ -307,6 +316,7 @@ 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"] }
@@ -338,6 +348,7 @@ 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"] }
@@ -399,12 +410,13 @@ wit-component = "0.201"
 sys-locale = "0.3.1"

 [workspace.dependencies.windows]
-version = "0.56.0"
+version = "0.57"
 features = [
    "implement",
    "Foundation_Numerics",
    "System",
    "System_Threading",
+    "UI_ViewManagement",
    "Wdk_System_SystemServices",
    "Win32_Globalization",
    "Win32_Graphics_Direct2D",
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.2

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

--- a/assets/icons/context.svg
+++ b/assets/icons/context.svg
@@ -0,0 +1,6 @@
+<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
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-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
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-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
@@ -0,0 +1,3 @@
+<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,10 +51,11 @@
      // "alt-h": "editor::DeleteToPreviousWordStart",
      // "alt-d": "editor::DeleteToNextWordEnd",
      "ctrl-x": "editor::Cut",
-      "ctrl-c": "editor::Copy",
      "ctrl-insert": "editor::Copy",
-      "ctrl-v": "editor::Paste",
+      "ctrl-c": "editor::Copy",
      "shift-insert": "editor::Paste",
+      "ctrl-v": "editor::Paste",
+      "ctrl-y": "editor::Redo",
      "ctrl-z": "editor::Undo",
      "ctrl-shift-z": "editor::Redo",
      "up": "editor::MoveUp",
@@ -419,7 +420,7 @@
      "alt-8": ["workspace::ActivatePane", 7],
      "alt-9": ["workspace::ActivatePane", 8],
      "ctrl-alt-b": "workspace::ToggleLeftDock",
-      "ctrl-b": "workspace::ToggleRightDock",
+      "ctrl-b": "workspace::ToggleLeftDock",
      "ctrl-j": "workspace::ToggleBottomDock",
      "ctrl-alt-y": "workspace::CloseAllDocks",
      "ctrl-shift-f": "pane::DeploySearch",
@@ -439,6 +440,7 @@
      "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",
@@ -562,6 +564,19 @@
      "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": {
@@ -583,7 +598,10 @@
      "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"
+      "alt-shift-f": "project_panel::NewSearchInDirectory",
+      "shift-down": "menu::SelectNext",
+      "shift-up": "menu::SelectPrev",
+      "escape": "menu::Cancel"
    }
  },
  {
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -475,6 +475,7 @@
      "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",
@@ -584,6 +585,19 @@
      "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
@@ -39,6 +39,7 @@
      "right": "vim::Right",
      "space": "vim::Space",
      "$": "vim::EndOfLine",
+      "end": "vim::EndOfLine",
      "^": "vim::FirstNonWhitespace",
      "_": "vim::StartOfLineDownward",
      "g _": "vim::EndOfLineDownward",
@@ -80,6 +81,7 @@
      "g shift-e": ["vim::PreviousWordEnd", { "ignorePunctuation": true }],

      "/": "vim::Search",
+      "g /": "pane::DeploySearch",
      "?": [
        "vim::Search",
        {
@@ -139,7 +141,8 @@
      "ctrl-q": "vim::ToggleVisualBlock",
      "shift-k": "editor::Hover",
      "shift-r": "vim::ToggleReplace",
-      "0": "vim::StartOfLine", // When no number operator present, use start of line motion
+      "0": "vim::StartOfLine",
+      "home": "vim::StartOfLine",
      "ctrl-f": "vim::PageDown",
      "pagedown": "vim::PageDown",
      "ctrl-b": "vim::PageUp",
@@ -245,9 +248,10 @@
          "displayLines": true
        }
      ],
+      "g v": "vim::RestoreVisualSelection",
      "g ]": "editor::GoToDiagnostic",
      "g [": "editor::GoToPrevDiagnostic",
-      "g i": ["workspace::SendKeystrokes", "` ^ i"],
+      "g i": "vim::InsertAtPrevious",
      "g ,": "vim::ChangeListNewer",
      "g ;": "vim::ChangeListOlder",
      "shift-h": "vim::WindowTop",
@@ -381,6 +385,10 @@
      "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
@@ -395,13 +403,14 @@
  {
    "context": "Editor && vim_mode == visual && vim_operator == none && !VimWaiting",
    "bindings": {
+      "\"": ["vim::PushOperator", "Register"],
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
      "] x": "editor::SelectSmallerSyntaxNode"
    }
  },
  {
-    "context": "Editor && VimCount",
+    "context": "Editor && VimCount && vim_mode != insert",
    "bindings": {
      "0": ["vim::Number", 0]
    }
@@ -430,6 +439,27 @@
      "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": {
@@ -606,8 +636,7 @@
      "ctrl-u": "editor::DeleteToBeginningOfLine",
      "ctrl-t": "vim::Indent",
      "ctrl-d": "vim::Outdent",
-      "ctrl-r \"": "editor::Paste",
-      "ctrl-r +": "editor::Paste"
+      "ctrl-r": ["vim::PushOperator", "Register"]
    }
  },
  {
--- 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 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.
+  // 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.
  "show_wrap_guides": true,
  // Character counts at which to show wrap guides in the editor.
  "wrap_guides": [],
@@ -295,6 +295,29 @@
    /// 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,
@@ -354,6 +377,9 @@
  "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
@@ -285,10 +285,10 @@ impl ActivityIndicator {
                    icon: None,
                    message: "Click to restart and update Zed".to_string(),
                    on_click: Some(Arc::new({
-                        let restart = workspace::Restart {
+                        let reload = workspace::Reload {
                            binary_path: Some(binary_path.clone()),
                        };
-                        move |_, cx| workspace::restart(&restart, cx)
+                        move |_, cx| workspace::reload(&reload, cx)
                    })),
                },
                AutoUpdateStatus::Errored => Content {
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -35,18 +35,21 @@ 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
@@ -12,7 +12,7 @@ mod streaming_diff;

 pub use assistant_panel::AssistantPanel;

-use assistant_settings::{AnthropicModel, AssistantSettings, CloudModel, OpenAiModel};
+use assistant_settings::{AnthropicModel, AssistantSettings, CloudModel, OllamaModel, OpenAiModel};
 use assistant_slash_command::SlashCommandRegistry;
 use client::{proto, Client};
 use command_palette_hooks::CommandPaletteFilter;
@@ -21,12 +21,13 @@ pub(crate) use context_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, fetch_command, file_command, project_command, prompt_command,
-    rustdoc_command, search_command, tabs_command,
+    active_command, default_command, diagnostics_command, fetch_command, file_command, now_command,
+    project_command, prompt_command, rustdoc_command, search_command, tabs_command,
 };
 use std::{
    fmt::{self, Display},
@@ -91,6 +92,7 @@ pub enum LanguageModel {
    Cloud(CloudModel),
    OpenAi(OpenAiModel),
    Anthropic(AnthropicModel),
+    Ollama(OllamaModel),
 }

 impl Default for LanguageModel {
@@ -105,6 +107,7 @@ 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()),
        }
    }

@@ -113,6 +116,7 @@ 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(),
        }
    }

@@ -121,6 +125,7 @@ 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(),
        }
    }

@@ -129,6 +134,7 @@ impl LanguageModel {
            LanguageModel::OpenAi(model) => model.id(),
            LanguageModel::Anthropic(model) => model.id(),
            LanguageModel::Cloud(model) => model.id(),
+            LanguageModel::Ollama(model) => model.id(),
        }
    }
 }
@@ -179,6 +185,7 @@ 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);
@@ -280,6 +287,7 @@ 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);
@@ -307,6 +315,8 @@ 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
@@ -18,18 +18,18 @@ use collections::{BTreeSet, HashMap, HashSet};
 use editor::actions::ShowCompletions;
 use editor::{
    actions::{FoldAt, MoveToEndOfLine, Newline, UnfoldAt},
-    display_map::{BlockDisposition, BlockId, BlockProperties, BlockStyle, Flap, ToDisplayPoint},
+    display_map::{BlockDisposition, BlockId, BlockProperties, BlockStyle, Crease, ToDisplayPoint},
    scroll::{Autoscroll, AutoscrollStrategy},
    Anchor, Editor, EditorEvent, RowExt, ToOffset as _, ToPoint,
 };
-use editor::{display_map::FlapId, FoldPlaceholder};
+use editor::{display_map::CreaseId, FoldPlaceholder};
 use file_icons::FileIcons;
 use fs::Fs;
 use futures::future::Shared;
 use futures::{FutureExt, StreamExt};
 use gpui::{
    div, point, rems, Action, AnyElement, AnyView, AppContext, AsyncAppContext, AsyncWindowContext,
-    ClipboardItem, Context as _, Empty, EventEmitter, FocusHandle, FocusableView,
+    ClipboardItem, Context as _, Empty, EventEmitter, FocusHandle, FocusOutEvent, FocusableView,
    InteractiveElement, IntoElement, Model, ModelContext, ParentElement, Pixels, Render,
    SharedString, StatefulInteractiveElement, Styled, Subscription, Task, UpdateGlobal, View,
    ViewContext, VisualContext, WeakView, WindowContext,
@@ -54,8 +54,8 @@ use std::{
 };
 use telemetry_events::AssistantKind;
 use ui::{
-    popover_menu, prelude::*, ButtonLike, ContextMenu, ElevationIndex, KeyBinding, ListItem,
-    ListItemSpacing, PopoverMenuHandle, Tab, TabBar, Tooltip,
+    popover_menu, prelude::*, ButtonLike, ContextMenu, Disclosure, ElevationIndex, KeyBinding,
+    ListItem, ListItemSpacing, PopoverMenuHandle, Tab, TabBar, Tooltip,
 };
 use util::{paths::CONTEXTS_DIR, post_inc, ResultExt, TryFutureExt};
 use uuid::Uuid;
@@ -79,7 +79,6 @@ pub fn init(cx: &mut AppContext) {
                    workspace.toggle_panel_focus::<AssistantPanel>(cx);
                })
                .register_action(AssistantPanel::inline_assist)
-                .register_action(AssistantPanel::cancel_last_inline_assist)
                .register_action(ContextEditor::quote_selection);
        },
    )
@@ -297,7 +296,7 @@ impl AssistantPanel {
        }
    }

-    fn focus_out(&mut self, cx: &mut ViewContext<Self>) {
+    fn focus_out(&mut self, _event: FocusOutEvent, cx: &mut ViewContext<Self>) {
        self.toolbar
            .update(cx, |toolbar, cx| toolbar.focus_changed(false, cx));
        cx.notify();
@@ -421,19 +420,6 @@ impl AssistantPanel {
        }
    }

-    fn cancel_last_inline_assist(
-        _workspace: &mut Workspace,
-        _: &editor::actions::Cancel,
-        cx: &mut ViewContext<Workspace>,
-    ) {
-        let canceled = InlineAssistant::update_global(cx, |assistant, cx| {
-            assistant.cancel_last_inline_assist(cx)
-        });
-        if !canceled {
-            cx.propagate();
-        }
-    }
-
    fn new_context(&mut self, cx: &mut ViewContext<Self>) -> Option<View<ContextEditor>> {
        let workspace = self.workspace.upgrade()?;

@@ -1222,6 +1208,10 @@ impl Context {
        }
    }

+    pub(crate) fn token_count(&self) -> Option<usize> {
+        self.token_count
+    }
+
    pub(crate) fn count_remaining_tokens(&mut self, cx: &mut ModelContext<Self>) {
        let request = self.to_completion_request(cx);
        self.pending_token_count = cx.spawn(|this, mut cx| {
@@ -2168,7 +2158,7 @@ pub struct ContextEditor {
    editor: View<Editor>,
    blocks: HashSet<BlockId>,
    scroll_position: Option<ScrollPosition>,
-    pending_slash_command_flaps: HashMap<Range<language::Anchor>, FlapId>,
+    pending_slash_command_creases: HashMap<Range<language::Anchor>, CreaseId>,
    _subscriptions: Vec<Subscription>,
 }

@@ -2240,7 +2230,7 @@ impl ContextEditor {
            scroll_position: None,
            fs,
            workspace: workspace.downgrade(),
-            pending_slash_command_flaps: HashMap::default(),
+            pending_slash_command_creases: HashMap::default(),
            _subscriptions,
        };
        this.update_message_headers(cx);
@@ -2360,7 +2350,7 @@ impl ContextEditor {
                    editor.insert(&format!("/{name}"), cx);
                    if command.requires_argument() {
                        editor.insert(" ", cx);
-                        editor.show_completions(&ShowCompletions, cx);
+                        editor.show_completions(&ShowCompletions::default(), cx);
                    }
                });
            });
@@ -2503,14 +2493,14 @@ impl ContextEditor {
                    let buffer = editor.buffer().read(cx).snapshot(cx);
                    let excerpt_id = *buffer.as_singleton().unwrap().0;

-                    editor.remove_flaps(
+                    editor.remove_creases(
                        removed
                            .iter()
-                            .filter_map(|range| self.pending_slash_command_flaps.remove(range)),
+                            .filter_map(|range| self.pending_slash_command_creases.remove(range)),
                        cx,
                    );

-                    let flap_ids = editor.insert_flaps(
+                    let crease_ids = editor.insert_creases(
                        updated.iter().map(|command| {
                            let workspace = self.workspace.clone();
                            let confirm_command = Arc::new({
@@ -2556,16 +2546,16 @@ impl ContextEditor {
                            let end = buffer
                                .anchor_in_excerpt(excerpt_id, command.source_range.end)
                                .unwrap();
-                            Flap::new(start..end, placeholder, render_toggle, render_trailer)
+                            Crease::new(start..end, placeholder, render_toggle, render_trailer)
                        }),
                        cx,
                    );

-                    self.pending_slash_command_flaps.extend(
+                    self.pending_slash_command_creases.extend(
                        updated
                            .iter()
                            .map(|command| command.source_range.clone())
-                            .zip(flap_ids),
+                            .zip(crease_ids),
                    );
                })
            }
@@ -2608,7 +2598,7 @@ impl ContextEditor {
            let buffer = editor.buffer().read(cx).snapshot(cx);
            let excerpt_id = *buffer.as_singleton().unwrap().0;
            let mut buffer_rows_to_fold = BTreeSet::new();
-            let mut flaps = Vec::new();
+            let mut creases = Vec::new();
            for section in sections {
                let start = buffer
                    .anchor_in_excerpt(excerpt_id, section.range.start)
@@ -2618,7 +2608,7 @@ impl ContextEditor {
                    .unwrap();
                let buffer_row = MultiBufferRow(start.to_point(&buffer).row);
                buffer_rows_to_fold.insert(buffer_row);
-                flaps.push(Flap::new(
+                creases.push(Crease::new(
                    start..end,
                    FoldPlaceholder {
                        render: Arc::new({
@@ -2648,7 +2638,7 @@ impl ContextEditor {
                ));
            }

-            editor.insert_flaps(flaps, cx);
+            editor.insert_creases(creases, cx);

            for buffer_row in buffer_rows_to_fold.into_iter().rev() {
                editor.fold_at(&FoldAt { buffer_row }, cx);
@@ -3142,17 +3132,10 @@ fn render_slash_command_output_toggle(
    fold: ToggleFold,
    _cx: &mut WindowContext,
 ) -> AnyElement {
-    IconButton::new(
-        ("slash-command-output-fold-indicator", row.0),
-        ui::IconName::ChevronDown,
-    )
-    .on_click(move |_e, cx| fold(!is_folded, cx))
-    .icon_color(ui::Color::Muted)
-    .icon_size(ui::IconSize::Small)
-    .selected(is_folded)
-    .selected_icon(ui::IconName::ChevronRight)
-    .size(ui::ButtonSize::None)
-    .into_any_element()
+    Disclosure::new(("slash-command-output-fold-indicator", row.0), !is_folded)
+        .selected(is_folded)
+        .on_click(move |_e, cx| fold(!is_folded, cx))
+        .into_any_element()
 }

 fn render_pending_slash_command_gutter_decoration(
--- a/crates/assistant/src/assistant_settings.rs
+++ b/crates/assistant/src/assistant_settings.rs
@@ -2,6 +2,7 @@ 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},
@@ -168,6 +169,11 @@ 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 {
@@ -197,6 +203,12 @@ 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)]
@@ -328,6 +340,13 @@ 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,
+                            })
+                        }
                    },
                },
            },
@@ -472,6 +491,27 @@ 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,
@@ -519,6 +559,15 @@ 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,12 +2,14 @@ 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::{
@@ -50,6 +52,18 @@ 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);

@@ -87,6 +101,24 @@ 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);
                }
@@ -130,6 +162,23 @@ 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,
+                    ));
+                }
            }
        })
    })
@@ -142,6 +191,7 @@ pub enum CompletionProvider {
    Cloud(CloudCompletionProvider),
    #[cfg(test)]
    Fake(FakeCompletionProvider),
+    Ollama(OllamaCompletionProvider),
 }

 impl gpui::Global for CompletionProvider {}
@@ -165,6 +215,10 @@ 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!(),
        }
@@ -175,6 +229,7 @@ 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!(),
        }
@@ -185,6 +240,7 @@ 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,
        }
@@ -195,6 +251,7 @@ 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(())),
        }
@@ -205,6 +262,7 @@ 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!(),
        }
@@ -215,6 +273,7 @@ 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(())),
        }
@@ -225,6 +284,7 @@ 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(),
        }
@@ -239,6 +299,7 @@ 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))),
        }
@@ -252,6 +313,7 @@ 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::Ai).size(IconSize::XSmall))
+                    .child(Icon::new(IconName::ZedAssistant).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
@@ -0,0 +1,348 @@
+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::Ai).size(IconSize::XSmall))
+                    .child(Icon::new(IconName::ZedAssistant).size(IconSize::XSmall))
                    .child(
                        Label::new("in the status bar to close this panel.").size(LabelSize::Small),
                    ),
--- 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,10 +13,9 @@ use futures::{
 };
 use fuzzy::StringMatchCandidate;
 use gpui::{
-    actions, percentage, point, size, Animation, AnimationExt, AnyElement, AppContext,
-    BackgroundExecutor, Bounds, DevicePixels, EventEmitter, Global, PromptLevel, ReadGlobal,
-    Subscription, Task, TitlebarOptions, Transformation, UpdateGlobal, View, WindowBounds,
-    WindowHandle, WindowOptions,
+    actions, percentage, point, size, Animation, AnimationExt, AppContext, BackgroundExecutor,
+    Bounds, 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};
@@ -26,6 +25,7 @@ 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, ListHeader, ListItem, ListItemSpacing, ListSubHeader,
-    ParentElement, Render, SharedString, Styled, TitleBar, Tooltip, ViewContext, VisualContext,
+    div, prelude::*, IconButtonShape, ListItem, ListItemSpacing, ParentElement, Render,
+    SharedString, Styled, TitleBar, Tooltip, ViewContext, VisualContext,
 };
 use util::{paths::PROMPTS_DIR, ResultExt, TryFutureExt};
 use uuid::Uuid;
@@ -80,11 +80,7 @@ pub fn open_prompt_library(
        cx.spawn(|cx| async move {
            let store = store.await?;
            cx.update(|cx| {
-                let bounds = Bounds::centered(
-                    None,
-                    size(DevicePixels::from(1024), DevicePixels::from(768)),
-                    cx,
-                );
+                let bounds = Bounds::centered(None, size(px(1024.0), px(768.0)), cx);
                cx.open_window(
                    WindowOptions {
                        titlebar: Some(TitlebarOptions {
@@ -97,7 +93,7 @@ pub fn open_prompt_library(
                    },
                    |cx| cx.new_view(|cx| PromptLibrary::new(store, language_registry, cx)),
                )
-            })
+            })?
        })
    }
 }
@@ -124,41 +120,23 @@ struct PromptEditor {
 struct PromptPickerDelegate {
    store: Arc<PromptStore>,
    selected_index: usize,
-    entries: Vec<PromptPickerEntry>,
+    matches: Vec<PromptMetadata>,
 }

 enum PromptPickerEvent {
-    Selected { prompt_id: Option<PromptId> },
+    Selected { prompt_id: 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 = AnyElement;
+    type ListItem = ListItem;

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

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

    fn set_selected_index(&mut self, ix: usize, cx: &mut ViewContext<Picker<Self>>) {
        self.selected_index = ix;
-        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 });
+        if let Some(prompt) = self.matches.get(self.selected_index) {
+            cx.emit(PromptPickerEvent::Selected {
+                prompt_id: prompt.id,
+            });
+        }
    }

    fn placeholder_text(&self, _cx: &mut WindowContext) -> Arc<str> {
@@ -183,48 +158,24 @@ 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
-            .entries
-            .get(self.selected_index)
-            .and_then(|mat| mat.prompt_id());
+        let prev_prompt_id = self.matches.get(self.selected_index).map(|mat| mat.id);
        cx.spawn(|this, mut cx| async move {
-            let (entries, selected_index) = cx
+            let (matches, selected_index) = cx
                .background_executor()
                .spawn(async move {
-                    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 matches = search.await;

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

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

    fn confirm(&mut self, _secondary: bool, cx: &mut ViewContext<Picker<Self>>) {
-        if let Some(PromptPickerEntry::Prompt(prompt)) = self.entries.get(self.selected_index) {
+        if let Some(prompt) = self.matches.get(self.selected_index) {
            cx.emit(PromptPickerEvent::Confirmed {
                prompt_id: prompt.id,
            });
@@ -248,82 +199,59 @@ impl PickerDelegate for PromptPickerDelegate {
        selected: bool,
        cx: &mut ViewContext<Picker<Self>>,
    ) -> Option<Self::ListItem> {
-        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 })
-                                    })),
-                            ),
+        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 })
+                            })),
                    )
-                    .into_any_element()
-            }
-        };
+                    .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 })
+                            })),
+                    ),
+            );
        Some(element)
    }

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

        let picker = cx.new_view(|cx| {
-            let picker = Picker::list(delegate, cx).modal(false).max_height(None);
+            let picker = Picker::uniform_list(delegate, cx)
+                .modal(false)
+                .max_height(None);
            picker.focus(cx);
            picker
        });
@@ -376,11 +306,7 @@ impl PromptLibrary {
    ) {
        match event {
            PromptPickerEvent::Selected { prompt_id } => {
-                if let Some(prompt_id) = *prompt_id {
-                    self.load_prompt(prompt_id, false, cx);
-                } else {
-                    self.focus_picker(&Default::default(), cx);
-                }
+                self.load_prompt(*prompt_id, false, cx);
            }
            PromptPickerEvent::Confirmed { prompt_id } => {
                self.load_prompt(*prompt_id, true, cx);
@@ -524,6 +450,7 @@ 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),
@@ -567,21 +494,23 @@ impl PromptLibrary {
            if let Some(prompt_id) = prompt_id {
                if picker
                    .delegate
-                    .entries
+                    .matches
                    .get(picker.delegate.selected_index())
                    .map_or(true, |old_selected_prompt| {
-                        old_selected_prompt.prompt_id() != Some(prompt_id)
+                        old_selected_prompt.id != prompt_id
                    })
                {
                    if let Some(ix) = picker
                        .delegate
-                        .entries
+                        .matches
                        .iter()
-                        .position(|mat| mat.prompt_id() == Some(prompt_id))
+                        .position(|mat| mat.id == prompt_id)
                    {
                        picker.set_selected_index(ix, true, cx);
                    }
                }
+            } else {
+                picker.focus(cx);
            }
        });
        cx.notify();
@@ -660,19 +589,6 @@ 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,
@@ -811,7 +727,6 @@ 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))
@@ -1105,7 +1020,7 @@ impl PromptStore {
        let cached_metadata = self.metadata_cache.read().metadata.clone();
        let executor = self.executor.clone();
        self.executor.spawn(async move {
-            if query.is_empty() {
+            let mut matches = if query.is_empty() {
                cached_metadata
            } else {
                let candidates = cached_metadata
@@ -1131,7 +1046,9 @@ 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
@@ -18,8 +18,10 @@ 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;
@@ -216,6 +218,7 @@ 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/active_command.rs
+++ b/crates/assistant/src/slash_command/active_command.rs
@@ -1,10 +1,13 @@
-use super::{file_command::FilePlaceholder, SlashCommand, SlashCommandOutput};
+use super::{
+    file_command::{codeblock_fence_for_path, EntryPlaceholder},
+    SlashCommand, SlashCommandOutput,
+};
 use anyhow::{anyhow, Result};
 use assistant_slash_command::SlashCommandOutputSection;
 use editor::Editor;
 use gpui::{AppContext, Task, WeakView};
 use language::LspAdapterDelegate;
-use std::{borrow::Cow, sync::Arc};
+use std::sync::Arc;
 use ui::{IntoElement, WindowContext};
 use workspace::Workspace;

@@ -60,14 +63,8 @@ impl SlashCommand for ActiveSlashCommand {
            let text = cx.background_executor().spawn({
                let path = path.clone();
                async move {
-                    let path = path
-                        .as_ref()
-                        .map(|path| path.to_string_lossy())
-                        .unwrap_or_else(|| Cow::Borrowed("untitled"));
-
-                    let mut output = String::with_capacity(path.len() + snapshot.len() + 9);
-                    output.push_str("```");
-                    output.push_str(&path);
+                    let mut output = String::new();
+                    output.push_str(&codeblock_fence_for_path(path.as_deref(), None));
                    output.push('\n');
                    for chunk in snapshot.as_rope().chunks() {
                        output.push_str(chunk);
@@ -87,9 +84,10 @@ impl SlashCommand for ActiveSlashCommand {
                    sections: vec![SlashCommandOutputSection {
                        range,
                        render_placeholder: Arc::new(move |id, unfold, _| {
-                            FilePlaceholder {
+                            EntryPlaceholder {
                                id,
                                path: path.clone(),
+                                is_directory: false,
                                line_range: None,
                                unfold,
                            }
--- a/crates/assistant/src/slash_command/default_command.rs
+++ b/crates/assistant/src/slash_command/default_command.rs
@@ -53,7 +53,7 @@ impl SlashCommand for DefaultSlashCommand {
            let prompts = store.default_prompt_metadata();

            let mut text = String::new();
-            writeln!(text, "Default Prompt:").unwrap();
+            text.push('\n');
            for prompt in prompts {
                if let Some(title) = prompt.title {
                    writeln!(text, "/prompt {}", title).unwrap();
@@ -61,6 +61,10 @@ impl SlashCommand for DefaultSlashCommand {
            }
            text.pop();

+            if text.is_empty() {
+                text.push('\n');
+            }
+
            Ok(SlashCommandOutput {
                sections: vec![SlashCommandOutputSection {
                    range: 0..text.len(),
--- a/crates/assistant/src/slash_command/diagnostics_command.rs
+++ b/crates/assistant/src/slash_command/diagnostics_command.rs
@@ -0,0 +1,444 @@
+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,3 +1,5 @@
+use std::cell::RefCell;
+use std::rc::Rc;
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;

@@ -5,12 +7,19 @@ use anyhow::{anyhow, bail, Context, Result};
 use assistant_slash_command::{SlashCommand, SlashCommandOutput, SlashCommandOutputSection};
 use futures::AsyncReadExt;
 use gpui::{AppContext, Task, WeakView};
-use html_to_markdown::convert_html_to_markdown;
+use html_to_markdown::{convert_html_to_markdown, markdown, TagHandler};
 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 {
@@ -37,7 +46,52 @@ impl FetchSlashCommand {
            );
        }

-        convert_html_to_markdown(&body[..])
+        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)?
+                ))
+            }
+        }
    }
 }

--- a/crates/assistant/src/slash_command/file_command.rs
+++ b/crates/assistant/src/slash_command/file_command.rs
@@ -1,16 +1,19 @@
 use super::{SlashCommand, SlashCommandOutput};
 use anyhow::{anyhow, Result};
 use assistant_slash_command::SlashCommandOutputSection;
+use fs::Fs;
 use fuzzy::PathMatch;
-use gpui::{AppContext, RenderOnce, SharedString, Task, View, WeakView};
+use gpui::{AppContext, Model, RenderOnce, SharedString, Task, View, WeakView};
 use language::{LineEnding, LspAdapterDelegate};
-use project::PathMatchCandidateSet;
+use project::{PathMatchCandidateSet, Worktree};
 use std::{
+    fmt::Write,
    ops::Range,
    path::{Path, PathBuf},
    sync::{atomic::AtomicBool, Arc},
 };
 use ui::{prelude::*, ButtonLike, ElevationIndex};
+use util::{paths::PathMatcher, ResultExt};
 use workspace::Workspace;

 pub(crate) struct FileSlashCommand;
@@ -58,7 +61,7 @@ impl FileSlashCommand {
                            .root_entry()
                            .map_or(false, |entry| entry.is_ignored),
                        include_root_name: true,
-                        directories_only: false,
+                        candidates: project::Candidates::Entries,
                    }
                })
                .collect::<Vec<_>>();
@@ -139,69 +142,223 @@ impl SlashCommand for FileSlashCommand {
            return Task::ready(Err(anyhow!("missing path")));
        };

-        let path = PathBuf::from(argument);
-        let abs_path = workspace
-            .read(cx)
-            .visible_worktrees(cx)
-            .find_map(|worktree| {
-                let worktree = worktree.read(cx);
-                let worktree_root_path = Path::new(worktree.root_name());
-                let relative_path = path.strip_prefix(worktree_root_path).ok()?;
-                worktree.absolutize(&relative_path).ok()
-            });
-
-        let Some(abs_path) = abs_path else {
-            return Task::ready(Err(anyhow!("missing path")));
-        };
-
        let fs = workspace.read(cx).app_state().fs.clone();
-        let argument = argument.to_string();
-        let text = cx.background_executor().spawn(async move {
-            let mut content = fs.load(&abs_path).await?;
-            LineEnding::normalize(&mut content);
-            let mut output = String::with_capacity(argument.len() + content.len() + 9);
-            output.push_str("```");
-            output.push_str(&argument);
-            output.push('\n');
-            output.push_str(&content);
-            if !output.ends_with('\n') {
-                output.push('\n');
-            }
-            output.push_str("```");
-            anyhow::Ok(output)
-        });
+        let task = collect_files(
+            workspace.read(cx).visible_worktrees(cx).collect(),
+            argument,
+            fs,
+            cx,
+        );
+
        cx.foreground_executor().spawn(async move {
-            let text = text.await?;
-            let range = 0..text.len();
+            let (text, ranges) = task.await?;
            Ok(SlashCommandOutput {
                text,
-                sections: vec![SlashCommandOutputSection {
-                    range,
-                    render_placeholder: Arc::new(move |id, unfold, _cx| {
-                        FilePlaceholder {
-                            path: Some(path.clone()),
-                            line_range: None,
-                            id,
-                            unfold,
-                        }
-                        .into_any_element()
-                    }),
-                }],
+                sections: ranges
+                    .into_iter()
+                    .map(|(range, path, entry_type)| SlashCommandOutputSection {
+                        range,
+                        render_placeholder: Arc::new(move |id, unfold, _cx| {
+                            EntryPlaceholder {
+                                path: Some(path.clone()),
+                                is_directory: entry_type == EntryType::Directory,
+                                line_range: None,
+                                id,
+                                unfold,
+                            }
+                            .into_any_element()
+                        }),
+                    })
+                    .collect(),
                run_commands_in_text: false,
            })
        })
    }
 }

+#[derive(Clone, Copy, PartialEq)]
+enum EntryType {
+    File,
+    Directory,
+}
+
+fn collect_files(
+    worktrees: Vec<Model<Worktree>>,
+    glob_input: &str,
+    fs: Arc<dyn Fs>,
+    cx: &mut AppContext,
+) -> Task<Result<(String, Vec<(Range<usize>, PathBuf, EntryType)>)>> {
+    let Ok(matcher) = PathMatcher::new(glob_input) else {
+        return Task::ready(Err(anyhow!("invalid path")));
+    };
+
+    let path = PathBuf::try_from(glob_input).ok();
+    let file_path = if let Some(path) = &path {
+        worktrees.iter().find_map(|worktree| {
+            let worktree = worktree.read(cx);
+            let worktree_root_path = Path::new(worktree.root_name());
+            let relative_path = path.strip_prefix(worktree_root_path).ok()?;
+            worktree.absolutize(&relative_path).ok()
+        })
+    } else {
+        None
+    };
+
+    if let Some(abs_path) = file_path {
+        if abs_path.is_file() {
+            let filename = path
+                .as_ref()
+                .map(|p| p.to_string_lossy().to_string())
+                .unwrap_or_default();
+            return cx.background_executor().spawn(async move {
+                let mut text = String::new();
+                collect_file_content(&mut text, fs, filename.clone(), abs_path.clone().into())
+                    .await?;
+                let text_range = 0..text.len();
+                Ok((
+                    text,
+                    vec![(text_range, path.unwrap_or_default(), EntryType::File)],
+                ))
+            });
+        }
+    }
+
+    let snapshots = worktrees
+        .iter()
+        .map(|worktree| worktree.read(cx).snapshot())
+        .collect::<Vec<_>>();
+    cx.background_executor().spawn(async move {
+        let mut text = String::new();
+        let mut ranges = Vec::new();
+        for snapshot in snapshots {
+            let mut directory_stack: Vec<(Arc<Path>, String, usize)> = Vec::new();
+            let mut folded_directory_names_stack = Vec::new();
+            let mut is_top_level_directory = true;
+            for entry in snapshot.entries(false, 0) {
+                let mut path_buf = PathBuf::new();
+                path_buf.push(snapshot.root_name());
+                path_buf.push(&entry.path);
+                if !matcher.is_match(&path_buf) {
+                    continue;
+                }
+
+                while let Some((dir, _, _)) = directory_stack.last() {
+                    if entry.path.starts_with(dir) {
+                        break;
+                    }
+                    let (_, entry_name, start) = directory_stack.pop().unwrap();
+                    ranges.push((
+                        start..text.len().saturating_sub(1),
+                        PathBuf::from(entry_name),
+                        EntryType::Directory,
+                    ));
+                }
+
+                let filename = entry
+                    .path
+                    .file_name()
+                    .unwrap_or_default()
+                    .to_str()
+                    .unwrap_or_default()
+                    .to_string();
+
+                if entry.is_dir() {
+                    // Auto-fold directories that contain no files
+                    let mut child_entries = snapshot.child_entries(&entry.path);
+                    if let Some(child) = child_entries.next() {
+                        if child_entries.next().is_none() && child.kind.is_dir() {
+                            if is_top_level_directory {
+                                is_top_level_directory = false;
+                                folded_directory_names_stack
+                                    .push(path_buf.to_string_lossy().to_string());
+                            } else {
+                                folded_directory_names_stack.push(filename.to_string());
+                            }
+                            continue;
+                        }
+                    } else {
+                        // Skip empty directories
+                        folded_directory_names_stack.clear();
+                        continue;
+                    }
+                    let prefix_paths = folded_directory_names_stack.drain(..).as_slice().join("/");
+                    let entry_start = text.len();
+                    if prefix_paths.is_empty() {
+                        if is_top_level_directory {
+                            text.push_str(&path_buf.to_string_lossy());
+                            is_top_level_directory = false;
+                        } else {
+                            text.push_str(&filename);
+                        }
+                        directory_stack.push((entry.path.clone(), filename, entry_start));
+                    } else {
+                        let entry_name = format!("{}/{}", prefix_paths, &filename);
+                        text.push_str(&entry_name);
+                        directory_stack.push((entry.path.clone(), entry_name, entry_start));
+                    }
+                    text.push('\n');
+                } else if entry.is_file() {
+                    if let Some(abs_path) = snapshot.absolutize(&entry.path).log_err() {
+                        let prev_len = text.len();
+                        collect_file_content(
+                            &mut text,
+                            fs.clone(),
+                            filename.clone(),
+                            abs_path.into(),
+                        )
+                        .await?;
+                        ranges.push((
+                            prev_len..text.len(),
+                            PathBuf::from(filename),
+                            EntryType::File,
+                        ));
+                        text.push('\n');
+                    }
+                }
+            }
+
+            while let Some((dir, _, start)) = directory_stack.pop() {
+                let mut root_path = PathBuf::new();
+                root_path.push(snapshot.root_name());
+                root_path.push(&dir);
+                ranges.push((start..text.len(), root_path, EntryType::Directory));
+            }
+        }
+        Ok((text, ranges))
+    })
+}
+
+async fn collect_file_content(
+    buffer: &mut String,
+    fs: Arc<dyn Fs>,
+    filename: String,
+    abs_path: Arc<Path>,
+) -> Result<()> {
+    let mut content = fs.load(&abs_path).await?;
+    LineEnding::normalize(&mut content);
+    buffer.reserve(filename.len() + content.len() + 9);
+    buffer.push_str(&codeblock_fence_for_path(
+        Some(&PathBuf::from(filename)),
+        None,
+    ));
+    buffer.push_str(&content);
+    if !buffer.ends_with('\n') {
+        buffer.push('\n');
+    }
+    buffer.push_str("```");
+    anyhow::Ok(())
+}
+
 #[derive(IntoElement)]
-pub struct FilePlaceholder {
+pub struct EntryPlaceholder {
    pub path: Option<PathBuf>,
+    pub is_directory: bool,
    pub line_range: Option<Range<u32>>,
    pub id: ElementId,
    pub unfold: Arc<dyn Fn(&mut WindowContext)>,
 }

-impl RenderOnce for FilePlaceholder {
+impl RenderOnce for EntryPlaceholder {
    fn render(self, _cx: &mut WindowContext) -> impl IntoElement {
        let unfold = self.unfold;
        let title = if let Some(path) = self.path.as_ref() {
@@ -209,11 +366,16 @@ impl RenderOnce for FilePlaceholder {
        } else {
            SharedString::from("untitled")
        };
+        let icon = if self.is_directory {
+            IconName::Folder
+        } else {
+            IconName::File
+        };

        ButtonLike::new(self.id)
            .style(ButtonStyle::Filled)
            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(IconName::File))
+            .child(Icon::new(icon))
            .child(Label::new(title))
            .when_some(self.line_range, |button, line_range| {
                button.child(Label::new(":")).child(Label::new(format!(
@@ -224,3 +386,25 @@ impl RenderOnce for FilePlaceholder {
            .on_click(move |_, cx| unfold(cx))
    }
 }
+
+pub fn codeblock_fence_for_path(path: Option<&Path>, row_range: Option<Range<u32>>) -> String {
+    let mut text = String::new();
+    write!(text, "```").unwrap();
+
+    if let Some(path) = path {
+        if let Some(extension) = path.extension().and_then(|ext| ext.to_str()) {
+            write!(text, "{} ", extension).unwrap();
+        }
+
+        write!(text, "{}", path.display()).unwrap();
+    } else {
+        write!(text, "untitled").unwrap();
+    }
+
+    if let Some(row_range) = row_range {
+        write!(text, ":{}-{}", row_range.start + 1, row_range.end + 1).unwrap();
+    }
+
+    text.push('\n');
+    text
+}
--- a/crates/assistant/src/slash_command/now_command.rs
+++ b/crates/assistant/src/slash_command/now_command.rs
@@ -0,0 +1,83 @@
+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/prompt_command.rs
+++ b/crates/assistant/src/slash_command/prompt_command.rs
@@ -69,7 +69,10 @@ impl SlashCommand for PromptSlashCommand {
            }
        });
        cx.foreground_executor().spawn(async move {
-            let prompt = prompt.await?;
+            let mut prompt = prompt.await?;
+            if prompt.is_empty() {
+                prompt.push('\n');
+            }
            let range = 0..prompt.len();
            Ok(SlashCommandOutput {
                text: prompt,
--- a/crates/assistant/src/slash_command/rustdoc_command.rs
+++ b/crates/assistant/src/slash_command/rustdoc_command.rs
@@ -7,11 +7,13 @@ 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)]
@@ -28,24 +30,23 @@ impl RustdocSlashCommand {
    async fn build_message(
        fs: Arc<dyn Fs>,
        http_client: Arc<HttpClientWithUrl>,
-        crate_name: String,
+        crate_name: CrateName,
        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);
+            local_cargo_doc_path.push(crate_name.as_ref());
            if !module_path.is_empty() {
                local_cargo_doc_path.push(module_path.join("/"));
            }
            local_cargo_doc_path.push("index.html");

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

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

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

    fn path_to_cargo_toml(project: Model<Project>, cx: &mut AppContext) -> Option<Arc<Path>> {
@@ -117,12 +117,41 @@ 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>>> {
-        Task::ready(Ok(Vec::new()))
+        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)
+        })
    }

    fn run(
@@ -142,37 +171,46 @@ 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) => crate_name.to_string(),
+            Ok(crate_name) => CrateName::from(crate_name),
            Err(err) => return Task::ready(Err(err)),
        };
-        let module_path = path_components.map(ToString::to_string).collect::<Vec<_>>();
-        let path_to_cargo_toml = Self::path_to_cargo_toml(project, cx);
+        let item_path = path_components.map(ToString::to_string).collect::<Vec<_>>();

        let text = cx.background_executor().spawn({
+            let rustdoc_store = RustdocStore::global(cx);
            let crate_name = crate_name.clone();
-            let module_path = module_path.clone();
+            let item_path = item_path.clone();
            async move {
-                Self::build_message(
-                    fs,
-                    http_client,
-                    crate_name,
-                    module_path,
-                    path_to_cargo_toml.as_deref(),
-                )
-                .await
+                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
+                }
            }
        });

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

--- a/crates/assistant/src/slash_command/search_command.rs
+++ b/crates/assistant/src/slash_command/search_command.rs
@@ -1,4 +1,7 @@
-use super::{file_command::FilePlaceholder, SlashCommand, SlashCommandOutput};
+use super::{
+    file_command::{codeblock_fence_for_path, EntryPlaceholder},
+    SlashCommand, SlashCommandOutput,
+};
 use anyhow::Result;
 use assistant_slash_command::SlashCommandOutputSection;
 use gpui::{AppContext, Task, WeakView};
@@ -125,9 +128,8 @@ impl SlashCommand for SearchSlashCommand {
                        let range_start = result.range.start.min(file_content.len());
                        let range_end = result.range.end.min(file_content.len());

-                        let start_line =
-                            file_content[0..range_start].matches('\n').count() as u32 + 1;
-                        let end_line = file_content[0..range_end].matches('\n').count() as u32 + 1;
+                        let start_row = file_content[0..range_start].matches('\n').count() as u32;
+                        let end_row = file_content[0..range_end].matches('\n').count() as u32;
                        let start_line_byte_offset = file_content[0..range_start]
                            .rfind('\n')
                            .map(|pos| pos + 1)
@@ -138,14 +140,11 @@ impl SlashCommand for SearchSlashCommand {
                            .unwrap_or_else(|| file_content.len());

                        let section_start_ix = text.len();
-                        writeln!(
-                            text,
-                            "```{}:{}-{}",
-                            result.path.display(),
-                            start_line,
-                            end_line,
-                        )
-                        .unwrap();
+                        text.push_str(&codeblock_fence_for_path(
+                            Some(&result.path),
+                            Some(start_row..end_row),
+                        ));
+
                        let mut excerpt =
                            file_content[start_line_byte_offset..end_line_byte_offset].to_string();
                        LineEnding::normalize(&mut excerpt);
@@ -156,10 +155,11 @@ impl SlashCommand for SearchSlashCommand {
                        sections.push(SlashCommandOutputSection {
                            range: section_start_ix..section_end_ix,
                            render_placeholder: Arc::new(move |id, unfold, _| {
-                                FilePlaceholder {
+                                EntryPlaceholder {
                                    id,
                                    path: Some(full_path.clone()),
-                                    line_range: Some(start_line..end_line),
+                                    is_directory: false,
+                                    line_range: Some(start_row..end_row),
                                    unfold,
                                }
                                .into_any_element()
--- a/crates/assistant/src/slash_command/tabs_command.rs
+++ b/crates/assistant/src/slash_command/tabs_command.rs
@@ -1,11 +1,14 @@
-use super::{file_command::FilePlaceholder, SlashCommand, SlashCommandOutput};
+use super::{
+    file_command::{codeblock_fence_for_path, EntryPlaceholder},
+    SlashCommand, SlashCommandOutput,
+};
 use anyhow::{anyhow, Result};
 use assistant_slash_command::SlashCommandOutputSection;
 use collections::HashMap;
 use editor::Editor;
 use gpui::{AppContext, Entity, Task, WeakView};
 use language::LspAdapterDelegate;
-use std::{fmt::Write, path::Path, sync::Arc};
+use std::{fmt::Write, sync::Arc};
 use ui::{IntoElement, WindowContext};
 use workspace::Workspace;

@@ -77,15 +80,7 @@ impl SlashCommand for TabsSlashCommand {
                let mut text = String::new();
                for (full_path, buffer, _) in open_buffers {
                    let section_start_ix = text.len();
-                    writeln!(
-                        text,
-                        "```{}\n",
-                        full_path
-                            .as_deref()
-                            .unwrap_or(Path::new("untitled"))
-                            .display()
-                    )
-                    .unwrap();
+                    text.push_str(&codeblock_fence_for_path(full_path.as_deref(), None));
                    for chunk in buffer.as_rope().chunks() {
                        text.push_str(chunk);
                    }
@@ -98,9 +93,10 @@ impl SlashCommand for TabsSlashCommand {
                    sections.push(SlashCommandOutputSection {
                        range: section_start_ix..section_end_ix,
                        render_placeholder: Arc::new(move |id, unfold, _| {
-                            FilePlaceholder {
+                            EntryPlaceholder {
                                id,
                                path: full_path.clone(),
+                                is_directory: false,
                                line_range: None,
                                unfold,
                            }
--- a/crates/call/Cargo.toml
+++ b/crates/call/Cargo.toml
@@ -13,6 +13,7 @@ path = "src/call.rs"
 doctest = false

 [features]
+no-webrtc = ["live_kit_client/no-webrtc"]
 test-support = [
    "client/test-support",
    "collections/test-support",
--- 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, TestAppContext};
+use gpui::{AppContext, Context, Model, SemanticVersion, 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("0.0.0", cx);
+    release_channel::init(SemanticVersion::default(), cx);
    client::init_settings(cx);

    let clock = Arc::new(FakeSystemClock::default());
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -19,7 +19,6 @@ 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,10 +161,7 @@ mod linux {
        env,
        ffi::OsString,
        io,
-        os::{
-            linux::net::SocketAddrExt,
-            unix::net::{SocketAddr, UnixDatagram},
-        },
+        os::unix::net::{SocketAddr, UnixDatagram},
        path::{Path, PathBuf},
        process::{self, ExitStatus},
        thread,
@@ -175,6 +172,7 @@ 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};

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

        fn launch(&self, ipc_url: String) -> anyhow::Result<()> {
-            let uid: u32 = unsafe { libc::getuid() };
-            let sock_addr =
-                SocketAddr::from_abstract_name(format!("zed-{}-{}", *RELEASE_CHANNEL, uid))?;
-
+            let sock_path = paths::SUPPORT_DIR.join(format!("zed-{}.sock", *RELEASE_CHANNEL));
            let sock = UnixDatagram::unbound()?;
-            if sock.connect_addr(&sock_addr).is_err() {
+            if sock.connect(&sock_path).is_err() {
                self.boot_background(ipc_url)?;
            } else {
                sock.send(ipc_url.as_bytes())?;
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -24,6 +24,7 @@ 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
@@ -60,6 +61,12 @@ 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
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -1429,6 +1429,31 @@ 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)
@@ -1704,6 +1729,7 @@ 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, AppMetadata, BackgroundExecutor, Task};
+use gpui::{AppContext, BackgroundExecutor, Task};
 use http::{self, HttpClient, HttpClientWithUrl, Method};
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;
@@ -39,7 +39,6 @@ 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<()>>,
@@ -48,6 +47,10 @@ 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)]
@@ -71,6 +74,87 @@ 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>,
@@ -84,7 +168,6 @@ 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,
@@ -97,6 +180,10 @@ 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))]
@@ -168,6 +255,9 @@ 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();
@@ -445,20 +535,14 @@ 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_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()),
+                            app_version: state.app_version.clone(),
+                            os_name: state.os_name.clone(),
+                            os_version: state.os_version.clone(),
                            architecture: state.architecture.to_string(),

                            release_channel: state.release_channel.map(Into::into),
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -96,6 +96,7 @@ 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,6 +308,14 @@ 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,
@@ -716,25 +724,25 @@ impl EditorEventRow {

 #[derive(Serialize, Debug, clickhouse::Row)]
 pub struct InlineCompletionEventRow {
-    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,
+    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,
    #[serde(serialize_with = "serialize_country_code")]
-    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>,
+    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>,
 }

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

    // ClientEventBase
    installation_id: String,
@@ -810,6 +820,8 @@ 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,
@@ -829,6 +841,8 @@ pub struct AssistantEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -861,6 +875,8 @@ 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,
@@ -878,18 +894,20 @@ impl AssistantEventRow {

 #[derive(Debug, clickhouse::Row, Serialize)]
 pub struct CpuEventRow {
-    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>,
+    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 normalized_cpu_usage: f64, MATERIALIZED
-    pub major: Option<i32>,
-    pub minor: Option<i32>,
-    pub patch: Option<i32>,
+    major: Option<i32>,
+    minor: Option<i32>,
+    patch: Option<i32>,
 }

 impl CpuEventRow {
@@ -909,6 +927,8 @@ 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,
@@ -927,6 +947,8 @@ pub struct MemoryEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -956,6 +978,8 @@ 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,
@@ -974,6 +998,8 @@ pub struct AppEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1002,6 +1028,8 @@ 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,
@@ -1019,6 +1047,8 @@ pub struct SettingEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1047,6 +1077,8 @@ 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,
@@ -1065,6 +1097,8 @@ pub struct ExtensionEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1098,6 +1132,8 @@ 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,
@@ -1127,6 +1163,8 @@ pub struct EditEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1162,6 +1200,8 @@ 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,
@@ -1181,6 +1221,8 @@ pub struct ActionEventRow {
    minor: Option<i32>,
    patch: Option<i32>,
    release_channel: String,
+    os_name: String,
+    os_version: String,

    // ClientEventBase
    installation_id: Option<String>,
@@ -1211,6 +1253,8 @@ 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::postgres(cx.executor().clone());
+        let test_db = crate::db::TestDb::sqlite(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,6 +2,8 @@ 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;
@@ -108,6 +110,7 @@ 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,9 +1,7 @@
 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,
@@ -564,9 +562,10 @@ 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 TestAppContext) {
-    let test_db = TestDb::postgres(cx.executor());
+async fn test_fuzzy_search_users(cx: &mut gpui::TestAppContext) {
+    let test_db = tests::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,6 +548,9 @@ 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,6 +68,7 @@ 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,
@@ -207,6 +208,7 @@ 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,
@@ -491,6 +493,7 @@ 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,
@@ -572,7 +575,8 @@ async fn test_save_as_remote(cx1: &mut gpui::TestAppContext, cx2: &mut gpui::Tes

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

--- a/crates/collab/src/tests/editor_tests.rs
+++ b/crates/collab/src/tests/editor_tests.rs
@@ -30,6 +30,7 @@ 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;
@@ -59,6 +60,7 @@ async fn test_host_disconnect(
        .await;

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

    client_a
        .fs()
@@ -83,10 +85,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
-        .as_local()
-        .unwrap()
-        .has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));

    let workspace_b = cx_b
        .add_window(|cx| Workspace::new(None, project_b.clone(), client_b.app_state.clone(), cx));
@@ -123,17 +122,13 @@ 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
-        .as_local()
-        .unwrap()
-        .has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| !tree.has_update_observer()));

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

@@ -349,7 +344,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::Url::from_file_path("/a/main.rs").unwrap(),
+                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -466,7 +461,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::Url::from_file_path("/a/main.rs").unwrap(),
+                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -590,7 +585,7 @@ async fn test_collaborating_with_code_actions(
        .handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
            );
            assert_eq!(params.range.start, lsp::Position::new(0, 0));
            assert_eq!(params.range.end, lsp::Position::new(0, 0));
@@ -612,7 +607,7 @@ async fn test_collaborating_with_code_actions(
        .handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
            );
            assert_eq!(params.range.start, lsp::Position::new(1, 31));
            assert_eq!(params.range.end, lsp::Position::new(1, 31));
@@ -624,7 +619,7 @@ async fn test_collaborating_with_code_actions(
                        changes: Some(
                            [
                                (
-                                    lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                                    lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                                    vec![lsp::TextEdit::new(
                                        lsp::Range::new(
                                            lsp::Position::new(1, 22),
@@ -634,7 +629,7 @@ async fn test_collaborating_with_code_actions(
                                    )],
                                ),
                                (
-                                    lsp::Url::from_file_path("/a/other.rs").unwrap(),
+                                    lsp::Uri::from_file_path("/a/other.rs").unwrap().into(),
                                    vec![lsp::TextEdit::new(
                                        lsp::Range::new(
                                            lsp::Position::new(0, 0),
@@ -694,7 +689,7 @@ async fn test_collaborating_with_code_actions(
                    changes: Some(
                        [
                            (
-                                lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                                vec![lsp::TextEdit::new(
                                    lsp::Range::new(
                                        lsp::Position::new(1, 22),
@@ -704,7 +699,7 @@ async fn test_collaborating_with_code_actions(
                                )],
                            ),
                            (
-                                lsp::Url::from_file_path("/a/other.rs").unwrap(),
+                                lsp::Uri::from_file_path("/a/other.rs").unwrap().into(),
                                vec![lsp::TextEdit::new(
                                    lsp::Range::new(
                                        lsp::Position::new(0, 0),
@@ -902,14 +897,14 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
                changes: Some(
                    [
                        (
-                            lsp::Url::from_file_path("/dir/one.rs").unwrap(),
+                            lsp::Uri::from_file_path("/dir/one.rs").unwrap().into(),
                            vec![lsp::TextEdit::new(
                                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                                "THREE".to_string(),
                            )],
                        ),
                        (
-                            lsp::Url::from_file_path("/dir/two.rs").unwrap(),
+                            lsp::Uri::from_file_path("/dir/two.rs").unwrap().into(),
                            vec![
                                lsp::TextEdit::new(
                                    lsp::Range::new(
@@ -1318,7 +1313,7 @@ async fn test_on_input_format_from_host_to_guest(
        |params, _| async move {
            assert_eq!(
                params.text_document_position.text_document.uri,
-                lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -1446,7 +1441,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::Url::from_file_path("/a/main.rs").unwrap(),
+                lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
            );
            assert_eq!(
                params.text_document_position.position,
@@ -1615,7 +1610,7 @@ async fn test_mutual_editor_inlay_hint_cache_update(
            async move {
                assert_eq!(
                    params.text_document.uri,
-                    lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                    lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                );
                let edits_made = task_edits_made.load(atomic::Ordering::Acquire);
                Ok(Some(vec![lsp::InlayHint {
@@ -1878,7 +1873,7 @@ async fn test_inlay_hint_refresh_is_forwarded(
            async move {
                assert_eq!(
                    params.text_document.uri,
-                    lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                    lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                );
                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,10 +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
-        .as_local()
-        .unwrap()
-        .has_update_observer()));
+    assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));

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

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

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

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

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

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

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

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

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

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

    let worktree4_id = worktree_a4.read_with(cx_a, |tree, _| {
-        assert!(tree.as_local().unwrap().has_update_observer());
+        assert!(tree.has_update_observer());
        tree.id()
    });
    project_a1.update(cx_a, |project, cx| {
@@ -3916,7 +3897,7 @@ async fn test_collaborating_with_diagnostics(
        .await;
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
        lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
+            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
                severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -3936,7 +3917,7 @@ async fn test_collaborating_with_diagnostics(
        .unwrap();
    fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
        lsp::PublishDiagnosticsParams {
-            uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
+            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
            version: None,
            diagnostics: vec![lsp::Diagnostic {
                severity: Some(lsp::DiagnosticSeverity::ERROR),
@@ -4010,7 +3991,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::Url::from_file_path("/a/a.rs").unwrap(),
+            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
            version: None,
            diagnostics: vec![
                lsp::Diagnostic {
@@ -4104,7 +4085,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::Url::from_file_path("/a/a.rs").unwrap(),
+            uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
            version: None,
            diagnostics: vec![],
        },
@@ -4208,7 +4189,9 @@ 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::Url::from_file_path(Path::new("/test").join(file_name)).unwrap(),
+                uri: lsp::Uri::from_file_path(Path::new("/test").join(file_name))
+                    .unwrap()
+                    .into(),
                version: None,
                diagnostics: vec![lsp::Diagnostic {
                    severity: Some(lsp::DiagnosticSeverity::WARNING),
@@ -4626,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::Url::from_file_path("/root/dir-2/b.rs").unwrap(),
+                lsp::Uri::from_file_path("/root/dir-2/b.rs").unwrap().into(),
                lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
            ),
        )))
@@ -4655,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::Url::from_file_path("/root/dir-2/b.rs").unwrap(),
+                lsp::Uri::from_file_path("/root/dir-2/b.rs").unwrap().into(),
                lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)),
            ),
        )))
@@ -4691,7 +4674,7 @@ async fn test_definition(
            );
            Ok(Some(lsp::GotoDefinitionResponse::Scalar(
                lsp::Location::new(
-                    lsp::Url::from_file_path("/root/dir-2/c.rs").unwrap(),
+                    lsp::Uri::from_file_path("/root/dir-2/c.rs").unwrap().into(),
                    lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)),
                ),
            )))
@@ -4803,15 +4786,21 @@ async fn test_references(
    lsp_response_tx
        .unbounded_send(Ok(Some(vec![
            lsp::Location {
-                uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(),
+                uri: lsp::Uri::from_file_path("/root/dir-1/two.rs")
+                    .unwrap()
+                    .into(),
                range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)),
            },
            lsp::Location {
-                uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(),
+                uri: lsp::Uri::from_file_path("/root/dir-1/two.rs")
+                    .unwrap()
+                    .into(),
                range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)),
            },
            lsp::Location {
-                uri: lsp::Url::from_file_path("/root/dir-2/three.rs").unwrap(),
+                uri: lsp::Uri::from_file_path("/root/dir-2/three.rs")
+                    .unwrap()
+                    .into(),
                range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)),
            },
        ])))
@@ -5311,7 +5300,9 @@ async fn test_project_symbols(
            lsp::SymbolInformation {
                name: "TWO".into(),
                location: lsp::Location {
-                    uri: lsp::Url::from_file_path("/code/crate-2/two.rs").unwrap(),
+                    uri: lsp::Uri::from_file_path("/code/crate-2/two.rs")
+                        .unwrap()
+                        .into(),
                    range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
                },
                kind: lsp::SymbolKind::CONSTANT,
@@ -5401,7 +5392,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::Url::from_file_path("/root/b.rs").unwrap(),
+                lsp::Uri::from_file_path("/root/b.rs").unwrap().into(),
                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,7 +14,9 @@ use language::{
 };
 use lsp::FakeLanguageServer;
 use pretty_assertions::assert_eq;
-use project::{search::SearchQuery, Project, ProjectPath, SearchResult};
+use project::{
+    search::SearchQuery, Project, ProjectPath, SearchResult, DEFAULT_COMPLETION_CONTEXT,
+};
 use rand::{
    distributions::{Alphanumeric, DistString},
    prelude::*,
@@ -303,7 +305,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    .filter(|worktree| {
                                        let worktree = worktree.read(cx);
                                        worktree.is_visible()
-                                            && worktree.entries(false).any(|e| e.is_file())
+                                            && worktree.entries(false, 0).any(|e| e.is_file())
                                            && worktree.root_entry().map_or(false, |e| e.is_dir())
                                    })
                                    .choose(rng)
@@ -425,14 +427,14 @@ impl RandomizedTest for ProjectCollaborationTest {
                                    .filter(|worktree| {
                                        let worktree = worktree.read(cx);
                                        worktree.is_visible()
-                                            && worktree.entries(false).any(|e| e.is_file())
+                                            && worktree.entries(false, 0).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)
+                                    .entries(false, 0)
                                    .filter(|e| e.is_file())
                                    .choose(rng)
                                    .unwrap();
@@ -829,7 +831,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                        .map_ok(|_| ())
                        .boxed(),
                    LspRequestKind::Completion => project
-                        .completions(&buffer, offset, cx)
+                        .completions(&buffer, offset, DEFAULT_COMPLETION_CONTEXT, cx)
                        .map_ok(|_| ())
                        .boxed(),
                    LspRequestKind::CodeAction => project
@@ -1099,7 +1101,7 @@ impl RandomizedTest for ProjectCollaborationTest {
                                        files
                                            .into_iter()
                                            .map(|file| lsp::Location {
-                                                uri: lsp::Url::from_file_path(file).unwrap(),
+                                                uri: lsp::Uri::from_file_path(file).unwrap().into(),
                                                range: Default::default(),
                                            })
                                            .collect(),
@@ -1204,8 +1206,8 @@ impl RandomizedTest for ProjectCollaborationTest {
                                        guest_project.remote_id(),
                                    );
                                    assert_eq!(
-                                        guest_snapshot.entries(false).collect::<Vec<_>>(),
-                                        host_snapshot.entries(false).collect::<Vec<_>>(),
+                                        guest_snapshot.entries(false, 0).collect::<Vec<_>>(),
+                                        host_snapshot.entries(false, 0).collect::<Vec<_>>(),
                                        "{} has different snapshot than the host for worktree {:?} ({:?}) and project {:?}",
                                        client.username,
                                        host_snapshot.abs_path(),
--- 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("0.0.0", cx);
+            release_channel::init(SemanticVersion::default(), cx);
            client::init_settings(cx);
        });

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

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

        cx.update(|cx| {
            theme::init(theme::LoadThemes::JustBase, cx);
@@ -327,7 +323,7 @@ impl TestServer {
            }
            let settings = SettingsStore::test(cx);
            cx.set_global(settings);
-            release_channel::init("0.0.0", cx);
+            release_channel::init(SemanticVersion::default(), 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::Result;
+use anyhow::{Context, Result};
 use channel::{ChannelChat, ChannelStore, MessageParams};
 use client::{UserId, UserStore};
 use collections::HashSet;
@@ -46,6 +46,7 @@ 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 {
@@ -132,7 +133,7 @@ impl MessageEditor {

        let markdown = language_registry.language_for_name("Markdown");
        cx.spawn(|_, mut cx| async move {
-            let markdown = markdown.await?;
+            let markdown = markdown.await.context("failed to load Markdown language")?;
            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,6 +58,8 @@ 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| {
@@ -243,7 +245,9 @@ impl Render for CollabTitlebarItem {
                                )
                                .tooltip(move |cx| {
                                    Tooltip::text(
-                                        if is_muted {
+                                        if !platform_supported {
+                                            "Cannot share microphone"
+                                        } else if is_muted {
                                            "Unmute microphone"
                                        } else {
                                            "Mute microphone"
@@ -253,7 +257,8 @@ impl Render for CollabTitlebarItem {
                                })
                                .style(ButtonStyle::Subtle)
                                .icon_size(IconSize::Small)
-                                .selected(is_muted)
+                                .selected(platform_supported && is_muted)
+                                .disabled(!platform_supported)
                                .selected_style(ButtonStyle::Tinted(TintColor::Negative))
                                .on_click(move |_, cx| crate::toggle_mute(&Default::default(), cx)),
                            )
@@ -271,8 +276,11 @@ impl Render for CollabTitlebarItem {
                            .selected_style(ButtonStyle::Tinted(TintColor::Negative))
                            .icon_size(IconSize::Small)
                            .selected(is_deafened)
+                            .disabled(!platform_supported)
                            .tooltip(move |cx| {
-                                if can_use_microphone {
+                                if !platform_supported {
+                                    Tooltip::text("Cannot share microphone", cx)
+                                } else if can_use_microphone {
                                    Tooltip::with_meta(
                                        "Deafen Audio",
                                        None,
@@ -291,10 +299,13 @@ 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 is_screen_sharing {
+                                            if !platform_supported {
+                                                "Cannot share screen"
+                                            } else if is_screen_sharing {
                                                "Stop Sharing Screen"
                                            } else {
                                                "Share Screen"
@@ -413,6 +424,17 @@ 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
@@ -686,7 +708,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::restart(&Default::default(), cx);
+                                    workspace::reload(&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, DevicePixels, Pixels, PlatformDisplay, Size, Task,
-    WindowBackgroundAppearance, WindowBounds, WindowContext, WindowKind, WindowOptions,
+    actions, point, AppContext, Pixels, PlatformDisplay, Size, Task, WindowBackgroundAppearance,
+    WindowBounds, WindowContext, WindowKind, WindowOptions,
 };
 use panel_settings::MessageEditorSettings;
 pub use panel_settings::{
@@ -22,6 +22,7 @@ pub use panel_settings::{
 };
 use release_channel::ReleaseChannel;
 use settings::Settings;
+use ui::px;
 use workspace::{notifications::DetachAndPromptErr, AppState};

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

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

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

    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,6 +8,7 @@ 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) {
@@ -27,16 +28,21 @@ 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 window = cx.open_window(options, |cx| {
-                    cx.new_view(|_| {
-                        ProjectSharedNotification::new(
-                            owner.clone(),
-                            *project_id,
-                            worktree_root_names.clone(),
-                            app_state.clone(),
-                        )
+                let Some(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
@@ -1,19 +0,0 @@
-[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/color/src/color.rs
+++ b/crates/color/src/color.rs
@@ -1,227 +0,0 @@
-//! # 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.clamp(0., 1.),
-            g: self.g.clamp(0., 1.),
-            b: self.b.clamp(0., 1.),
-            a: self.a.clamp(0., 1.),
-        }
-    }
-}
-
-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::Url,
+    uri: lsp::RawUri,
    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: lsp::Url = uri_for_buffer(buffer, cx);
+                    let uri = 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::Url {
+fn uri_for_buffer(buffer: &Model<Buffer>, cx: &AppContext) -> lsp::RawUri {
    if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
-        lsp::Url::from_file_path(file.abs_path(cx)).unwrap()
+        lsp::Uri::from_file_path(file.abs_path(cx)).unwrap().into()
    } else {
        format!("buffer://{}", buffer.entity_id()).parse().unwrap()
    }
@@ -1042,6 +1042,8 @@ 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;

@@ -1050,9 +1052,8 @@ mod tests {
        let (copilot, mut lsp) = Copilot::fake(cx);

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

        let buffer_2 = cx.new_model(|cx| Buffer::local("Goodbye", cx));
-        let buffer_2_uri: lsp::Url = format!("buffer://{}", buffer_2.entity_id().as_u64())
-            .parse()
-            .unwrap();
+        let buffer_2_uri =
+            lsp::RawUri::from_str(&format!("buffer://{}", buffer_2.entity_id().as_u64())).unwrap();
        copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_2, cx));
        assert_eq!(
            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
@@ -1119,7 +1119,9 @@ mod tests {
                text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri),
            }
        );
-        let buffer_1_uri = lsp::Url::from_file_path("/root/child/buffer-1").unwrap();
+        let buffer_1_uri: lsp::RawUri = lsp::Uri::from_file_path("/root/child/buffer-1")
+            .unwrap()
+            .into();
        assert_eq!(
            lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
                .await,
--- a/crates/copilot/src/copilot_completion_provider.rs
+++ b/crates/copilot/src/copilot_completion_provider.rs
@@ -1121,7 +1121,10 @@ 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());
+                    assert_eq!(
+                        params.text_document_position.text_document.uri,
+                        url.clone().into()
+                    );
                    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::Url,
+    pub uri: lsp::RawUri,
    pub relative_path: String,
    pub position: lsp::Position,
    pub version: usize,
--- a/crates/diagnostics/src/diagnostics.rs
+++ b/crates/diagnostics/src/diagnostics.rs
@@ -150,7 +150,7 @@ impl ProjectDiagnosticsEditor {
        let focus_handle = cx.focus_handle();
        cx.on_focus_in(&focus_handle, |this, cx| this.focus_in(cx))
            .detach();
-        cx.on_focus_out(&focus_handle, |this, cx| this.focus_out(cx))
+        cx.on_focus_out(&focus_handle, |this, _event, cx| this.focus_out(cx))
            .detach();

        let excerpts = cx.new_model(|cx| {
@@ -867,10 +867,12 @@ fn compare_diagnostics(
    snapshot: &language::BufferSnapshot,
 ) -> Ordering {
    use language::ToOffset;
-    // The old diagnostics may point to a previously open Buffer for this file.
-    if !old.range.start.is_valid(snapshot) {
+
+    // 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) {
        return Ordering::Greater;
    }
+
    old.range
        .start
        .to_offset(snapshot)
--- a/crates/editor/Cargo.toml
+++ b/crates/editor/Cargo.toml
@@ -30,6 +30,7 @@ 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,6 +125,11 @@ 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,
@@ -147,6 +152,7 @@ impl_actions!(
        SelectToBeginningOfLine,
        SelectToEndOfLine,
        SelectUpByLines,
+        ShowCompletions,
        ToggleCodeActions,
        ToggleComments,
        UnfoldAt,
@@ -274,7 +280,6 @@ gpui::actions!(
        SelectToStartOfParagraph,
        SelectUp,
        ShowCharacterPalette,
-        ShowCompletions,
        ShowInlineCompletion,
        ShuffleLines,
        SortLinesCaseInsensitive,
--- a/crates/editor/src/display_map.rs
+++ b/crates/editor/src/display_map.rs
@@ -18,7 +18,7 @@
 //! [EditorElement]: crate::element::EditorElement

 mod block_map;
-mod flap_map;
+mod crease_map;
 mod fold_map;
 mod inlay_map;
 mod tab_map;
@@ -33,7 +33,7 @@ pub use block_map::{
 };
 use block_map::{BlockRow, BlockSnapshot};
 use collections::{HashMap, HashSet};
-pub use flap_map::*;
+pub use crease_map::*;
 pub use fold_map::{Fold, FoldId, FoldPlaceholder, FoldPoint};
 use fold_map::{FoldMap, FoldSnapshot};
 use gpui::{
@@ -52,8 +52,14 @@ use multi_buffer::{
    ToOffset, ToPoint,
 };
 use serde::Deserialize;
-use std::ops::Add;
-use std::{any::TypeId, borrow::Cow, fmt::Debug, num::NonZeroU32, ops::Range, sync::Arc};
+use std::{
+    any::TypeId,
+    borrow::Cow,
+    fmt::Debug,
+    num::NonZeroU32,
+    ops::{Add, Range, Sub},
+    sync::Arc,
+};
 use sum_tree::{Bias, TreeMap};
 use tab_map::{TabMap, TabSnapshot};
 use text::LineIndent;
@@ -100,7 +106,7 @@ pub struct DisplayMap {
    /// Regions of inlays that should be highlighted.
    inlay_highlights: InlayHighlights,
    /// A container for explicitly foldable ranges, which supersede indentation based fold range suggestions.
-    flap_map: FlapMap,
+    crease_map: CreaseMap,
    fold_placeholder: FoldPlaceholder,
    pub clip_at_line_ends: bool,
 }
@@ -133,7 +139,7 @@ impl DisplayMap {
            excerpt_header_height,
            excerpt_footer_height,
        );
-        let flap_map = FlapMap::default();
+        let crease_map = CreaseMap::default();

        cx.observe(&wrap_map, |_, _, cx| cx.notify()).detach();

@@ -145,7 +151,7 @@ impl DisplayMap {
            tab_map,
            wrap_map,
            block_map,
-            flap_map,
+            crease_map,
            fold_placeholder,
            text_highlights: Default::default(),
            inlay_highlights: Default::default(),
@@ -172,7 +178,7 @@ impl DisplayMap {
            tab_snapshot,
            wrap_snapshot,
            block_snapshot,
-            flap_snapshot: self.flap_map.snapshot(),
+            crease_snapshot: self.crease_map.snapshot(),
            text_highlights: self.text_highlights.clone(),
            inlay_highlights: self.inlay_highlights.clone(),
            clip_at_line_ends: self.clip_at_line_ends,
@@ -241,22 +247,22 @@ impl DisplayMap {
        self.block_map.read(snapshot, edits);
    }

-    pub fn insert_flaps(
+    pub fn insert_creases(
        &mut self,
-        flaps: impl IntoIterator<Item = Flap>,
+        creases: impl IntoIterator<Item = Crease>,
        cx: &mut ModelContext<Self>,
-    ) -> Vec<FlapId> {
+    ) -> Vec<CreaseId> {
        let snapshot = self.buffer.read(cx).snapshot(cx);
-        self.flap_map.insert(flaps, &snapshot)
+        self.crease_map.insert(creases, &snapshot)
    }

-    pub fn remove_flaps(
+    pub fn remove_creases(
        &mut self,
-        flap_ids: impl IntoIterator<Item = FlapId>,
+        crease_ids: impl IntoIterator<Item = CreaseId>,
        cx: &mut ModelContext<Self>,
    ) {
        let snapshot = self.buffer.read(cx).snapshot(cx);
-        self.flap_map.remove(flap_ids, &snapshot)
+        self.crease_map.remove(crease_ids, &snapshot)
    }

    pub fn insert_blocks(
@@ -466,7 +472,7 @@ pub struct HighlightedChunk<'a> {
 pub struct DisplaySnapshot {
    pub buffer_snapshot: MultiBufferSnapshot,
    pub fold_snapshot: FoldSnapshot,
-    pub flap_snapshot: FlapSnapshot,
+    pub crease_snapshot: CreaseSnapshot,
    inlay_snapshot: InlaySnapshot,
    tab_snapshot: TabSnapshot,
    wrap_snapshot: WrapSnapshot,
@@ -949,13 +955,13 @@ impl DisplaySnapshot {
        buffer_row: MultiBufferRow,
    ) -> Option<(Range<Point>, FoldPlaceholder)> {
        let start = MultiBufferPoint::new(buffer_row.0, self.buffer_snapshot.line_len(buffer_row));
-        if let Some(flap) = self
-            .flap_snapshot
+        if let Some(crease) = self
+            .crease_snapshot
            .query_row(buffer_row, &self.buffer_snapshot)
        {
            Some((
-                flap.range.to_point(&self.buffer_snapshot),
-                flap.placeholder.clone(),
+                crease.range.to_point(&self.buffer_snapshot),
+                crease.placeholder.clone(),
            ))
        } else if self.starts_indent(MultiBufferRow(start.row))
            && !self.is_line_folded(MultiBufferRow(start.row))
@@ -1015,6 +1021,22 @@ impl Debug for DisplayPoint {
    }
 }

+impl Add for DisplayPoint {
+    type Output = Self;
+
+    fn add(self, other: Self) -> Self::Output {
+        DisplayPoint(BlockPoint(self.0 .0 + other.0 .0))
+    }
+}
+
+impl Sub for DisplayPoint {
+    type Output = Self;
+
+    fn sub(self, other: Self) -> Self::Output {
+        DisplayPoint(BlockPoint(self.0 .0 - other.0 .0))
+    }
+}
+
 #[derive(Debug, Copy, Clone, Default, Eq, Ord, PartialOrd, PartialEq, Deserialize, Hash)]
 #[serde(transparent)]
 pub struct DisplayRow(pub u32);
@@ -1027,6 +1049,14 @@ 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)))
@@ -1097,14 +1127,11 @@ impl ToDisplayPoint for Anchor {
 #[cfg(test)]
 pub mod tests {
    use super::*;
-    use crate::{
-        movement,
-        test::{editor_test_context::EditorTestContext, marked_display_snapshot},
-    };
+    use crate::{movement, test::marked_display_snapshot};
    use gpui::{div, font, observe, px, AppContext, BorrowAppContext, Context, Element, Hsla};
    use language::{
        language_settings::{AllLanguageSettings, AllLanguageSettingsContent},
-        Buffer, Language, LanguageConfig, LanguageMatcher, SelectionGoal,
+        Buffer, Language, LanguageConfig, LanguageMatcher,
    };
    use project::Project;
    use rand::{prelude::*, Rng};
@@ -1379,6 +1406,7 @@ pub mod tests {
        }
    }

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

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

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

@@ -1665,6 +1693,8 @@ 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 _;
@@ -1916,7 +1946,7 @@ pub mod tests {
    }

    #[gpui::test]
-    fn test_flaps(cx: &mut gpui::AppContext) {
+    fn test_creases(cx: &mut gpui::AppContext) {
        init_test(cx, |_| {});

        let text = "aaa\nbbb\nccc\nddd\neee\nfff\nggg\nhhh\niii\njjj\nkkk\nlll";
@@ -1939,8 +1969,8 @@ pub mod tests {
            let range =
                snapshot.anchor_before(Point::new(2, 0))..snapshot.anchor_after(Point::new(3, 3));

-            map.flap_map.insert(
-                [Flap::new(
+            map.crease_map.insert(
+                [Crease::new(
                    range,
                    FoldPlaceholder::test(),
                    |_row, _status, _toggle, _cx| div(),
--- a/crates/editor/src/display_map/block_map.rs
+++ b/crates/editor/src/display_map/block_map.rs
@@ -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, Element};
+    use gpui::{div, font, px, AssetSource, Element};
    use multi_buffer::MultiBuffer;
    use rand::prelude::*;
    use settings::SettingsStore;
@@ -1452,6 +1452,7 @@ mod tests {
        }
    }

+    #[cfg(target_os = "macos")]
    #[gpui::test]
    fn test_blocks_on_wrapped_lines(cx: &mut gpui::TestAppContext) {
        cx.update(|cx| init_test(cx));
@@ -1940,6 +1941,12 @@ 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/display_map/crease_map.rs
+++ b/crates/editor/src/display_map/crease_map.rs
@@ -9,36 +9,36 @@ use ui::WindowContext;
 use crate::FoldPlaceholder;

 #[derive(Copy, Clone, Default, Debug, Eq, PartialEq, PartialOrd, Ord, Hash)]
-pub struct FlapId(usize);
+pub struct CreaseId(usize);

 #[derive(Default)]
-pub struct FlapMap {
-    snapshot: FlapSnapshot,
-    next_id: FlapId,
-    id_to_range: HashMap<FlapId, Range<Anchor>>,
+pub struct CreaseMap {
+    snapshot: CreaseSnapshot,
+    next_id: CreaseId,
+    id_to_range: HashMap<CreaseId, Range<Anchor>>,
 }

 #[derive(Clone, Default)]
-pub struct FlapSnapshot {
-    flaps: SumTree<FlapItem>,
+pub struct CreaseSnapshot {
+    creases: SumTree<CreaseItem>,
 }

-impl FlapSnapshot {
-    /// Returns the first Flap starting on the specified buffer row.
+impl CreaseSnapshot {
+    /// Returns the first Crease starting on the specified buffer row.
    pub fn query_row<'a>(
        &'a self,
        row: MultiBufferRow,
        snapshot: &'a MultiBufferSnapshot,
-    ) -> Option<&'a Flap> {
+    ) -> Option<&'a Crease> {
        let start = snapshot.anchor_before(Point::new(row.0, 0));
-        let mut cursor = self.flaps.cursor::<ItemSummary>();
+        let mut cursor = self.creases.cursor::<ItemSummary>();
        cursor.seek(&start, Bias::Left, snapshot);
        while let Some(item) = cursor.item() {
-            match Ord::cmp(&item.flap.range.start.to_point(snapshot).row, &row.0) {
+            match Ord::cmp(&item.crease.range.start.to_point(snapshot).row, &row.0) {
                Ordering::Less => cursor.next(snapshot),
                Ordering::Equal => {
-                    if item.flap.range.start.is_valid(snapshot) {
-                        return Some(&item.flap);
+                    if item.crease.range.start.is_valid(snapshot) {
+                        return Some(&item.crease);
                    } else {
                        cursor.next(snapshot);
                    }
@@ -49,17 +49,17 @@ impl FlapSnapshot {
        return None;
    }

-    pub fn flap_items_with_offsets(
+    pub fn crease_items_with_offsets(
        &self,
        snapshot: &MultiBufferSnapshot,
-    ) -> Vec<(FlapId, Range<Point>)> {
-        let mut cursor = self.flaps.cursor::<ItemSummary>();
+    ) -> Vec<(CreaseId, Range<Point>)> {
+        let mut cursor = self.creases.cursor::<ItemSummary>();
        let mut results = Vec::new();

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

 #[derive(Clone)]
-pub struct Flap {
+pub struct Crease {
    pub range: Range<Anchor>,
    pub placeholder: FoldPlaceholder,
    pub render_toggle: RenderToggleFn,
    pub render_trailer: RenderTrailerFn,
 }

-impl Flap {
+impl Crease {
    pub fn new<RenderToggle, ToggleElement, RenderTrailer, TrailerElement>(
        range: Range<Anchor>,
        placeholder: FoldPlaceholder,
@@ -115,7 +115,7 @@ impl Flap {
            + 'static,
        TrailerElement: IntoElement,
    {
-        Flap {
+        Crease {
            range,
            placeholder,
            render_toggle: Arc::new(move |row, folded, toggle, cx| {
@@ -128,50 +128,52 @@ impl Flap {
    }
 }

-impl std::fmt::Debug for Flap {
+impl std::fmt::Debug for Crease {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Flap").field("range", &self.range).finish()
+        f.debug_struct("Crease")
+            .field("range", &self.range)
+            .finish()
    }
 }

 #[derive(Clone, Debug)]
-struct FlapItem {
-    id: FlapId,
-    flap: Flap,
+struct CreaseItem {
+    id: CreaseId,
+    crease: Crease,
 }

-impl FlapMap {
-    pub fn snapshot(&self) -> FlapSnapshot {
+impl CreaseMap {
+    pub fn snapshot(&self) -> CreaseSnapshot {
        self.snapshot.clone()
    }

    pub fn insert(
        &mut self,
-        flaps: impl IntoIterator<Item = Flap>,
+        creases: impl IntoIterator<Item = Crease>,
        snapshot: &MultiBufferSnapshot,
-    ) -> Vec<FlapId> {
+    ) -> Vec<CreaseId> {
        let mut new_ids = Vec::new();
-        self.snapshot.flaps = {
-            let mut new_flaps = SumTree::new();
-            let mut cursor = self.snapshot.flaps.cursor::<ItemSummary>();
-            for flap in flaps {
-                new_flaps.append(cursor.slice(&flap.range, Bias::Left, snapshot), snapshot);
+        self.snapshot.creases = {
+            let mut new_creases = SumTree::new();
+            let mut cursor = self.snapshot.creases.cursor::<ItemSummary>();
+            for crease in creases {
+                new_creases.append(cursor.slice(&crease.range, Bias::Left, snapshot), snapshot);

                let id = self.next_id;
                self.next_id.0 += 1;
-                self.id_to_range.insert(id, flap.range.clone());
-                new_flaps.push(FlapItem { flap, id }, snapshot);
+                self.id_to_range.insert(id, crease.range.clone());
+                new_creases.push(CreaseItem { crease, id }, snapshot);
                new_ids.push(id);
            }
-            new_flaps.append(cursor.suffix(snapshot), snapshot);
-            new_flaps
+            new_creases.append(cursor.suffix(snapshot), snapshot);
+            new_creases
        };
        new_ids
    }

    pub fn remove(
        &mut self,
-        ids: impl IntoIterator<Item = FlapId>,
+        ids: impl IntoIterator<Item = CreaseId>,
        snapshot: &MultiBufferSnapshot,
    ) {
        let mut removals = Vec::new();
@@ -184,24 +186,24 @@ impl FlapMap {
            AnchorRangeExt::cmp(a_range, b_range, snapshot).then(b_id.cmp(&a_id))
        });

-        self.snapshot.flaps = {
-            let mut new_flaps = SumTree::new();
-            let mut cursor = self.snapshot.flaps.cursor::<ItemSummary>();
+        self.snapshot.creases = {
+            let mut new_creases = SumTree::new();
+            let mut cursor = self.snapshot.creases.cursor::<ItemSummary>();

            for (id, range) in removals {
-                new_flaps.append(cursor.slice(&range, Bias::Left, snapshot), snapshot);
+                new_creases.append(cursor.slice(&range, Bias::Left, snapshot), snapshot);
                while let Some(item) = cursor.item() {
                    cursor.next(snapshot);
                    if item.id == id {
                        break;
                    } else {
-                        new_flaps.push(item.clone(), snapshot);
+                        new_creases.push(item.clone(), snapshot);
                    }
                }
            }

-            new_flaps.append(cursor.suffix(snapshot), snapshot);
-            new_flaps
+            new_creases.append(cursor.suffix(snapshot), snapshot);
+            new_creases
        };
    }
 }
@@ -227,17 +229,17 @@ impl sum_tree::Summary for ItemSummary {
    }
 }

-impl sum_tree::Item for FlapItem {
+impl sum_tree::Item for CreaseItem {
    type Summary = ItemSummary;

    fn summary(&self) -> Self::Summary {
        ItemSummary {
-            range: self.flap.range.clone(),
+            range: self.crease.range.clone(),
        }
    }
 }

-/// Implements `SeekTarget` for `Range<Anchor>` to enable seeking within a `SumTree` of `FlapItem`s.
+/// Implements `SeekTarget` for `Range<Anchor>` to enable seeking within a `SumTree` of `CreaseItem`s.
 impl SeekTarget<'_, ItemSummary, ItemSummary> for Range<Anchor> {
    fn cmp(&self, cursor_location: &ItemSummary, snapshot: &MultiBufferSnapshot) -> Ordering {
        AnchorRangeExt::cmp(self, &cursor_location.range, snapshot)
@@ -257,48 +259,48 @@ mod test {
    use multi_buffer::MultiBuffer;

    #[gpui::test]
-    fn test_insert_and_remove_flaps(cx: &mut AppContext) {
+    fn test_insert_and_remove_creases(cx: &mut AppContext) {
        let text = "line1\nline2\nline3\nline4\nline5";
        let buffer = MultiBuffer::build_simple(text, cx);
        let snapshot = buffer.read_with(cx, |buffer, cx| buffer.snapshot(cx));
-        let mut flap_map = FlapMap::default();
+        let mut crease_map = CreaseMap::default();

-        // Insert flaps
-        let flaps = [
-            Flap::new(
+        // Insert creases
+        let creases = [
+            Crease::new(
                snapshot.anchor_before(Point::new(1, 0))..snapshot.anchor_after(Point::new(1, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
                |_row, _folded, _cx| div(),
            ),
-            Flap::new(
+            Crease::new(
                snapshot.anchor_before(Point::new(3, 0))..snapshot.anchor_after(Point::new(3, 5)),
                FoldPlaceholder::test(),
                |_row, _folded, _toggle, _cx| div(),
                |_row, _folded, _cx| div(),
            ),
        ];
-        let flap_ids = flap_map.insert(flaps, &snapshot);
-        assert_eq!(flap_ids.len(), 2);
+        let crease_ids = crease_map.insert(creases, &snapshot);
+        assert_eq!(crease_ids.len(), 2);

-        // Verify flaps are inserted
-        let flap_snapshot = flap_map.snapshot();
-        assert!(flap_snapshot
+        // Verify creases are inserted
+        let crease_snapshot = crease_map.snapshot();
+        assert!(crease_snapshot
            .query_row(MultiBufferRow(1), &snapshot)
            .is_some());
-        assert!(flap_snapshot
+        assert!(crease_snapshot
            .query_row(MultiBufferRow(3), &snapshot)
            .is_some());

-        // Remove flaps
-        flap_map.remove(flap_ids, &snapshot);
+        // Remove creases
+        crease_map.remove(crease_ids, &snapshot);

-        // Verify flaps are removed
-        let flap_snapshot = flap_map.snapshot();
-        assert!(flap_snapshot
+        // Verify creases are removed
+        let crease_snapshot = crease_map.snapshot();
+        assert!(crease_snapshot
            .query_row(MultiBufferRow(1), &snapshot)
            .is_none());
-        assert!(flap_snapshot
+        assert!(crease_snapshot
            .query_row(MultiBufferRow(3), &snapshot)
            .is_none());
    }
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
--- a/crates/editor/src/editor_tests.rs
+++ b/crates/editor/src/editor_tests.rs
@@ -9,7 +9,10 @@ use crate::{
    JoinLines,
 };
 use futures::StreamExt;
-use gpui::{div, TestAppContext, UpdateGlobal, VisualTestContext, WindowBounds, WindowOptions};
+use gpui::{
+    div, AssetSource, SemanticVersion, TestAppContext, UpdateGlobal, VisualTestContext,
+    WindowBounds, WindowOptions,
+};
 use indoc::indoc;
 use language::{
    language_settings::{
@@ -54,10 +57,10 @@ fn test_edit_events(cx: &mut TestAppContext) {
        let events = events.clone();
        |cx| {
            let view = cx.view().clone();
-            cx.subscribe(&view, move |_, _, event: &EditorEvent, _| {
-                if matches!(event, EditorEvent::Edited | EditorEvent::BufferEdited) {
-                    events.borrow_mut().push(("editor1", event.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")),
+                _ => {}
            })
            .detach();
            Editor::for_buffer(buffer.clone(), None, cx)
@@ -67,11 +70,16 @@ 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, _| {
-                if matches!(event, EditorEvent::Edited | EditorEvent::BufferEdited) {
-                    events.borrow_mut().push(("editor2", event.clone()));
-                }
-            })
+            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"))
+                    }
+                    _ => {}
+                },
+            )
            .detach();
            Editor::for_buffer(buffer.clone(), None, cx)
        }
@@ -84,9 +92,9 @@ fn test_edit_events(cx: &mut TestAppContext) {
    assert_eq!(
        mem::take(&mut *events.borrow_mut()),
        [
-            ("editor1", EditorEvent::Edited),
-            ("editor1", EditorEvent::BufferEdited),
-            ("editor2", EditorEvent::BufferEdited),
+            ("editor1", "edited"),
+            ("editor1", "buffer edited"),
+            ("editor2", "buffer edited"),
        ]
    );

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

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

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

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

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

@@ -473,6 +481,42 @@ 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, |_| {});
@@ -509,6 +553,7 @@ 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();
@@ -891,6 +936,8 @@ 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, |_| {});
@@ -5814,7 +5861,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::Url::from_file_path("/file.rs").unwrap()
+                lsp::Uri::from_file_path("/file.rs").unwrap().into()
            );
            assert_eq!(params.options.tab_size, 4);
            Ok(Some(vec![lsp::TextEdit::new(
@@ -5840,7 +5887,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::Url::from_file_path("/file.rs").unwrap()
+            lsp::Uri::from_file_path("/file.rs").unwrap().into()
        );
        futures::future::pending::<()>().await;
        unreachable!()
@@ -5889,7 +5936,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::Url::from_file_path("/file.rs").unwrap()
+                lsp::Uri::from_file_path("/file.rs").unwrap().into()
            );
            assert_eq!(params.options.tab_size, 8);
            Ok(Some(vec![]))
@@ -6092,7 +6139,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),
+                format!("[{} formatted]", params.text_document.uri.as_str()),
            )]))
        })
        .detach();
@@ -6166,7 +6213,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::Url::from_file_path("/file.rs").unwrap()
+                lsp::Uri::from_file_path("/file.rs").unwrap().into()
            );
            assert_eq!(params.options.tab_size, 4);
            Ok(Some(vec![lsp::TextEdit::new(
@@ -6192,7 +6239,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
        move |params, _| async move {
            assert_eq!(
                params.text_document.uri,
-                lsp::Url::from_file_path("/file.rs").unwrap()
+                lsp::Uri::from_file_path("/file.rs").unwrap().into()
            );
            futures::future::pending::<()>().await;
            unreachable!()
@@ -6242,7 +6289,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::Url::from_file_path("/file.rs").unwrap()
+                lsp::Uri::from_file_path("/file.rs").unwrap().into()
            );
            assert_eq!(params.options.tab_size, 8);
            Ok(Some(vec![]))
@@ -6316,7 +6363,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::Url::from_file_path("/file.rs").unwrap()
+                lsp::Uri::from_file_path("/file.rs").unwrap().into()
            );
            assert_eq!(params.options.tab_size, 4);
            Ok(Some(vec![lsp::TextEdit::new(
@@ -6338,7 +6385,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::Url::from_file_path("/file.rs").unwrap()
+            lsp::Uri::from_file_path("/file.rs").unwrap().into()
        );
        futures::future::pending::<()>().await;
        unreachable!()
@@ -6696,7 +6743,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, cx);
+        editor.show_completions(&ShowCompletions { trigger: None }, cx);
    });
    handle_completion_request(
        &mut cx,
@@ -7650,13 +7697,14 @@ async fn test_following(cx: &mut gpui::TestAppContext) {
        cx.open_window(
            WindowOptions {
                window_bounds: Some(WindowBounds::Windowed(Bounds::from_corners(
-                    gpui::Point::new(0.into(), 0.into()),
-                    gpui::Point::new(10.into(), 80.into()),
+                    gpui::Point::new(px(0.), px(0.)),
+                    gpui::Point::new(px(10.), px(80.)),
                ))),
                ..Default::default()
            },
            |cx| cx.new_view(|cx| build_editor(buffer.clone(), cx)),
        )
+        .unwrap()
    });

    let is_still_following = Rc::new(RefCell::new(true));
@@ -7980,7 +8028,7 @@ async fn go_to_prev_overlapping_diagnostic(
                .update_diagnostics(
                    LanguageServerId(0),
                    lsp::PublishDiagnosticsParams {
-                        uri: lsp::Url::from_file_path("/root/file").unwrap(),
+                        uri: lsp::Uri::from_file_path("/root/file").unwrap().into(),
                        version: None,
                        diagnostics: vec![
                            lsp::Diagnostic {
@@ -8352,7 +8400,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::Url::from_file_path("/a/main.rs").unwrap(),
+            lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
        );
        assert_eq!(
            params.text_document_position.position,
@@ -12001,7 +12049,7 @@ async fn test_active_indent_guide_non_matching_indent(cx: &mut gpui::TestAppCont
 }

 #[gpui::test]
-fn test_flap_insertion_and_rendering(cx: &mut TestAppContext) {
+fn test_crease_insertion_and_rendering(cx: &mut TestAppContext) {
    init_test(cx, |_| {});

    let editor = cx.add_window(|cx| {
@@ -12022,7 +12070,7 @@ fn test_flap_insertion_and_rendering(cx: &mut TestAppContext) {
                callback: Arc<dyn Fn(bool, &mut WindowContext) + Send + Sync>,
            }

-            let flap = Flap::new(
+            let crease = Crease::new(
                range,
                FoldPlaceholder::test(),
                {
@@ -12039,7 +12087,7 @@ fn test_flap_insertion_and_rendering(cx: &mut TestAppContext) {
                |_row, _folded, _cx| div(),
            );

-            editor.insert_flaps(Some(flap), cx);
+            editor.insert_creases(Some(crease), cx);
            let snapshot = editor.snapshot(cx);
            let _div = snapshot.render_fold_toggle(MultiBufferRow(1), false, cx.view().clone(), cx);
            snapshot
@@ -12103,7 +12151,10 @@ 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());
+            assert_eq!(
+                params.text_document_position.text_document.uri,
+                url.clone().into()
+            );
            assert_eq!(
                params.text_document_position.position,
                complete_from_position
@@ -12184,10 +12235,16 @@ 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("0.0.0", cx);
+        release_channel::init(SemanticVersion::default(), 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.iter() {
+            for action in editor.editor_actions.borrow().values() {
                (action)(cx)
            }
        });
@@ -586,7 +586,7 @@ impl EditorElement {
            editor.handle_click_hovered_link(point, event.modifiers, cx);

            cx.stop_propagation();
-        } else if end_selection {
+        } else if end_selection && pending_nonempty_selections {
            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_clipboard() {
+            if let Some(item) = cx.read_from_primary() {
                let point_for_position =
                    position_map.point_for_position(text_hitbox.bounds, event.position);
                let position = point_for_position.previous_valid;
@@ -1136,7 +1136,7 @@ impl EditorElement {
    }

    #[allow(clippy::too_many_arguments)]
-    fn prepaint_flap_trailers(
+    fn prepaint_crease_trailers(
        &self,
        trailers: Vec<Option<AnyElement>>,
        lines: &[LineWithInvisibles],
@@ -1145,7 +1145,7 @@ impl EditorElement {
        scroll_pixel_position: gpui::Point<Pixels>,
        em_width: Pixels,
        cx: &mut WindowContext,
-    ) -> Vec<Option<FlapTrailerLayout>> {
+    ) -> Vec<Option<CreaseTrailerLayout>> {
        trailers
            .into_iter()
            .enumerate()
@@ -1170,7 +1170,7 @@ impl EditorElement {
                let centering_offset = point(px(0.), (line_height - size.height) / 2.);
                let origin = content_origin + position + centering_offset;
                element.prepaint_as_root(origin, available_space, cx);
-                Some(FlapTrailerLayout {
+                Some(CreaseTrailerLayout {
                    element,
                    bounds: Bounds::new(origin, size),
                })
@@ -1266,7 +1266,7 @@ impl EditorElement {
        display_row: DisplayRow,
        display_snapshot: &DisplaySnapshot,
        line_layout: &LineWithInvisibles,
-        flap_trailer: Option<&FlapTrailerLayout>,
+        crease_trailer: Option<&CreaseTrailerLayout>,
        em_width: Pixels,
        content_origin: gpui::Point<Pixels>,
        scroll_pixel_position: gpui::Point<Pixels>,
@@ -1306,8 +1306,8 @@ impl EditorElement {
        let start_x = {
            const INLINE_BLAME_PADDING_EM_WIDTHS: f32 = 6.;

-            let line_end = if let Some(flap_trailer) = flap_trailer {
-                flap_trailer.bounds.right()
+            let line_end = if let Some(crease_trailer) = crease_trailer {
+                crease_trailer.bounds.right()
            } else {
                content_origin.x - scroll_pixel_position.x + line_layout.width
            };
@@ -1779,7 +1779,7 @@ impl EditorElement {
        }
    }

-    fn layout_flap_trailers(
+    fn layout_crease_trailers(
        &self,
        buffer_rows: impl IntoIterator<Item = Option<MultiBufferRow>>,
        snapshot: &EditorSnapshot,
@@ -1789,7 +1789,7 @@ impl EditorElement {
            .into_iter()
            .map(|row| {
                if let Some(multibuffer_row) = row {
-                    snapshot.render_flap_trailer(multibuffer_row, cx)
+                    snapshot.render_crease_trailer(multibuffer_row, cx)
                } else {
                    None
                }
@@ -2810,36 +2810,12 @@ impl EditorElement {
        }
    }

-    fn paint_gutter(&mut self, layout: &mut EditorLayout, cx: &mut WindowContext) {
+    fn paint_line_numbers(&mut self, layout: &mut EditorLayout, cx: &mut WindowContext) {
        let line_height = layout.position_map.line_height;
-
        let scroll_position = layout.position_map.snapshot.scroll_position();
        let scroll_top = scroll_position.y * line_height;

        cx.set_cursor_style(CursorStyle::Arrow, &layout.gutter_hitbox);
-        for (_, hunk_hitbox) in &layout.display_hunks {
-            if let Some(hunk_hitbox) = hunk_hitbox {
-                cx.set_cursor_style(CursorStyle::PointingHand, hunk_hitbox);
-            }
-        }
-
-        let show_git_gutter = layout
-            .position_map
-            .snapshot
-            .show_git_diff_gutter
-            .unwrap_or_else(|| {
-                matches!(
-                    ProjectSettings::get_global(cx).git.git_gutter,
-                    Some(GitGutterSetting::TrackedFiles)
-                )
-            });
-        if show_git_gutter {
-            Self::paint_diff_hunks(layout.gutter_hitbox.bounds, layout, cx)
-        }
-
-        if layout.blamed_display_rows.is_some() {
-            self.paint_blamed_display_rows(layout, cx);
-        }

        for (ix, line) in layout.line_numbers.iter().enumerate() {
            if let Some(line) = line {
@@ -2854,29 +2830,9 @@ impl EditorElement {
                line.paint(line_origin, line_height, cx).log_err();
            }
        }
-
-        cx.paint_layer(layout.gutter_hitbox.bounds, |cx| {
-            cx.with_element_namespace("gutter_fold_toggles", |cx| {
-                for fold_indicator in layout.gutter_fold_toggles.iter_mut().flatten() {
-                    fold_indicator.paint(cx);
-                }
-            });
-
-            for test_indicators in layout.test_indicators.iter_mut() {
-                test_indicators.paint(cx);
-            }
-
-            if let Some(indicator) = layout.code_actions_indicator.as_mut() {
-                indicator.paint(cx);
-            }
-        });
    }

-    fn paint_diff_hunks(
-        gutter_bounds: Bounds<Pixels>,
-        layout: &EditorLayout,
-        cx: &mut WindowContext,
-    ) {
+    fn paint_diff_hunks(layout: &EditorLayout, cx: &mut WindowContext) {
        if layout.display_hunks.is_empty() {
            return;
        }
@@ -2889,7 +2845,7 @@ impl EditorElement {
                        let hunk_bounds = Self::diff_hunk_bounds(
                            &layout.position_map.snapshot,
                            line_height,
-                            gutter_bounds,
+                            layout.gutter_hitbox.bounds,
                            &hunk,
                        );
                        Some((
@@ -3006,6 +2962,75 @@ impl EditorElement {
        }
    }

+    fn paint_gutter_indicators(&self, layout: &mut EditorLayout, cx: &mut WindowContext) {
+        cx.paint_layer(layout.gutter_hitbox.bounds, |cx| {
+            cx.with_element_namespace("gutter_fold_toggles", |cx| {
+                for fold_indicator in layout.gutter_fold_toggles.iter_mut().flatten() {
+                    fold_indicator.paint(cx);
+                }
+            });
+
+            for test_indicators in layout.test_indicators.iter_mut() {
+                test_indicators.paint(cx);
+            }
+
+            if let Some(indicator) = layout.code_actions_indicator.as_mut() {
+                indicator.paint(cx);
+            }
+        });
+    }
+
+    fn paint_gutter_highlights(&self, layout: &EditorLayout, cx: &mut WindowContext) {
+        for (_, hunk_hitbox) in &layout.display_hunks {
+            if let Some(hunk_hitbox) = hunk_hitbox {
+                cx.set_cursor_style(CursorStyle::PointingHand, hunk_hitbox);
+            }
+        }
+
+        let show_git_gutter = layout
+            .position_map
+            .snapshot
+            .show_git_diff_gutter
+            .unwrap_or_else(|| {
+                matches!(
+                    ProjectSettings::get_global(cx).git.git_gutter,
+                    Some(GitGutterSetting::TrackedFiles)
+                )
+            });
+        if show_git_gutter {
+            Self::paint_diff_hunks(layout, cx)
+        }
+
+        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;
@@ -3042,8 +3067,8 @@ impl EditorElement {
                self.paint_redactions(layout, cx);
                self.paint_cursors(layout, cx);
                self.paint_inline_blame(layout, cx);
-                cx.with_element_namespace("flap_trailers", |cx| {
-                    for trailer in layout.flap_trailers.iter_mut().flatten() {
+                cx.with_element_namespace("crease_trailers", |cx| {
+                    for trailer in layout.crease_trailers.iter_mut().flatten() {
                        trailer.element.paint(cx);
                    }
                });
@@ -4631,6 +4656,12 @@ 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,
@@ -4666,8 +4697,8 @@ impl Element for EditorElement {
                                cx,
                            )
                        });
-                    let flap_trailers = cx.with_element_namespace("flap_trailers", |cx| {
-                        self.layout_flap_trailers(buffer_rows.iter().copied(), &snapshot, cx)
+                    let crease_trailers = cx.with_element_namespace("crease_trailers", |cx| {
+                        self.layout_crease_trailers(buffer_rows.iter().copied(), &snapshot, cx)
                    });

                    let display_hunks = self.layout_git_gutters(
@@ -4728,9 +4759,9 @@ impl Element for EditorElement {
                        cx,
                    );

-                    let flap_trailers = cx.with_element_namespace("flap_trailers", |cx| {
-                        self.prepaint_flap_trailers(
-                            flap_trailers,
+                    let crease_trailers = cx.with_element_namespace("crease_trailers", |cx| {
+                        self.prepaint_crease_trailers(
+                            crease_trailers,
                            &line_layouts,
                            line_height,
                            content_origin,
@@ -4746,12 +4777,12 @@ impl Element for EditorElement {
                        if (start_row..end_row).contains(&display_row) {
                            let line_ix = display_row.minus(start_row) as usize;
                            let line_layout = &line_layouts[line_ix];
-                            let flap_trailer_layout = flap_trailers[line_ix].as_ref();
+                            let crease_trailer_layout = crease_trailers[line_ix].as_ref();
                            inline_blame = self.layout_inline_blame(
                                display_row,
                                &snapshot.display_snapshot,
                                line_layout,
-                                flap_trailer_layout,
+                                crease_trailer_layout,
                                em_width,
                                content_origin,
                                scroll_pixel_position,
@@ -4991,6 +5022,7 @@ impl Element for EditorElement {
                        active_rows,
                        highlighted_rows,
                        highlighted_ranges,
+                        highlighted_gutter_ranges,
                        redacted_ranges,
                        line_elements,
                        line_numbers,
@@ -5005,7 +5037,7 @@ impl Element for EditorElement {
                        test_indicators,
                        code_actions_indicator,
                        gutter_fold_toggles,
-                        flap_trailers,
+                        crease_trailers,
                        tab_invisible,
                        space_invisible,
                    }
@@ -5072,8 +5104,10 @@ impl Element for EditorElement {
                    self.paint_mouse_listeners(layout, hovered_hunk, cx);
                    self.paint_background(layout, cx);
                    self.paint_indent_guides(layout, cx);
+
                    if layout.gutter_hitbox.size.width > Pixels::ZERO {
-                        self.paint_gutter(layout, cx)
+                        self.paint_blamed_display_rows(layout, cx);
+                        self.paint_line_numbers(layout, cx);
                    }

                    self.paint_text(layout, cx);
@@ -5084,6 +5118,11 @@ impl Element for EditorElement {
                        });
                    }

+                    if layout.gutter_hitbox.size.width > Pixels::ZERO {
+                        self.paint_gutter_highlights(layout, cx);
+                        self.paint_gutter_indicators(layout, cx);
+                    }
+
                    self.paint_scrollbar(layout, cx);
                    self.paint_mouse_context_menu(layout, cx);
                });
@@ -5121,6 +5160,7 @@ 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>,
@@ -5128,7 +5168,7 @@ pub struct EditorLayout {
    code_actions_indicator: Option<AnyElement>,
    test_indicators: Vec<AnyElement>,
    gutter_fold_toggles: Vec<Option<AnyElement>>,
-    flap_trailers: Vec<Option<FlapTrailerLayout>>,
+    crease_trailers: Vec<Option<CreaseTrailerLayout>>,
    mouse_context_menu: Option<AnyElement>,
    tab_invisible: ShapedLine,
    space_invisible: ShapedLine,
@@ -5252,7 +5292,7 @@ impl ScrollbarLayout {
    }
 }

-struct FlapTrailerLayout {
+struct CreaseTrailerLayout {
    element: AnyElement,
    bounds: Bounds<Pixels>,
 }
--- a/crates/editor/src/hover_links.rs
+++ b/crates/editor/src/hover_links.rs
@@ -741,16 +741,20 @@ mod tests {
                Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![
                    lsp::LocationLink {
                        origin_selection_range: Some(symbol_range),
-                        target_uri: url.clone(),
+                        target_uri: url.clone().into(),
                        target_range,
                        target_selection_range: target_range,
                    },
                ])))
            });

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

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

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

        cx.assert_editor_state(indoc! {"
            struct «Aˇ»;
@@ -813,7 +815,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: Some(symbol_range),
-                    target_uri: url.clone(),
+                    target_uri: url.clone().into(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -839,7 +841,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: Some(symbol_range),
-                    target_uri: url.clone(),
+                    target_uri: url.clone().into(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -902,7 +904,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: Some(symbol_range),
-                    target_uri: url,
+                    target_uri: url.into(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -978,7 +980,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: None,
-                    target_uri: url,
+                    target_uri: url.into(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -1006,7 +1008,7 @@ mod tests {
            Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
                lsp::LocationLink {
                    origin_selection_range: None,
-                    target_uri: url,
+                    target_uri: url.into(),
                    target_range,
                    target_selection_range: target_range,
                },
@@ -1086,7 +1088,7 @@ mod tests {
        let hint_label = ": TestStruct";
        cx.lsp
            .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let expected_uri = expected_uri.clone();
+                let expected_uri = expected_uri.clone().into();
                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
@@ -1376,7 +1376,7 @@ mod tests {
        let closure_uri = uri.clone();
        cx.lsp
            .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
-                let task_uri = closure_uri.clone();
+                let task_uri = closure_uri.clone().into();
                async move {
                    assert_eq!(params.text_document.uri, task_uri);
                    Ok(Some(vec![lsp::InlayHint {
@@ -1467,7 +1467,7 @@ mod tests {
                            lsp::InlayHintLabelPart {
                                value: new_type_label.to_string(),
                                location: Some(lsp::Location {
-                                    uri: task_uri.clone(),
+                                    uri: task_uri.clone().into(),
                                    range: new_type_target_range,
                                }),
                                tooltip: Some(lsp::InlayHintLabelPartTooltip::String(format!(
@@ -1482,7 +1482,7 @@ mod tests {
                            lsp::InlayHintLabelPart {
                                value: struct_label.to_string(),
                                location: Some(lsp::Location {
-                                    uri: task_uri,
+                                    uri: task_uri.into(),
                                    range: struct_target_range,
                                }),
                                tooltip: Some(lsp::InlayHintLabelPartTooltip::MarkupContent(
--- a/crates/editor/src/hunk_diff.rs
+++ b/crates/editor/src/hunk_diff.rs
@@ -615,32 +615,36 @@ 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();
-        });
+        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
    });

--- 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, TestAppContext, WindowHandle};
+    use gpui::{Context, SemanticVersion, 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::Url::from_file_path(file_with_hints).unwrap(),
+                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
                    );
                    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::Url::from_file_path(file_with_hints).unwrap(),
+                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
                    );
                    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::Url::from_file_path("/a/main.rs").unwrap(),
+                        lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                    );
                    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::Url::from_file_path("/a/other.md").unwrap(),
+                        lsp::Uri::from_file_path("/a/other.md").unwrap().into(),
                    );
                    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::Url::from_file_path(file_with_hints).unwrap(),
+                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
                    );
                    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::Url::from_file_path(file_with_hints).unwrap(),
+                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
                    );
                    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::Url::from_file_path("/a/main.rs").unwrap(),
+                        lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                    );

                    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::Url::from_file_path("/a/main.rs").unwrap()
+                        == lsp::Uri::from_file_path("/a/main.rs").unwrap().into()
                    {
                        "main hint"
                    } else if params.text_document.uri
-                        == lsp::Url::from_file_path("/a/other.rs").unwrap()
+                        == lsp::Uri::from_file_path("/a/other.rs").unwrap().into()
                    {
                        "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::Url::from_file_path("/a/main.rs").unwrap()
+                        == lsp::Uri::from_file_path("/a/main.rs").unwrap().into()
                    {
                        "main hint"
                    } else if params.text_document.uri
-                        == lsp::Url::from_file_path("/a/other.rs").unwrap()
+                        == lsp::Uri::from_file_path("/a/other.rs").unwrap().into()
                    {
                        "other hint"
                    } else {
@@ -3177,7 +3177,7 @@ pub mod tests {
                async move {
                    assert_eq!(
                        params.text_document.uri,
-                        lsp::Url::from_file_path("/a/main.rs").unwrap(),
+                        lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
                    );
                    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::Url::from_file_path(file_with_hints).unwrap(),
+                        lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
                    );

                    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("0.0.0", cx);
+            release_channel::init(SemanticVersion::default(), 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
@@ -0,0 +1,150 @@
+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,7 +256,10 @@ impl SelectionsCollection {
    }

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

    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: "Courier".into(),
+        family: "Zed Mono".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::{View, ViewContext, VisualTestContext};
+use gpui::{AssetSource, 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::Url,
+    pub buffer_lsp_url: lsp::Uri,
 }

 impl EditorLspTestContext {
@@ -39,6 +39,12 @@ 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);
@@ -107,7 +113,7 @@ impl EditorLspTestContext {
            },
            lsp,
            workspace,
-            buffer_lsp_url: lsp::Url::from_file_path(format!("/root/dir/{file_name}")).unwrap(),
+            buffer_lsp_url: lsp::Uri::from_file_path(format!("/root/dir/{file_name}")).unwrap(),
        }
    }

@@ -293,7 +299,7 @@ impl EditorLspTestContext {
    where
        T: 'static + request::Request,
        T::Params: 'static + Send,
-        F: 'static + Send + FnMut(lsp::Url, T::Params, gpui::AsyncAppContext) -> Fut,
+        F: 'static + Send + FnMut(lsp::Uri, T::Params, gpui::AsyncAppContext) -> Fut,
        Fut: 'static + Send + Future<Output = Result<T::Result>>,
    {
        let url = self.buffer_lsp_url.clone();
--- a/crates/extension/Cargo.toml
+++ b/crates/extension/Cargo.toml
@@ -12,6 +12,9 @@ workspace = true
 path = "src/extension_store.rs"
 doctest = false

+[features]
+no-webrtc = ["workspace/no-webrtc"]
+
 [dependencies]
 anyhow.workspace = true
 assistant_slash_command.workspace = true
--- 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, TestAppContext};
+use gpui::{Context, SemanticVersion, TestAppContext};
 use http::{FakeHttpClient, Response};
 use language::{LanguageMatcher, LanguageRegistry, LanguageServerBinaryStatus, LanguageServerName};
 use node_runtime::FakeNodeRuntime;
 use parking_lot::Mutex;
-use project::Project;
+use project::{Project, DEFAULT_COMPLETION_CONTEXT};
 use serde_json::json;
 use settings::{Settings as _, SettingsStore};
 use std::{
@@ -510,6 +510,14 @@ 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
                                    }
                                ]
                            }
@@ -657,7 +665,9 @@ async fn test_extension_store_with_gleam_extension(cx: &mut TestAppContext) {
    });

    let completion_labels = project
-        .update(cx, |project, cx| project.completions(&buffer, 0, cx))
+        .update(cx, |project, cx| {
+            project.completions(&buffer, 0, DEFAULT_COMPLETION_CONTEXT, cx)
+        })
        .await
        .unwrap()
        .into_iter()
@@ -723,7 +733,7 @@ fn init_test(cx: &mut TestAppContext) {
    cx.update(|cx| {
        let store = SettingsStore::test(cx);
        cx.set_global(store);
-        release_channel::init("0.0.0", cx);
+        release_channel::init(SemanticVersion::default(), 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,6 +8,10 @@ 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/extension_cli/Cargo.toml
+++ b/crates/extension_cli/Cargo.toml
@@ -17,7 +17,7 @@ anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
 env_logger.workspace = true
 fs.workspace = true
-extension.workspace = true
+extension = { workspace = true, features = ["no-webrtc"] }
 language.workspace = true
 log.workspace = true
 rpc.workspace = true
--- a/crates/extensions_ui/Cargo.toml
+++ b/crates/extensions_ui/Cargo.toml
@@ -24,6 +24,7 @@ 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,6 +16,7 @@ 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;
@@ -487,8 +488,11 @@ impl ExtensionsPage {
                        .size(LabelSize::Small),
                    )
                    .child(
-                        Label::new(format!("Downloads: {}", extension.download_count))
-                            .size(LabelSize::Small),
+                        Label::new(format!(
+                            "Downloads: {}",
+                            extension.download_count.to_formatted_string(&Locale::en)
+                        ))
+                        .size(LabelSize::Small),
                    ),
            )
            .child(
@@ -769,7 +773,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,5 +1,6 @@
 use gpui::{actions, AppContext, ClipboardItem, PromptLevel};
 use system_specs::SystemSpecs;
+use util::ResultExt;
 use workspace::Workspace;

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

-                let prompt = cx.prompt(
-                    PromptLevel::Info,
-                    "Copied into clipboard",
-                    Some(&specs),
-                    &["OK"],
-                );
-                cx.spawn(|_, _cx| async move {
-                    prompt.await.ok();
+                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();
                })
                .detach();
-                cx.write_to_clipboard(ClipboardItem::new(specs.clone()));
            })
            .register_action(|_, _: &RequestFeature, cx| {
                cx.open_url(request_feature_url());
            })
            .register_action(move |_, _: &FileBugReport, cx| {
-                cx.open_url(&file_bug_report_url(&SystemSpecs::new(&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();
            })
            .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 *event == EditorEvent::Edited {
+            if matches!(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,4 +1,5 @@
-use gpui::AppContext;
+use client::telemetry;
+use gpui::{AppContext, Task};
 use human_bytes::human_bytes;
 use release_channel::{AppCommitSha, AppVersion, ReleaseChannel};
 use serde::Serialize;
@@ -9,27 +10,23 @@ use sysinfo::{MemoryRefreshKind, RefreshKind, System};
 pub struct SystemSpecs {
    app_version: String,
    release_channel: &'static str,
-    os_name: &'static str,
-    os_version: Option<String>,
+    os_name: String,
+    os_version: String,
    memory: u64,
    architecture: &'static str,
    commit_sha: Option<String>,
 }

 impl SystemSpecs {
-    pub fn new(cx: &AppContext) -> Self {
+    pub fn new(cx: &AppContext) -> Task<Self> {
        let app_version = AppVersion::global(cx).to_string();
        let release_channel = ReleaseChannel::global(cx);
-        let os_name = cx.app_metadata().os_name;
+        let os_name = telemetry::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())
@@ -37,24 +34,24 @@ impl SystemSpecs {
            _ => None,
        };

-        SystemSpecs {
-            app_version,
-            release_channel: release_channel.display_name(),
-            os_name,
-            os_version,
-            memory,
-            architecture,
-            commit_sha,
-        }
+        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,
+            }
+        })
    }
 }

 impl Display for SystemSpecs {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let os_information = match &self.os_version {
-            Some(os_version) => format!("OS: {} {}", self.os_name, os_version),
-            None => format!("OS: {}", self.os_name),
-        };
+        let os_information = format!("OS: {} {}", self.os_name, self.os_version);
        let app_version_information = format!(
            "Zed: v{} ({})",
            self.app_version,
--- a/crates/file_finder/Cargo.toml
+++ b/crates/file_finder/Cargo.toml
@@ -37,6 +37,7 @@ 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,
-                    directories_only: false,
+                    candidates: project::Candidates::Files,
                }
            })
            .collect::<Vec<_>>();
--- a/crates/file_finder/src/file_finder_tests.rs
+++ b/crates/file_finder/src/file_finder_tests.rs
@@ -1747,6 +1747,45 @@ 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,
-                    directories_only: true,
+                    candidates: project::Candidates::Directories,
                }
            })
            .collect::<Vec<_>>();
--- a/crates/fs/src/fs.rs
+++ b/crates/fs/src/fs.rs
@@ -135,8 +135,6 @@ pub struct RealFs {
 }

 pub struct RealWatcher {
-    #[cfg(target_os = "linux")]
-    root_path: PathBuf,
    #[cfg(target_os = "linux")]
    fs_watcher: parking_lot::Mutex<notify::INotifyWatcher>,
 }
@@ -452,25 +450,38 @@ impl Fs for RealFs {
    async fn watch(
        &self,
        path: &Path,
-        _latency: Duration,
+        latency: Duration,
    ) -> (
        Pin<Box<dyn Send + Stream<Item = Vec<PathBuf>>>>,
        Arc<dyn Watcher>,
    ) {
+        use parking_lot::Mutex;
+
        let (tx, rx) = smol::channel::unbounded();
+        let pending_paths: Arc<Mutex<Vec<PathBuf>>> = Default::default();
+        let root_path = path.to_path_buf();

        let file_watcher = notify::recommended_watcher({
            let tx = tx.clone();
+            let pending_paths = pending_paths.clone();
            move |event: Result<notify::Event, _>| {
                if let Some(event) = event.log_err() {
-                    tx.try_send(event.paths).ok();
+                    let mut paths = event.paths;
+                    paths.retain(|path| path.starts_with(&root_path));
+                    if !paths.is_empty() {
+                        paths.sort();
+                        let mut pending_paths = pending_paths.lock();
+                        if pending_paths.is_empty() {
+                            tx.try_send(()).ok();
+                        }
+                        util::extend_sorted(&mut *pending_paths, paths, usize::MAX, PathBuf::cmp);
+                    }
                }
            }
        })
        .expect("Could not start file watcher");

        let watcher = Arc::new(RealWatcher {
-            root_path: path.to_path_buf(),
            fs_watcher: parking_lot::Mutex::new(file_watcher),
        });

@@ -484,14 +495,13 @@ impl Fs for RealFs {
        (
            Box::pin(rx.filter_map({
                let watcher = watcher.clone();
-                move |mut paths| {
-                    paths.retain(|path| path.starts_with(&watcher.root_path));
+                move |_| {
+                    let _ = watcher.clone();
+                    let pending_paths = pending_paths.clone();
                    async move {
-                        if paths.is_empty() {
-                            None
-                        } else {
-                            Some(paths)
-                        }
+                        smol::Timer::after(latency).await;
+                        let paths = std::mem::take(&mut *pending_paths.lock());
+                        (!paths.is_empty()).then_some(paths)
                    }
                }
            })),
--- 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)]
+#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
 pub struct CharBag(u64);

 impl CharBag {
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-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>`