More work on fixing blame PR

Set up ground work for getting correct remote branch per git blame entry
Co-authored-by: smit <0xtimsb@gmail.com>
2025-02-21 17:42:24 -05:00 · 2025-02-21 15:33:56 -05:00 · 2025-02-21 11:32:14 -05:00 · 2025-02-21 17:05:14 +01:00 · 2025-02-21 15:59:32 +00:00 · 2025-02-21 10:36:07 -05:00
664 changed files with 33213 additions and 30128 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -482,6 +482,6 @@ jobs:
      - bundle
    steps:
      - name: gh release
-        run: gh release edit $GITHUB_REF_NAME --draft=false
+        run: gh release edit $GITHUB_REF_NAME --draft=true
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/deploy_cloudflare.yml
+++ b/.github/workflows/deploy_cloudflare.yml
@@ -37,28 +37,28 @@ jobs:
          mdbook build ./docs --dest-dir=../target/deploy/docs/

      - name: Deploy Docs
-        uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
+        uses: cloudflare/wrangler-action@392082e81ffbcb9ebdde27400634aa004b35ea37 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: pages deploy target/deploy --project-name=docs

      - name: Deploy Install
-        uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
+        uses: cloudflare/wrangler-action@392082e81ffbcb9ebdde27400634aa004b35ea37 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: r2 object put -f script/install.sh zed-open-source-website-assets/install.sh

      - name: Deploy Docs Workers
-        uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
+        uses: cloudflare/wrangler-action@392082e81ffbcb9ebdde27400634aa004b35ea37 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
          command: deploy .cloudflare/docs-proxy/src/worker.js

      - name: Deploy Install Workers
-        uses: cloudflare/wrangler-action@7a5f8bbdfeedcde38e6777a50fe685f89259d4ca # v3
+        uses: cloudflare/wrangler-action@392082e81ffbcb9ebdde27400634aa004b35ea37 # v3
        with:
          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -24,11 +24,13 @@ jobs:
      - name: Prettier Check on /docs
        working-directory: ./docs
        run: |
-          pnpm dlx prettier . --check || {
+          pnpm dlx prettier@${PRETTIER_VERSION} . --check || {
            echo "To fix, run from the root of the zed repo:"
-            echo "  cd docs && pnpm dlx prettier . --write && cd .."
+            echo "  cd docs && pnpm dlx prettier@${PRETTIER_VERSION} . --write && cd .."
            false
          }
+        env:
+          PRETTIER_VERSION: 3.5.0

      - name: Check for Typos with Typos-CLI
        uses: crate-ci/typos@8e6a4285bcbde632c5d79900a7779746e8b7ea3f # v1.24.6
--- a/.github/workflows/issue_response.yml
+++ b/.github/workflows/issue_response.yml
@@ -0,0 +1,33 @@
+name: Issue Response
+
+on:
+  schedule:
+    - cron: "0 12 * * 2"
+  workflow_dispatch:
+
+jobs:
+  issue-response:
+    if: github.repository_owner == 'zed-industries'
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+
+      - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
+        with:
+          version: 9
+
+      - name: Setup Node
+        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
+        with:
+          node-version: "20"
+          cache: "pnpm"
+          cache-dependency-path: "script/issue_response/pnpm-lock.yaml"
+
+      - run: pnpm install --dir script/issue_response
+
+      - name: Run Issue Response
+        run: pnpm run --dir script/issue_response start
+        env:
+          ISSUE_RESPONSE_GITHUB_TOKEN: ${{ secrets.ISSUE_RESPONSE_GITHUB_TOKEN }}
+          SLACK_ISSUE_RESPONSE_WEBHOOK_URL: ${{ secrets.SLACK_ISSUE_RESPONSE_WEBHOOK_URL }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,36 @@
-/.direnv
-.envrc
-.idea
-**/target
+**/*.db
 **/cargo-target
-/zed.xcworkspace
-.DS_Store
-/plugins/bin
-/script/node_modules
-/crates/theme/schemas/theme.json
-/crates/collab/seed.json
-/crates/zed/resources/flatpak/flatpak-cargo-sources.json
-/dev.zed.Zed*.json
-/assets/*licenses.*
+**/target
 **/venv
-.build
 *.wasm
-Packages
 *.xcodeproj
-xcuserdata/
-DerivedData/
+.DS_Store
+.blob_store
+.build
+.envrc
+.flatpak-builder
+.idea
+.netrc
+.pytest_cache
+.swiftpm
 .swiftpm/config/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-.netrc
-.swiftpm
-**/*.db
-.pytest_cache
 .venv
-.blob_store
 .vscode
 .wrangler
-.flatpak-builder
-.envrc
+/.direnv
+/assets/*licenses.*
+/crates/collab/seed.json
+/crates/theme/schemas/theme.json
+/crates/zed/resources/flatpak/flatpak-cargo-sources.json
+/dev.zed.Zed*.json
+/plugins/bin
+/script/node_modules
+/snap
+/zed.xcworkspace
+DerivedData/
+Packages
+xcuserdata/

 # Don't commit any secrets to the repo.
 .env.secret.toml
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,6 +37,16 @@ We plan to set aside time each week to pair program with contributors on promisi
 - Pair with us and watch us code to learn the codebase
 - Low effort PRs, such as those that just re-arrange syntax, won't be merged without a compelling justification

+## File icons
+
+Zed's default icon theme consists of icons that are hand-designed to fit together in a cohesive manner.
+
+We do not accept PRs for file icons that are just an off-the-shelf SVG taken from somewhere else.
+
+### Adding new icons to the Zed icon theme
+
+If you would like to add a new icon to the Zed icon theme, [open a Discussion](https://github.com/zed-industries/zed/discussions/new?category=ux-and-design) and we can work with you on getting an icon designed and added to Zed.
+
 ## Bird's-eye view of Zed

 Zed is made up of several smaller crates - let's go over those you're most likely to interact with:
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
    "crates/auto_update",
    "crates/auto_update_ui",
    "crates/breadcrumbs",
+    "crates/buffer_diff",
    "crates/call",
    "crates/channel",
    "crates/cli",
@@ -26,13 +27,15 @@ members = [
    "crates/collections",
    "crates/command_palette",
    "crates/command_palette_hooks",
+    "crates/component",
+    "crates/component_preview",
    "crates/context_server",
    "crates/context_server_settings",
    "crates/copilot",
+    "crates/credentials_provider",
    "crates/db",
    "crates/deepseek",
    "crates/diagnostics",
-    "crates/diff",
    "crates/docs_preprocessor",
    "crates/editor",
    "crates/evals",
@@ -72,15 +75,17 @@ members = [
    "crates/language_selector",
    "crates/language_tools",
    "crates/languages",
+    "crates/livekit_api",
    "crates/livekit_client",
    "crates/livekit_client_macos",
-    "crates/livekit_server",
    "crates/lmstudio",
    "crates/lsp",
    "crates/markdown",
    "crates/markdown_preview",
    "crates/media",
    "crates/menu",
+    "crates/migrator",
+    "crates/mistral",
    "crates/multi_buffer",
    "crates/node_runtime",
    "crates/notifications",
@@ -146,7 +151,6 @@ members = [
    "crates/ui_macros",
    "crates/util",
    "crates/util_macros",
-    "crates/vcs_menu",
    "crates/vim",
    "crates/vim_mode_setting",
    "crates/welcome",
@@ -169,7 +173,6 @@ members = [
    "extensions/haskell",
    "extensions/html",
    "extensions/lua",
-    "extensions/php",
    "extensions/perplexity",
    "extensions/proto",
    "extensions/purescript",
@@ -226,13 +229,16 @@ collab_ui = { path = "crates/collab_ui" }
 collections = { path = "crates/collections" }
 command_palette = { path = "crates/command_palette" }
 command_palette_hooks = { path = "crates/command_palette_hooks" }
+component = { path = "crates/component" }
+component_preview = { path = "crates/component_preview" }
 context_server = { path = "crates/context_server" }
 context_server_settings = { path = "crates/context_server_settings" }
 copilot = { path = "crates/copilot" }
+credentials_provider = { path = "crates/credentials_provider" }
 db = { path = "crates/db" }
 deepseek = { path = "crates/deepseek" }
 diagnostics = { path = "crates/diagnostics" }
-diff = { path = "crates/diff" }
+buffer_diff = { path = "crates/buffer_diff" }
 editor = { path = "crates/editor" }
 extension = { path = "crates/extension" }
 extension_host = { path = "crates/extension_host" }
@@ -270,15 +276,17 @@ language_models = { path = "crates/language_models" }
 language_selector = { path = "crates/language_selector" }
 language_tools = { path = "crates/language_tools" }
 languages = { path = "crates/languages" }
+livekit_api = { path = "crates/livekit_api" }
 livekit_client = { path = "crates/livekit_client" }
 livekit_client_macos = { path = "crates/livekit_client_macos" }
-livekit_server = { path = "crates/livekit_server" }
 lmstudio = { path = "crates/lmstudio" }
 lsp = { path = "crates/lsp" }
 markdown = { path = "crates/markdown" }
 markdown_preview = { path = "crates/markdown_preview" }
 media = { path = "crates/media" }
 menu = { path = "crates/menu" }
+migrator = { path = "crates/migrator" }
+mistral = { path = "crates/mistral" }
 multi_buffer = { path = "crates/multi_buffer" }
 node_runtime = { path = "crates/node_runtime" }
 notifications = { path = "crates/notifications" }
@@ -344,7 +352,6 @@ ui_input = { path = "crates/ui_input" }
 ui_macros = { path = "crates/ui_macros" }
 util = { path = "crates/util" }
 util_macros = { path = "crates/util_macros" }
-vcs_menu = { path = "crates/vcs_menu" }
 vim = { path = "crates/vim" }
 vim_mode_setting = { path = "crates/vim_mode_setting" }
 welcome = { path = "crates/welcome" }
@@ -359,12 +366,11 @@ zeta = { path = "crates/zeta" }
 #

 aho-corasick = "1.1"
-# TODO(#18342): Update to version 0.25 from crates.io when it is released.
-alacritty_terminal = { git = "https://github.com/alacritty/alacritty.git", rev = "5e78d20c709cb1ab8d44ca7a8702cc26d779227c" }
+alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e"}
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
-ashpd = { version = "0.10", default-features = false, features = ["async-std"] }
+ashpd = { version = "0.11", default-features = false, features = ["async-std"] }
 async-compat = "0.2.1"
 async-compression = { version = "0.4", features = ["gzip", "futures-io"] }
 async-dispatcher = "0.1"
@@ -393,7 +399,7 @@ cocoa-foundation = "0.2.0"
 convert_case = "0.7.0"
 core-foundation = "0.9.3"
 core-foundation-sys = "0.8.6"
-ctor = "0.2.6"
+ctor = "0.3.0"
 dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
@@ -417,8 +423,10 @@ hyper = "0.14"
 http = "1.1"
 ignore = "0.4.22"
 image = "0.25.1"
+imara-diff = "0.1.8"
 indexmap = { version = "2.7.0", features = ["serde"] }
 indoc = "2"
+inventory = "0.3.19"
 itertools = "0.14.0"
 jsonwebtoken = "9.3"
 jupyter-protocol = { version = "0.6.0" }
@@ -426,6 +434,7 @@ jupyter-websocket-client = { version = "0.9.0" }
 libc = "0.2"
 libsqlite3-sys = { version = "0.30.1", features = ["bundled"] }
 linkify = "0.10.0"
+linkme = "0.3.31"
 livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "811ceae29fabee455f110c56cd66b3f49a7e5003", features = [
    "dispatcher",
    "services-dispatcher",
@@ -437,6 +446,7 @@ nanoid = "0.4"
 nbformat = { version = "0.10.0" }
 nix = "0.29"
 num-format = "0.4.4"
+once_cell = "1.20"
 ordered-float = "2.1.1"
 palette = { version = "0.7.5", default-features = false, features = ["std"] }
 parking_lot = "0.12.1"
@@ -477,7 +487,7 @@ rustc-demangle = "0.1.23"
 rust-embed = { version = "8.4", features = ["include-exclude"] }
 rustc-hash = "2.1.0"
 rustls = { version = "0.23.22" }
-rustls-native-certs = "0.8.0"
+rustls-platform-verifier = "0.5.0"
 schemars = { version = "0.8", features = ["impl_json_schema", "indexmap2"] }
 semver = "1.0"
 serde = { version = "1.0", features = ["derive", "rc"] }
@@ -492,11 +502,11 @@ sha2 = "0.10"
 shellexpand = "2.1.0"
 shlex = "1.3.0"
 signal-hook = "0.3.17"
-similar = "1.3"
 simplelog = "0.12.2"
 smallvec = { version = "1.6", features = ["union"] }
 smol = "2.0"
 sqlformat = "0.2"
+streaming-iterator = "0.1"
 strsim = "0.11"
 strum = { version = "0.26.0", features = ["derive"] }
 subtle = "2.5.0"
@@ -518,7 +528,7 @@ tiny_http = "0.8"
 toml = "0.8"
 tokio = { version = "1" }
 tower-http = "0.4.4"
-tree-sitter = { version = "0.23", features = ["wasm"] }
+tree-sitter = { version = "0.25.2", features = ["wasm"] }
 tree-sitter-bash = "0.23"
 tree-sitter-c = "0.23"
 tree-sitter-cpp = "0.23"
@@ -531,7 +541,7 @@ tree-sitter-go-mod = { git = "https://github.com/camdencheek/tree-sitter-go-mod"
 tree-sitter-gowork = { git = "https://github.com/zed-industries/tree-sitter-go-work", rev = "acb0617bf7f4fda02c6217676cc64acb89536dc7" }
 tree-sitter-heex = { git = "https://github.com/zed-industries/tree-sitter-heex", rev = "1dd45142fbb05562e35b2040c6129c9bca346592" }
 tree-sitter-diff = "0.1.0"
-tree-sitter-html = "0.20"
+tree-sitter-html = "0.23"
 tree-sitter-jsdoc = "0.23"
 tree-sitter-json = "0.24"
 tree-sitter-md = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "9a23c1a96c0513d8fc6520972beedd419a973539" }
@@ -547,19 +557,19 @@ unicode-segmentation = "1.10"
 unicode-script = "0.5.7"
 url = "2.2"
 uuid = { version = "1.1.2", features = ["v4", "v5", "v7", "serde"] }
-wasmparser = "0.215"
-wasm-encoder = "0.215"
-wasmtime = { version = "24", default-features = false, features = [
+wasmparser = "0.221"
+wasm-encoder = "0.221"
+wasmtime = { version = "29", default-features = false, features = [
    "async",
    "demangle",
    "runtime",
    "cranelift",
    "component-model",
 ] }
-wasmtime-wasi = "24"
+wasmtime-wasi = "29"
 which = "6.0.0"
-wit-component = "0.201"
-zed_llm_client = "0.2"
+wit-component = "0.221"
+zed_llm_client = "0.4"
 zstd = "0.11"
 metal = "0.31"

@@ -674,7 +684,6 @@ telemetry_events = { codegen-units = 1 }
 theme_selector = { codegen-units = 1 }
 time_format = { codegen-units = 1 }
 ui_input = { codegen-units = 1 }
-vcs_menu = { codegen-units = 1 }
 zed_actions = { codegen-units = 1 }

 [profile.release]
--- a/assets/icons/ai_mistral.svg
+++ b/assets/icons/ai_mistral.svg
@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Mistral</title><g><path d="M15 6v4h-2V6h2zm4-4v4h-2V2h2zM3 2H1h2zM1 2h2v20H1V2zm8 12h2v4H9v-4zm8 0h2v8h-2v-8z"></path><path d="M19 2h4v4h-4V2zM3 2h4v4H3V2z" opacity=".4"></path><path d="M15 10V6h8v4h-8zM3 10V6h8v4H3z" opacity=".5"></path><path d="M3 14v-4h20v4z" opacity=".6"></path><path d="M11 14h4v4h-4v-4zm8 0h4v4h-4v-4zM3 14h4v4H3v-4z" opacity=".7"></path><path d="M19 18h4v4h-4v-4zM3 18h4v4H3v-4z" opacity=".8"></path></g></svg>
--- a/assets/icons/file_icons/file_types.json
+++ b/assets/icons/file_icons/file_types.json
@@ -1,220 +0,0 @@
-{
-  "stems": {
-    "Dockerfile": "docker",
-    "Podfile": "ruby",
-    "Procfile": "heroku"
-  },
-  "suffixes": {
-    "Emakefile": "erlang",
-    "aac": "audio",
-    "accdb": "storage",
-    "app.src": "erlang",
-    "astro": "astro",
-    "avi": "video",
-    "avif": "image",
-    "bak": "backup",
-    "bash": "terminal",
-    "bash_aliases": "terminal",
-    "bash_logout": "terminal",
-    "bash_profile": "terminal",
-    "bashrc": "terminal",
-    "bmp": "image",
-    "c": "c",
-    "c++": "cpp",
-    "cc": "cpp",
-    "cjs": "javascript",
-    "coffee": "coffeescript",
-    "conf": "settings",
-    "cpp": "cpp",
-    "css": "css",
-    "csv": "storage",
-    "cxx": "cpp",
-    "cts": "typescript",
-    "dart": "dart",
-    "dat": "storage",
-    "db": "storage",
-    "dbf": "storage",
-    "diff": "diff",
-    "dll": "storage",
-    "doc": "document",
-    "docx": "document",
-    "eex": "elixir",
-    "elm": "elm",
-    "erl": "erlang",
-    "escript": "erlang",
-    "eslint.config.cjs": "eslint",
-    "eslint.config.cts": "eslint",
-    "eslint.config.js": "eslint",
-    "eslint.config.mjs": "eslint",
-    "eslint.config.mts": "eslint",
-    "eslint.config.ts": "eslint",
-    "eslintrc": "eslint",
-    "eslintrc.js": "eslint",
-    "eslintrc.json": "eslint",
-    "ex": "elixir",
-    "exs": "elixir",
-    "fish": "terminal",
-    "flac": "audio",
-    "fmp": "storage",
-    "fp7": "storage",
-    "frm": "storage",
-    "fs": "fsharp",
-    "gdb": "storage",
-    "gif": "image",
-    "gitattributes": "vcs",
-    "gitignore": "vcs",
-    "gitkeep": "vcs",
-    "gitmodules": "vcs",
-    "TAG_EDITMSG": "vcs",
-    "MERGE_MSG": "vcs",
-    "COMMIT_EDITMSG": "vcs",
-    "NOTES_EDITMSG": "vcs",
-    "EDIT_DESCRIPTION": "vcs",
-    "gleam": "gleam",
-    "go": "go",
-    "gql": "graphql",
-    "graphql": "graphql",
-    "graphqls": "graphql",
-    "h": "c",
-    "handlebars": "code",
-    "hbs": "template",
-    "hcl": "hcl",
-    "heex": "elixir",
-    "heic": "image",
-    "heif": "image",
-    "hh": "cpp",
-    "hpp": "cpp",
-    "hrl": "erlang",
-    "hs": "haskell",
-    "htm": "html",
-    "html": "html",
-    "hxx": "cpp",
-    "ib": "storage",
-    "ico": "image",
-    "ini": "settings",
-    "inl": "cpp",
-    "j2k": "image",
-    "java": "java",
-    "jfif": "image",
-    "jl": "julia",
-    "jp2": "image",
-    "jpeg": "image",
-    "jpg": "image",
-    "js": "javascript",
-    "json": "storage",
-    "jsonc": "storage",
-    "jsx": "react",
-    "jxl": "image",
-    "kt": "kotlin",
-    "ldf": "storage",
-    "lock": "lock",
-    "lockb": "bun",
-    "log": "log",
-    "lua": "lua",
-    "m4a": "audio",
-    "m4v": "video",
-    "markdown": "document",
-    "md": "document",
-    "mdb": "storage",
-    "mdf": "storage",
-    "mdx": "document",
-    "metadata": "code",
-    "metal": "metal",
-    "mjs": "javascript",
-    "mka": "audio",
-    "mkv": "video",
-    "ml": "ocaml",
-    "mli": "ocaml",
-    "mod": "go",
-    "mov": "video",
-    "mp3": "audio",
-    "mp4": "video",
-    "mts": "typescript",
-    "myd": "storage",
-    "myi": "storage",
-    "nim": "nim",
-    "nix": "nix",
-    "nu": "terminal",
-    "odp": "document",
-    "ods": "document",
-    "odt": "document",
-    "ogg": "audio",
-    "opus": "audio",
-    "otf": "font",
-    "pcss": "css",
-    "pdb": "storage",
-    "pdf": "document",
-    "php": "php",
-    "plist": "template",
-    "png": "image",
-    "postcss": "css",
-    "ppt": "document",
-    "pptx": "document",
-    "prettierignore": "prettier",
-    "prettierrc": "prettier",
-    "prisma": "prisma",
-    "profile": "terminal",
-    "ps1": "terminal",
-    "psd": "image",
-    "py": "python",
-    "qoi": "image",
-    "r": "r",
-    "rb": "ruby",
-    "rebar.config": "erlang",
-    "rkt": "code",
-    "roc": "roc",
-    "rs": "rust",
-    "rtf": "document",
-    "sass": "sass",
-    "sav": "storage",
-    "sc": "scala",
-    "scala": "scala",
-    "scm": "code",
-    "scss": "sass",
-    "sdf": "storage",
-    "sh": "terminal",
-    "sql": "storage",
-    "sqlite": "storage",
-    "svelte": "template",
-    "svg": "image",
-    "swift": "swift",
-    "tcl": "tcl",
-    "tf": "terraform",
-    "tfvars": "terraform",
-    "tiff": "image",
-    "toml": "toml",
-    "ts": "typescript",
-    "tsv": "storage",
-    "tsx": "react",
-    "ttf": "font",
-    "txt": "document",
-    "v": "v",
-    "vsh": "v",
-    "vv": "v",
-    "vue": "vue",
-    "wav": "audio",
-    "webm": "video",
-    "webp": "image",
-    "wma": "audio",
-    "wmv": "video",
-    "woff": "font",
-    "woff2": "font",
-    "work": "go",
-    "wv": "audio",
-    "xls": "document",
-    "xlsx": "document",
-    "xml": "template",
-    "xrl": "erlang",
-    "yaml": "settings",
-    "yml": "settings",
-    "yrl": "erlang",
-    "zig": "zig",
-    "zlogin": "terminal",
-    "zsh": "terminal",
-    "zsh_aliases": "terminal",
-    "zsh_histfile": "terminal",
-    "zsh_profile": "terminal",
-    "zshenv": "terminal",
-    "zshrc": "terminal"
-  }
-}
--- a/assets/icons/lock_outlined.svg
+++ b/assets/icons/lock_outlined.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="M5 5C5 3.89543 5.89543 3 7 3H9C10.1046 3 11 3.89543 11 5V6H5V5Z" stroke="black" stroke-width="1.5"/>
+<path d="M8 9V11" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+<circle cx="8" cy="9" r="1" fill="black"/>
+<rect x="3.75" y="5.75" width="8.5" height="7.5" rx="1.25" stroke="black" stroke-width="1.5" stroke-linejoin="round"/>
+</svg>
--- a/assets/icons/zed_predict_bg.svg
+++ b/assets/icons/zed_predict_bg.svg
@@ -1,6 +1,6 @@
-<svg width="440" height="128" xmlns="http://www.w3.org/2000/svg">
+<svg width="550" height="128" xmlns="http://www.w3.org/2000/svg">
  <defs>
-    <pattern id="tilePattern" width="22" height="22" patternUnits="userSpaceOnUse">
+    <pattern id="tilePattern" width="23" height="23" patternUnits="userSpaceOnUse">
      <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
        <path d="M12 5L14 8L12 11" stroke="black" stroke-width="1.5"/>
        <path d="M10 6.5L11 8L10 9.5" stroke="black" stroke-width="1.5"/>
--- a/assets/icons/zed_predict_down.svg
+++ b/assets/icons/zed_predict_down.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 9.33333L14.5 9.66667L12.5 11L10.5 9.66667L10 9.33333" stroke="black" stroke-width="1.5"/>
+<path d="M12.5 11V4.5" stroke="black" stroke-width="1.5"/>
+<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
+</svg>
--- a/assets/icons/zed_predict_up.svg
+++ b/assets/icons/zed_predict_up.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 6.66667L10.5 6.33333L12.5 5L14.5 6.33333L15 6.66667" stroke="black" stroke-width="1.5"/>
+<path d="M12.5 11V5" stroke="black" stroke-width="1.5"/>
+<path d="M7.5 8.9V11C5.43097 11 4.56903 11 2.5 11V10.4L7.5 5.6V5H2.5V7.1" stroke="black" stroke-width="1.5"/>
+</svg>
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -24,15 +24,15 @@
      "shift-escape": "workspace::ToggleZoom",
      "open": "workspace::Open",
      "ctrl-o": "workspace::Open",
-      "ctrl-=": "zed::IncreaseBufferFontSize",
-      "ctrl-+": "zed::IncreaseBufferFontSize",
-      "ctrl--": "zed::DecreaseBufferFontSize",
-      "ctrl-0": "zed::ResetBufferFontSize",
+      "ctrl-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
+      "ctrl-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
+      "ctrl--": ["zed::DecreaseBufferFontSize", { "persist": false }],
+      "ctrl-0": ["zed::ResetBufferFontSize", { "persist": false }],
      "ctrl-,": "zed::OpenSettings",
      "ctrl-q": "zed::Quit",
      "f11": "zed::ToggleFullScreen",
-      "ctrl-alt-z": "zeta::RateCompletions",
-      "ctrl-shift-i": "inline_completion::ToggleMenu"
+      "ctrl-alt-z": "edit_prediction::RateCompletions",
+      "ctrl-shift-i": "edit_prediction::ToggleMenu"
    }
  },
  {
@@ -116,13 +116,14 @@
      // "alt-v": ["editor::MovePageUp", { "center_cursor": true }],
      "ctrl-alt-space": "editor::ShowCharacterPalette",
      "ctrl-;": "editor::ToggleLineNumbers",
-      "ctrl-k ctrl-r": "editor::RevertSelectedHunks",
+      "ctrl-k ctrl-r": "git::Restore",
      "ctrl-'": "editor::ToggleSelectedDiffHunks",
      "ctrl-\"": "editor::ExpandAllHunkDiffs",
      "ctrl-i": "editor::ShowSignatureHelp",
      "alt-g b": "editor::ToggleGitBlame",
      "menu": "editor::OpenContextMenu",
-      "shift-f10": "editor::OpenContextMenu"
+      "shift-f10": "editor::OpenContextMenu",
+      "ctrl-shift-e": "editor::ToggleEditPrediction"
    }
  },
  {
@@ -145,17 +146,17 @@
    }
  },
  {
-    "context": "Editor && mode == full && inline_completion",
+    "context": "Editor && mode == full && edit_prediction",
    "bindings": {
-      "alt-]": "editor::NextInlineCompletion",
-      "alt-[": "editor::PreviousInlineCompletion",
-      "alt-right": "editor::AcceptPartialInlineCompletion"
+      "alt-]": "editor::NextEditPrediction",
+      "alt-[": "editor::PreviousEditPrediction",
+      "alt-right": "editor::AcceptPartialEditPrediction"
    }
  },
  {
-    "context": "Editor && !inline_completion",
+    "context": "Editor && !edit_prediction",
    "bindings": {
-      "alt-\\": "editor::ShowInlineCompletion"
+      "alt-\\": "editor::ShowEditPrediction"
    }
  },
  {
@@ -184,6 +185,7 @@
      "ctrl-k h": "assistant::DeployHistory",
      "ctrl-k l": "assistant::DeployPromptLibrary",
      "new": "assistant::NewContext",
+      "ctrl-t": "assistant::NewContext",
      "ctrl-n": "assistant::NewContext"
    }
  },
@@ -274,8 +276,8 @@
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "ctrl-f4": "pane::CloseActiveItem",
-      "ctrl-w": "pane::CloseActiveItem",
+      "ctrl-f4": ["pane::CloseActiveItem", { "close_pinned": false }],
+      "ctrl-w": ["pane::CloseActiveItem", { "close_pinned": false }],
      "alt-ctrl-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
      "alt-ctrl-shift-w": "workspace::CloseInactiveTabsAndPanes",
      "ctrl-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
@@ -342,21 +344,21 @@
      "alt-ctrl-f12": "editor::GoToTypeDefinitionSplit",
      "alt-shift-f12": "editor::FindAllReferences",
      "ctrl-m": "editor::MoveToEnclosingBracket",
-      "ctrl-shift-\\": "editor::MoveToEnclosingBracket",
-      "ctrl-shift-[": "editor::Fold",
-      "ctrl-shift-]": "editor::UnfoldLines",
+      "ctrl-|": "editor::MoveToEnclosingBracket",
+      "ctrl-{": "editor::Fold",
+      "ctrl-}": "editor::UnfoldLines",
      "ctrl-k ctrl-l": "editor::ToggleFold",
      "ctrl-k ctrl-[": "editor::FoldRecursive",
      "ctrl-k ctrl-]": "editor::UnfoldRecursive",
-      "ctrl-k ctrl-1": ["editor::FoldAtLevel", { "level": 1 }],
-      "ctrl-k ctrl-2": ["editor::FoldAtLevel", { "level": 2 }],
-      "ctrl-k ctrl-3": ["editor::FoldAtLevel", { "level": 3 }],
-      "ctrl-k ctrl-4": ["editor::FoldAtLevel", { "level": 4 }],
-      "ctrl-k ctrl-5": ["editor::FoldAtLevel", { "level": 5 }],
-      "ctrl-k ctrl-6": ["editor::FoldAtLevel", { "level": 6 }],
-      "ctrl-k ctrl-7": ["editor::FoldAtLevel", { "level": 7 }],
-      "ctrl-k ctrl-8": ["editor::FoldAtLevel", { "level": 8 }],
-      "ctrl-k ctrl-9": ["editor::FoldAtLevel", { "level": 9 }],
+      "ctrl-k ctrl-1": ["editor::FoldAtLevel", 1],
+      "ctrl-k ctrl-2": ["editor::FoldAtLevel", 2],
+      "ctrl-k ctrl-3": ["editor::FoldAtLevel", 3],
+      "ctrl-k ctrl-4": ["editor::FoldAtLevel", 4],
+      "ctrl-k ctrl-5": ["editor::FoldAtLevel", 5],
+      "ctrl-k ctrl-6": ["editor::FoldAtLevel", 6],
+      "ctrl-k ctrl-7": ["editor::FoldAtLevel", 7],
+      "ctrl-k ctrl-8": ["editor::FoldAtLevel", 8],
+      "ctrl-k ctrl-9": ["editor::FoldAtLevel", 9],
      "ctrl-k ctrl-0": "editor::FoldAll",
      "ctrl-k ctrl-j": "editor::UnfoldAll",
      "ctrl-space": "editor::ShowCompletions",
@@ -432,14 +434,14 @@
      "ctrl-alt-s": "workspace::SaveAll",
      "ctrl-k m": "language_selector::Toggle",
      "escape": "workspace::Unfollow",
-      "ctrl-k ctrl-left": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-k ctrl-right": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-k ctrl-up": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-k ctrl-down": ["workspace::ActivatePaneInDirection", "Down"],
-      "ctrl-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
-      "ctrl-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
-      "ctrl-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
-      "ctrl-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
+      "ctrl-k ctrl-left": "workspace::ActivatePaneLeft",
+      "ctrl-k ctrl-right": "workspace::ActivatePaneRight",
+      "ctrl-k ctrl-up": "workspace::ActivatePaneUp",
+      "ctrl-k ctrl-down": "workspace::ActivatePaneDown",
+      "ctrl-k shift-left": "workspace::SwapPaneLeft",
+      "ctrl-k shift-right": "workspace::SwapPaneRight",
+      "ctrl-k shift-up": "workspace::SwapPaneUp",
+      "ctrl-k shift-down": "workspace::SwapPaneDown",
      "ctrl-shift-x": "zed::Extensions",
      "ctrl-shift-r": "task::Rerun",
      "ctrl-alt-r": "task::Rerun",
@@ -453,8 +455,8 @@
  {
    "context": "ApplicationMenu",
    "bindings": {
-      "left": ["app_menu::NavigateApplicationMenuInDirection", "Left"],
-      "right": ["app_menu::NavigateApplicationMenuInDirection", "Right"]
+      "left": "app_menu::ActivateMenuLeft",
+      "right": "app_menu::ActivateMenuRight"
    }
  },
  // Bindings from Sublime Text
@@ -496,24 +498,28 @@
  },
  {
    "context": "Editor && showing_completions",
-    "use_key_equivalents": true,
    "bindings": {
      "enter": "editor::ConfirmCompletion",
      "tab": "editor::ComposeCompletion"
    }
  },
+  // Bindings for accepting edit predictions
+  //
+  // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This is
+  // because alt-tab may not be available, as it is often used for window switching.
  {
-    "context": "Editor && inline_completion",
+    "context": "Editor && edit_prediction",
    "bindings": {
-      // Changing the modifier currently breaks accepting while you also an LSP completions menu open
-      "alt-enter": "editor::AcceptInlineCompletion"
+      "alt-tab": "editor::AcceptEditPrediction",
+      "alt-l": "editor::AcceptEditPrediction",
+      "tab": "editor::AcceptEditPrediction"
    }
  },
  {
-    "context": "Editor && inline_completion && !inline_completion_requires_modifier",
-    "use_key_equivalents": true,
+    "context": "Editor && edit_prediction_conflict",
    "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
+      "alt-tab": "editor::AcceptEditPrediction",
+      "alt-l": "editor::AcceptEditPrediction"
    }
  },
  {
@@ -537,8 +543,7 @@
  {
    "bindings": {
      "ctrl-alt-shift-f": "workspace::FollowNextCollaborator",
-      "ctrl-alt-i": "zed::DebugElements",
-      "ctrl-:": "editor::ToggleInlayHints"
+      "ctrl-alt-i": "zed::DebugElements"
    }
  },
  {
@@ -556,7 +561,8 @@
      "ctrl-shift-e": "pane::RevealInProjectPanel",
      "ctrl-f8": "editor::GoToHunk",
      "ctrl-shift-f8": "editor::GoToPrevHunk",
-      "ctrl-enter": "assistant::InlineAssist"
+      "ctrl-enter": "assistant::InlineAssist",
+      "ctrl-:": "editor::ToggleInlayHints"
    }
  },
  {
@@ -582,6 +588,7 @@
      "save": "workspace::Save",
      "ctrl->": "assistant::QuoteSelection",
      "ctrl-<": "assistant::InsertIntoEditor",
+      "ctrl-alt-/": "assistant::ToggleModelSelector",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
      "enter": "assistant::ConfirmCommand",
@@ -602,14 +609,12 @@
  },
  {
    "context": "MessageEditor > Editor",
-    "use_key_equivalents": true,
    "bindings": {
      "enter": "assistant2::Chat"
    }
  },
  {
    "context": "ContextStrip",
-    "use_key_equivalents": true,
    "bindings": {
      "up": "assistant2::FocusUp",
      "right": "assistant2::FocusRight",
@@ -647,8 +652,8 @@
      "right": "outline_panel::ExpandSelectedEntry",
      "alt-copy": "outline_panel::CopyPath",
      "ctrl-alt-c": "outline_panel::CopyPath",
-      "alt-shift-copy": "outline_panel::CopyRelativePath",
-      "alt-ctrl-shift-c": "outline_panel::CopyRelativePath",
+      "alt-shift-copy": "workspace::CopyRelativePath",
+      "alt-ctrl-shift-c": "workspace::CopyRelativePath",
      "alt-ctrl-r": "outline_panel::RevealInFileManager",
      "space": "outline_panel::Open",
      "shift-down": "menu::SelectNext",
@@ -676,8 +681,8 @@
      "ctrl-v": "project_panel::Paste",
      "alt-copy": "project_panel::CopyPath",
      "ctrl-alt-c": "project_panel::CopyPath",
-      "alt-shift-copy": "project_panel::CopyRelativePath",
-      "alt-ctrl-shift-c": "project_panel::CopyRelativePath",
+      "alt-shift-copy": "workspace::CopyRelativePath",
+      "alt-ctrl-shift-c": "workspace::CopyRelativePath",
      "enter": "project_panel::Rename",
      "f2": "project_panel::Rename",
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
@@ -702,30 +707,32 @@
  },
  {
    "context": "GitPanel && !CommitEditor",
-    "use_key_equivalents": true,
    "bindings": {
      "escape": "git_panel::Close"
    }
  },
  {
    "context": "GitPanel && ChangesList",
-    "use_key_equivalents": true,
    "bindings": {
      "up": "menu::SelectPrev",
      "down": "menu::SelectNext",
      "enter": "menu::Confirm",
      "space": "git::ToggleStaged",
      "ctrl-space": "git::StageAll",
-      "ctrl-shift-space": "git::UnstageAll"
+      "ctrl-shift-space": "git::UnstageAll",
+      "tab": "git_panel::FocusEditor",
+      "shift-tab": "git_panel::FocusEditor",
+      "escape": "git_panel::ToggleFocus"
    }
  },
  {
-    "context": "GitPanel && CommitEditor > Editor",
-    "use_key_equivalents": true,
+    "context": "GitPanel > Editor",
    "bindings": {
      "escape": "git_panel::FocusChanges",
-      "ctrl-enter": "git::CommitChanges",
-      "ctrl-shift-enter": "git::CommitAllChanges"
+      "ctrl-enter": "git::Commit",
+      "tab": "git_panel::FocusChanges",
+      "shift-tab": "git_panel::FocusChanges",
+      "alt-up": "git_panel::FocusChanges"
    }
  },
  {
@@ -761,13 +768,7 @@
    }
  },
  {
-    "context": "FileFinder",
-    "bindings": {
-      "ctrl": "file_finder::ToggleMenu"
-    }
-  },
-  {
-    "context": "FileFinder && !menu_open",
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "bindings": {
      "ctrl-shift-p": "file_finder::SelectPrev",
      "ctrl-j": "pane::SplitDown",
@@ -776,15 +777,6 @@
      "ctrl-l": "pane::SplitRight"
    }
  },
-  {
-    "context": "FileFinder && menu_open",
-    "bindings": {
-      "j": "pane::SplitDown",
-      "k": "pane::SplitUp",
-      "h": "pane::SplitLeft",
-      "l": "pane::SplitRight"
-    }
-  },
  {
    "context": "TabSwitcher",
    "bindings": {
@@ -833,7 +825,6 @@
  },
  {
    "context": "ZedPredictModal",
-    "use_key_equivalents": true,
    "bindings": {
      "escape": "menu::Cancel"
    }
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -28,10 +28,10 @@
      "cmd-shift-w": "workspace::CloseWindow",
      "shift-escape": "workspace::ToggleZoom",
      "cmd-o": "workspace::Open",
-      "cmd-=": "zed::IncreaseBufferFontSize",
-      "cmd-+": "zed::IncreaseBufferFontSize",
-      "cmd--": "zed::DecreaseBufferFontSize",
-      "cmd-0": "zed::ResetBufferFontSize",
+      "cmd-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
+      "cmd-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
+      "cmd--": ["zed::DecreaseBufferFontSize", { "persist": false }],
+      "cmd-0": ["zed::ResetBufferFontSize", { "persist": false }],
      "cmd-,": "zed::OpenSettings",
      "cmd-q": "zed::Quit",
      "cmd-h": "zed::Hide",
@@ -39,8 +39,8 @@
      "cmd-m": "zed::Minimize",
      "fn-f": "zed::ToggleFullScreen",
      "ctrl-cmd-f": "zed::ToggleFullScreen",
-      "ctrl-shift-z": "zeta::RateCompletions",
-      "ctrl-shift-i": "inline_completion::ToggleMenu"
+      "ctrl-cmd-z": "edit_prediction::RateCompletions",
+      "ctrl-cmd-i": "edit_prediction::ToggleMenu"
    }
  },
  {
@@ -97,8 +97,10 @@
      "cmd-right": "editor::MoveToEndOfLine",
      "ctrl-e": "editor::MoveToEndOfLine",
      "end": "editor::MoveToEndOfLine",
-      "cmd-up": "editor::MoveToBeginning",
-      "cmd-down": "editor::MoveToEnd",
+      "cmd-up": "editor::MoveToStartOfExcerpt",
+      "cmd-down": "editor::MoveToEndOfExcerpt",
+      "cmd-home": "editor::MoveToBeginning", // Typed via `cmd-fn-left`
+      "cmd-end": "editor::MoveToEnd", // Typed via `cmd-fn-right`
      "shift-up": "editor::SelectUp",
      "ctrl-shift-p": "editor::SelectUp",
      "shift-down": "editor::SelectDown",
@@ -111,8 +113,8 @@
      "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
      "ctrl-shift-up": "editor::SelectToStartOfParagraph",
      "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-      "cmd-shift-up": "editor::SelectToBeginning",
-      "cmd-shift-down": "editor::SelectToEnd",
+      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
+      "cmd-shift-down": "editor::SelectToEndOfExcerpt",
      "cmd-a": "editor::SelectAll",
      "cmd-l": "editor::SelectLine",
      "cmd-shift-i": "editor::Format",
@@ -126,13 +128,17 @@
      "ctrl-shift-v": ["editor::MovePageUp", { "center_cursor": true }],
      "ctrl-cmd-space": "editor::ShowCharacterPalette",
      "cmd-;": "editor::ToggleLineNumbers",
-      "cmd-alt-z": "editor::RevertSelectedHunks",
+      "cmd-alt-z": "git::Restore",
+      "cmd-alt-y": "git::ToggleStaged",
+      "cmd-y": "git::StageAndNext",
+      "cmd-shift-y": "git::UnstageAndNext",
      "cmd-'": "editor::ToggleSelectedDiffHunks",
      "cmd-\"": "editor::ExpandAllHunkDiffs",
      "cmd-alt-g b": "editor::ToggleGitBlame",
      "cmd-i": "editor::ShowSignatureHelp",
      "ctrl-f12": "editor::GoToDeclaration",
-      "alt-ctrl-f12": "editor::GoToDeclarationSplit"
+      "alt-ctrl-f12": "editor::GoToDeclarationSplit",
+      "ctrl-cmd-e": "editor::ToggleEditPrediction"
    }
  },
  {
@@ -155,19 +161,19 @@
    }
  },
  {
-    "context": "Editor && mode == full && inline_completion",
+    "context": "Editor && mode == full && edit_prediction",
    "use_key_equivalents": true,
    "bindings": {
-      "alt-tab": "editor::NextInlineCompletion",
-      "alt-shift-tab": "editor::PreviousInlineCompletion",
-      "ctrl-cmd-right": "editor::AcceptPartialInlineCompletion"
+      "alt-tab": "editor::NextEditPrediction",
+      "alt-shift-tab": "editor::PreviousEditPrediction",
+      "ctrl-cmd-right": "editor::AcceptPartialEditPrediction"
    }
  },
  {
-    "context": "Editor && !inline_completion",
+    "context": "Editor && !edit_prediction",
    "use_key_equivalents": true,
    "bindings": {
-      "alt-tab": "editor::ShowInlineCompletion"
+      "alt-tab": "editor::ShowEditPrediction"
    }
  },
  {
@@ -205,6 +211,7 @@
      "cmd-alt-/": "assistant::ToggleModelSelector",
      "cmd-k h": "assistant::DeployHistory",
      "cmd-k l": "assistant::DeployPromptLibrary",
+      "cmd-t": "assistant::NewContext",
      "cmd-n": "assistant::NewContext"
    }
  },
@@ -217,6 +224,7 @@
      "cmd-s": "workspace::Save",
      "cmd->": "assistant::QuoteSelection",
      "cmd-<": "assistant::InsertIntoEditor",
+      "cmd-alt-/": "assistant::ToggleModelSelector",
      "shift-enter": "assistant::Split",
      "ctrl-r": "assistant::CycleMessageRole",
      "enter": "assistant::ConfirmCommand",
@@ -281,7 +289,8 @@
      "alt-enter": "search::SelectAllMatches",
      "cmd-f": "search::FocusSearch",
      "cmd-alt-f": "search::ToggleReplace",
-      "cmd-alt-l": "search::ToggleSelection"
+      "cmd-alt-l": "search::ToggleSelection",
+      "cmd-shift-o": "outline::Toggle"
    }
  },
  {
@@ -349,7 +358,7 @@
      "cmd-}": "pane::ActivateNextItem",
      "ctrl-shift-pageup": "pane::SwapItemLeft",
      "ctrl-shift-pagedown": "pane::SwapItemRight",
-      "cmd-w": "pane::CloseActiveItem",
+      "cmd-w": ["pane::CloseActiveItem", { "close_pinned": false }],
      "alt-cmd-t": ["pane::CloseInactiveItems", { "close_pinned": false }],
      "ctrl-alt-cmd-w": "workspace::CloseInactiveTabsAndPanes",
      "cmd-k e": ["pane::CloseItemsToTheLeft", { "close_pinned": false }],
@@ -413,15 +422,15 @@
      "cmd-k cmd-l": "editor::ToggleFold",
      "cmd-k cmd-[": "editor::FoldRecursive",
      "cmd-k cmd-]": "editor::UnfoldRecursive",
-      "cmd-k cmd-1": ["editor::FoldAtLevel", { "level": 1 }],
-      "cmd-k cmd-2": ["editor::FoldAtLevel", { "level": 2 }],
-      "cmd-k cmd-3": ["editor::FoldAtLevel", { "level": 3 }],
-      "cmd-k cmd-4": ["editor::FoldAtLevel", { "level": 4 }],
-      "cmd-k cmd-5": ["editor::FoldAtLevel", { "level": 5 }],
-      "cmd-k cmd-6": ["editor::FoldAtLevel", { "level": 6 }],
-      "cmd-k cmd-7": ["editor::FoldAtLevel", { "level": 7 }],
-      "cmd-k cmd-8": ["editor::FoldAtLevel", { "level": 8 }],
-      "cmd-k cmd-9": ["editor::FoldAtLevel", { "level": 9 }],
+      "cmd-k cmd-1": ["editor::FoldAtLevel", 1],
+      "cmd-k cmd-2": ["editor::FoldAtLevel", 2],
+      "cmd-k cmd-3": ["editor::FoldAtLevel", 3],
+      "cmd-k cmd-4": ["editor::FoldAtLevel", 4],
+      "cmd-k cmd-5": ["editor::FoldAtLevel", 5],
+      "cmd-k cmd-6": ["editor::FoldAtLevel", 6],
+      "cmd-k cmd-7": ["editor::FoldAtLevel", 7],
+      "cmd-k cmd-8": ["editor::FoldAtLevel", 8],
+      "cmd-k cmd-9": ["editor::FoldAtLevel", 9],
      "cmd-k cmd-0": "editor::FoldAll",
      "cmd-k cmd-j": "editor::UnfoldAll",
      // Using `ctrl-space` in Zed requires disabling the macOS global shortcut.
@@ -459,7 +468,7 @@
      "ctrl-9": ["pane::ActivateItem", 8],
      "ctrl-0": "pane::ActivateLastItem",
      "ctrl--": "pane::GoBack",
-      "ctrl-shift--": "pane::GoForward",
+      "ctrl-_": "pane::GoForward",
      "cmd-shift-f": "pane::DeploySearch"
    }
  },
@@ -509,14 +518,14 @@
      "cmd-alt-s": "workspace::SaveAll",
      "cmd-k m": "language_selector::Toggle",
      "escape": "workspace::Unfollow",
-      "cmd-k cmd-left": ["workspace::ActivatePaneInDirection", "Left"],
-      "cmd-k cmd-right": ["workspace::ActivatePaneInDirection", "Right"],
-      "cmd-k cmd-up": ["workspace::ActivatePaneInDirection", "Up"],
-      "cmd-k cmd-down": ["workspace::ActivatePaneInDirection", "Down"],
-      "cmd-k shift-left": ["workspace::SwapPaneInDirection", "Left"],
-      "cmd-k shift-right": ["workspace::SwapPaneInDirection", "Right"],
-      "cmd-k shift-up": ["workspace::SwapPaneInDirection", "Up"],
-      "cmd-k shift-down": ["workspace::SwapPaneInDirection", "Down"],
+      "cmd-k cmd-left": "workspace::ActivatePaneLeft",
+      "cmd-k cmd-right": "workspace::ActivatePaneRight",
+      "cmd-k cmd-up": "workspace::ActivatePaneUp",
+      "cmd-k cmd-down": "workspace::ActivatePaneDown",
+      "cmd-k shift-left": "workspace::SwapPaneLeft",
+      "cmd-k shift-right": "workspace::SwapPaneRight",
+      "cmd-k shift-up": "workspace::SwapPaneUp",
+      "cmd-k shift-down": "workspace::SwapPaneDown",
      "cmd-shift-x": "zed::Extensions"
    }
  },
@@ -580,17 +589,17 @@
    }
  },
  {
-    "context": "Editor && inline_completion",
+    "context": "Editor && edit_prediction",
    "bindings": {
-      // Changing the modifier currently breaks accepting while you also an LSP completions menu open
-      "alt-tab": "editor::AcceptInlineCompletion"
+      "alt-tab": "editor::AcceptEditPrediction",
+      "tab": "editor::AcceptEditPrediction"
    }
  },
  {
-    "context": "Editor && inline_completion && !inline_completion_requires_modifier",
+    "context": "Editor && edit_prediction_conflict",
    "use_key_equivalents": true,
    "bindings": {
-      "tab": "editor::AcceptInlineCompletion"
+      "alt-tab": "editor::AcceptEditPrediction"
    }
  },
  {
@@ -619,8 +628,7 @@
      "ctrl-alt-cmd-f": "workspace::FollowNextCollaborator",
      // TODO: Move this to a dock open action
      "cmd-shift-c": "collab_panel::ToggleFocus",
-      "cmd-alt-i": "zed::DebugElements",
-      "ctrl-:": "editor::ToggleInlayHints"
+      "cmd-alt-i": "zed::DebugElements"
    }
  },
  {
@@ -633,7 +641,8 @@
      "cmd-shift-e": "pane::RevealInProjectPanel",
      "cmd-f8": "editor::GoToHunk",
      "cmd-shift-f8": "editor::GoToPrevHunk",
-      "ctrl-enter": "assistant::InlineAssist"
+      "ctrl-enter": "assistant::InlineAssist",
+      "ctrl-:": "editor::ToggleInlayHints"
    }
  },
  {
@@ -669,8 +678,8 @@
      "escape": "menu::Cancel",
      "left": "outline_panel::CollapseSelectedEntry",
      "right": "outline_panel::ExpandSelectedEntry",
-      "cmd-alt-c": "outline_panel::CopyPath",
-      "alt-cmd-shift-c": "outline_panel::CopyRelativePath",
+      "cmd-alt-c": "workspace::CopyPath",
+      "alt-cmd-shift-c": "workspace::CopyRelativePath",
      "alt-cmd-r": "outline_panel::RevealInFileManager",
      "space": "outline_panel::Open",
      "shift-down": "menu::SelectNext",
@@ -691,8 +700,8 @@
      "cmd-x": "project_panel::Cut",
      "cmd-c": "project_panel::Copy",
      "cmd-v": "project_panel::Paste",
-      "cmd-alt-c": "project_panel::CopyPath",
-      "alt-cmd-shift-c": "project_panel::CopyRelativePath",
+      "cmd-alt-c": "workspace::CopyPath",
+      "alt-cmd-shift-c": "workspace::CopyRelativePath",
      "enter": "project_panel::Rename",
      "f2": "project_panel::Rename",
      "backspace": ["project_panel::Trash", { "skip_prompt": false }],
@@ -715,13 +724,6 @@
      "space": "project_panel::Open"
    }
  },
-  {
-    "context": "GitPanel && !CommitEditor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "escape": "git_panel::Close"
-    }
-  },
  {
    "context": "GitPanel && ChangesList",
    "use_key_equivalents": true,
@@ -734,17 +736,29 @@
      "space": "git::ToggleStaged",
      "cmd-shift-space": "git::StageAll",
      "ctrl-shift-space": "git::UnstageAll",
-      "alt-down": "git_panel::FocusEditor"
+      "alt-down": "git_panel::FocusEditor",
+      "tab": "git_panel::FocusEditor",
+      "shift-tab": "git_panel::FocusEditor",
+      "escape": "git_panel::ToggleFocus"
    }
  },
  {
-    "context": "GitPanel && CommitEditor > Editor",
+    "context": "GitCommit > Editor",
    "use_key_equivalents": true,
    "bindings": {
-      "alt-up": "git_panel::FocusChanges",
-      "escape": "git_panel::FocusChanges",
-      "cmd-enter": "git::CommitChanges",
-      "cmd-alt-enter": "git::CommitAllChanges"
+      "enter": "editor::Newline",
+      "cmd-enter": "git::Commit"
+    }
+  },
+  {
+    "context": "GitPanel > Editor",
+    "use_key_equivalents": true,
+    "bindings": {
+      "enter": "editor::Newline",
+      "cmd-enter": "git::Commit",
+      "tab": "git_panel::FocusChanges",
+      "shift-tab": "git_panel::FocusChanges",
+      "alt-up": "git_panel::FocusChanges"
    }
  },
  {
@@ -786,14 +800,7 @@
    }
  },
  {
-    "context": "FileFinder",
-    "use_key_equivalents": true,
-    "bindings": {
-      "cmd": "file_finder::ToggleMenu"
-    }
-  },
-  {
-    "context": "FileFinder && !menu_open",
+    "context": "FileFinder || (FileFinder > Picker > Editor) || (FileFinder > Picker > menu)",
    "use_key_equivalents": true,
    "bindings": {
      "cmd-shift-p": "file_finder::SelectPrev",
@@ -803,16 +810,6 @@
      "cmd-l": "pane::SplitRight"
    }
  },
-  {
-    "context": "FileFinder && menu_open",
-    "use_key_equivalents": true,
-    "bindings": {
-      "j": "pane::SplitDown",
-      "k": "pane::SplitUp",
-      "h": "pane::SplitLeft",
-      "l": "pane::SplitRight"
-    }
-  },
  {
    "context": "TabSwitcher",
    "use_key_equivalents": true,
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -2,15 +2,15 @@
  {
    "bindings": {
      "ctrl-alt-s": "zed::OpenSettings",
-      "ctrl-shift-[": "pane::ActivatePrevItem",
-      "ctrl-shift-]": "pane::ActivateNextItem"
+      "ctrl-{": "pane::ActivatePrevItem",
+      "ctrl-}": "pane::ActivateNextItem"
    }
  },
  {
    "context": "Editor",
    "bindings": {
-      "ctrl->": "zed::IncreaseBufferFontSize",
-      "ctrl-<": "zed::DecreaseBufferFontSize",
+      "ctrl->": ["zed::IncreaseBufferFontSize", { "persist": true }],
+      "ctrl-<": ["zed::DecreaseBufferFontSize", { "persist": true }],
      "ctrl-shift-j": "editor::JoinLines",
      "ctrl-d": "editor::DuplicateSelection",
      "ctrl-y": "editor::DeleteLine",
@@ -44,7 +44,7 @@
      "shift-f2": "editor::GoToPrevDiagnostic",
      "ctrl-alt-shift-down": "editor::GoToHunk",
      "ctrl-alt-shift-up": "editor::GoToPrevHunk",
-      "ctrl-alt-z": "editor::RevertSelectedHunks",
+      "ctrl-alt-z": "git::Restore",
      "ctrl-home": "editor::MoveToBeginning",
      "ctrl-end": "editor::MoveToEnd",
      "ctrl-shift-home": "editor::SelectToBeginning",
--- a/assets/keymaps/linux/sublime_text.json
+++ b/assets/keymaps/linux/sublime_text.json
@@ -1,8 +1,8 @@
 [
  {
    "bindings": {
-      "ctrl-shift-[": "pane::ActivatePrevItem",
-      "ctrl-shift-]": "pane::ActivateNextItem",
+      "ctrl-{": "pane::ActivatePrevItem",
+      "ctrl-}": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-1": ["workspace::ActivatePane", 0],
@@ -14,15 +14,15 @@
      "ctrl-7": ["workspace::ActivatePane", 6],
      "ctrl-8": ["workspace::ActivatePane", 7],
      "ctrl-9": ["workspace::ActivatePane", 8],
-      "ctrl-shift-1": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }],
-      "ctrl-shift-2": ["workspace::MoveItemToPane", { "destination": 1 }],
-      "ctrl-shift-3": ["workspace::MoveItemToPane", { "destination": 2 }],
-      "ctrl-shift-4": ["workspace::MoveItemToPane", { "destination": 3 }],
-      "ctrl-shift-5": ["workspace::MoveItemToPane", { "destination": 4 }],
-      "ctrl-shift-6": ["workspace::MoveItemToPane", { "destination": 5 }],
-      "ctrl-shift-7": ["workspace::MoveItemToPane", { "destination": 6 }],
-      "ctrl-shift-8": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-shift-9": ["workspace::MoveItemToPane", { "destination": 8 }]
+      "ctrl-!": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }],
+      "ctrl-@": ["workspace::MoveItemToPane", { "destination": 1 }],
+      "ctrl-#": ["workspace::MoveItemToPane", { "destination": 2 }],
+      "ctrl-$": ["workspace::MoveItemToPane", { "destination": 3 }],
+      "ctrl-%": ["workspace::MoveItemToPane", { "destination": 4 }],
+      "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
+      "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
+      "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
+      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
    }
  },
  {
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -1,15 +1,15 @@
 [
  {
    "bindings": {
-      "cmd-shift-[": "pane::ActivatePrevItem",
-      "cmd-shift-]": "pane::ActivateNextItem"
+      "cmd-{": "pane::ActivatePrevItem",
+      "cmd-}": "pane::ActivateNextItem"
    }
  },
  {
    "context": "Editor",
    "bindings": {
-      "ctrl->": "zed::IncreaseBufferFontSize",
-      "ctrl-<": "zed::DecreaseBufferFontSize",
+      "ctrl->": ["zed::IncreaseBufferFontSize", { "persist": true }],
+      "ctrl-<": ["zed::DecreaseBufferFontSize", { "persist": true }],
      "ctrl-shift-j": "editor::JoinLines",
      "cmd-d": "editor::DuplicateSelection",
      "cmd-backspace": "editor::DeleteLine",
--- a/assets/keymaps/macos/sublime_text.json
+++ b/assets/keymaps/macos/sublime_text.json
@@ -1,8 +1,8 @@
 [
  {
    "bindings": {
-      "cmd-shift-[": "pane::ActivatePrevItem",
-      "cmd-shift-]": "pane::ActivateNextItem",
+      "cmd-{": "pane::ActivatePrevItem",
+      "cmd-}": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-1": ["workspace::ActivatePane", 0],
@@ -14,15 +14,15 @@
      "ctrl-7": ["workspace::ActivatePane", 6],
      "ctrl-8": ["workspace::ActivatePane", 7],
      "ctrl-9": ["workspace::ActivatePane", 8],
-      "ctrl-shift-1": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }],
-      "ctrl-shift-2": ["workspace::MoveItemToPane", { "destination": 1 }],
-      "ctrl-shift-3": ["workspace::MoveItemToPane", { "destination": 2 }],
-      "ctrl-shift-4": ["workspace::MoveItemToPane", { "destination": 3 }],
-      "ctrl-shift-5": ["workspace::MoveItemToPane", { "destination": 4 }],
-      "ctrl-shift-6": ["workspace::MoveItemToPane", { "destination": 5 }],
-      "ctrl-shift-7": ["workspace::MoveItemToPane", { "destination": 6 }],
-      "ctrl-shift-8": ["workspace::MoveItemToPane", { "destination": 7 }],
-      "ctrl-shift-9": ["workspace::MoveItemToPane", { "destination": 8 }]
+      "ctrl-!": ["workspace::MoveItemToPane", { "destination": 0, "focus": true }],
+      "ctrl-@": ["workspace::MoveItemToPane", { "destination": 1 }],
+      "ctrl-#": ["workspace::MoveItemToPane", { "destination": 2 }],
+      "ctrl-$": ["workspace::MoveItemToPane", { "destination": 3 }],
+      "ctrl-%": ["workspace::MoveItemToPane", { "destination": 4 }],
+      "ctrl-^": ["workspace::MoveItemToPane", { "destination": 5 }],
+      "ctrl-&": ["workspace::MoveItemToPane", { "destination": 6 }],
+      "ctrl-*": ["workspace::MoveItemToPane", { "destination": 7 }],
+      "ctrl-(": ["workspace::MoveItemToPane", { "destination": 8 }]
    }
  },
  {
--- a/assets/keymaps/vim.json
+++ b/assets/keymaps/vim.json
@@ -2,8 +2,8 @@
  {
    "context": "VimControl && !menu",
    "bindings": {
-      "i": ["vim::PushOperator", { "Object": { "around": false } }],
-      "a": ["vim::PushOperator", { "Object": { "around": true } }],
+      "i": ["vim::PushObject", { "around": false }],
+      "a": ["vim::PushObject", { "around": true }],
      "left": "vim::Left",
      "h": "vim::Left",
      "backspace": "vim::Backspace",
@@ -37,9 +37,9 @@
      "[ [": "vim::PreviousSectionStart",
      "[ ]": "vim::PreviousSectionEnd",
      "] m": "vim::NextMethodStart",
-      "] M": "vim::NextMethodEnd",
+      "] shift-m": "vim::NextMethodEnd",
      "[ m": "vim::PreviousMethodStart",
-      "[ M": "vim::PreviousMethodEnd",
+      "[ shift-m": "vim::PreviousMethodEnd",
      "[ *": "vim::PreviousComment",
      "[ /": "vim::PreviousComment",
      "] *": "vim::NextComment",
@@ -54,10 +54,10 @@
      // "b": "vim::PreviousSubwordStart",
      // "e": "vim::NextSubwordEnd",
      // "g e": "vim::PreviousSubwordEnd",
-      "shift-w": ["vim::NextWordStart", { "ignorePunctuation": true }],
-      "shift-e": ["vim::NextWordEnd", { "ignorePunctuation": true }],
-      "shift-b": ["vim::PreviousWordStart", { "ignorePunctuation": true }],
-      "g shift-e": ["vim::PreviousWordEnd", { "ignorePunctuation": true }],
+      "shift-w": ["vim::NextWordStart", { "ignore_punctuation": true }],
+      "shift-e": ["vim::NextWordEnd", { "ignore_punctuation": true }],
+      "shift-b": ["vim::PreviousWordStart", { "ignore_punctuation": true }],
+      "g shift-e": ["vim::PreviousWordEnd", { "ignore_punctuation": true }],
      "/": "vim::Search",
      "g /": "pane::DeploySearch",
      "?": ["vim::Search", { "backwards": true }],
@@ -70,20 +70,20 @@
      "[ {": ["vim::UnmatchedBackward", { "char": "{" }],
      "] )": ["vim::UnmatchedForward", { "char": ")" }],
      "[ (": ["vim::UnmatchedBackward", { "char": "(" }],
-      "f": ["vim::PushOperator", { "FindForward": { "before": false } }],
-      "t": ["vim::PushOperator", { "FindForward": { "before": true } }],
-      "shift-f": ["vim::PushOperator", { "FindBackward": { "after": false } }],
-      "shift-t": ["vim::PushOperator", { "FindBackward": { "after": true } }],
-      "m": ["vim::PushOperator", "Mark"],
-      "'": ["vim::PushOperator", { "Jump": { "line": true } }],
-      "`": ["vim::PushOperator", { "Jump": { "line": false } }],
+      "f": ["vim::PushFindForward", { "before": false }],
+      "t": ["vim::PushFindForward", { "before": true }],
+      "shift-f": ["vim::PushFindBackward", { "after": false }],
+      "shift-t": ["vim::PushFindBackward", { "after": true }],
+      "m": "vim::PushMark",
+      "'": ["vim::PushJump", { "line": true }],
+      "`": ["vim::PushJump", { "line": false }],
      ";": "vim::RepeatFind",
      ",": "vim::RepeatFindReversed",
      "ctrl-o": "pane::GoBack",
      "ctrl-i": "pane::GoForward",
      "ctrl-]": "editor::GoToDefinition",
-      "escape": ["vim::SwitchMode", "Normal"],
-      "ctrl-[": ["vim::SwitchMode", "Normal"],
+      "escape": "vim::SwitchToNormalMode",
+      "ctrl-[": "vim::SwitchToNormalMode",
      "v": "vim::ToggleVisual",
      "shift-v": "vim::ToggleVisualLine",
      "ctrl-g": "vim::ShowLocation",
@@ -102,6 +102,7 @@
      "ctrl-e": "vim::LineDown",
      "ctrl-y": "vim::LineUp",
      // "g" commands
+      "g r": "vim::PushReplaceWithRegister",
      "g g": "vim::StartOfDocument",
      "g h": "editor::Hover",
      "g t": "pane::ActivateNextItem",
@@ -124,17 +125,17 @@
      "g .": "editor::ToggleCodeActions", // zed specific
      "g shift-a": "editor::FindAllReferences", // zed specific
      "g space": "editor::OpenExcerpts", // zed specific
-      "g *": ["vim::MoveToNext", { "partialWord": true }],
-      "g #": ["vim::MoveToPrev", { "partialWord": true }],
-      "g j": ["vim::Down", { "displayLines": true }],
-      "g down": ["vim::Down", { "displayLines": true }],
-      "g k": ["vim::Up", { "displayLines": true }],
-      "g up": ["vim::Up", { "displayLines": true }],
-      "g $": ["vim::EndOfLine", { "displayLines": true }],
-      "g end": ["vim::EndOfLine", { "displayLines": true }],
-      "g 0": ["vim::StartOfLine", { "displayLines": true }],
-      "g home": ["vim::StartOfLine", { "displayLines": true }],
-      "g ^": ["vim::FirstNonWhitespace", { "displayLines": true }],
+      "g *": ["vim::MoveToNext", { "partial_word": true }],
+      "g #": ["vim::MoveToPrev", { "partial_word": true }],
+      "g j": ["vim::Down", { "display_lines": true }],
+      "g down": ["vim::Down", { "display_lines": true }],
+      "g k": ["vim::Up", { "display_lines": true }],
+      "g up": ["vim::Up", { "display_lines": true }],
+      "g $": ["vim::EndOfLine", { "display_lines": true }],
+      "g end": ["vim::EndOfLine", { "display_lines": true }],
+      "g 0": ["vim::StartOfLine", { "display_lines": true }],
+      "g home": ["vim::StartOfLine", { "display_lines": true }],
+      "g ^": ["vim::FirstNonWhitespace", { "display_lines": true }],
      "g v": "vim::RestoreVisualSelection",
      "g ]": "editor::GoToDiagnostic",
      "g [": "editor::GoToPrevDiagnostic",
@@ -146,7 +147,7 @@
      "shift-l": "vim::WindowBottom",
      "q": "vim::ToggleRecord",
      "shift-q": "vim::ReplayLastRecording",
-      "@": ["vim::PushOperator", "ReplayRegister"],
+      "@": "vim::PushReplayRegister",
      // z commands
      "z enter": ["workspace::SendKeystrokes", "z t ^"],
      "z -": ["workspace::SendKeystrokes", "z b ^"],
@@ -165,8 +166,8 @@
      "z f": "editor::FoldSelectedRanges",
      "z shift-m": "editor::FoldAll",
      "z shift-r": "editor::UnfoldAll",
-      "shift-z shift-q": ["pane::CloseActiveItem", { "saveIntent": "skip" }],
-      "shift-z shift-z": ["pane::CloseActiveItem", { "saveIntent": "saveAll" }],
+      "shift-z shift-q": ["pane::CloseActiveItem", { "save_intent": "skip" }],
+      "shift-z shift-z": ["pane::CloseActiveItem", { "save_intent": "save_all" }],
      // Count support
      "1": ["vim::Number", 1],
      "2": ["vim::Number", 2],
@@ -193,13 +194,13 @@
      "escape": "editor::Cancel",
      ":": "command_palette::Toggle",
      ".": "vim::Repeat",
-      "c": ["vim::PushOperator", "Change"],
+      "c": "vim::PushChange",
      "shift-c": "vim::ChangeToEndOfLine",
-      "d": ["vim::PushOperator", "Delete"],
+      "d": "vim::PushDelete",
      "shift-d": "vim::DeleteToEndOfLine",
      "shift-j": "vim::JoinLines",
      "g shift-j": "vim::JoinLinesNoWhitespace",
-      "y": ["vim::PushOperator", "Yank"],
+      "y": "vim::PushYank",
      "shift-y": "vim::YankLine",
      "i": "vim::InsertBefore",
      "shift-i": "vim::InsertFirstNonWhitespace",
@@ -216,19 +217,19 @@
      "shift-p": ["vim::Paste", { "before": true }],
      "u": "vim::Undo",
      "ctrl-r": "vim::Redo",
-      "r": ["vim::PushOperator", "Replace"],
+      "r": "vim::PushReplace",
      "s": "vim::Substitute",
      "shift-s": "vim::SubstituteLine",
-      ">": ["vim::PushOperator", "Indent"],
-      "<": ["vim::PushOperator", "Outdent"],
-      "=": ["vim::PushOperator", "AutoIndent"],
-      "!": ["vim::PushOperator", "ShellCommand"],
-      "g u": ["vim::PushOperator", "Lowercase"],
-      "g shift-u": ["vim::PushOperator", "Uppercase"],
-      "g ~": ["vim::PushOperator", "OppositeCase"],
-      "\"": ["vim::PushOperator", "Register"],
-      "g w": ["vim::PushOperator", "Rewrap"],
-      "g q": ["vim::PushOperator", "Rewrap"],
+      ">": "vim::PushIndent",
+      "<": "vim::PushOutdent",
+      "=": "vim::PushAutoIndent",
+      "!": "vim::PushShellCommand",
+      "g u": "vim::PushLowercase",
+      "g shift-u": "vim::PushUppercase",
+      "g ~": "vim::PushOppositeCase",
+      "\"": "vim::PushRegister",
+      "g w": "vim::PushRewrap",
+      "g q": "vim::PushRewrap",
      "ctrl-pagedown": "pane::ActivateNextItem",
      "ctrl-pageup": "pane::ActivatePrevItem",
      "insert": "vim::InsertBefore",
@@ -239,7 +240,7 @@
      "[ d": "editor::GoToPrevDiagnostic",
      "] c": "editor::GoToHunk",
      "[ c": "editor::GoToPrevHunk",
-      "g c": ["vim::PushOperator", "ToggleComments"]
+      "g c": "vim::PushToggleComments"
    }
  },
  {
@@ -264,14 +265,14 @@
      "y": "vim::VisualYank",
      "shift-y": "vim::VisualYankLine",
      "p": "vim::Paste",
-      "shift-p": ["vim::Paste", { "preserveClipboard": true }],
+      "shift-p": ["vim::Paste", { "preserve_clipboard": true }],
      "c": "vim::Substitute",
      "s": "vim::Substitute",
      "shift-r": "vim::SubstituteLine",
      "shift-s": "vim::SubstituteLine",
      "~": "vim::ChangeCase",
-      "*": ["vim::MoveToNext", { "partialWord": true }],
-      "#": ["vim::MoveToPrev", { "partialWord": true }],
+      "*": ["vim::MoveToNext", { "partial_word": true }],
+      "#": ["vim::MoveToPrev", { "partial_word": true }],
      "ctrl-a": "vim::Increment",
      "ctrl-x": "vim::Decrement",
      "g ctrl-a": ["vim::Increment", { "step": true }],
@@ -282,19 +283,20 @@
      "g shift-a": "vim::VisualInsertEndOfLine",
      "shift-j": "vim::JoinLines",
      "g shift-j": "vim::JoinLinesNoWhitespace",
-      "r": ["vim::PushOperator", "Replace"],
-      "ctrl-c": ["vim::SwitchMode", "Normal"],
-      "ctrl-[": ["vim::SwitchMode", "Normal"],
-      "escape": ["vim::SwitchMode", "Normal"],
+      "r": "vim::PushReplace",
+      "ctrl-c": "vim::SwitchToNormalMode",
+      "ctrl-[": "vim::SwitchToNormalMode",
+      "escape": "vim::SwitchToNormalMode",
      ">": "vim::Indent",
      "<": "vim::Outdent",
      "=": "vim::AutoIndent",
      "!": "vim::ShellCommand",
-      "i": ["vim::PushOperator", { "Object": { "around": false } }],
-      "a": ["vim::PushOperator", { "Object": { "around": true } }],
+      "i": ["vim::PushObject", { "around": false }],
+      "a": ["vim::PushObject", { "around": true }],
+      "g r": ["vim::Paste", { "preserve_clipboard": true }],
      "g c": "vim::ToggleComments",
      "g q": "vim::Rewrap",
-      "\"": ["vim::PushOperator", "Register"],
+      "\"": "vim::PushRegister",
      // tree-sitter related commands
      "[ x": "editor::SelectLargerSyntaxNode",
      "] x": "editor::SelectSmallerSyntaxNode"
@@ -309,19 +311,19 @@
      "ctrl-x": null,
      "ctrl-x ctrl-o": "editor::ShowCompletions",
      "ctrl-x ctrl-a": "assistant::InlineAssist", // zed specific
-      "ctrl-x ctrl-c": "editor::ShowInlineCompletion", // zed specific
+      "ctrl-x ctrl-c": "editor::ShowEditPrediction", // zed specific
      "ctrl-x ctrl-l": "editor::ToggleCodeActions", // zed specific
      "ctrl-x ctrl-z": "editor::Cancel",
      "ctrl-w": "editor::DeleteToPreviousWordStart",
      "ctrl-u": "editor::DeleteToBeginningOfLine",
      "ctrl-t": "vim::Indent",
      "ctrl-d": "vim::Outdent",
-      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
+      "ctrl-k": ["vim::PushDigraph", {}],
+      "ctrl-v": ["vim::PushLiteral", {}],
      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
-      "ctrl-q": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-shift-q": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-r": ["vim::PushOperator", "Register"],
+      "ctrl-q": ["vim::PushLiteral", {}],
+      "ctrl-shift-q": ["vim::PushLiteral", {}],
+      "ctrl-r": "vim::PushRegister",
      "insert": "vim::ToggleReplace",
      "ctrl-o": "vim::TemporaryNormal"
    }
@@ -356,11 +358,11 @@
      "ctrl-c": "vim::NormalBefore",
      "ctrl-[": "vim::NormalBefore",
      "escape": "vim::NormalBefore",
-      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
+      "ctrl-k": ["vim::PushDigraph", {}],
+      "ctrl-v": ["vim::PushLiteral", {}],
      "ctrl-shift-v": "editor::Paste", // note: this is *very* similar to ctrl-v in vim, but ctrl-shift-v on linux is the typical shortcut for paste when ctrl-v is already in use.
-      "ctrl-q": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-shift-q": ["vim::PushOperator", { "Literal": {} }],
+      "ctrl-q": ["vim::PushLiteral", {}],
+      "ctrl-shift-q": ["vim::PushLiteral", {}],
      "backspace": "vim::UndoReplace",
      "tab": "vim::Tab",
      "enter": "vim::Enter",
@@ -375,9 +377,15 @@
      "ctrl-c": "vim::ClearOperators",
      "ctrl-[": "vim::ClearOperators",
      "escape": "vim::ClearOperators",
-      "ctrl-k": ["vim::PushOperator", { "Digraph": {} }],
-      "ctrl-v": ["vim::PushOperator", { "Literal": {} }],
-      "ctrl-q": ["vim::PushOperator", { "Literal": {} }]
+      "ctrl-k": ["vim::PushDigraph", {}],
+      "ctrl-v": ["vim::PushLiteral", {}],
+      "ctrl-q": ["vim::PushLiteral", {}]
+    }
+  },
+  {
+    "context": "Editor && vim_mode == waiting && (vim_operator == ys || vim_operator == cs)",
+    "bindings": {
+      "escape": "vim::SwitchToNormalMode"
    }
  },
  {
@@ -393,10 +401,10 @@
    "context": "vim_operator == a || vim_operator == i || vim_operator == cs",
    "bindings": {
      "w": "vim::Word",
-      "shift-w": ["vim::Word", { "ignorePunctuation": true }],
+      "shift-w": ["vim::Word", { "ignore_punctuation": true }],
      // Subword TextObject
      // "w": "vim::Subword",
-      // "shift-w": ["vim::Subword", { "ignorePunctuation": true }],
+      // "shift-w": ["vim::Subword", { "ignore_punctuation": true }],
      "t": "vim::Tag",
      "s": "vim::Sentence",
      "p": "vim::Paragraph",
@@ -419,7 +427,7 @@
      ">": "vim::AngleBrackets",
      "a": "vim::Argument",
      "i": "vim::IndentObj",
-      "shift-i": ["vim::IndentObj", { "includeBelow": true }],
+      "shift-i": ["vim::IndentObj", { "include_below": true }],
      "f": "vim::Method",
      "c": "vim::Class",
      "e": "vim::EntireFile"
@@ -430,16 +438,16 @@
    "bindings": {
      "c": "vim::CurrentLine",
      "d": "editor::Rename", // zed specific
-      "s": ["vim::PushOperator", { "ChangeSurrounds": {} }]
+      "s": ["vim::PushChangeSurrounds", {}]
    }
  },
  {
    "context": "vim_operator == d",
    "bindings": {
      "d": "vim::CurrentLine",
-      "s": ["vim::PushOperator", "DeleteSurrounds"],
+      "s": "vim::PushDeleteSurrounds",
      "o": "editor::ToggleSelectedDiffHunks", // "d o"
-      "p": "editor::RevertSelectedHunks" // "d p"
+      "p": "git::Restore" // "d p"
    }
  },
  {
@@ -476,7 +484,7 @@
    "context": "vim_operator == y",
    "bindings": {
      "y": "vim::CurrentLine",
-      "s": ["vim::PushOperator", { "AddSurrounds": {} }]
+      "s": ["vim::PushAddSurrounds", {}]
    }
  },
  {
@@ -566,34 +574,34 @@
    }
  },
  {
-    "context": "ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
+    "context": "GitPanel || ProjectPanel || CollabPanel || OutlinePanel || ChatPanel || VimControl || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView",
    "bindings": {
      // window related commands (ctrl-w X)
      "ctrl-w": null,
-      "ctrl-w left": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-w right": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-w up": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-w down": ["workspace::ActivatePaneInDirection", "Down"],
-      "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
-      "ctrl-w h": ["workspace::ActivatePaneInDirection", "Left"],
-      "ctrl-w l": ["workspace::ActivatePaneInDirection", "Right"],
-      "ctrl-w k": ["workspace::ActivatePaneInDirection", "Up"],
-      "ctrl-w j": ["workspace::ActivatePaneInDirection", "Down"],
-      "ctrl-w shift-left": ["workspace::SwapPaneInDirection", "Left"],
-      "ctrl-w shift-right": ["workspace::SwapPaneInDirection", "Right"],
-      "ctrl-w shift-up": ["workspace::SwapPaneInDirection", "Up"],
-      "ctrl-w shift-down": ["workspace::SwapPaneInDirection", "Down"],
-      "ctrl-w shift-h": ["workspace::SwapPaneInDirection", "Left"],
-      "ctrl-w shift-l": ["workspace::SwapPaneInDirection", "Right"],
-      "ctrl-w shift-k": ["workspace::SwapPaneInDirection", "Up"],
-      "ctrl-w shift-j": ["workspace::SwapPaneInDirection", "Down"],
-      "ctrl-w >": ["vim::ResizePane", "Widen"],
-      "ctrl-w <": ["vim::ResizePane", "Narrow"],
-      "ctrl-w -": ["vim::ResizePane", "Shorten"],
-      "ctrl-w +": ["vim::ResizePane", "Lengthen"],
+      "ctrl-w left": "workspace::ActivatePaneLeft",
+      "ctrl-w right": "workspace::ActivatePaneRight",
+      "ctrl-w up": "workspace::ActivatePaneUp",
+      "ctrl-w down": "workspace::ActivatePaneDown",
+      "ctrl-w ctrl-h": "workspace::ActivatePaneLeft",
+      "ctrl-w ctrl-l": "workspace::ActivatePaneRight",
+      "ctrl-w ctrl-k": "workspace::ActivatePaneUp",
+      "ctrl-w ctrl-j": "workspace::ActivatePaneDown",
+      "ctrl-w h": "workspace::ActivatePaneLeft",
+      "ctrl-w l": "workspace::ActivatePaneRight",
+      "ctrl-w k": "workspace::ActivatePaneUp",
+      "ctrl-w j": "workspace::ActivatePaneDown",
+      "ctrl-w shift-left": "workspace::SwapPaneLeft",
+      "ctrl-w shift-right": "workspace::SwapPaneRight",
+      "ctrl-w shift-up": "workspace::SwapPaneUp",
+      "ctrl-w shift-down": "workspace::SwapPaneDown",
+      "ctrl-w shift-h": "workspace::SwapPaneLeft",
+      "ctrl-w shift-l": "workspace::SwapPaneRight",
+      "ctrl-w shift-k": "workspace::SwapPaneUp",
+      "ctrl-w shift-j": "workspace::SwapPaneDown",
+      "ctrl-w >": "vim::ResizePaneRight",
+      "ctrl-w <": "vim::ResizePaneLeft",
+      "ctrl-w -": "vim::ResizePaneDown",
+      "ctrl-w +": "vim::ResizePaneUp",
      "ctrl-w _": "vim::MaximizePane",
      "ctrl-w =": "vim::ResetPaneSizes",
      "ctrl-w g t": "pane::ActivateNextItem",
@@ -624,7 +632,7 @@
    }
  },
  {
-    "context": "EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || Welcome",
+    "context": "ChangesList || EmptyPane || SharedScreen || MarkdownPreview || KeyContextView || Welcome",
    "bindings": {
      ":": "command_palette::Toggle",
      "g /": "pane::DeploySearch"
@@ -687,5 +695,22 @@
      "shift-x": "git::StageAll",
      "shift-u": "git::UnstageAll"
    }
+  },
+  {
+    "context": "Editor && edit_prediction",
+    "bindings": {
+      // This is identical to the binding in the base keymap, but the vim bindings above to
+      // "vim::Tab" shadow it, so it needs to be bound again.
+      "tab": "editor::AcceptEditPrediction"
+    }
+  },
+  {
+    "context": "os != macos && Editor && edit_prediction_conflict",
+    "bindings": {
+      // alt-l is provided as an alternative to tab/alt-tab. and will be displayed in the UI. This
+      // is because alt-tab may not be available, as it is often used for window switching on Linux
+      // and Windows.
+      "alt-l": "editor::AcceptEditPrediction"
+    }
  }
 ]
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -25,7 +25,7 @@
  // Features that can be globally enabled or disabled
  "features": {
    // Which edit prediction provider to use.
-    "inline_completion_provider": "copilot"
+    "edit_prediction_provider": "copilot"
  },
  // The name of a font to use for rendering text in the editor
  "buffer_font_family": "Zed Plex Mono",
@@ -93,6 +93,13 @@
    // workspace when the centered layout is used.
    "right_padding": 0.2
  },
+  // All settings related to the image viewer.
+  "image_viewer": {
+    // The unit for image file sizes.
+    // By default we're setting it to binary.
+    // The second option is decimal.
+    "unit": "binary"
+  },
  // The key to use for adding multiple cursors
  // Currently "alt" or "cmd_or_ctrl"  (also aliased as
  // "cmd" and "ctrl") are supported.
@@ -119,6 +126,13 @@
  //  3. Never close the window
  //         "when_closing_with_no_tabs": "keep_window_open",
  "when_closing_with_no_tabs": "platform_default",
+  // What to do when the last window is closed.
+  // May take 2 values:
+  //  1. Use the current platform's convention
+  //         "on_last_window_closed": "platform_default"
+  //  2. Always quit the application
+  //         "on_last_window_closed": "quit_app",
+  "on_last_window_closed": "platform_default",
  // Whether to use the system provided dialogs for Open and Save As.
  // When set to false, Zed will use the built-in keyboard-first pickers.
  "use_system_path_prompts": true,
@@ -136,6 +150,8 @@
  //
  // Default: not set, defaults to "bar"
  "cursor_shape": null,
+  // Determines whether the mouse cursor is hidden when typing in an editor or input box.
+  "hide_mouse_while_typing": true,
  // How to highlight the current line in the editor.
  //
  // 1. Don't highlight the current line:
@@ -147,6 +163,10 @@
  // 4. Highlight the full line (default):
  //    "all"
  "current_line_highlight": "all",
+  // Whether to highlight all occurrences of the selected text in an editor.
+  "selection_highlight": true,
+  // The debounce delay before querying highlights based on the selected text.
+  "selection_highlight_debounce": 50,
  // The debounce delay before querying highlights from the language
  // server based on the current cursor location.
  "lsp_highlight_debounce": 75,
@@ -161,9 +181,6 @@
  /// Whether to show the signature help after completion or a bracket pair inserted.
  /// If `auto_signature_help` is enabled, this setting will be treated as enabled also.
  "show_signature_help_after_edits": false,
-  /// Whether to show the edit predictions next to the completions provided by a language server.
-  /// Only has an effect if edit prediction provider supports it.
-  "show_inline_completions_in_menu": true,
  // Whether to show wrap guides (vertical rulers) in the editor.
  // Setting this to true will show a guide at the 'preferred_line_length' value
  // if 'soft_wrap' is set to 'preferred_line_length', and will show any
@@ -196,12 +213,29 @@
  // Otherwise(when `true`), the closing characters are always skipped over and auto-removed
  // no matter how they were inserted.
  "always_treat_brackets_as_autoclosed": false,
+  // Controls where the `editor::Rewrap` action is allowed in the current language scope.
+  //
+  // This setting can take three values:
+  //
+  // 1. Only allow rewrapping in comments:
+  //    "in_comments"
+  // 2. Only allow rewrapping in the current selection(s):
+  //    "in_selections"
+  // 3. Allow rewrapping anywhere:
+  //    "anywhere"
+  //
+  // When using values other than `in_comments`, it is possible for the rewrapping to produce code
+  // that is syntactically invalid. Keep this in mind when selecting which behavior you would like
+  // to use.
+  //
+  // Note: This setting has no effect in Vim mode, as rewrap is already allowed everywhere.
+  "allow_rewrap": "in_comments",
  // Controls whether edit predictions are shown immediately (true)
-  // or manually by triggering `editor::ShowInlineCompletion` (false).
-  "show_inline_completions": true,
+  // or manually by triggering `editor::ShowEditPrediction` (false).
+  "show_edit_predictions": true,
  // Controls whether edit predictions are shown in a given language scope.
  // Example: ["string", "comment"]
-  "inline_completions_disabled_in": [],
+  "edit_predictions_disabled_in": [],
  // Whether to show tabs and spaces in the editor.
  // This setting can take four values:
  //
@@ -255,6 +289,8 @@
    "git_diff": true,
    // Whether to show buffer search results in the scrollbar.
    "search_results": true,
+    // Whether to show selected text occurrences in the scrollbar.
+    "selected_text": true,
    // Whether to show selected symbol occurrences in the scrollbar.
    "selected_symbol": true,
    // Which diagnostic indicators to show in the scrollbar:
@@ -648,15 +684,15 @@
    // There are 5 possible width values:
    //
    // 1. Small: This value is essentially a fixed width.
-    //    "modal_width": "small"
+    //    "modal_max_width": "small"
    // 2. Medium:
-    //    "modal_width": "medium"
+    //    "modal_max_width": "medium"
    // 3. Large:
-    //    "modal_width": "large"
+    //    "modal_max_width": "large"
    // 4. Extra Large:
-    //    "modal_width": "xlarge"
+    //    "modal_max_width": "xlarge"
    // 5. Fullscreen: This value removes any horizontal padding, as it consumes the whole viewport width.
-    //    "modal_width": "full"
+    //    "modal_max_width": "full"
    //
    // Default: small
    "modal_max_width": "small"
@@ -724,11 +760,28 @@
  // Diagnostics configuration.
  "diagnostics": {
    // Whether to show warnings or not by default.
-    "include_warnings": true
+    "include_warnings": true,
+    // Settings for inline diagnostics
+    "inline": {
+      // Whether to show diagnostics inline or not
+      "enabled": false,
+      // The delay in milliseconds to show inline diagnostics after the
+      // last diagnostic update.
+      "update_debounce_ms": 150,
+      // The amount of padding between the end of the source line and the start
+      // of the inline diagnostic in units of em widths.
+      "padding": 4,
+      // The minimum column to display inline diagnostics. This setting can be
+      // used to horizontally align inline diagnostics at some column. Lines
+      // longer than this value will still push diagnostics further to the right.
+      "min_column": 0,
+      // The minimum severity of the diagnostics to show inline.
+      // Shows all diagnostics when not specified.
+      "max_severity": null
+    }
  },
-  // Add files or globs of files that will be excluded by Zed entirely:
-  // they will be skipped during FS scan(s), file tree and file search
-  // will lack the corresponding file entries. Overrides `file_scan_inclusions`.
+  // Files or globs of files that will be excluded by Zed entirely. They will be skipped during file
+  // scans, file searches, and not be displayed in the project file tree. Takes precedence over `file_scan_inclusions`.
  "file_scan_exclusions": [
    "**/.git",
    "**/.svn",
@@ -740,10 +793,10 @@
    "**/.classpath",
    "**/.settings"
  ],
-  // Add files or globs of files that will be included by Zed, even when
-  // ignored by git. This is useful for files that are not tracked by git,
-  // but are still important to your project. Note that globs that are
-  // overly broad can slow down Zed's file scanning. Overridden by `file_scan_exclusions`.
+  // Files or globs of files that will be included by Zed, even when ignored by git. This is useful
+  // for files that are not tracked by git, but are still important to your project. Note that globs
+  // that are overly broad can slow down Zed's file scanning. `file_scan_exclusions` takes
+  // precedence over these inclusions.
  "file_scan_inclusions": [".env*"],
  // Git gutter behavior configuration.
  "git": {
@@ -774,23 +827,26 @@
  // 2. Load direnv configuration through the shell hook, works for POSIX shells and fish.
  //      "load_direnv": "shell_hook"
  "load_direnv": "direct",
-  "inline_completions": {
+  "edit_predictions": {
    // A list of globs representing files that edit predictions should be disabled for.
+    // There's a sensible default list of globs already included.
+    // Any addition to this list will be merged with the default list.
    "disabled_globs": [
      "**/.env*",
      "**/*.pem",
      "**/*.key",
      "**/*.cert",
      "**/*.crt",
+      "**/.dev.vars",
      "**/secrets.yml"
    ],
    // When to show edit predictions previews in buffer.
    // This setting takes two possible values:
    // 1. Display inline when there are no language server completions available.
-    //     "inline_preview": "auto"
+    //     "mode": "eager_preview"
    // 2. Display inline when holding modifier key (alt by default).
-    //     "inline_preview": "when_holding_modifier"
-    "inline_preview": "auto"
+    //     "mode": "auto"
+    "mode": "eager_preview"
  },
  // Settings specific to journaling
  "journal": {
@@ -1048,6 +1104,9 @@
    "Erlang": {
      "language_servers": ["erlang-ls", "!elp", "..."]
    },
+    "Git Commit": {
+      "allow_rewrap": "anywhere"
+    },
    "Go": {
      "code_actions_on_format": {
        "source.organizeImports": true
@@ -1091,6 +1150,7 @@
    "Markdown": {
      "format_on_save": "off",
      "use_on_type_format": false,
+      "allow_rewrap": "anywhere",
      "prettier": {
        "allowed": true
      }
@@ -1103,6 +1163,9 @@
        "parser": "php"
      }
    },
+    "Plain Text": {
+      "allow_rewrap": "anywhere"
+    },
    "Ruby": {
      "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "..."]
    },
@@ -1186,6 +1249,9 @@
    },
    "deepseek": {
      "api_url": "https://api.deepseek.com"
+    },
+    "mistral": {
+      "api_url": "https://api.mistral.ai/v1"
    }
  },
  // Zed's Prettier integration settings.
--- a/assets/themes/LICENSES
+++ b/assets/themes/LICENSES
@@ -1,549 +1,3 @@
-## [Andromeda](https://github.com/EliverLara/Andromeda)
-
-The MIT License (MIT)
-
-Copyright (c) 2017 <eliverlara@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Cave Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Cave Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Dune Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Dune Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Estuary Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Estuary Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Forest Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Forest Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Heath Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Heath Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Lakeside Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Lakeside Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Plateau Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Plateau Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Savanna Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Savanna Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Seaside Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Seaside Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Sulphurpool Dark](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Atelier Sulphurpool Light](https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/)
-
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
 ## [Ayu Dark](https://github.com/dempfi/ayu)

 The MIT License (MIT)
@@ -827,187 +281,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-********************************************************************************
-
-## [Rosé Pine](https://github.com/edunfelt/base16-rose-pine-scheme)
-
-The MIT License (MIT)
-
-Copyright (c) 2021 Emilia Dunfelt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Rosé Pine Dawn](https://github.com/edunfelt/base16-rose-pine-scheme)
-
-The MIT License (MIT)
-
-Copyright (c) 2021 Emilia Dunfelt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Rosé Pine Moon](https://github.com/edunfelt/base16-rose-pine-scheme)
-
-The MIT License (MIT)
-
-Copyright (c) 2021 Emilia Dunfelt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Sandcastle](https://github.com/gessig/base16-sandcastle-scheme)
-
-The MIT License (MIT)
-
-Copyright (c) 2019 George Essig
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Solarized Dark](https://github.com/altercation/solarized)
-
-The MIT License (MIT)
-
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Solarized Light](https://github.com/altercation/solarized)
-
-The MIT License (MIT)
-
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
-
-## [Summercamp](https://github.com/zoefiri/base16-sc)
-
-The MIT License (MIT)
-
-Copyright (c) 2019 Zoe FiriH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-********************************************************************************
--- a/assets/themes/andromeda/LICENSE
+++ b/assets/themes/andromeda/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 <eliverlara@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/assets/themes/andromeda/andromeda.json
+++ b/assets/themes/andromeda/andromeda.json
@@ -1,378 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "Andromeda",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "Andromeda",
-      "appearance": "dark",
-      "style": {
-        "border": "#2b2f38ff",
-        "border.variant": "#252931ff",
-        "border.focused": "#183934ff",
-        "border.selected": "#183934ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#292d37ff",
-        "elevated_surface.background": "#21242bff",
-        "surface.background": "#21242bff",
-        "background": "#262933ff",
-        "element.background": "#21242bff",
-        "element.hover": "#252931ff",
-        "element.active": "#2a2f39ff",
-        "element.selected": "#2a2f39ff",
-        "element.disabled": "#21242bff",
-        "drop_target.background": "#aca8ae80",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#252931ff",
-        "ghost_element.active": "#2a2f39ff",
-        "ghost_element.selected": "#2a2f39ff",
-        "ghost_element.disabled": "#21242bff",
-        "text": "#f7f7f8ff",
-        "text.muted": "#aca8aeff",
-        "text.placeholder": "#6b6b73ff",
-        "text.disabled": "#6b6b73ff",
-        "text.accent": "#10a793ff",
-        "icon": "#f7f7f8ff",
-        "icon.muted": "#aca8aeff",
-        "icon.disabled": "#6b6b73ff",
-        "icon.placeholder": "#aca8aeff",
-        "icon.accent": "#10a793ff",
-        "status_bar.background": "#262933ff",
-        "title_bar.background": "#262933ff",
-        "title_bar.inactive_background": "#21242bff",
-        "toolbar.background": "#1e2025ff",
-        "tab_bar.background": "#21242bff",
-        "tab.inactive_background": "#21242bff",
-        "tab.active_background": "#1e2025ff",
-        "search.match_background": "#11a79366",
-        "panel.background": "#21242bff",
-        "panel.focused_border": "#10a793ff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f7f7f84c",
-        "scrollbar.thumb.hover_background": "#252931ff",
-        "scrollbar.thumb.border": "#252931ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#21232aff",
-        "editor.foreground": "#f7f7f8ff",
-        "editor.background": "#1e2025ff",
-        "editor.gutter.background": "#1e2025ff",
-        "editor.subheader.background": "#21242bff",
-        "editor.active_line.background": "#21242bbf",
-        "editor.highlighted_line.background": "#21242bff",
-        "editor.line_number": "#565960",
-        "editor.active_line_number": "#f8f8f9",
-        "editor.hover_line_number": "#cbcdd0",
-        "editor.invisible": "#64646dff",
-        "editor.wrap_guide": "#f7f7f80d",
-        "editor.active_wrap_guide": "#f7f7f81a",
-        "editor.document_highlight.read_background": "#10a7931a",
-        "editor.document_highlight.write_background": "#64646d66",
-        "terminal.background": "#1e2025ff",
-        "terminal.foreground": "#f7f7f8ff",
-        "terminal.bright_foreground": "#f7f7f8ff",
-        "terminal.dim_foreground": "#1e2025ff",
-        "terminal.ansi.black": "#1e2025ff",
-        "terminal.ansi.bright_black": "#40434cff",
-        "terminal.ansi.dim_black": "#f7f7f8ff",
-        "terminal.ansi.red": "#f82871ff",
-        "terminal.ansi.bright_red": "#8e0f3aff",
-        "terminal.ansi.dim_red": "#ffa3b5ff",
-        "terminal.ansi.green": "#96df71ff",
-        "terminal.ansi.bright_green": "#457c38ff",
-        "terminal.ansi.dim_green": "#cef0b9ff",
-        "terminal.ansi.yellow": "#fee56cff",
-        "terminal.ansi.bright_yellow": "#958334ff",
-        "terminal.ansi.dim_yellow": "#fef1b7ff",
-        "terminal.ansi.blue": "#10a793ff",
-        "terminal.ansi.bright_blue": "#1a5148ff",
-        "terminal.ansi.dim_blue": "#9cd4c7ff",
-        "terminal.ansi.magenta": "#c74cecff",
-        "terminal.ansi.bright_magenta": "#682681ff",
-        "terminal.ansi.dim_magenta": "#e7abf7ff",
-        "terminal.ansi.cyan": "#08e7c5ff",
-        "terminal.ansi.bright_cyan": "#008169ff",
-        "terminal.ansi.dim_cyan": "#a9f4e1ff",
-        "terminal.ansi.white": "#f7f7f8ff",
-        "terminal.ansi.bright_white": "#f7f7f8ff",
-        "terminal.ansi.dim_white": "#87858cff",
-        "link_text.hover": "#10a793ff",
-        "conflict": "#fee56cff",
-        "conflict.background": "#5c5014ff",
-        "conflict.border": "#796b26ff",
-        "created": "#96df71ff",
-        "created.background": "#184618ff",
-        "created.border": "#306129ff",
-        "deleted": "#f82871ff",
-        "deleted.background": "#54051bff",
-        "deleted.border": "#72092aff",
-        "error": "#f82871ff",
-        "error.background": "#54051bff",
-        "error.border": "#72092aff",
-        "hidden": "#6b6b73ff",
-        "hidden.background": "#262933ff",
-        "hidden.border": "#292d37ff",
-        "hint": "#618399ff",
-        "hint.background": "#12231fff",
-        "hint.border": "#183934ff",
-        "ignored": "#6b6b73ff",
-        "ignored.background": "#262933ff",
-        "ignored.border": "#2b2f38ff",
-        "info": "#10a793ff",
-        "info.background": "#12231fff",
-        "info.border": "#183934ff",
-        "modified": "#fee56cff",
-        "modified.background": "#5c5014ff",
-        "modified.border": "#796b26ff",
-        "predictive": "#315f70ff",
-        "predictive.background": "#184618ff",
-        "predictive.border": "#306129ff",
-        "renamed": "#10a793ff",
-        "renamed.background": "#12231fff",
-        "renamed.border": "#183934ff",
-        "success": "#96df71ff",
-        "success.background": "#184618ff",
-        "success.border": "#306129ff",
-        "unreachable": "#aca8aeff",
-        "unreachable.background": "#262933ff",
-        "unreachable.border": "#2b2f38ff",
-        "warning": "#fee56cff",
-        "warning.background": "#5c5014ff",
-        "warning.border": "#796b26ff",
-        "players": [
-          {
-            "cursor": "#10a793ff",
-            "background": "#10a793ff",
-            "selection": "#10a7933d"
-          },
-          {
-            "cursor": "#c74cecff",
-            "background": "#c74cecff",
-            "selection": "#c74cec3d"
-          },
-          {
-            "cursor": "#f29c14ff",
-            "background": "#f29c14ff",
-            "selection": "#f29c143d"
-          },
-          {
-            "cursor": "#893ea6ff",
-            "background": "#893ea6ff",
-            "selection": "#893ea63d"
-          },
-          {
-            "cursor": "#08e7c5ff",
-            "background": "#08e7c5ff",
-            "selection": "#08e7c53d"
-          },
-          {
-            "cursor": "#f82871ff",
-            "background": "#f82871ff",
-            "selection": "#f828713d"
-          },
-          {
-            "cursor": "#fee56cff",
-            "background": "#fee56cff",
-            "selection": "#fee56c3d"
-          },
-          {
-            "cursor": "#96df71ff",
-            "background": "#96df71ff",
-            "selection": "#96df713d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#96df71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#afabb1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#afabb1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#96df71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#f7f7f8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#fee56cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#618399ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "keyword": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#f29c14ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#96df71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#96df71ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#315f70ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#f7f7f8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#f7f7f8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#d8d5dbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#d8d5dbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#d8d5dbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#d8d5dbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#d8d5dbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#afabb1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#f29c14ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#f7f7f8ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#08e7c5ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#f7f7f8ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#10a793ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
--- a/assets/themes/atelier/LICENSE
+++ b/assets/themes/atelier/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2023 Bram de Haan, http://atelierbramdehaan.nl
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/assets/themes/atelier/atelier.json
+++ b/assets/themes/atelier/atelier.json
--- a/assets/themes/gruvbox/gruvbox.json
+++ b/assets/themes/gruvbox/gruvbox.json
@@ -105,6 +105,9 @@
        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
+        "version_control_added": "#b7bb26ff",
+        "version_control_modified": "#f9bd2fff",
+        "version_control_deleted": "#fb4a35ff",
        "conflict": "#f9bd2fff",
        "conflict.background": "#572e10ff",
        "conflict.border": "#754916ff",
@@ -490,6 +493,9 @@
        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
+        "version_control_added": "#b7bb26ff",
+        "version_control_modified": "#f9bd2fff",
+        "version_control_deleted": "#fb4a35ff",
        "conflict": "#f9bd2fff",
        "conflict.background": "#572e10ff",
        "conflict.border": "#754916ff",
@@ -875,6 +881,9 @@
        "terminal.ansi.bright_white": "#fbf1c7ff",
        "terminal.ansi.dim_white": "#b0a189ff",
        "link_text.hover": "#83a598ff",
+        "version_control_added": "#b7bb26ff",
+        "version_control_modified": "#f9bd2fff",
+        "version_control_deleted": "#fb4a35ff",
        "conflict": "#f9bd2fff",
        "conflict.background": "#572e10ff",
        "conflict.border": "#754916ff",
@@ -1260,6 +1269,9 @@
        "terminal.ansi.bright_white": "#282828ff",
        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
+        "version_control_added": "#797410ff",
+        "version_control_modified": "#b57615ff",
+        "version_control_deleted": "#9d0308ff",
        "conflict": "#b57615ff",
        "conflict.background": "#f5e2d0ff",
        "conflict.border": "#ebccabff",
@@ -1645,6 +1657,9 @@
        "terminal.ansi.bright_white": "#282828ff",
        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
+        "version_control_added": "#797410ff",
+        "version_control_modified": "#b57615ff",
+        "version_control_deleted": "#9d0308ff",
        "conflict": "#b57615ff",
        "conflict.background": "#f5e2d0ff",
        "conflict.border": "#ebccabff",
@@ -2030,6 +2045,9 @@
        "terminal.ansi.bright_white": "#282828ff",
        "terminal.ansi.dim_white": "#73675eff",
        "link_text.hover": "#0b6678ff",
+        "version_control_added": "#797410ff",
+        "version_control_modified": "#b57615ff",
+        "version_control_deleted": "#9d0308ff",
        "conflict": "#b57615ff",
        "conflict.background": "#f5e2d0ff",
        "conflict.border": "#ebccabff",
--- a/assets/themes/one/one.json
+++ b/assets/themes/one/one.json
@@ -81,7 +81,7 @@
        "terminal.ansi.bright_green": "#4d6140ff",
        "terminal.ansi.dim_green": "#d1e0bfff",
        "terminal.ansi.yellow": "#dec184ff",
-        "terminal.ansi.bright_yellow": "#786441ff",
+        "terminal.ansi.bright_yellow": "#e5c07bff",
        "terminal.ansi.dim_yellow": "#f1dfc1ff",
        "terminal.ansi.blue": "#74ade8ff",
        "terminal.ansi.bright_blue": "#385378ff",
@@ -96,6 +96,9 @@
        "terminal.ansi.bright_white": "#dce0e5ff",
        "terminal.ansi.dim_white": "#575d65ff",
        "link_text.hover": "#74ade8ff",
+        "version_control_added": "#a7c088ff",
+        "version_control_modified": "#dec184ff",
+        "version_control_deleted": "#d07277ff",
        "conflict": "#dec184ff",
        "conflict.background": "#dec1841a",
        "conflict.border": "#5d4c2fff",
@@ -441,7 +444,7 @@
        "editor.invisible": "#a3a3a4ff",
        "editor.wrap_guide": "#383a410d",
        "editor.active_wrap_guide": "#383a411a",
-        "editor.document_highlight.read_background": "#5c78e21a",
+        "editor.document_highlight.read_background": "#5c78e225",
        "editor.document_highlight.write_background": "#a3a3a466",
        "terminal.background": "#fafafaff",
        "terminal.foreground": "#242529ff",
@@ -457,7 +460,7 @@
        "terminal.ansi.bright_green": "#b2cfa9ff",
        "terminal.ansi.dim_green": "#354d2eff",
        "terminal.ansi.yellow": "#dec184ff",
-        "terminal.ansi.bright_yellow": "#f1dfc1ff",
+        "terminal.ansi.bright_yellow": "#826221ff",
        "terminal.ansi.dim_yellow": "#786441ff",
        "terminal.ansi.blue": "#5c78e2ff",
        "terminal.ansi.bright_blue": "#b5baf2ff",
@@ -472,6 +475,9 @@
        "terminal.ansi.bright_white": "#242529ff",
        "terminal.ansi.dim_white": "#97979aff",
        "link_text.hover": "#5c78e2ff",
+        "version_control_added": "#669f59ff",
+        "version_control_modified": "#a48819ff",
+        "version_control_deleted": "#d36151ff",
        "conflict": "#a48819ff",
        "conflict.background": "#faf2e6ff",
        "conflict.border": "#f4e7d1ff",
--- a/assets/themes/rose_pine/LICENSE
+++ b/assets/themes/rose_pine/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2021 Emilia Dunfelt
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/assets/themes/rose_pine/rose_pine.json
+++ b/assets/themes/rose_pine/rose_pine.json
--- a/assets/themes/sandcastle/LICENSE
+++ b/assets/themes/sandcastle/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 George Essig
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/assets/themes/sandcastle/sandcastle.json
+++ b/assets/themes/sandcastle/sandcastle.json
@@ -1,378 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "Sandcastle",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "Sandcastle",
-      "appearance": "dark",
-      "style": {
-        "border": "#3d4350ff",
-        "border.variant": "#313741ff",
-        "border.focused": "#223131ff",
-        "border.selected": "#223131ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#393f4aff",
-        "elevated_surface.background": "#2b3038ff",
-        "surface.background": "#2b3038ff",
-        "background": "#333944ff",
-        "element.background": "#2b3038ff",
-        "element.hover": "#313741ff",
-        "element.active": "#3d4350ff",
-        "element.selected": "#3d4350ff",
-        "element.disabled": "#2b3038ff",
-        "drop_target.background": "#a6978280",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#313741ff",
-        "ghost_element.active": "#3d4350ff",
-        "ghost_element.selected": "#3d4350ff",
-        "ghost_element.disabled": "#2b3038ff",
-        "text": "#fdf4c1ff",
-        "text.muted": "#a69782ff",
-        "text.placeholder": "#827568ff",
-        "text.disabled": "#827568ff",
-        "text.accent": "#518b8bff",
-        "icon": "#fdf4c1ff",
-        "icon.muted": "#a69782ff",
-        "icon.disabled": "#827568ff",
-        "icon.placeholder": "#a69782ff",
-        "icon.accent": "#518b8bff",
-        "status_bar.background": "#333944ff",
-        "title_bar.background": "#333944ff",
-        "title_bar.inactive_background": "#2b3038ff",
-        "toolbar.background": "#282c33ff",
-        "tab_bar.background": "#2b3038ff",
-        "tab.inactive_background": "#2b3038ff",
-        "tab.active_background": "#282c33ff",
-        "search.match_background": "#528b8b66",
-        "panel.background": "#2b3038ff",
-        "panel.focused_border": "#518b8bff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fdf4c14c",
-        "scrollbar.thumb.hover_background": "#313741ff",
-        "scrollbar.thumb.border": "#313741ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#2a2f38ff",
-        "editor.foreground": "#fdf4c1ff",
-        "editor.background": "#282c33ff",
-        "editor.gutter.background": "#282c33ff",
-        "editor.subheader.background": "#2b3038ff",
-        "editor.active_line.background": "#2b3038bf",
-        "editor.highlighted_line.background": "#2b3038ff",
-        "editor.line_number": "#6b6b61",
-        "editor.active_line_number": "#dbdbd7",
-        "editor.hover_line_number": "#b6b6af",
-        "editor.invisible": "#7c6f64ff",
-        "editor.wrap_guide": "#fdf4c10d",
-        "editor.active_wrap_guide": "#fdf4c11a",
-        "editor.document_highlight.read_background": "#518b8b1a",
-        "editor.document_highlight.write_background": "#7c6f6466",
-        "terminal.background": "#282c33ff",
-        "terminal.foreground": "#fdf4c1ff",
-        "terminal.bright_foreground": "#fdf4c1ff",
-        "terminal.dim_foreground": "#282c33ff",
-        "terminal.ansi.black": "#282c33ff",
-        "terminal.ansi.bright_black": "#5e5753ff",
-        "terminal.ansi.dim_black": "#fdf4c1ff",
-        "terminal.ansi.red": "#b3627aff",
-        "terminal.ansi.bright_red": "#57333dff",
-        "terminal.ansi.dim_red": "#dcb0bbff",
-        "terminal.ansi.green": "#83a598ff",
-        "terminal.ansi.bright_green": "#414f4aff",
-        "terminal.ansi.dim_green": "#c0d2cbff",
-        "terminal.ansi.yellow": "#a07d3aff",
-        "terminal.ansi.bright_yellow": "#4e3f22ff",
-        "terminal.ansi.dim_yellow": "#d3bd9aff",
-        "terminal.ansi.blue": "#518b8bff",
-        "terminal.ansi.bright_blue": "#2c4444ff",
-        "terminal.ansi.dim_blue": "#a8c4c4ff",
-        "terminal.ansi.magenta": "#a87222ff",
-        "terminal.ansi.bright_magenta": "#523918ff",
-        "terminal.ansi.dim_magenta": "#dab78eff",
-        "terminal.ansi.cyan": "#83a598ff",
-        "terminal.ansi.bright_cyan": "#414f4aff",
-        "terminal.ansi.dim_cyan": "#c0d2cbff",
-        "terminal.ansi.white": "#fdf4c1ff",
-        "terminal.ansi.bright_white": "#fdf4c1ff",
-        "terminal.ansi.dim_white": "#958776ff",
-        "link_text.hover": "#518b8bff",
-        "conflict": "#a07d3aff",
-        "conflict.background": "#231d12ff",
-        "conflict.border": "#392e19ff",
-        "created": "#83a598ff",
-        "created.background": "#1e2321ff",
-        "created.border": "#303a36ff",
-        "deleted": "#b3627aff",
-        "deleted.background": "#26191cff",
-        "deleted.border": "#3e272dff",
-        "error": "#b3627aff",
-        "error.background": "#26191cff",
-        "error.border": "#3e272dff",
-        "hidden": "#827568ff",
-        "hidden.background": "#333944ff",
-        "hidden.border": "#393f4aff",
-        "hint": "#727d68ff",
-        "hint.background": "#171e1eff",
-        "hint.border": "#223131ff",
-        "ignored": "#827568ff",
-        "ignored.background": "#333944ff",
-        "ignored.border": "#3d4350ff",
-        "info": "#518b8bff",
-        "info.background": "#171e1eff",
-        "info.border": "#223131ff",
-        "modified": "#a07d3aff",
-        "modified.background": "#231d12ff",
-        "modified.border": "#392e19ff",
-        "predictive": "#5c6152ff",
-        "predictive.background": "#1e2321ff",
-        "predictive.border": "#303a36ff",
-        "renamed": "#518b8bff",
-        "renamed.background": "#171e1eff",
-        "renamed.border": "#223131ff",
-        "success": "#83a598ff",
-        "success.background": "#1e2321ff",
-        "success.border": "#303a36ff",
-        "unreachable": "#a69782ff",
-        "unreachable.background": "#333944ff",
-        "unreachable.border": "#3d4350ff",
-        "warning": "#a07d3aff",
-        "warning.background": "#231d12ff",
-        "warning.border": "#392e19ff",
-        "players": [
-          {
-            "cursor": "#518b8bff",
-            "background": "#518b8bff",
-            "selection": "#518b8b3d"
-          },
-          {
-            "cursor": "#a87222ff",
-            "background": "#a87222ff",
-            "selection": "#a872223d"
-          },
-          {
-            "cursor": "#a07d3aff",
-            "background": "#a07d3aff",
-            "selection": "#a07d3a3d"
-          },
-          {
-            "cursor": "#d75f5fff",
-            "background": "#d75f5fff",
-            "selection": "#d75f5f3d"
-          },
-          {
-            "cursor": "#83a598ff",
-            "background": "#83a598ff",
-            "selection": "#83a5983d"
-          },
-          {
-            "cursor": "#b3627aff",
-            "background": "#b3627aff",
-            "selection": "#b3627a3d"
-          },
-          {
-            "cursor": "#a07d3aff",
-            "background": "#a07d3aff",
-            "selection": "#a07d3a3d"
-          },
-          {
-            "cursor": "#83a598ff",
-            "background": "#83a598ff",
-            "selection": "#83a5983d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#fdf4c1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#727d68ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "keyword": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#a07d3aff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#5c6152ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#fdf4c1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#fdf4c1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#d5c5a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#d5c5a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#d5c5a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#d5c5a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#d5c5a1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#a89984ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#a07d3aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#fdf4c1ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#83a598ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#fdf4c1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#518b8bff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
--- a/assets/themes/solarized/LICENSE
+++ b/assets/themes/solarized/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2011 Ethan Schoonover
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/assets/themes/solarized/solarized.json
+++ b/assets/themes/solarized/solarized.json
@@ -1,749 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "Solarized",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "Solarized Dark",
-      "appearance": "dark",
-      "style": {
-        "border": "#2b4e58ff",
-        "border.variant": "#053541ff",
-        "border.focused": "#1b3149ff",
-        "border.selected": "#1b3149ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#19424dff",
-        "elevated_surface.background": "#04313bff",
-        "surface.background": "#04313bff",
-        "background": "#073743ff",
-        "element.background": "#04313bff",
-        "element.hover": "#053541ff",
-        "element.active": "#294d58ff",
-        "element.selected": "#294d58ff",
-        "element.disabled": "#04313bff",
-        "drop_target.background": "#93a1a180",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#053541ff",
-        "ghost_element.active": "#294d58ff",
-        "ghost_element.selected": "#294d58ff",
-        "ghost_element.disabled": "#04313bff",
-        "text": "#fdf6e3ff",
-        "text.muted": "#93a1a1ff",
-        "text.placeholder": "#6f8389ff",
-        "text.disabled": "#6f8389ff",
-        "text.accent": "#278ad1ff",
-        "icon": "#fdf6e3ff",
-        "icon.muted": "#93a1a1ff",
-        "icon.disabled": "#6f8389ff",
-        "icon.placeholder": "#93a1a1ff",
-        "icon.accent": "#278ad1ff",
-        "status_bar.background": "#073743ff",
-        "title_bar.background": "#073743ff",
-        "title_bar.inactive_background": "#04313bff",
-        "toolbar.background": "#002a35ff",
-        "tab_bar.background": "#04313bff",
-        "tab.inactive_background": "#04313bff",
-        "tab.active_background": "#002a35ff",
-        "search.match_background": "#288bd166",
-        "panel.background": "#04313bff",
-        "panel.focused_border": "#278ad1ff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#fdf6e34c",
-        "scrollbar.thumb.hover_background": "#053541ff",
-        "scrollbar.thumb.border": "#053541ff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#022f3bff",
-        "editor.foreground": "#fdf6e3ff",
-        "editor.background": "#002a35ff",
-        "editor.gutter.background": "#002a35ff",
-        "editor.subheader.background": "#04313bff",
-        "editor.active_line.background": "#04313bbf",
-        "editor.highlighted_line.background": "#04313bff",
-        "editor.line_number": "#5a6d6f",
-        "editor.active_line_number": "#e3e8e8",
-        "editor.hover_line_number": "#abb9ba",
-        "editor.invisible": "#6c8287ff",
-        "editor.wrap_guide": "#fdf6e30d",
-        "editor.active_wrap_guide": "#fdf6e31a",
-        "editor.document_highlight.read_background": "#278ad11a",
-        "editor.document_highlight.write_background": "#6c828766",
-        "terminal.background": "#002a35ff",
-        "terminal.foreground": "#fdf6e3ff",
-        "terminal.bright_foreground": "#fdf6e3ff",
-        "terminal.dim_foreground": "#002a35ff",
-        "terminal.ansi.black": "#002a35ff",
-        "terminal.ansi.bright_black": "#5c7279ff",
-        "terminal.ansi.dim_black": "#fdf6e3ff",
-        "terminal.ansi.red": "#dc3330ff",
-        "terminal.ansi.bright_red": "#7d181cff",
-        "terminal.ansi.dim_red": "#faa091ff",
-        "terminal.ansi.green": "#849903ff",
-        "terminal.ansi.bright_green": "#434a10ff",
-        "terminal.ansi.dim_green": "#c6cb8bff",
-        "terminal.ansi.yellow": "#b58902ff",
-        "terminal.ansi.bright_yellow": "#5d430fff",
-        "terminal.ansi.dim_yellow": "#e0c189ff",
-        "terminal.ansi.blue": "#278ad1ff",
-        "terminal.ansi.bright_blue": "#214365ff",
-        "terminal.ansi.dim_blue": "#a5c3e9ff",
-        "terminal.ansi.magenta": "#d33781ff",
-        "terminal.ansi.bright_magenta": "#6f1f3fff",
-        "terminal.ansi.dim_magenta": "#f0a2beff",
-        "terminal.ansi.cyan": "#2ba198ff",
-        "terminal.ansi.bright_cyan": "#204e4aff",
-        "terminal.ansi.dim_cyan": "#9fd0cbff",
-        "terminal.ansi.white": "#fdf6e3ff",
-        "terminal.ansi.bright_white": "#fdf6e3ff",
-        "terminal.ansi.dim_white": "#7b8e91ff",
-        "link_text.hover": "#278ad1ff",
-        "conflict": "#b58902ff",
-        "conflict.background": "#2e1d0cff",
-        "conflict.border": "#47300fff",
-        "created": "#849903ff",
-        "created.background": "#1e210cff",
-        "created.border": "#313510ff",
-        "deleted": "#dc3330ff",
-        "deleted.background": "#4a080eff",
-        "deleted.border": "#641015ff",
-        "error": "#dc3330ff",
-        "error.background": "#4a080eff",
-        "error.border": "#641015ff",
-        "hidden": "#6f8389ff",
-        "hidden.background": "#073743ff",
-        "hidden.border": "#19424dff",
-        "hint": "#4f8297ff",
-        "hint.background": "#141f2cff",
-        "hint.border": "#1b3149ff",
-        "ignored": "#6f8389ff",
-        "ignored.background": "#073743ff",
-        "ignored.border": "#2b4e58ff",
-        "info": "#278ad1ff",
-        "info.background": "#141f2cff",
-        "info.border": "#1b3149ff",
-        "modified": "#b58902ff",
-        "modified.background": "#2e1d0cff",
-        "modified.border": "#47300fff",
-        "predictive": "#3f718bff",
-        "predictive.background": "#1e210cff",
-        "predictive.border": "#313510ff",
-        "renamed": "#278ad1ff",
-        "renamed.background": "#141f2cff",
-        "renamed.border": "#1b3149ff",
-        "success": "#849903ff",
-        "success.background": "#1e210cff",
-        "success.border": "#313510ff",
-        "unreachable": "#93a1a1ff",
-        "unreachable.background": "#073743ff",
-        "unreachable.border": "#2b4e58ff",
-        "warning": "#b58902ff",
-        "warning.background": "#2e1d0cff",
-        "warning.border": "#47300fff",
-        "players": [
-          {
-            "cursor": "#278ad1ff",
-            "background": "#278ad1ff",
-            "selection": "#278ad13d"
-          },
-          {
-            "cursor": "#d33781ff",
-            "background": "#d33781ff",
-            "selection": "#d337813d"
-          },
-          {
-            "cursor": "#cb4b16ff",
-            "background": "#cb4b16ff",
-            "selection": "#cb4b163d"
-          },
-          {
-            "cursor": "#6c71c4ff",
-            "background": "#6c71c4ff",
-            "selection": "#6c71c43d"
-          },
-          {
-            "cursor": "#2ba198ff",
-            "background": "#2ba198ff",
-            "selection": "#2ba1983d"
-          },
-          {
-            "cursor": "#dc3330ff",
-            "background": "#dc3330ff",
-            "selection": "#dc33303d"
-          },
-          {
-            "cursor": "#b58902ff",
-            "background": "#b58902ff",
-            "selection": "#b589023d"
-          },
-          {
-            "cursor": "#849903ff",
-            "background": "#849903ff",
-            "selection": "#8499033d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#99a5a4ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#99a5a4ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#fdf6e3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#b58902ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#4f8297ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "keyword": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#cb4b16ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#3f718bff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#fdf6e3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#fdf6e3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#efe9d6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#efe9d6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#efe9d6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#efe9d6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#efe9d6ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#99a5a4ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#fdf6e3ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#2ba198ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#fdf6e3ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#278ad1ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    },
-    {
-      "name": "Solarized Light",
-      "appearance": "light",
-      "style": {
-        "border": "#9faaa8ff",
-        "border.variant": "#dcdacbff",
-        "border.focused": "#bfd3efff",
-        "border.selected": "#bfd3efff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#b6bcb5ff",
-        "elevated_surface.background": "#f3eddaff",
-        "surface.background": "#f3eddaff",
-        "background": "#cfd0c4ff",
-        "element.background": "#f3eddaff",
-        "element.hover": "#dcdacbff",
-        "element.active": "#a2aca9ff",
-        "element.selected": "#a2aca9ff",
-        "element.disabled": "#f3eddaff",
-        "drop_target.background": "#34555e80",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#dcdacbff",
-        "ghost_element.active": "#a2aca9ff",
-        "ghost_element.selected": "#a2aca9ff",
-        "ghost_element.disabled": "#f3eddaff",
-        "text": "#002a35ff",
-        "text.muted": "#34555eff",
-        "text.placeholder": "#6a7f86ff",
-        "text.disabled": "#6a7f86ff",
-        "text.accent": "#288bd1ff",
-        "icon": "#002a35ff",
-        "icon.muted": "#34555eff",
-        "icon.disabled": "#6a7f86ff",
-        "icon.placeholder": "#34555eff",
-        "icon.accent": "#288bd1ff",
-        "status_bar.background": "#cfd0c4ff",
-        "title_bar.background": "#cfd0c4ff",
-        "title_bar.inactive_background": "#f3eddaff",
-        "toolbar.background": "#fdf6e3ff",
-        "tab_bar.background": "#f3eddaff",
-        "tab.inactive_background": "#f3eddaff",
-        "tab.active_background": "#fdf6e3ff",
-        "search.match_background": "#298bd166",
-        "panel.background": "#f3eddaff",
-        "panel.focused_border": "#288bd1ff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#002a354c",
-        "scrollbar.thumb.hover_background": "#dcdacbff",
-        "scrollbar.thumb.border": "#dcdacbff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#f5eedbff",
-        "editor.foreground": "#002a35ff",
-        "editor.background": "#fdf6e3ff",
-        "editor.gutter.background": "#fdf6e3ff",
-        "editor.subheader.background": "#f3eddaff",
-        "editor.active_line.background": "#f3eddabf",
-        "editor.highlighted_line.background": "#f3eddaff",
-        "editor.line_number": "#a8ad9f",
-        "editor.active_line_number": "#272923",
-        "editor.hover_line_number": "#42453b",
-        "editor.invisible": "#6c8287ff",
-        "editor.wrap_guide": "#002a350d",
-        "editor.active_wrap_guide": "#002a351a",
-        "editor.document_highlight.read_background": "#288bd11a",
-        "editor.document_highlight.write_background": "#6c828766",
-        "terminal.background": "#fdf6e3ff",
-        "terminal.foreground": "#002a35ff",
-        "terminal.bright_foreground": "#002a35ff",
-        "terminal.dim_foreground": "#fdf6e3ff",
-        "terminal.ansi.black": "#fdf6e3ff",
-        "terminal.ansi.bright_black": "#7b8e91ff",
-        "terminal.ansi.dim_black": "#002a35ff",
-        "terminal.ansi.red": "#dc3330ff",
-        "terminal.ansi.bright_red": "#faa091ff",
-        "terminal.ansi.dim_red": "#7d181cff",
-        "terminal.ansi.green": "#849903ff",
-        "terminal.ansi.bright_green": "#c6cb8bff",
-        "terminal.ansi.dim_green": "#434a10ff",
-        "terminal.ansi.yellow": "#b58903ff",
-        "terminal.ansi.bright_yellow": "#e0c189ff",
-        "terminal.ansi.dim_yellow": "#5d430fff",
-        "terminal.ansi.blue": "#288bd1ff",
-        "terminal.ansi.bright_blue": "#a5c3e9ff",
-        "terminal.ansi.dim_blue": "#214365ff",
-        "terminal.ansi.magenta": "#d33781ff",
-        "terminal.ansi.bright_magenta": "#f0a2beff",
-        "terminal.ansi.dim_magenta": "#6f1f3fff",
-        "terminal.ansi.cyan": "#2ba198ff",
-        "terminal.ansi.bright_cyan": "#9fd0cbff",
-        "terminal.ansi.dim_cyan": "#204e4aff",
-        "terminal.ansi.white": "#002a35ff",
-        "terminal.ansi.bright_white": "#002a35ff",
-        "terminal.ansi.dim_white": "#5c7279ff",
-        "link_text.hover": "#288bd1ff",
-        "conflict": "#b58903ff",
-        "conflict.background": "#f5e6d0ff",
-        "conflict.border": "#ebd3aaff",
-        "created": "#849903ff",
-        "created.background": "#e9ead0ff",
-        "created.border": "#d6d9abff",
-        "deleted": "#dc3330ff",
-        "deleted.background": "#ffd9d2ff",
-        "deleted.border": "#ffbbafff",
-        "error": "#dc3330ff",
-        "error.background": "#ffd9d2ff",
-        "error.border": "#ffbbafff",
-        "hidden": "#6a7f86ff",
-        "hidden.background": "#cfd0c4ff",
-        "hidden.border": "#b6bcb5ff",
-        "hint": "#5789a3ff",
-        "hint.background": "#dbe6f6ff",
-        "hint.border": "#bfd3efff",
-        "ignored": "#6a7f86ff",
-        "ignored.background": "#cfd0c4ff",
-        "ignored.border": "#9faaa8ff",
-        "info": "#288bd1ff",
-        "info.background": "#dbe6f6ff",
-        "info.border": "#bfd3efff",
-        "modified": "#b58903ff",
-        "modified.background": "#f5e6d0ff",
-        "modified.border": "#ebd3aaff",
-        "predictive": "#679aafff",
-        "predictive.background": "#e9ead0ff",
-        "predictive.border": "#d6d9abff",
-        "renamed": "#288bd1ff",
-        "renamed.background": "#dbe6f6ff",
-        "renamed.border": "#bfd3efff",
-        "success": "#849903ff",
-        "success.background": "#e9ead0ff",
-        "success.border": "#d6d9abff",
-        "unreachable": "#34555eff",
-        "unreachable.background": "#cfd0c4ff",
-        "unreachable.border": "#9faaa8ff",
-        "warning": "#b58903ff",
-        "warning.background": "#f5e6d0ff",
-        "warning.border": "#ebd3aaff",
-        "players": [
-          {
-            "cursor": "#288bd1ff",
-            "background": "#288bd1ff",
-            "selection": "#288bd13d"
-          },
-          {
-            "cursor": "#d33781ff",
-            "background": "#d33781ff",
-            "selection": "#d337813d"
-          },
-          {
-            "cursor": "#cb4b16ff",
-            "background": "#cb4b16ff",
-            "selection": "#cb4b173d"
-          },
-          {
-            "cursor": "#6c71c3ff",
-            "background": "#6c71c3ff",
-            "selection": "#6c71c33d"
-          },
-          {
-            "cursor": "#2ba198ff",
-            "background": "#2ba198ff",
-            "selection": "#2ba1983d"
-          },
-          {
-            "cursor": "#dc3330ff",
-            "background": "#dc3330ff",
-            "selection": "#dc33303d"
-          },
-          {
-            "cursor": "#b58903ff",
-            "background": "#b58903ff",
-            "selection": "#b589033d"
-          },
-          {
-            "cursor": "#849903ff",
-            "background": "#849903ff",
-            "selection": "#8499033d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#30525bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#30525bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#002a35ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#b58903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#5789a3ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "keyword": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#cb4b16ff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#849903ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#679aafff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#002a35ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#002a35ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#04333eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#04333eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#04333eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#04333eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#04333eff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#30525bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#cb4b16ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#002a35ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#2ba198ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#002a35ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#288bd1ff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
--- a/assets/themes/summercamp/LICENSE
+++ b/assets/themes/summercamp/LICENSE
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Zoe FiriH
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/assets/themes/summercamp/summercamp.json
+++ b/assets/themes/summercamp/summercamp.json
@@ -1,378 +0,0 @@
-{
-  "$schema": "https://zed.dev/schema/themes/v0.2.0.json",
-  "name": "Summercamp",
-  "author": "Zed Industries",
-  "themes": [
-    {
-      "name": "Summercamp",
-      "appearance": "dark",
-      "style": {
-        "border": "#302c21ff",
-        "border.variant": "#29251bff",
-        "border.focused": "#193760ff",
-        "border.selected": "#193760ff",
-        "border.transparent": "#00000000",
-        "border.disabled": "#2e2a1fff",
-        "elevated_surface.background": "#231f16ff",
-        "surface.background": "#231f16ff",
-        "background": "#2a261cff",
-        "element.background": "#231f16ff",
-        "element.hover": "#29251bff",
-        "element.active": "#2f2b20ff",
-        "element.selected": "#2f2b20ff",
-        "element.disabled": "#231f16ff",
-        "drop_target.background": "#736e5580",
-        "ghost_element.background": "#00000000",
-        "ghost_element.hover": "#29251bff",
-        "ghost_element.active": "#2f2b20ff",
-        "ghost_element.selected": "#2f2b20ff",
-        "ghost_element.disabled": "#231f16ff",
-        "text": "#f8f5deff",
-        "text.muted": "#736e55ff",
-        "text.placeholder": "#4c4735ff",
-        "text.disabled": "#4c4735ff",
-        "text.accent": "#499befff",
-        "icon": "#f8f5deff",
-        "icon.muted": "#736e55ff",
-        "icon.disabled": "#4c4735ff",
-        "icon.placeholder": "#736e55ff",
-        "icon.accent": "#499befff",
-        "status_bar.background": "#2a261cff",
-        "title_bar.background": "#2a261cff",
-        "title_bar.inactive_background": "#231f16ff",
-        "toolbar.background": "#1b1810ff",
-        "tab_bar.background": "#231f16ff",
-        "tab.inactive_background": "#231f16ff",
-        "tab.active_background": "#1b1810ff",
-        "search.match_background": "#499bef66",
-        "panel.background": "#231f16ff",
-        "panel.focused_border": "#499befff",
-        "pane.focused_border": null,
-        "scrollbar.thumb.background": "#f8f5de4c",
-        "scrollbar.thumb.hover_background": "#29251bff",
-        "scrollbar.thumb.border": "#29251bff",
-        "scrollbar.track.background": "#00000000",
-        "scrollbar.track.border": "#221e15ff",
-        "editor.foreground": "#f8f5deff",
-        "editor.background": "#1b1810ff",
-        "editor.gutter.background": "#1b1810ff",
-        "editor.subheader.background": "#231f16ff",
-        "editor.active_line.background": "#231f16bf",
-        "editor.highlighted_line.background": "#231f16ff",
-        "editor.line_number": "#676559",
-        "editor.active_line_number": "#e3e2de",
-        "editor.hover_line_number": "#b8b6ad",
-        "editor.invisible": "#494433ff",
-        "editor.wrap_guide": "#f8f5de0d",
-        "editor.active_wrap_guide": "#f8f5de1a",
-        "editor.document_highlight.read_background": "#499bef1a",
-        "editor.document_highlight.write_background": "#49443366",
-        "terminal.background": "#1b1810ff",
-        "terminal.foreground": "#f8f5deff",
-        "terminal.bright_foreground": "#f8f5deff",
-        "terminal.dim_foreground": "#1b1810ff",
-        "terminal.ansi.black": "#1b1810ff",
-        "terminal.ansi.bright_black": "#3a3527ff",
-        "terminal.ansi.dim_black": "#f8f5deff",
-        "terminal.ansi.red": "#e35041ff",
-        "terminal.ansi.bright_red": "#7f2724ff",
-        "terminal.ansi.dim_red": "#faaa9bff",
-        "terminal.ansi.green": "#5dea5aff",
-        "terminal.ansi.bright_green": "#28842cff",
-        "terminal.ansi.dim_green": "#b9f7aeff",
-        "terminal.ansi.yellow": "#f1fe28ff",
-        "terminal.ansi.bright_yellow": "#8c9a0fff",
-        "terminal.ansi.dim_yellow": "#ffffa2ff",
-        "terminal.ansi.blue": "#499befff",
-        "terminal.ansi.bright_blue": "#234b7fff",
-        "terminal.ansi.dim_blue": "#b1ccf8ff",
-        "terminal.ansi.magenta": "#f59be6ff",
-        "terminal.ansi.bright_magenta": "#88487eff",
-        "terminal.ansi.dim_magenta": "#fccef3ff",
-        "terminal.ansi.cyan": "#5aeabbff",
-        "terminal.ansi.bright_cyan": "#288461ff",
-        "terminal.ansi.dim_cyan": "#b7f6ddff",
-        "terminal.ansi.white": "#f8f5deff",
-        "terminal.ansi.bright_white": "#f8f5deff",
-        "terminal.ansi.dim_white": "#57533fff",
-        "link_text.hover": "#499befff",
-        "conflict": "#f1fe28ff",
-        "conflict.background": "#546205ff",
-        "conflict.border": "#717f0aff",
-        "created": "#5dea5aff",
-        "created.background": "#094d12ff",
-        "created.border": "#1a6a20ff",
-        "deleted": "#e35041ff",
-        "deleted.background": "#490f12ff",
-        "deleted.border": "#651c1cff",
-        "error": "#e35041ff",
-        "error.background": "#490f12ff",
-        "error.border": "#651c1cff",
-        "hidden": "#4c4735ff",
-        "hidden.background": "#2a261cff",
-        "hidden.border": "#2e2a1fff",
-        "hint": "#246e61ff",
-        "hint.background": "#0e2242ff",
-        "hint.border": "#193760ff",
-        "ignored": "#4c4735ff",
-        "ignored.background": "#2a261cff",
-        "ignored.border": "#302c21ff",
-        "info": "#499befff",
-        "info.background": "#0e2242ff",
-        "info.border": "#193760ff",
-        "modified": "#f1fe28ff",
-        "modified.background": "#546205ff",
-        "modified.border": "#717f0aff",
-        "predictive": "#78434aff",
-        "predictive.background": "#094d12ff",
-        "predictive.border": "#1a6a20ff",
-        "renamed": "#499befff",
-        "renamed.background": "#0e2242ff",
-        "renamed.border": "#193760ff",
-        "success": "#5dea5aff",
-        "success.background": "#094d12ff",
-        "success.border": "#1a6a20ff",
-        "unreachable": "#736e55ff",
-        "unreachable.background": "#2a261cff",
-        "unreachable.border": "#302c21ff",
-        "warning": "#f1fe28ff",
-        "warning.background": "#546205ff",
-        "warning.border": "#717f0aff",
-        "players": [
-          {
-            "cursor": "#499befff",
-            "background": "#499befff",
-            "selection": "#499bef3d"
-          },
-          {
-            "cursor": "#f59be6ff",
-            "background": "#f59be6ff",
-            "selection": "#f59be63d"
-          },
-          {
-            "cursor": "#faa11cff",
-            "background": "#faa11cff",
-            "selection": "#faa11c3d"
-          },
-          {
-            "cursor": "#fe8080ff",
-            "background": "#fe8080ff",
-            "selection": "#fe80803d"
-          },
-          {
-            "cursor": "#5aeabbff",
-            "background": "#5aeabbff",
-            "selection": "#5aeabb3d"
-          },
-          {
-            "cursor": "#e35041ff",
-            "background": "#e35041ff",
-            "selection": "#e350413d"
-          },
-          {
-            "cursor": "#f1fe28ff",
-            "background": "#f1fe28ff",
-            "selection": "#f1fe283d"
-          },
-          {
-            "cursor": "#5dea5aff",
-            "background": "#5dea5aff",
-            "selection": "#5dea5a3d"
-          }
-        ],
-        "syntax": {
-          "attribute": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "boolean": {
-            "color": "#5dea5aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment": {
-            "color": "#777159ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "comment.doc": {
-            "color": "#777159ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constant": {
-            "color": "#5dea5aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "constructor": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "embedded": {
-            "color": "#f8f5deff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "emphasis.strong": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "enum": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "function": {
-            "color": "#f1fe28ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "hint": {
-            "color": "#246e61ff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "keyword": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "label": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "link_text": {
-            "color": "#faa11cff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "link_uri": {
-            "color": "#5dea5aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "number": {
-            "color": "#5dea5aff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "operator": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "predictive": {
-            "color": "#78434aff",
-            "font_style": "italic",
-            "font_weight": null
-          },
-          "preproc": {
-            "color": "#f8f5deff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "primary": {
-            "color": "#f8f5deff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "property": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation": {
-            "color": "#bfbb9bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.bracket": {
-            "color": "#bfbb9bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.delimiter": {
-            "color": "#bfbb9bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.list_marker": {
-            "color": "#bfbb9bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "punctuation.special": {
-            "color": "#bfbb9bff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.escape": {
-            "color": "#777159ff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.regex": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "string.special.symbol": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "tag": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "text.literal": {
-            "color": "#faa11cff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "title": {
-            "color": "#f8f5deff",
-            "font_style": null,
-            "font_weight": 700
-          },
-          "type": {
-            "color": "#5aeabbff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variable": {
-            "color": "#f8f5deff",
-            "font_style": null,
-            "font_weight": null
-          },
-          "variant": {
-            "color": "#499befff",
-            "font_style": null,
-            "font_weight": null
-          }
-        }
-      }
-    }
-  ]
-}
--- a/crates/assistant/Cargo.toml
+++ b/crates/assistant/Cargo.toml
@@ -59,7 +59,6 @@ search.workspace = true
 semantic_index.workspace = true
 serde.workspace = true
 settings.workspace = true
-similar.workspace = true
 smol.workspace = true
 streaming_diff.workspace = true
 telemetry.workspace = true
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -7,7 +7,7 @@ use assistant_context_editor::{
    make_lsp_adapter_delegate, AssistantContext, AssistantPanelDelegate, ContextEditor,
    ContextEditorToolbarItem, ContextEditorToolbarItemEvent, ContextHistory, ContextId,
    ContextStore, ContextStoreEvent, InsertDraggedFiles, SlashCommandCompletionProvider,
-    ToggleModelSelector, DEFAULT_TAB_TITLE,
+    DEFAULT_TAB_TITLE,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
@@ -20,8 +20,9 @@ use gpui::{
    Subscription, Task, UpdateGlobal, WeakEntity,
 };
 use language::LanguageRegistry;
-use language_model::{LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID};
-use language_model_selector::LanguageModelSelector;
+use language_model::{
+    AuthenticateError, LanguageModelProviderId, LanguageModelRegistry, ZED_CLOUD_PROVIDER_ID,
+};
 use project::Project;
 use prompt_library::{open_prompt_library, PromptBuilder, PromptLibrary};
 use search::{buffer_search::DivRegistrar, BufferSearchBar};
@@ -29,7 +30,7 @@ use settings::{update_settings_file, Settings};
 use smol::stream::StreamExt;
 use std::{ops::ControlFlow, path::PathBuf, sync::Arc};
 use terminal_view::{terminal_panel::TerminalPanel, TerminalView};
-use ui::{prelude::*, ContextMenu, PopoverMenu, PopoverMenuHandle, Tooltip};
+use ui::{prelude::*, ContextMenu, PopoverMenu, Tooltip};
 use util::{maybe, ResultExt};
 use workspace::DraggedTab;
 use workspace::{
@@ -77,7 +78,6 @@ pub struct AssistantPanel {
    languages: Arc<LanguageRegistry>,
    fs: Arc<dyn Fs>,
    subscriptions: Vec<Subscription>,
-    model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
    model_summary_editor: Entity<Editor>,
    authenticate_provider_task: Option<(LanguageModelProviderId, Task<()>)>,
    configuration_subscription: Option<Subscription>,
@@ -119,17 +119,9 @@ impl AssistantPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> Self {
-        let model_selector_menu_handle = PopoverMenuHandle::default();
        let model_summary_editor = cx.new(|cx| Editor::single_line(window, cx));
-        let context_editor_toolbar = cx.new(|cx| {
-            ContextEditorToolbarItem::new(
-                workspace,
-                model_selector_menu_handle.clone(),
-                model_summary_editor.clone(),
-                window,
-                cx,
-            )
-        });
+        let context_editor_toolbar =
+            cx.new(|_| ContextEditorToolbarItem::new(model_summary_editor.clone()));

        let pane = cx.new(|cx| {
            let mut pane = Pane::new(
@@ -250,10 +242,10 @@ impl AssistantPanel {
                    )
                    .child(
                        PopoverMenu::new("assistant-panel-popover-menu")
-                            .trigger(
+                            .trigger_with_tooltip(
                                IconButton::new("menu", IconName::EllipsisVertical)
-                                    .icon_size(IconSize::Small)
-                                    .tooltip(Tooltip::text("Toggle Assistant Menu")),
+                                    .icon_size(IconSize::Small),
+                                Tooltip::text("Toggle Assistant Menu"),
                            )
                            .menu(move |window, cx| {
                                let zoom_label = if _pane.read(cx).is_zoomed() {
@@ -279,7 +271,17 @@ impl AssistantPanel {
            });
            pane.toolbar().update(cx, |toolbar, cx| {
                toolbar.add_item(context_editor_toolbar.clone(), window, cx);
-                toolbar.add_item(cx.new(|cx| BufferSearchBar::new(window, cx)), window, cx)
+                toolbar.add_item(
+                    cx.new(|cx| {
+                        BufferSearchBar::new(
+                            Some(workspace.project().read(cx).languages().clone()),
+                            window,
+                            cx,
+                        )
+                    }),
+                    window,
+                    cx,
+                )
            });
            pane
        });
@@ -321,7 +323,6 @@ impl AssistantPanel {
            languages: workspace.app_state().languages.clone(),
            fs: workspace.app_state().fs.clone(),
            subscriptions,
-            model_selector_menu_handle,
            model_summary_editor,
            authenticate_provider_task: None,
            configuration_subscription: None,
@@ -1044,15 +1045,6 @@ impl AssistantPanel {
        .detach_and_log_err(cx);
    }

-    fn toggle_model_selector(
-        &mut self,
-        _: &ToggleModelSelector,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.model_selector_menu_handle.toggle(window, cx);
-    }
-
    pub(crate) fn active_context_editor(&self, cx: &App) -> Option<Entity<ContextEditor>> {
        self.pane
            .read(cx)
@@ -1166,7 +1158,10 @@ impl AssistantPanel {
            .map_or(false, |provider| provider.is_authenticated(cx))
    }

-    fn authenticate(&mut self, cx: &mut Context<Self>) -> Option<Task<Result<()>>> {
+    fn authenticate(
+        &mut self,
+        cx: &mut Context<Self>,
+    ) -> Option<Task<Result<(), AuthenticateError>>> {
        LanguageModelRegistry::read_global(cx)
            .active_provider()
            .map_or(None, |provider| Some(provider.authenticate(cx)))
@@ -1219,7 +1214,6 @@ impl Render for AssistantPanel {
            }))
            .on_action(cx.listener(AssistantPanel::deploy_history))
            .on_action(cx.listener(AssistantPanel::deploy_prompt_library))
-            .on_action(cx.listener(AssistantPanel::toggle_model_selector))
            .child(registrar.size_full().child(self.pane.clone()))
            .into_any_element()
    }
--- a/crates/assistant/src/inline_assistant.rs
+++ b/crates/assistant/src/inline_assistant.rs
@@ -30,7 +30,7 @@ use gpui::{
    EventEmitter, FocusHandle, Focusable, FontWeight, Global, HighlightStyle, Subscription, Task,
    TextStyle, UpdateGlobal, WeakEntity, Window,
 };
-use language::{Buffer, IndentKind, Point, Selection, TransactionId};
+use language::{line_diff, Buffer, IndentKind, Point, Selection, TransactionId};
 use language_model::{
    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    LanguageModelTextStream, Role,
@@ -1255,7 +1255,7 @@ impl InlineAssistant {
                    editor.scroll_manager.set_forbid_vertical_scroll(true);
                    editor.set_show_scrollbars(false, cx);
                    editor.set_read_only(true);
-                    editor.set_show_inline_completions(Some(false), window, cx);
+                    editor.set_show_edit_predictions(Some(false), window, cx);
                    editor.highlight_rows::<DeletedLines>(
                        Anchor::min()..Anchor::max(),
                        cx.theme().status().deleted_background,
@@ -1595,22 +1595,23 @@ impl Render for PromptEditor {
                        IconButton::new("context", IconName::SettingsAlt)
                            .shape(IconButtonShape::Square)
                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .tooltip(move |window, cx| {
-                                Tooltip::with_meta(
-                                    format!(
-                                        "Using {}",
-                                        LanguageModelRegistry::read_global(cx)
-                                            .active_model()
-                                            .map(|model| model.name().0)
-                                            .unwrap_or_else(|| "No model selected".into()),
-                                    ),
-                                    None,
-                                    "Change Model",
-                                    window,
-                                    cx,
-                                )
-                            }),
+                            .icon_color(Color::Muted),
+                        move |window, cx| {
+                            Tooltip::with_meta(
+                                format!(
+                                    "Using {}",
+                                    LanguageModelRegistry::read_global(cx)
+                                        .active_model()
+                                        .map(|model| model.name().0)
+                                        .unwrap_or_else(|| "No model selected".into()),
+                                ),
+                                None,
+                                "Change Model",
+                                window,
+                                cx,
+                            )
+                        },
+                        gpui::Corner::TopRight,
                    ))
                    .map(|el| {
                        let CodegenStatus::Error(error) = self.codegen.read(cx).status(cx) else {
@@ -1704,7 +1705,7 @@ impl PromptEditor {
            // always show the cursor (even when it isn't focused) because
            // typing in one will make what you typed appear in all of them.
            editor.set_show_cursor_when_unfocused(true, cx);
-            editor.set_placeholder_text(Self::placeholder_text(codegen.read(cx), window), cx);
+            editor.set_placeholder_text(Self::placeholder_text(codegen.read(cx), window, cx), cx);
            editor
        });

@@ -1783,7 +1784,10 @@ impl PromptEditor {
        self.editor = cx.new(|cx| {
            let mut editor = Editor::auto_height(Self::MAX_LINES as usize, window, cx);
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text(Self::placeholder_text(self.codegen.read(cx), window), cx);
+            editor.set_placeholder_text(
+                Self::placeholder_text(self.codegen.read(cx), window, cx),
+                cx,
+            );
            editor.set_placeholder_text("Add a prompt…", cx);
            editor.set_text(prompt, window, cx);
            if focus {
@@ -1794,8 +1798,8 @@ impl PromptEditor {
        self.subscribe_to_editor(window, cx);
    }

-    fn placeholder_text(codegen: &Codegen, window: &Window) -> String {
-        let context_keybinding = text_for_action(&zed_actions::assistant::ToggleFocus, window)
+    fn placeholder_text(codegen: &Codegen, window: &Window, cx: &App) -> String {
+        let context_keybinding = text_for_action(&zed_actions::assistant::ToggleFocus, window, cx)
            .map(|keybinding| format!(" • {keybinding} for context"))
            .unwrap_or_default();

@@ -2084,12 +2088,13 @@ impl PromptEditor {
                    .tooltip({
                        let focus_handle = self.editor.focus_handle(cx);
                        move |window, cx| {
-                            cx.new(|_| {
+                            cx.new(|cx| {
                                let mut tooltip = Tooltip::new("Previous Alternative").key_binding(
                                    KeyBinding::for_action_in(
                                        &CyclePreviousInlineAssist,
                                        &focus_handle,
                                        window,
+                                        cx,
                                    ),
                                );
                                if !disabled && current_index != 0 {
@@ -2126,12 +2131,13 @@ impl PromptEditor {
                    .tooltip({
                        let focus_handle = self.editor.focus_handle(cx);
                        move |window, cx| {
-                            cx.new(|_| {
+                            cx.new(|cx| {
                                let mut tooltip = Tooltip::new("Next Alternative").key_binding(
                                    KeyBinding::for_action_in(
                                        &CycleNextInlineAssist,
                                        &focus_handle,
                                        window,
+                                        cx,
                                    ),
                                );
                                if !disabled && current_index != total_models - 1 {
@@ -2221,7 +2227,7 @@ impl PromptEditor {
            },
            font_family: settings.buffer_font.family.clone(),
            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size.into(),
+            font_size: settings.buffer_font_size(cx).into(),
            font_weight: settings.buffer_font.weight,
            line_height: relative(settings.buffer_line_height.value()),
            ..Default::default()
@@ -3010,7 +3016,7 @@ impl CodegenAlternative {
                    let executor = cx.background_executor().clone();
                    let message_id = message_id.clone();
                    let line_based_stream_diff: Task<anyhow::Result<()>> =
-                        cx.background_executor().spawn(async move {
+                        cx.background_spawn(async move {
                            let mut response_latency = None;
                            let request_start = Instant::now();
                            let diff = async {
@@ -3324,8 +3330,7 @@ impl CodegenAlternative {

        cx.spawn(|codegen, mut cx| async move {
            let (deleted_row_ranges, inserted_row_ranges) = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    let old_text = old_snapshot
                        .text_for_range(
                            Point::new(old_range.start.row, 0)
@@ -3345,52 +3350,29 @@ impl CodegenAlternative {
                        )
                        .collect::<String>();

-                    let mut old_row = old_range.start.row;
-                    let mut new_row = new_range.start.row;
-                    let batch_diff =
-                        similar::TextDiff::from_lines(old_text.as_str(), new_text.as_str());
-
+                    let old_start_row = old_range.start.row;
+                    let new_start_row = new_range.start.row;
                    let mut deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)> = Vec::new();
                    let mut inserted_row_ranges = Vec::new();
-                    for change in batch_diff.iter_all_changes() {
-                        let line_count = change.value().lines().count() as u32;
-                        match change.tag() {
-                            similar::ChangeTag::Equal => {
-                                old_row += line_count;
-                                new_row += line_count;
-                            }
-                            similar::ChangeTag::Delete => {
-                                let old_end_row = old_row + line_count - 1;
-                                let new_row = new_snapshot.anchor_before(Point::new(new_row, 0));
-
-                                if let Some((_, last_deleted_row_range)) =
-                                    deleted_row_ranges.last_mut()
-                                {
-                                    if *last_deleted_row_range.end() + 1 == old_row {
-                                        *last_deleted_row_range =
-                                            *last_deleted_row_range.start()..=old_end_row;
-                                    } else {
-                                        deleted_row_ranges.push((new_row, old_row..=old_end_row));
-                                    }
-                                } else {
-                                    deleted_row_ranges.push((new_row, old_row..=old_end_row));
-                                }
-
-                                old_row += line_count;
-                            }
-                            similar::ChangeTag::Insert => {
-                                let new_end_row = new_row + line_count - 1;
-                                let start = new_snapshot.anchor_before(Point::new(new_row, 0));
-                                let end = new_snapshot.anchor_before(Point::new(
-                                    new_end_row,
-                                    new_snapshot.line_len(MultiBufferRow(new_end_row)),
-                                ));
-                                inserted_row_ranges.push(start..end);
-                                new_row += line_count;
-                            }
+                    for (old_rows, new_rows) in line_diff(&old_text, &new_text) {
+                        let old_rows = old_start_row + old_rows.start..old_start_row + old_rows.end;
+                        let new_rows = new_start_row + new_rows.start..new_start_row + new_rows.end;
+                        if !old_rows.is_empty() {
+                            deleted_row_ranges.push((
+                                new_snapshot.anchor_before(Point::new(new_rows.start, 0)),
+                                old_rows.start..=old_rows.end - 1,
+                            ));
+                        }
+                        if !new_rows.is_empty() {
+                            let start = new_snapshot.anchor_before(Point::new(new_rows.start, 0));
+                            let new_end_row = new_rows.end - 1;
+                            let end = new_snapshot.anchor_before(Point::new(
+                                new_end_row,
+                                new_snapshot.line_len(MultiBufferRow(new_end_row)),
+                            ));
+                            inserted_row_ranges.push(start..end);
                        }
                    }
-
                    (deleted_row_ranges, inserted_row_ranges)
                })
                .await;
--- a/crates/assistant/src/terminal_inline_assistant.rs
+++ b/crates/assistant/src/terminal_inline_assistant.rs
@@ -646,22 +646,23 @@ impl Render for PromptEditor {
                        IconButton::new("context", IconName::SettingsAlt)
                            .shape(IconButtonShape::Square)
                            .icon_size(IconSize::Small)
-                            .icon_color(Color::Muted)
-                            .tooltip(move |window, cx| {
-                                Tooltip::with_meta(
-                                    format!(
-                                        "Using {}",
-                                        LanguageModelRegistry::read_global(cx)
-                                            .active_model()
-                                            .map(|model| model.name().0)
-                                            .unwrap_or_else(|| "No model selected".into()),
-                                    ),
-                                    None,
-                                    "Change Model",
-                                    window,
-                                    cx,
-                                )
-                            }),
+                            .icon_color(Color::Muted),
+                        move |window, cx| {
+                            Tooltip::with_meta(
+                                format!(
+                                    "Using {}",
+                                    LanguageModelRegistry::read_global(cx)
+                                        .active_model()
+                                        .map(|model| model.name().0)
+                                        .unwrap_or_else(|| "No model selected".into()),
+                                ),
+                                None,
+                                "Change Model",
+                                window,
+                                cx,
+                            )
+                        },
+                        gpui::Corner::TopRight,
                    ))
                    .children(
                        if let CodegenStatus::Error(error) = &self.codegen.read(cx).status {
@@ -725,7 +726,7 @@ impl PromptEditor {
                cx,
            );
            editor.set_soft_wrap_mode(language::language_settings::SoftWrap::EditorWidth, cx);
-            editor.set_placeholder_text(Self::placeholder_text(window), cx);
+            editor.set_placeholder_text(Self::placeholder_text(window, cx), cx);
            editor
        });

@@ -774,8 +775,8 @@ impl PromptEditor {
        this
    }

-    fn placeholder_text(window: &Window) -> String {
-        let context_keybinding = text_for_action(&zed_actions::assistant::ToggleFocus, window)
+    fn placeholder_text(window: &Window, cx: &App) -> String {
+        let context_keybinding = text_for_action(&zed_actions::assistant::ToggleFocus, window, cx)
            .map(|keybinding| format!(" • {keybinding} for context"))
            .unwrap_or_default();

@@ -1048,7 +1049,7 @@ impl PromptEditor {
            },
            font_family: settings.buffer_font.family.clone(),
            font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size.into(),
+            font_size: settings.buffer_font_size(cx).into(),
            font_weight: settings.buffer_font.weight,
            line_height: relative(settings.buffer_line_height.value()),
            ..Default::default()
@@ -1150,7 +1151,7 @@ impl Codegen {

                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);

-                let task = cx.background_executor().spawn({
+                let task = cx.background_spawn({
                    let message_id = message_id.clone();
                    let executor = cx.background_executor().clone();
                    async move {
--- a/crates/assistant2/Cargo.toml
+++ b/crates/assistant2/Cargo.toml
@@ -62,7 +62,6 @@ rope.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true
-similar.workspace = true
 smol.workspace = true
 streaming_diff.workspace = true
 telemetry_events.workspace = true
@@ -79,5 +78,10 @@ workspace.workspace = true
 zed_actions.workspace = true

 [dev-dependencies]
+editor = { workspace = true, features = ["test-support"] }
+gpui = { workspace = true, "features" = ["test-support"] }
+language = { workspace = true, "features" = ["test-support"] }
+language_model = { workspace = true, "features" = ["test-support"] }
+project = { workspace = true, features = ["test-support"] }
 rand.workspace = true
 indoc.workspace = true
--- a/crates/assistant2/src/active_thread.rs
+++ b/crates/assistant2/src/active_thread.rs
@@ -179,11 +179,10 @@ impl ActiveThread {

        let markdown = cx.new(|cx| {
            Markdown::new(
-                text,
+                text.into(),
                markdown_style,
                Some(self.language_registry.clone()),
                None,
-                window,
                cx,
            )
        });
@@ -215,7 +214,7 @@ impl ActiveThread {
            ThreadEvent::StreamedAssistantText(message_id, text) => {
                if let Some(markdown) = self.rendered_messages_by_id.get_mut(&message_id) {
                    markdown.update(cx, |markdown, cx| {
-                        markdown.append(text, window, cx);
+                        markdown.append(text, cx);
                    });
                }
            }
--- a/crates/assistant2/src/assistant.rs
+++ b/crates/assistant2/src/assistant.rs
@@ -7,6 +7,7 @@ mod context;
 mod context_picker;
 mod context_store;
 mod context_strip;
+mod history_store;
 mod inline_assistant;
 mod inline_prompt_editor;
 mod message_editor;
@@ -40,7 +41,6 @@ actions!(
        ToggleModelSelector,
        RemoveAllContext,
        OpenHistory,
-        OpenPromptEditorHistory,
        OpenConfiguration,
        RemoveSelectedThread,
        Chat,
@@ -66,6 +66,7 @@ pub fn init(
    cx: &mut App,
 ) {
    AssistantSettings::register(cx);
+    thread_store::init(cx);
    assistant_panel::init(cx);

    inline_assistant::init(
--- a/crates/assistant2/src/assistant_model_selector.rs
+++ b/crates/assistant2/src/assistant_model_selector.rs
@@ -61,29 +61,26 @@ impl Render for AssistantModelSelector {
                    h_flex()
                        .gap_0p5()
                        .child(
-                            div().max_w_32().child(
-                                Label::new(model_name)
-                                    .size(LabelSize::Small)
-                                    .color(Color::Muted)
-                                    .text_ellipsis()
-                                    .into_any_element(),
-                            ),
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
                        )
                        .child(
                            Icon::new(IconName::ChevronDown)
                                .color(Color::Muted)
                                .size(IconSize::XSmall),
                        ),
+                ),
+            move |window, cx| {
+                Tooltip::for_action_in(
+                    "Change Model",
+                    &ToggleModelSelector,
+                    &focus_handle,
+                    window,
+                    cx,
                )
-                .tooltip(move |window, cx| {
-                    Tooltip::for_action_in(
-                        "Change Model",
-                        &ToggleModelSelector,
-                        &focus_handle,
-                        window,
-                        cx,
-                    )
-                }),
+            },
+            gpui::Corner::BottomRight,
        )
        .with_handle(self.menu_handle.clone())
    }
--- a/crates/assistant2/src/assistant_panel.rs
+++ b/crates/assistant2/src/assistant_panel.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;

 use anyhow::{anyhow, Result};
 use assistant_context_editor::{
-    make_lsp_adapter_delegate, AssistantPanelDelegate, ConfigurationError, ContextEditor,
-    ContextHistory, SlashCommandCompletionProvider,
+    make_lsp_adapter_delegate, render_remaining_tokens, AssistantPanelDelegate, ConfigurationError,
+    ContextEditor, SlashCommandCompletionProvider,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
@@ -31,14 +31,12 @@ use zed_actions::assistant::{DeployPromptLibrary, ToggleFocus};

 use crate::active_thread::ActiveThread;
 use crate::assistant_configuration::{AssistantConfiguration, AssistantConfigurationEvent};
+use crate::history_store::{HistoryEntry, HistoryStore};
 use crate::message_editor::MessageEditor;
 use crate::thread::{Thread, ThreadError, ThreadId};
-use crate::thread_history::{PastThread, ThreadHistory};
+use crate::thread_history::{PastContext, PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
-use crate::{
-    InlineAssistant, NewPromptEditor, NewThread, OpenConfiguration, OpenHistory,
-    OpenPromptEditorHistory,
-};
+use crate::{InlineAssistant, NewPromptEditor, NewThread, OpenConfiguration, OpenHistory};

 pub fn init(cx: &mut App) {
    cx.observe_new(
@@ -62,12 +60,6 @@ pub fn init(cx: &mut App) {
                        panel.update(cx, |panel, cx| panel.new_prompt_editor(window, cx));
                    }
                })
-                .register_action(|workspace, _: &OpenPromptEditorHistory, window, cx| {
-                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
-                        workspace.focus_panel::<AssistantPanel>(window, cx);
-                        panel.update(cx, |panel, cx| panel.open_prompt_editor_history(window, cx));
-                    }
-                })
                .register_action(|workspace, _: &OpenConfiguration, window, cx| {
                    if let Some(panel) = workspace.panel::<AssistantPanel>(cx) {
                        workspace.focus_panel::<AssistantPanel>(window, cx);
@@ -83,7 +75,6 @@ enum ActiveView {
    Thread,
    PromptEditor,
    History,
-    PromptEditorHistory,
    Configuration,
 }

@@ -97,15 +88,14 @@ pub struct AssistantPanel {
    message_editor: Entity<MessageEditor>,
    context_store: Entity<assistant_context_editor::ContextStore>,
    context_editor: Option<Entity<ContextEditor>>,
-    context_history: Option<Entity<ContextHistory>>,
    configuration: Option<Entity<AssistantConfiguration>>,
    configuration_subscription: Option<Subscription>,
    tools: Arc<ToolWorkingSet>,
    local_timezone: UtcOffset,
    active_view: ActiveView,
+    history_store: Entity<HistoryStore>,
    history: Entity<ThreadHistory>,
    new_item_context_menu_handle: PopoverMenuHandle<ContextMenu>,
-    open_history_context_menu_handle: PopoverMenuHandle<ContextMenu>,
    width: Option<Pixels>,
    height: Option<Pixels>,
 }
@@ -173,6 +163,9 @@ impl AssistantPanel {
            )
        });

+        let history_store =
+            cx.new(|cx| HistoryStore::new(thread_store.clone(), context_store.clone(), cx));
+
        Self {
            active_view: ActiveView::Thread,
            workspace: workspace.clone(),
@@ -194,7 +187,6 @@ impl AssistantPanel {
            message_editor,
            context_store,
            context_editor: None,
-            context_history: None,
            configuration: None,
            configuration_subscription: None,
            tools,
@@ -202,9 +194,9 @@ impl AssistantPanel {
                chrono::Local::now().offset().local_minus_utc(),
            )
            .unwrap(),
-            history: cx.new(|cx| ThreadHistory::new(weak_self, thread_store, cx)),
+            history_store: history_store.clone(),
+            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, cx)),
            new_item_context_menu_handle: PopoverMenuHandle::default(),
-            open_history_context_menu_handle: PopoverMenuHandle::default(),
            width: None,
            height: None,
        }
@@ -323,31 +315,15 @@ impl AssistantPanel {
    }

    fn open_history(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.thread_store
+            .update(cx, |thread_store, cx| thread_store.reload(cx))
+            .detach_and_log_err(cx);
        self.active_view = ActiveView::History;
        self.history.focus_handle(cx).focus(window);
        cx.notify();
    }

-    fn open_prompt_editor_history(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.active_view = ActiveView::PromptEditorHistory;
-        self.context_history = Some(cx.new(|cx| {
-            ContextHistory::new(
-                self.project.clone(),
-                self.context_store.clone(),
-                self.workspace.clone(),
-                window,
-                cx,
-            )
-        }));
-
-        if let Some(context_history) = self.context_history.as_ref() {
-            context_history.focus_handle(cx).focus(window);
-        }
-
-        cx.notify();
-    }
-
-    fn open_saved_prompt_editor(
+    pub(crate) fn open_saved_prompt_editor(
        &mut self,
        path: PathBuf,
        window: &mut Window,
@@ -478,6 +454,10 @@ impl AssistantPanel {
            .update(cx, |this, cx| this.delete_thread(thread_id, cx))
            .detach_and_log_err(cx);
    }
+
+    pub(crate) fn active_context_editor(&self) -> Option<Entity<ContextEditor>> {
+        self.context_editor.clone()
+    }
 }

 impl Focusable for AssistantPanel {
@@ -492,13 +472,6 @@ impl Focusable for AssistantPanel {
                    cx.focus_handle()
                }
            }
-            ActiveView::PromptEditorHistory => {
-                if let Some(context_history) = self.context_history.as_ref() {
-                    context_history.focus_handle(cx)
-                } else {
-                    cx.focus_handle()
-                }
-            }
            ActiveView::Configuration => {
                if let Some(configuration) = self.configuration.as_ref() {
                    configuration.focus_handle(cx)
@@ -611,18 +584,10 @@ impl AssistantPanel {
                    SharedString::from(context_editor.read(cx).title(cx).to_string())
                })
                .unwrap_or_else(|| SharedString::from("Loading Summary…")),
-            ActiveView::History | ActiveView::PromptEditorHistory => "History".into(),
+            ActiveView::History => "History".into(),
            ActiveView::Configuration => "Assistant Settings".into(),
        };

-        let sub_title = match self.active_view {
-            ActiveView::Thread => None,
-            ActiveView::PromptEditor => None,
-            ActiveView::History => Some("Thread"),
-            ActiveView::PromptEditorHistory => Some("Prompt Editor"),
-            ActiveView::Configuration => None,
-        };
-
        h_flex()
            .id("assistant-toolbar")
            .px(DynamicSpacing::Base08.rems(cx))
@@ -635,20 +600,16 @@ impl AssistantPanel {
            .border_color(cx.theme().colors().border)
            .child(
                h_flex()
+                    .w_full()
+                    .gap_1()
+                    .justify_between()
                    .child(Label::new(title))
-                    .when(sub_title.is_some(), |this| {
-                        this.child(
-                            h_flex()
-                                .pl_1p5()
-                                .gap_1p5()
-                                .child(
-                                    Label::new("/")
-                                        .size(LabelSize::Small)
-                                        .color(Color::Disabled)
-                                        .alpha(0.5),
-                                )
-                                .child(Label::new(sub_title.unwrap())),
-                        )
+                    .children(if matches!(self.active_view, ActiveView::PromptEditor) {
+                        self.context_editor
+                            .as_ref()
+                            .and_then(|editor| render_remaining_tokens(editor, cx))
+                    } else {
+                        None
                    }),
            )
            .child(
@@ -660,11 +621,11 @@ impl AssistantPanel {
                    .gap(DynamicSpacing::Base02.rems(cx))
                    .child(
                        PopoverMenu::new("assistant-toolbar-new-popover-menu")
-                            .trigger(
+                            .trigger_with_tooltip(
                                IconButton::new("new", IconName::Plus)
                                    .icon_size(IconSize::Small)
-                                    .style(ButtonStyle::Subtle)
-                                    .tooltip(Tooltip::text("New…")),
+                                    .style(ButtonStyle::Subtle),
+                                Tooltip::text("New…"),
                            )
                            .anchor(Corner::TopRight)
                            .with_handle(self.new_item_context_menu_handle.clone())
@@ -676,23 +637,23 @@ impl AssistantPanel {
                            }),
                    )
                    .child(
-                        PopoverMenu::new("assistant-toolbar-history-popover-menu")
-                            .trigger(
-                                IconButton::new("open-history", IconName::HistoryRerun)
-                                    .icon_size(IconSize::Small)
-                                    .style(ButtonStyle::Subtle)
-                                    .tooltip(Tooltip::text("History…")),
-                            )
-                            .anchor(Corner::TopRight)
-                            .with_handle(self.open_history_context_menu_handle.clone())
-                            .menu(move |window, cx| {
-                                Some(ContextMenu::build(window, cx, |menu, _window, _cx| {
-                                    menu.action("Thread History", OpenHistory.boxed_clone())
-                                        .action(
-                                            "Prompt Editor History",
-                                            OpenPromptEditorHistory.boxed_clone(),
-                                        )
-                                }))
+                        IconButton::new("open-history", IconName::HistoryRerun)
+                            .icon_size(IconSize::Small)
+                            .style(ButtonStyle::Subtle)
+                            .tooltip({
+                                let focus_handle = self.focus_handle(cx);
+                                move |window, cx| {
+                                    Tooltip::for_action_in(
+                                        "History",
+                                        &OpenHistory,
+                                        &focus_handle,
+                                        window,
+                                        cx,
+                                    )
+                                }
+                            })
+                            .on_click(move |_event, window, cx| {
+                                window.dispatch_action(OpenHistory.boxed_clone(), cx);
                            }),
                    )
                    .child(
@@ -742,9 +703,9 @@ impl AssistantPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) -> impl IntoElement {
-        let recent_threads = self
-            .thread_store
-            .update(cx, |this, _cx| this.recent_threads(3));
+        let recent_history = self
+            .history_store
+            .update(cx, |this, cx| this.recent_entries(3, cx));

        let create_welcome_heading = || {
            h_flex()
@@ -771,7 +732,8 @@ impl AssistantPanel {
            )
            .map(|parent| {
                match configuration_error {
-                    Some(ConfigurationError::ProviderNotAuthenticated) | Some(ConfigurationError::NoProvider)  => {
+                    Some(ConfigurationError::ProviderNotAuthenticated)
+                    | Some(ConfigurationError::NoProvider) => {
                        parent.child(
                            v_flex()
                                .gap_0p5()
@@ -798,34 +760,24 @@ impl AssistantPanel {
                                ),
                        )
                    }
-                    Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => {
-                        parent.child(
-                            v_flex()
-                                .gap_0p5()
-                                .child(create_welcome_heading())
-                                .children(provider.render_accept_terms(
-                                    LanguageModelProviderTosView::ThreadEmptyState,
-                                    cx,
-                                )),
-                        )
-                    }
+                    Some(ConfigurationError::ProviderPendingTermsAcceptance(provider)) => parent
+                        .child(v_flex().gap_0p5().child(create_welcome_heading()).children(
+                            provider.render_accept_terms(
+                                LanguageModelProviderTosView::ThreadEmptyState,
+                                cx,
+                            ),
+                        )),
                    None => parent,
                }
            })
-            .when(
-                recent_threads.is_empty() && no_error,
-                |parent| {
-                    parent.child(
-                        v_flex().gap_0p5().child(create_welcome_heading()).child(
-                            h_flex().w_full().justify_center().child(
-                                Label::new("Start typing to chat with your codebase")
-                                    .color(Color::Muted),
-                            ),
-                        ),
-                    )
-                },
-            )
-            .when(!recent_threads.is_empty(), |parent| {
+            .when(recent_history.is_empty() && no_error, |parent| {
+                parent.child(v_flex().gap_0p5().child(create_welcome_heading()).child(
+                    h_flex().w_full().justify_center().child(
+                        Label::new("Start typing to chat with your codebase").color(Color::Muted),
+                    ),
+                ))
+            })
+            .when(!recent_history.is_empty(), |parent| {
                parent
                    .child(
                        h_flex().w_full().justify_center().child(
@@ -835,9 +787,18 @@ impl AssistantPanel {
                        ),
                    )
                    .child(v_flex().mx_auto().w_4_5().gap_2().children(
-                        recent_threads.into_iter().map(|thread| {
-                            // TODO: keyboard navigation
-                            PastThread::new(thread, cx.entity().downgrade(), false)
+                        recent_history.into_iter().map(|entry| {
+                            // TODO: Add keyboard navigation.
+                            match entry {
+                                HistoryEntry::Thread(thread) => {
+                                    PastThread::new(thread, cx.entity().downgrade(), false)
+                                        .into_any_element()
+                                }
+                                HistoryEntry::Context(context) => {
+                                    PastContext::new(context, cx.entity().downgrade(), false)
+                                        .into_any_element()
+                                }
+                            }
                        }),
                    ))
                    .child(
@@ -849,6 +810,7 @@ impl AssistantPanel {
                                    &OpenHistory,
                                    &self.focus_handle(cx),
                                    window,
+                                    cx,
                                ))
                                .on_click(move |_event, window, cx| {
                                    window.dispatch_action(OpenHistory.boxed_clone(), cx);
@@ -1047,7 +1009,6 @@ impl Render for AssistantPanel {
                    .children(self.render_last_error(cx)),
                ActiveView::History => parent.child(self.history.clone()),
                ActiveView::PromptEditor => parent.children(self.context_editor.clone()),
-                ActiveView::PromptEditorHistory => parent.children(self.context_history.clone()),
                ActiveView::Configuration => parent.children(self.configuration.clone()),
            })
    }
--- a/crates/assistant2/src/buffer_codegen.rs
+++ b/crates/assistant2/src/buffer_codegen.rs
@@ -7,7 +7,7 @@ use collections::HashSet;
 use editor::{Anchor, AnchorRangeExt, MultiBuffer, MultiBufferSnapshot, ToOffset as _, ToPoint};
 use futures::{channel::mpsc, future::LocalBoxFuture, join, SinkExt, Stream, StreamExt};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Subscription, Task};
-use language::{Buffer, IndentKind, Point, TransactionId};
+use language::{line_diff, Buffer, IndentKind, Point, TransactionId};
 use language_model::{
    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
    LanguageModelTextStream, Role,
@@ -493,7 +493,7 @@ impl CodegenAlternative {
                    let executor = cx.background_executor().clone();
                    let message_id = message_id.clone();
                    let line_based_stream_diff: Task<anyhow::Result<()>> =
-                        cx.background_executor().spawn(async move {
+                        cx.background_spawn(async move {
                            let mut response_latency = None;
                            let request_start = Instant::now();
                            let diff = async {
@@ -807,8 +807,7 @@ impl CodegenAlternative {

        cx.spawn(|codegen, mut cx| async move {
            let (deleted_row_ranges, inserted_row_ranges) = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    let old_text = old_snapshot
                        .text_for_range(
                            Point::new(old_range.start.row, 0)
@@ -828,52 +827,29 @@ impl CodegenAlternative {
                        )
                        .collect::<String>();

-                    let mut old_row = old_range.start.row;
-                    let mut new_row = new_range.start.row;
-                    let batch_diff =
-                        similar::TextDiff::from_lines(old_text.as_str(), new_text.as_str());
-
+                    let old_start_row = old_range.start.row;
+                    let new_start_row = new_range.start.row;
                    let mut deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)> = Vec::new();
                    let mut inserted_row_ranges = Vec::new();
-                    for change in batch_diff.iter_all_changes() {
-                        let line_count = change.value().lines().count() as u32;
-                        match change.tag() {
-                            similar::ChangeTag::Equal => {
-                                old_row += line_count;
-                                new_row += line_count;
-                            }
-                            similar::ChangeTag::Delete => {
-                                let old_end_row = old_row + line_count - 1;
-                                let new_row = new_snapshot.anchor_before(Point::new(new_row, 0));
-
-                                if let Some((_, last_deleted_row_range)) =
-                                    deleted_row_ranges.last_mut()
-                                {
-                                    if *last_deleted_row_range.end() + 1 == old_row {
-                                        *last_deleted_row_range =
-                                            *last_deleted_row_range.start()..=old_end_row;
-                                    } else {
-                                        deleted_row_ranges.push((new_row, old_row..=old_end_row));
-                                    }
-                                } else {
-                                    deleted_row_ranges.push((new_row, old_row..=old_end_row));
-                                }
-
-                                old_row += line_count;
-                            }
-                            similar::ChangeTag::Insert => {
-                                let new_end_row = new_row + line_count - 1;
-                                let start = new_snapshot.anchor_before(Point::new(new_row, 0));
-                                let end = new_snapshot.anchor_before(Point::new(
-                                    new_end_row,
-                                    new_snapshot.line_len(MultiBufferRow(new_end_row)),
-                                ));
-                                inserted_row_ranges.push(start..end);
-                                new_row += line_count;
-                            }
+                    for (old_rows, new_rows) in line_diff(&old_text, &new_text) {
+                        let old_rows = old_start_row + old_rows.start..old_start_row + old_rows.end;
+                        let new_rows = new_start_row + new_rows.start..new_start_row + new_rows.end;
+                        if !old_rows.is_empty() {
+                            deleted_row_ranges.push((
+                                new_snapshot.anchor_before(Point::new(new_rows.start, 0)),
+                                old_rows.start..=old_rows.end - 1,
+                            ));
+                        }
+                        if !new_rows.is_empty() {
+                            let start = new_snapshot.anchor_before(Point::new(new_rows.start, 0));
+                            let new_end_row = new_rows.end - 1;
+                            let end = new_snapshot.anchor_before(Point::new(
+                                new_end_row,
+                                new_snapshot.line_len(MultiBufferRow(new_end_row)),
+                            ));
+                            inserted_row_ranges.push(start..end);
                        }
                    }
-
                    (deleted_row_ranges, inserted_row_ranges)
                })
                .await;
--- a/crates/assistant2/src/context_picker/fetch_context_picker.rs
+++ b/crates/assistant2/src/context_picker/fetch_context_picker.rs
@@ -208,8 +208,7 @@ impl PickerDelegate for FetchContextPickerDelegate {
        let confirm_behavior = self.confirm_behavior;
        cx.spawn_in(window, |this, mut cx| async move {
            let text = cx
-                .background_executor()
-                .spawn(Self::build_message(http_client, url.clone()))
+                .background_spawn(Self::build_message(http_client, url.clone()))
                .await?;

            this.update_in(&mut cx, |this, window, cx| {
--- a/crates/assistant2/src/context_picker/file_context_picker.rs
+++ b/crates/assistant2/src/context_picker/file_context_picker.rs
@@ -7,19 +7,19 @@ use std::sync::Arc;
 use editor::actions::FoldAt;
 use editor::display_map::{Crease, FoldId};
 use editor::scroll::Autoscroll;
-use editor::{Anchor, Editor, FoldPlaceholder, ToPoint};
+use editor::{Anchor, AnchorRangeExt, Editor, FoldPlaceholder, ToPoint};
 use file_icons::FileIcons;
 use fuzzy::PathMatch;
 use gpui::{
-    AnyElement, App, DismissEvent, Empty, Entity, FocusHandle, Focusable, Stateful, Task,
-    WeakEntity,
+    AnyElement, App, AppContext, DismissEvent, Empty, Entity, FocusHandle, Focusable, Stateful,
+    Task, WeakEntity,
 };
 use multi_buffer::{MultiBufferPoint, MultiBufferRow};
 use picker::{Picker, PickerDelegate};
 use project::{PathMatchCandidateSet, ProjectPath, WorktreeId};
 use rope::Point;
 use text::SelectionGoal;
-use ui::{prelude::*, ButtonLike, Disclosure, ElevationIndex, ListItem, Tooltip};
+use ui::{prelude::*, ButtonLike, Disclosure, ListItem, TintColor, Tooltip};
 use util::ResultExt as _;
 use workspace::{notifications::NotifyResultExt, Workspace};

@@ -238,11 +238,11 @@ impl PickerDelegate for FileContextPickerDelegate {
            path: mat.path.clone(),
        };

-        let Some(editor) = self.editor.upgrade() else {
+        let Some(editor_entity) = self.editor.upgrade() else {
            return;
        };

-        editor.update(cx, |editor, cx| {
+        editor_entity.update(cx, |editor, cx| {
            editor.transact(window, cx, |editor, window, cx| {
                // Move empty selections left by 1 column to select the `@`s, so they get overwritten when we insert.
                {
@@ -288,8 +288,15 @@ impl PickerDelegate for FileContextPickerDelegate {

                editor.insert("\n", window, cx); // Needed to end the fold

+                let file_icon = FileIcons::get_icon(&Path::new(&full_path), cx)
+                    .unwrap_or_else(|| SharedString::new(""));
+
                let placeholder = FoldPlaceholder {
-                    render: render_fold_icon_button(IconName::File, file_name.into()),
+                    render: render_fold_icon_button(
+                        file_icon,
+                        file_name.into(),
+                        editor_entity.downgrade(),
+                    ),
                    ..Default::default()
                };

@@ -459,15 +466,66 @@ pub fn render_file_context_entry(
 }

 fn render_fold_icon_button(
-    icon: IconName,
+    icon: SharedString,
    label: SharedString,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut Window, &mut App) -> AnyElement> {
-    Arc::new(move |fold_id, _fold_range, _window, _cx| {
+    editor: WeakEntity<Editor>,
+) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
+    Arc::new(move |fold_id, fold_range, cx| {
+        let is_in_text_selection = editor.upgrade().is_some_and(|editor| {
+            editor.update(cx, |editor, cx| {
+                let snapshot = editor
+                    .buffer()
+                    .update(cx, |multi_buffer, cx| multi_buffer.snapshot(cx));
+
+                let is_in_pending_selection = || {
+                    editor
+                        .selections
+                        .pending
+                        .as_ref()
+                        .is_some_and(|pending_selection| {
+                            pending_selection
+                                .selection
+                                .range()
+                                .includes(&fold_range, &snapshot)
+                        })
+                };
+
+                let mut is_in_complete_selection = || {
+                    editor
+                        .selections
+                        .disjoint_in_range::<usize>(fold_range.clone(), cx)
+                        .into_iter()
+                        .any(|selection| {
+                            // This is needed to cover a corner case, if we just check for an existing
+                            // selection in the fold range, having a cursor at the start of the fold
+                            // marks it as selected. Non-empty selections don't cause this.
+                            let length = selection.end - selection.start;
+                            length > 0
+                        })
+                };
+
+                is_in_pending_selection() || is_in_complete_selection()
+            })
+        });
+
        ButtonLike::new(fold_id)
            .style(ButtonStyle::Filled)
-            .layer(ElevationIndex::ElevatedSurface)
-            .child(Icon::new(icon))
-            .child(Label::new(label.clone()).single_line())
+            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
+            .toggle_state(is_in_text_selection)
+            .child(
+                h_flex()
+                    .gap_1()
+                    .child(
+                        Icon::from_path(icon.clone())
+                            .size(IconSize::Small)
+                            .color(Color::Muted),
+                    )
+                    .child(
+                        Label::new(label.clone())
+                            .size(LabelSize::Small)
+                            .single_line(),
+                    ),
+            )
            .into_any_element()
    })
 }
--- a/crates/assistant2/src/context_picker/thread_context_picker.rs
+++ b/crates/assistant2/src/context_picker/thread_context_picker.rs
@@ -123,7 +123,7 @@ impl PickerDelegate for ThreadContextPickerDelegate {
        };

        let executor = cx.background_executor().clone();
-        let search_task = cx.background_executor().spawn(async move {
+        let search_task = cx.background_spawn(async move {
            if query.is_empty() {
                threads
            } else {
--- a/crates/assistant2/src/context_store.rs
+++ b/crates/assistant2/src/context_store.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, bail, Result};
 use collections::{BTreeMap, HashMap, HashSet};
 use futures::{self, future, Future, FutureExt};
-use gpui::{App, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, SharedString, Task, WeakEntity};
 use language::Buffer;
 use project::{ProjectPath, Worktree};
 use rope::Rope;
@@ -456,9 +456,7 @@ fn collect_buffer_info_and_text(
    };
    // Important to collect version at the same time as content so that staleness logic is correct.
    let content = buffer.as_rope().clone();
-    let text_task = cx
-        .background_executor()
-        .spawn(async move { to_fenced_codeblock(&path, content) });
+    let text_task = cx.background_spawn(async move { to_fenced_codeblock(&path, content) });
    (buffer_info, text_task)
 }

--- a/crates/assistant2/src/context_strip.rs
+++ b/crates/assistant2/src/context_strip.rs
@@ -411,22 +411,22 @@ impl Render for ContextStrip {

                        Some(context_picker.clone())
                    })
-                    .trigger(
+                    .trigger_with_tooltip(
                        IconButton::new("add-context", IconName::Plus)
                            .icon_size(IconSize::Small)
-                            .style(ui::ButtonStyle::Filled)
-                            .tooltip({
-                                let focus_handle = focus_handle.clone();
-                                move |window, cx| {
-                                    Tooltip::for_action_in(
-                                        "Add Context",
-                                        &ToggleContextPicker,
-                                        &focus_handle,
-                                        window,
-                                        cx,
-                                    )
-                                }
-                            }),
+                            .style(ui::ButtonStyle::Filled),
+                        {
+                            let focus_handle = focus_handle.clone();
+                            move |window, cx| {
+                                Tooltip::for_action_in(
+                                    "Add Context",
+                                    &ToggleContextPicker,
+                                    &focus_handle,
+                                    window,
+                                    cx,
+                                )
+                            }
+                        },
                    )
                    .attach(gpui::Corner::TopLeft)
                    .anchor(gpui::Corner::BottomLeft)
@@ -453,6 +453,7 @@ impl Render for ContextStrip {
                                    &ToggleContextPicker,
                                    &focus_handle,
                                    window,
+                                    cx,
                                )
                                .map(|binding| binding.into_any_element()),
                            ),
--- a/crates/assistant2/src/history_store.rs
+++ b/crates/assistant2/src/history_store.rs
@@ -0,0 +1,61 @@
+use assistant_context_editor::SavedContextMetadata;
+use chrono::{DateTime, Utc};
+use gpui::{prelude::*, Entity};
+
+use crate::thread_store::{SavedThreadMetadata, ThreadStore};
+
+pub enum HistoryEntry {
+    Thread(SavedThreadMetadata),
+    Context(SavedContextMetadata),
+}
+
+impl HistoryEntry {
+    pub fn updated_at(&self) -> DateTime<Utc> {
+        match self {
+            HistoryEntry::Thread(thread) => thread.updated_at,
+            HistoryEntry::Context(context) => context.mtime.to_utc(),
+        }
+    }
+}
+
+pub struct HistoryStore {
+    thread_store: Entity<ThreadStore>,
+    context_store: Entity<assistant_context_editor::ContextStore>,
+}
+
+impl HistoryStore {
+    pub fn new(
+        thread_store: Entity<ThreadStore>,
+        context_store: Entity<assistant_context_editor::ContextStore>,
+        _cx: &mut Context<Self>,
+    ) -> Self {
+        Self {
+            thread_store,
+            context_store,
+        }
+    }
+
+    /// Returns the number of history entries.
+    pub fn entry_count(&self, cx: &mut Context<Self>) -> usize {
+        self.entries(cx).len()
+    }
+
+    pub fn entries(&self, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
+        let mut history_entries = Vec::new();
+
+        for thread in self.thread_store.update(cx, |this, _cx| this.threads()) {
+            history_entries.push(HistoryEntry::Thread(thread));
+        }
+
+        for context in self.context_store.update(cx, |this, _cx| this.contexts()) {
+            history_entries.push(HistoryEntry::Context(context));
+        }
+
+        history_entries.sort_unstable_by_key(|entry| std::cmp::Reverse(entry.updated_at()));
+        history_entries
+    }
+
+    pub fn recent_entries(&self, limit: usize, cx: &mut Context<Self>) -> Vec<HistoryEntry> {
+        self.entries(cx).into_iter().take(limit).collect()
+    }
+}
--- a/crates/assistant2/src/inline_assistant.rs
+++ b/crates/assistant2/src/inline_assistant.rs
@@ -228,8 +228,12 @@ impl InlineAssistant {
            return;
        }

-        let Some(inline_assist_target) = Self::resolve_inline_assist_target(workspace, window, cx)
-        else {
+        let Some(inline_assist_target) = Self::resolve_inline_assist_target(
+            workspace,
+            workspace.panel::<AssistantPanel>(cx),
+            window,
+            cx,
+        ) else {
            return;
        };

@@ -1345,7 +1349,7 @@ impl InlineAssistant {
                    editor.scroll_manager.set_forbid_vertical_scroll(true);
                    editor.set_show_scrollbars(false, cx);
                    editor.set_read_only(true);
-                    editor.set_show_inline_completions(Some(false), window, cx);
+                    editor.set_show_edit_predictions(Some(false), window, cx);
                    editor.highlight_rows::<DeletedLines>(
                        Anchor::min()..Anchor::max(),
                        cx.theme().status().deleted_background,
@@ -1384,6 +1388,7 @@ impl InlineAssistant {

    fn resolve_inline_assist_target(
        workspace: &mut Workspace,
+        assistant_panel: Option<Entity<AssistantPanel>>,
        window: &mut Window,
        cx: &mut App,
    ) -> Option<InlineAssistTarget> {
@@ -1403,7 +1408,20 @@ impl InlineAssistant {
            }
        }

-        if let Some(workspace_editor) = workspace
+        let context_editor = assistant_panel
+            .and_then(|panel| panel.read(cx).active_context_editor())
+            .and_then(|editor| {
+                let editor = &editor.read(cx).editor().clone();
+                if editor.read(cx).is_focused(window) {
+                    Some(editor.clone())
+                } else {
+                    None
+                }
+            });
+
+        if let Some(context_editor) = context_editor {
+            Some(InlineAssistTarget::Editor(context_editor))
+        } else if let Some(workspace_editor) = workspace
            .active_item(cx)
            .and_then(|item| item.act_as::<Editor>(cx))
        {
--- a/crates/assistant2/src/inline_prompt_editor.rs
+++ b/crates/assistant2/src/inline_prompt_editor.rs
@@ -56,7 +56,7 @@ impl<T: 'static> EventEmitter<PromptEditorEvent> for PromptEditor<T> {}

 impl<T: 'static> Render for PromptEditor<T> {
    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size;
+        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size(cx);
        let mut buttons = Vec::new();

        let left_gutter_width = match &self.mode {
@@ -271,7 +271,7 @@ impl<T: 'static> PromptEditor<T> {
        };

        let assistant_panel_keybinding =
-            ui::text_for_action(&zed_actions::assistant::ToggleFocus, window)
+            ui::text_for_action(&zed_actions::assistant::ToggleFocus, window, cx)
                .map(|keybinding| format!("{keybinding} to chat ― "))
                .unwrap_or_default();

@@ -618,12 +618,13 @@ impl<T: 'static> PromptEditor<T> {
                    .tooltip({
                        let focus_handle = self.editor.focus_handle(cx);
                        move |window, cx| {
-                            cx.new(|_| {
+                            cx.new(|cx| {
                                let mut tooltip = Tooltip::new("Previous Alternative").key_binding(
                                    KeyBinding::for_action_in(
                                        &CyclePreviousInlineAssist,
                                        &focus_handle,
                                        window,
+                                        cx,
                                    ),
                                );
                                if !disabled && current_index != 0 {
@@ -659,12 +660,13 @@ impl<T: 'static> PromptEditor<T> {
                    .tooltip({
                        let focus_handle = self.editor.focus_handle(cx);
                        move |window, cx| {
-                            cx.new(|_| {
+                            cx.new(|cx| {
                                let mut tooltip = Tooltip::new("Next Alternative").key_binding(
                                    KeyBinding::for_action_in(
                                        &CycleNextInlineAssist,
                                        &focus_handle,
                                        window,
+                                        cx,
                                    ),
                                );
                                if !disabled && current_index != total_models - 1 {
--- a/crates/assistant2/src/message_editor.rs
+++ b/crates/assistant2/src/message_editor.rs
@@ -13,7 +13,7 @@ use rope::Point;
 use settings::Settings;
 use std::time::Duration;
 use text::Bias;
-use theme::ThemeSettings;
+use theme::{get_ui_font_size, ThemeSettings};
 use ui::{
    prelude::*, ButtonLike, KeyBinding, PopoverMenu, PopoverMenuHandle, Switch, TintColor, Tooltip,
 };
@@ -369,11 +369,7 @@ impl Render for MessageEditor {
                            .anchor(gpui::Corner::BottomLeft)
                            .offset(gpui::Point {
                                x: px(0.0),
-                                y: px(-ThemeSettings::clamp_font_size(
-                                    ThemeSettings::get_global(cx).ui_font_size,
-                                )
-                                .0 * 2.0)
-                                    - px(4.0),
+                                y: (-get_ui_font_size(cx) * 2) - px(4.0),
                            })
                            .with_handle(self.inline_context_picker_menu_handle.clone()),
                    )
@@ -394,6 +390,7 @@ impl Render for MessageEditor {
                                        &ChatMode,
                                        &focus_handle,
                                        window,
+                                        cx,
                                    )),
                            )
                            .child(h_flex().gap_1().child(self.model_selector.clone()).child(
@@ -423,6 +420,7 @@ impl Render for MessageEditor {
                                                        &editor::actions::Cancel,
                                                        &focus_handle,
                                                        window,
+                                                        cx,
                                                    )
                                                    .map(|binding| binding.into_any_element()),
                                                ),
@@ -453,6 +451,7 @@ impl Render for MessageEditor {
                                                        &Chat,
                                                        &focus_handle,
                                                        window,
+                                                        cx,
                                                    )
                                                    .map(|binding| binding.into_any_element()),
                                                ),
--- a/crates/assistant2/src/terminal_codegen.rs
+++ b/crates/assistant2/src/terminal_codegen.rs
@@ -1,7 +1,7 @@
 use crate::inline_prompt_editor::CodegenStatus;
 use client::telemetry::Telemetry;
 use futures::{channel::mpsc, SinkExt, StreamExt};
-use gpui::{App, Context, Entity, EventEmitter, Task};
+use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
 use language_model::{LanguageModelRegistry, LanguageModelRequest};
 use language_models::report_assistant_event;
 use std::{sync::Arc, time::Instant};
@@ -53,7 +53,7 @@ impl TerminalCodegen {

                let (mut hunks_tx, mut hunks_rx) = mpsc::channel(1);

-                let task = cx.background_executor().spawn({
+                let task = cx.background_spawn({
                    let message_id = message_id.clone();
                    let executor = cx.background_executor().clone();
                    async move {
--- a/crates/assistant2/src/thread_history.rs
+++ b/crates/assistant2/src/thread_history.rs
@@ -1,3 +1,4 @@
+use assistant_context_editor::SavedContextMetadata;
 use gpui::{
    uniform_list, App, Entity, FocusHandle, Focusable, ScrollStrategy, UniformListScrollHandle,
    WeakEntity,
@@ -5,13 +6,14 @@ use gpui::{
 use time::{OffsetDateTime, UtcOffset};
 use ui::{prelude::*, IconButtonShape, ListItem, ListItemSpacing, Tooltip};

-use crate::thread_store::{SavedThreadMetadata, ThreadStore};
+use crate::history_store::{HistoryEntry, HistoryStore};
+use crate::thread_store::SavedThreadMetadata;
 use crate::{AssistantPanel, RemoveSelectedThread};

 pub struct ThreadHistory {
    focus_handle: FocusHandle,
    assistant_panel: WeakEntity<AssistantPanel>,
-    thread_store: Entity<ThreadStore>,
+    history_store: Entity<HistoryStore>,
    scroll_handle: UniformListScrollHandle,
    selected_index: usize,
 }
@@ -19,14 +21,13 @@ pub struct ThreadHistory {
 impl ThreadHistory {
    pub(crate) fn new(
        assistant_panel: WeakEntity<AssistantPanel>,
-        thread_store: Entity<ThreadStore>,
-
+        history_store: Entity<HistoryStore>,
        cx: &mut Context<Self>,
    ) -> Self {
        Self {
            focus_handle: cx.focus_handle(),
            assistant_panel,
-            thread_store,
+            history_store,
            scroll_handle: UniformListScrollHandle::default(),
            selected_index: 0,
        }
@@ -38,7 +39,9 @@ impl ThreadHistory {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.thread_store.read(cx).thread_count();
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
            if self.selected_index == 0 {
                self.set_selected_index(count - 1, window, cx);
@@ -54,7 +57,9 @@ impl ThreadHistory {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let count = self.thread_store.read(cx).thread_count();
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
            if self.selected_index == count - 1 {
                self.set_selected_index(0, window, cx);
@@ -65,14 +70,18 @@ impl ThreadHistory {
    }

    fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.thread_store.read(cx).thread_count();
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
            self.set_selected_index(0, window, cx);
        }
    }

    fn select_last(&mut self, _: &menu::SelectLast, window: &mut Window, cx: &mut Context<Self>) {
-        let count = self.thread_store.read(cx).thread_count();
+        let count = self
+            .history_store
+            .update(cx, |this, cx| this.entry_count(cx));
        if count > 0 {
            self.set_selected_index(count - 1, window, cx);
        }
@@ -86,12 +95,23 @@ impl ThreadHistory {
    }

    fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let threads = self.thread_store.update(cx, |this, _cx| this.threads());
+        let entries = self.history_store.update(cx, |this, cx| this.entries(cx));

-        if let Some(thread) = threads.get(self.selected_index) {
-            self.assistant_panel
-                .update(cx, move |this, cx| this.open_thread(&thread.id, window, cx))
-                .ok();
+        if let Some(entry) = entries.get(self.selected_index) {
+            match entry {
+                HistoryEntry::Thread(thread) => {
+                    self.assistant_panel
+                        .update(cx, move |this, cx| this.open_thread(&thread.id, window, cx))
+                        .ok();
+                }
+                HistoryEntry::Context(context) => {
+                    self.assistant_panel
+                        .update(cx, move |this, cx| {
+                            this.open_saved_prompt_editor(context.path.clone(), window, cx)
+                        })
+                        .ok();
+                }
+            }

            cx.notify();
        }
@@ -103,14 +123,19 @@ impl ThreadHistory {
        _window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        let threads = self.thread_store.update(cx, |this, _cx| this.threads());
+        let entries = self.history_store.update(cx, |this, cx| this.entries(cx));

-        if let Some(thread) = threads.get(self.selected_index) {
-            self.assistant_panel
-                .update(cx, |this, cx| {
-                    this.delete_thread(&thread.id, cx);
-                })
-                .ok();
+        if let Some(entry) = entries.get(self.selected_index) {
+            match entry {
+                HistoryEntry::Thread(thread) => {
+                    self.assistant_panel
+                        .update(cx, |this, cx| {
+                            this.delete_thread(&thread.id, cx);
+                        })
+                        .ok();
+                }
+                HistoryEntry::Context(_context) => {}
+            }

            cx.notify();
        }
@@ -125,7 +150,7 @@ impl Focusable for ThreadHistory {

 impl Render for ThreadHistory {
    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let threads = self.thread_store.update(cx, |this, _cx| this.threads());
+        let history_entries = self.history_store.update(cx, |this, cx| this.entries(cx));
        let selected_index = self.selected_index;

        v_flex()
@@ -142,7 +167,7 @@ impl Render for ThreadHistory {
            .on_action(cx.listener(Self::confirm))
            .on_action(cx.listener(Self::remove_selected_thread))
            .map(|history| {
-                if threads.is_empty() {
+                if history_entries.is_empty() {
                    history
                        .justify_center()
                        .child(
@@ -156,17 +181,26 @@ impl Render for ThreadHistory {
                        uniform_list(
                            cx.entity().clone(),
                            "thread-history",
-                            threads.len(),
+                            history_entries.len(),
                            move |history, range, _window, _cx| {
-                                threads[range]
+                                history_entries[range]
                                    .iter()
                                    .enumerate()
-                                    .map(|(index, thread)| {
-                                        h_flex().w_full().pb_1().child(PastThread::new(
-                                            thread.clone(),
-                                            history.assistant_panel.clone(),
-                                            selected_index == index,
-                                        ))
+                                    .map(|(index, entry)| {
+                                        h_flex().w_full().pb_1().child(match entry {
+                                            HistoryEntry::Thread(thread) => PastThread::new(
+                                                thread.clone(),
+                                                history.assistant_panel.clone(),
+                                                selected_index == index,
+                                            )
+                                            .into_any_element(),
+                                            HistoryEntry::Context(context) => PastContext::new(
+                                                context.clone(),
+                                                history.assistant_panel.clone(),
+                                                selected_index == index,
+                                            )
+                                            .into_any_element(),
+                                        })
                                    })
                                    .collect()
                            },
@@ -262,3 +296,71 @@ impl RenderOnce for PastThread {
            })
    }
 }
+
+#[derive(IntoElement)]
+pub struct PastContext {
+    context: SavedContextMetadata,
+    assistant_panel: WeakEntity<AssistantPanel>,
+    selected: bool,
+}
+
+impl PastContext {
+    pub fn new(
+        context: SavedContextMetadata,
+        assistant_panel: WeakEntity<AssistantPanel>,
+        selected: bool,
+    ) -> Self {
+        Self {
+            context,
+            assistant_panel,
+            selected,
+        }
+    }
+}
+
+impl RenderOnce for PastContext {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let summary = self.context.title;
+
+        let context_timestamp = time_format::format_localized_timestamp(
+            OffsetDateTime::from_unix_timestamp(self.context.mtime.timestamp()).unwrap(),
+            OffsetDateTime::now_utc(),
+            self.assistant_panel
+                .update(cx, |this, _cx| this.local_timezone())
+                .unwrap_or(UtcOffset::UTC),
+            time_format::TimestampFormat::EnhancedAbsolute,
+        );
+
+        ListItem::new(SharedString::from(
+            self.context.path.to_string_lossy().to_string(),
+        ))
+        .outlined()
+        .toggle_state(self.selected)
+        .start_slot(
+            Icon::new(IconName::Code)
+                .size(IconSize::Small)
+                .color(Color::Muted),
+        )
+        .spacing(ListItemSpacing::Sparse)
+        .child(Label::new(summary).size(LabelSize::Small).text_ellipsis())
+        .end_slot(
+            h_flex().gap_1p5().child(
+                Label::new(context_timestamp)
+                    .color(Color::Muted)
+                    .size(LabelSize::XSmall),
+            ),
+        )
+        .on_click({
+            let assistant_panel = self.assistant_panel.clone();
+            let path = self.context.path.clone();
+            move |_event, window, cx| {
+                assistant_panel
+                    .update(cx, |this, cx| {
+                        this.open_saved_prompt_editor(path.clone(), window, cx)
+                            .detach_and_log_err(cx);
+                    })
+                    .ok();
+            }
+        })
+    }
+}
--- a/crates/assistant2/src/thread_store.rs
+++ b/crates/assistant2/src/thread_store.rs
@@ -9,7 +9,9 @@ use context_server::manager::ContextServerManager;
 use context_server::{ContextServerFactoryRegistry, ContextServerTool};
 use futures::future::{self, BoxFuture, Shared};
 use futures::FutureExt as _;
-use gpui::{prelude::*, App, BackgroundExecutor, Context, Entity, SharedString, Task};
+use gpui::{
+    prelude::*, App, BackgroundExecutor, Context, Entity, Global, ReadGlobal, SharedString, Task,
+};
 use heed::types::SerdeBincode;
 use heed::Database;
 use language_model::Role;
@@ -19,6 +21,10 @@ use util::ResultExt as _;

 use crate::thread::{MessageId, Thread, ThreadId};

+pub fn init(cx: &mut App) {
+    ThreadsDatabase::init(cx);
+}
+
 pub struct ThreadStore {
    #[allow(unused)]
    project: Entity<Project>,
@@ -26,7 +32,6 @@ pub struct ThreadStore {
    context_server_manager: Entity<ContextServerManager>,
    context_server_tool_ids: HashMap<Arc<str>, Vec<ToolId>>,
    threads: Vec<SavedThreadMetadata>,
-    database_future: Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>,
 }

 impl ThreadStore {
@@ -41,24 +46,12 @@ impl ThreadStore {
                ContextServerManager::new(context_server_factory_registry, project.clone(), cx)
            });

-            let executor = cx.background_executor().clone();
-            let database_future = executor
-                .spawn({
-                    let executor = executor.clone();
-                    let database_path = paths::support_dir().join("threads/threads-db.0.mdb");
-                    async move { ThreadsDatabase::new(database_path, executor) }
-                })
-                .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
-                .boxed()
-                .shared();
-
            let this = Self {
                project,
                tools,
                context_server_manager,
                context_server_tool_ids: HashMap::default(),
                threads: Vec::new(),
-                database_future,
            };
            this.register_context_server_handlers(cx);
            this.reload(cx).detach_and_log_err(cx);
@@ -94,7 +87,7 @@ impl ThreadStore {
        cx: &mut Context<Self>,
    ) -> Task<Result<Entity<Thread>>> {
        let id = id.clone();
-        let database_future = self.database_future.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let database = database_future.await.map_err(|err| anyhow!(err))?;
            let thread = database
@@ -127,7 +120,7 @@ impl ThreadStore {
            (id, thread)
        });

-        let database_future = self.database_future.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let database = database_future.await.map_err(|err| anyhow!(err))?;
            database.save_thread(metadata, thread).await?;
@@ -138,7 +131,7 @@ impl ThreadStore {

    pub fn delete_thread(&mut self, id: &ThreadId, cx: &mut Context<Self>) -> Task<Result<()>> {
        let id = id.clone();
-        let database_future = self.database_future.clone();
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let database = database_future.await.map_err(|err| anyhow!(err))?;
            database.delete_thread(id.clone()).await?;
@@ -149,8 +142,8 @@ impl ThreadStore {
        })
    }

-    fn reload(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
-        let database_future = self.database_future.clone();
+    pub fn reload(&self, cx: &mut Context<Self>) -> Task<Result<()>> {
+        let database_future = ThreadsDatabase::global_future(cx);
        cx.spawn(|this, mut cx| async move {
            let threads = database_future
                .await
@@ -253,13 +246,40 @@ pub struct SavedMessage {
    pub text: String,
 }

-struct ThreadsDatabase {
+struct GlobalThreadsDatabase(
+    Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>>,
+);
+
+impl Global for GlobalThreadsDatabase {}
+
+pub(crate) struct ThreadsDatabase {
    executor: BackgroundExecutor,
    env: heed::Env,
    threads: Database<SerdeBincode<ThreadId>, SerdeBincode<SavedThread>>,
 }

 impl ThreadsDatabase {
+    fn global_future(
+        cx: &mut App,
+    ) -> Shared<BoxFuture<'static, Result<Arc<ThreadsDatabase>, Arc<anyhow::Error>>>> {
+        GlobalThreadsDatabase::global(cx).0.clone()
+    }
+
+    fn init(cx: &mut App) {
+        let executor = cx.background_executor().clone();
+        let database_future = executor
+            .spawn({
+                let executor = executor.clone();
+                let database_path = paths::support_dir().join("threads/threads-db.0.mdb");
+                async move { ThreadsDatabase::new(database_path, executor) }
+            })
+            .then(|result| future::ready(result.map(Arc::new).map_err(Arc::new)))
+            .boxed()
+            .shared();
+
+        cx.set_global(GlobalThreadsDatabase(database_future));
+    }
+
    pub fn new(path: PathBuf, executor: BackgroundExecutor) -> Result<Self> {
        std::fs::create_dir_all(&path)?;

--- a/crates/assistant_context_editor/src/context.rs
+++ b/crates/assistant_context_editor/src/context.rs
@@ -851,7 +851,7 @@ impl AssistantContext {
            .collect::<Vec<_>>();
        context_ops.extend(self.pending_ops.iter().cloned());

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let buffer_ops = buffer_ops.await;
            context_ops.sort_unstable_by_key(|op| op.timestamp());
            buffer_ops
@@ -1192,11 +1192,14 @@ impl AssistantContext {
        let Some(model) = LanguageModelRegistry::read_global(cx).active_model() else {
            return;
        };
+        let debounce = self.token_count.is_some();
        self.pending_token_count = cx.spawn(|this, mut cx| {
            async move {
-                cx.background_executor()
-                    .timer(Duration::from_millis(200))
-                    .await;
+                if debounce {
+                    cx.background_executor()
+                        .timer(Duration::from_millis(200))
+                        .await;
+                }

                let token_count = cx.update(|cx| model.count_tokens(request, cx))?.await?;
                this.update(&mut cx, |this, cx| {
@@ -3363,7 +3366,7 @@ impl SavedContextV0_1_0 {
    }
 }

-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct SavedContextMetadata {
    pub title: String,
    pub path: PathBuf,
--- a/crates/assistant_context_editor/src/context_editor.rs
+++ b/crates/assistant_context_editor/src/context_editor.rs
@@ -193,6 +193,8 @@ pub struct ContextEditor {
    // the file is opened. In order to keep the worktree alive for the duration of the
    // context editor, we keep a reference here.
    dragged_file_worktrees: Vec<Entity<Worktree>>,
+    language_model_selector: Entity<LanguageModelSelector>,
+    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

 pub const DEFAULT_TAB_TITLE: &str = "New Chat";
@@ -238,6 +240,22 @@ impl ContextEditor {
            cx.subscribe_in(&editor, window, Self::handle_editor_search_event),
        ];

+        let fs_clone = fs.clone();
+        let language_model_selector = cx.new(|cx| {
+            LanguageModelSelector::new(
+                move |model, cx| {
+                    update_settings_file::<AssistantSettings>(
+                        fs_clone.clone(),
+                        cx,
+                        move |settings, _| settings.set_model(model.clone()),
+                    );
+                },
+                window,
+                cx,
+            )
+        });
+
+        let language_model_selector_menu_handle = PopoverMenuHandle::default();
        let sections = context.read(cx).slash_command_output_sections().to_vec();
        let patch_ranges = context.read(cx).patch_ranges().collect::<Vec<_>>();
        let slash_commands = context.read(cx).slash_commands().clone();
@@ -262,6 +280,8 @@ impl ContextEditor {
            show_accept_terms: false,
            slash_menu_handle: Default::default(),
            dragged_file_worktrees: Vec::new(),
+            language_model_selector,
+            language_model_selector_menu_handle,
        };
        this.update_message_headers(cx);
        this.update_image_blocks(cx);
@@ -614,7 +634,7 @@ impl ContextEditor {
                                }
                            });
                            let placeholder = FoldPlaceholder {
-                                render: Arc::new(move |_, _, _, _| Empty.into_any()),
+                                render: Arc::new(move |_, _, _| Empty.into_any()),
                                ..Default::default()
                            };
                            let render_toggle = {
@@ -832,12 +852,13 @@ impl ContextEditor {
                let render_block: RenderBlock = Arc::new({
                    let this = this.clone();
                    let patch_range = range.clone();
-                    move |cx: &mut BlockContext<'_, '_>| {
+                    move |cx: &mut BlockContext| {
                        let max_width = cx.max_width;
                        let gutter_width = cx.gutter_dimensions.full_width();
                        let block_id = cx.block_id;
                        let selected = cx.selected;
-                        this.update_in(cx, |this, window, cx| {
+                        let window = &mut cx.window;
+                        this.update(cx.app, |this, cx| {
                            this.render_patch_block(
                                patch_range.clone(),
                                max_width,
@@ -2022,6 +2043,15 @@ impl ContextEditor {
        });
    }

+    fn toggle_model_selector(
+        &mut self,
+        _: &ToggleModelSelector,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.language_model_selector_menu_handle.toggle(window, cx);
+    }
+
    fn save(&mut self, _: &Save, _window: &mut Window, cx: &mut Context<Self>) {
        self.context.update(cx, |context, cx| {
            context.save(Some(Duration::from_millis(500)), self.fs.clone(), cx)
@@ -2289,7 +2319,7 @@ impl ContextEditor {
                },
            ))
            .children(
-                KeyBinding::for_action_in(&Assist, &focus_handle, window)
+                KeyBinding::for_action_in(&Assist, &focus_handle, window, cx)
                    .map(|binding| binding.into_any_element()),
            )
            .on_click(move |_event, window, cx| {
@@ -2342,7 +2372,7 @@ impl ContextEditor {
            .layer(ElevationIndex::ModalSurface)
            .child(Label::new("Suggest Edits"))
            .children(
-                KeyBinding::for_action_in(&Edit, &focus_handle, window)
+                KeyBinding::for_action_in(&Edit, &focus_handle, window, cx)
                    .map(|binding| binding.into_any_element()),
            )
            .on_click(move |_event, window, cx| {
@@ -2354,15 +2384,61 @@ impl ContextEditor {
        slash_command_picker::SlashCommandSelector::new(
            self.slash_commands.clone(),
            cx.entity().downgrade(),
-            Button::new("trigger", "Add Context")
-                .icon(IconName::Plus)
+            IconButton::new("trigger", IconName::Plus)
                .icon_size(IconSize::Small)
-                .icon_color(Color::Muted)
-                .icon_position(IconPosition::Start)
-                .tooltip(Tooltip::text("Type / to insert via keyboard")),
+                .icon_color(Color::Muted),
+            move |window, cx| {
+                Tooltip::with_meta(
+                    "Add Context",
+                    None,
+                    "Type / to insert via keyboard",
+                    window,
+                    cx,
+                )
+            },
        )
    }

+    fn render_language_model_selector(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+        let focus_handle = self.editor().focus_handle(cx).clone();
+        let model_name = match active_model {
+            Some(model) => model.name().0,
+            None => SharedString::from("No model selected"),
+        };
+
+        LanguageModelSelectorPopoverMenu::new(
+            self.language_model_selector.clone(),
+            ButtonLike::new("active-model")
+                .style(ButtonStyle::Subtle)
+                .child(
+                    h_flex()
+                        .gap_0p5()
+                        .child(
+                            Label::new(model_name)
+                                .size(LabelSize::Small)
+                                .color(Color::Muted),
+                        )
+                        .child(
+                            Icon::new(IconName::ChevronDown)
+                                .color(Color::Muted)
+                                .size(IconSize::XSmall),
+                        ),
+                ),
+            move |window, cx| {
+                Tooltip::for_action_in(
+                    "Change Model",
+                    &ToggleModelSelector,
+                    &focus_handle,
+                    window,
+                    cx,
+                )
+            },
+            gpui::Corner::BottomLeft,
+        )
+        .with_handle(self.language_model_selector_menu_handle.clone())
+    }
+
    fn render_last_error(&self, cx: &mut Context<Self>) -> Option<AnyElement> {
        let last_error = self.last_error.as_ref()?;

@@ -2592,8 +2668,8 @@ fn render_fold_icon_button(
    editor: WeakEntity<Editor>,
    icon: IconName,
    label: SharedString,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut Window, &mut App) -> AnyElement> {
-    Arc::new(move |fold_id, fold_range, _window, _cx| {
+) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
+    Arc::new(move |fold_id, fold_range, _cx| {
        let editor = editor.clone();
        ButtonLike::new(fold_id)
            .style(ButtonStyle::Filled)
@@ -2653,7 +2729,7 @@ pub fn fold_toggle(
 fn quote_selection_fold_placeholder(title: String, editor: WeakEntity<Editor>) -> FoldPlaceholder {
    FoldPlaceholder {
        render: Arc::new({
-            move |fold_id, fold_range, _window, _cx| {
+            move |fold_id, fold_range, _cx| {
                let editor = editor.clone();
                ButtonLike::new(fold_id)
                    .style(ButtonStyle::Filled)
@@ -2819,6 +2895,7 @@ impl Render for ContextEditor {
            .on_action(cx.listener(ContextEditor::edit))
            .on_action(cx.listener(ContextEditor::assist))
            .on_action(cx.listener(ContextEditor::split))
+            .on_action(cx.listener(ContextEditor::toggle_model_selector))
            .size_full()
            .children(self.render_notice(cx))
            .child(
@@ -2851,7 +2928,17 @@ impl Render for ContextEditor {
                        .border_t_1()
                        .border_color(cx.theme().colors().border_variant)
                        .bg(cx.theme().colors().editor_background)
-                        .child(h_flex().gap_1().child(self.render_inject_context_menu(cx)))
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(self.render_inject_context_menu(cx))
+                                .child(ui::Divider::vertical())
+                                .child(
+                                    div()
+                                        .pl_0p5()
+                                        .child(self.render_language_model_selector(cx)),
+                                ),
+                        )
                        .child(
                            h_flex()
                                .w_full()
@@ -3162,80 +3249,67 @@ impl FollowableItem for ContextEditor {
 pub struct ContextEditorToolbarItem {
    active_context_editor: Option<WeakEntity<ContextEditor>>,
    model_summary_editor: Entity<Editor>,
-    language_model_selector: Entity<LanguageModelSelector>,
-    language_model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
 }

 impl ContextEditorToolbarItem {
-    pub fn new(
-        workspace: &Workspace,
-        model_selector_menu_handle: PopoverMenuHandle<LanguageModelSelector>,
-        model_summary_editor: Entity<Editor>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> Self {
+    pub fn new(model_summary_editor: Entity<Editor>) -> Self {
        Self {
            active_context_editor: None,
            model_summary_editor,
-            language_model_selector: cx.new(|cx| {
-                let fs = workspace.app_state().fs.clone();
-                LanguageModelSelector::new(
-                    move |model, cx| {
-                        update_settings_file::<AssistantSettings>(
-                            fs.clone(),
-                            cx,
-                            move |settings, _| settings.set_model(model.clone()),
-                        );
-                    },
-                    window,
-                    cx,
-                )
-            }),
-            language_model_selector_menu_handle: model_selector_menu_handle,
        }
    }
+}

-    fn render_remaining_tokens(&self, cx: &mut Context<Self>) -> Option<impl IntoElement> {
-        let context = &self
-            .active_context_editor
-            .as_ref()?
-            .upgrade()?
-            .read(cx)
-            .context;
-        let (token_count_color, token_count, max_token_count) = match token_state(context, cx)? {
-            TokenState::NoTokensLeft {
-                max_token_count,
-                token_count,
-            } => (Color::Error, token_count, max_token_count),
-            TokenState::HasMoreTokens {
-                max_token_count,
-                token_count,
-                over_warn_threshold,
-            } => {
-                let color = if over_warn_threshold {
-                    Color::Warning
-                } else {
-                    Color::Muted
-                };
-                (color, token_count, max_token_count)
-            }
-        };
-        Some(
-            h_flex()
-                .gap_0p5()
-                .child(
-                    Label::new(humanize_token_count(token_count))
-                        .size(LabelSize::Small)
-                        .color(token_count_color),
-                )
-                .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
-                .child(
-                    Label::new(humanize_token_count(max_token_count))
-                        .size(LabelSize::Small)
-                        .color(Color::Muted),
-                ),
-        )
-    }
+pub fn render_remaining_tokens(
+    context_editor: &Entity<ContextEditor>,
+    cx: &App,
+) -> Option<impl IntoElement> {
+    let context = &context_editor.read(cx).context;
+
+    let (token_count_color, token_count, max_token_count, tooltip) = match token_state(context, cx)?
+    {
+        TokenState::NoTokensLeft {
+            max_token_count,
+            token_count,
+        } => (
+            Color::Error,
+            token_count,
+            max_token_count,
+            Some("Token Limit Reached"),
+        ),
+        TokenState::HasMoreTokens {
+            max_token_count,
+            token_count,
+            over_warn_threshold,
+        } => {
+            let (color, tooltip) = if over_warn_threshold {
+                (Color::Warning, Some("Token Limit is Close to Exhaustion"))
+            } else {
+                (Color::Muted, None)
+            };
+            (color, token_count, max_token_count, tooltip)
+        }
+    };
+
+    Some(
+        h_flex()
+            .id("token-count")
+            .gap_0p5()
+            .child(
+                Label::new(humanize_token_count(token_count))
+                    .size(LabelSize::Small)
+                    .color(token_count_color),
+            )
+            .child(Label::new("/").size(LabelSize::Small).color(Color::Muted))
+            .child(
+                Label::new(humanize_token_count(max_token_count))
+                    .size(LabelSize::Small)
+                    .color(Color::Muted),
+            )
+            .when_some(tooltip, |element, tooltip| {
+                element.tooltip(Tooltip::text(tooltip))
+            }),
+    )
 }

 impl Render for ContextEditorToolbarItem {
@@ -3262,8 +3336,7 @@ impl Render for ContextEditorToolbarItem {
                        })),
                ),
            );
-        let active_provider = LanguageModelRegistry::read_global(cx).active_provider();
-        let active_model = LanguageModelRegistry::read_global(cx).active_model();
+
        let right_side = h_flex()
            .gap_2()
            // TODO display this in a nicer way, once we have a design for it.
@@ -3279,57 +3352,12 @@ impl Render for ContextEditorToolbarItem {
            //     scan_items_remaining
            //         .map(|remaining_items| format!("Files to scan: {}", remaining_items))
            // })
-            .child(
-                LanguageModelSelectorPopoverMenu::new(
-                    self.language_model_selector.clone(),
-                    ButtonLike::new("active-model")
-                        .style(ButtonStyle::Subtle)
-                        .child(
-                            h_flex()
-                                .w_full()
-                                .gap_0p5()
-                                .child(
-                                    div()
-                                        .overflow_x_hidden()
-                                        .flex_grow()
-                                        .whitespace_nowrap()
-                                        .child(match (active_provider, active_model) {
-                                            (Some(provider), Some(model)) => h_flex()
-                                                .gap_1()
-                                                .child(
-                                                    Icon::new(
-                                                        model
-                                                            .icon()
-                                                            .unwrap_or_else(|| provider.icon()),
-                                                    )
-                                                    .color(Color::Muted)
-                                                    .size(IconSize::XSmall),
-                                                )
-                                                .child(
-                                                    Label::new(model.name().0)
-                                                        .size(LabelSize::Small)
-                                                        .color(Color::Muted),
-                                                )
-                                                .into_any_element(),
-                                            _ => Label::new("No model selected")
-                                                .size(LabelSize::Small)
-                                                .color(Color::Muted)
-                                                .into_any_element(),
-                                        }),
-                                )
-                                .child(
-                                    Icon::new(IconName::ChevronDown)
-                                        .color(Color::Muted)
-                                        .size(IconSize::XSmall),
-                                ),
-                        )
-                        .tooltip(move |window, cx| {
-                            Tooltip::for_action("Change Model", &ToggleModelSelector, window, cx)
-                        }),
-                )
-                .with_handle(self.language_model_selector_menu_handle.clone()),
-            )
-            .children(self.render_remaining_tokens(cx));
+            .children(
+                self.active_context_editor
+                    .as_ref()
+                    .and_then(|editor| editor.upgrade())
+                    .and_then(|editor| render_remaining_tokens(&editor, cx)),
+            );

        h_flex()
            .px_0p5()
@@ -3385,7 +3413,7 @@ fn invoked_slash_command_fold_placeholder(
    FoldPlaceholder {
        constrain_width: false,
        merge_adjacent: false,
-        render: Arc::new(move |fold_id, _, _window, cx| {
+        render: Arc::new(move |fold_id, _, cx| {
            let Some(context) = context.upgrade() else {
                return Empty.into_any();
            };
--- a/crates/assistant_context_editor/src/context_store.rs
+++ b/crates/assistant_context_editor/src/context_store.rs
@@ -265,19 +265,18 @@ impl ContextStore {
                    local_versions.push(context.version(cx).to_proto(context_id.clone()));
                    let client = this.client.clone();
                    let project_id = envelope.payload.project_id;
-                    cx.background_executor()
-                        .spawn(async move {
-                            let operations = operations.await;
-                            for operation in operations {
-                                client.send(proto::UpdateContext {
-                                    project_id,
-                                    context_id: context_id.to_proto(),
-                                    operation: Some(operation),
-                                })?;
-                            }
-                            anyhow::Ok(())
-                        })
-                        .detach_and_log_err(cx);
+                    cx.background_spawn(async move {
+                        let operations = operations.await;
+                        for operation in operations {
+                            client.send(proto::UpdateContext {
+                                project_id,
+                                context_id: context_id.to_proto(),
+                                operation: Some(operation),
+                            })?;
+                        }
+                        anyhow::Ok(())
+                    })
+                    .detach_and_log_err(cx);
                }
            }

@@ -351,6 +350,12 @@ impl ContextStore {
        }
    }

+    pub fn contexts(&self) -> Vec<SavedContextMetadata> {
+        let mut contexts = self.contexts_metadata.iter().cloned().collect::<Vec<_>>();
+        contexts.sort_unstable_by_key(|thread| std::cmp::Reverse(thread.mtime));
+        contexts
+    }
+
    pub fn create(&mut self, cx: &mut Context<Self>) -> Entity<AssistantContext> {
        let context = cx.new(|cx| {
            AssistantContext::local(
@@ -401,8 +406,7 @@ impl ContextStore {
                )
            })?;
            let operations = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    context_proto
                        .operations
                        .into_iter()
@@ -436,7 +440,7 @@ impl ContextStore {
        let languages = self.languages.clone();
        let project = self.project.clone();
        let telemetry = self.telemetry.clone();
-        let load = cx.background_executor().spawn({
+        let load = cx.background_spawn({
            let path = path.clone();
            async move {
                let saved_context = fs.load(&path).await?;
@@ -539,8 +543,7 @@ impl ContextStore {
                )
            })?;
            let operations = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    context_proto
                        .operations
                        .into_iter()
@@ -693,7 +696,7 @@ impl ContextStore {
    pub fn search(&self, query: String, cx: &App) -> Task<Vec<SavedContextMetadata>> {
        let metadata = self.contexts_metadata.clone();
        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            if query.is_empty() {
                metadata
            } else {
--- a/crates/assistant_context_editor/src/patch.rs
+++ b/crates/assistant_context_editor/src/patch.rs
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Context as _, Result};
 use collections::HashMap;
 use editor::ProposedChangesEditor;
 use futures::{future, TryFutureExt as _};
-use gpui::{App, AsyncApp, Entity, SharedString};
+use gpui::{App, AppContext as _, AsyncApp, Entity, SharedString};
 use language::{AutoindentMode, Buffer, BufferSnapshot};
 use project::{Project, ProjectPath};
 use std::{cmp, ops::Range, path::Path, sync::Arc};
@@ -140,7 +140,7 @@ impl ResolvedPatch {
            buffer.edit(
                edits,
                Some(AutoindentMode::Block {
-                    original_indent_columns: Vec::new(),
+                    original_start_columns: Vec::new(),
                }),
                cx,
            );
@@ -258,8 +258,7 @@ impl AssistantEdit {

        let snapshot = buffer.update(&mut cx, |buffer, _| buffer.snapshot())?;
        let suggestion = cx
-            .background_executor()
-            .spawn(async move { kind.resolve(&snapshot) })
+            .background_spawn(async move { kind.resolve(&snapshot) })
            .await;

        Ok((buffer, suggestion))
@@ -547,7 +546,7 @@ impl Eq for AssistantPatch {}
 #[cfg(test)]
 mod tests {
    use super::*;
-    use gpui::{App, AppContext as _};
+    use gpui::App;
    use language::{
        language_settings::AllLanguageSettings, Language, LanguageConfig, LanguageMatcher,
    };
--- a/crates/assistant_context_editor/src/slash_command.rs
+++ b/crates/assistant_context_editor/src/slash_command.rs
@@ -4,10 +4,10 @@ pub use assistant_slash_command::SlashCommand;
 use assistant_slash_command::{AfterCompletion, SlashCommandLine, SlashCommandWorkingSet};
 use editor::{CompletionProvider, Editor};
 use fuzzy::{match_strings, StringMatchCandidate};
-use gpui::{App, Context, Entity, Task, WeakEntity, Window};
-use language::{Anchor, Buffer, CompletionDocumentation, LanguageServerId, ToPoint};
+use gpui::{App, AppContext as _, Context, Entity, Task, WeakEntity, Window};
+use language::{Anchor, Buffer, LanguageServerId, ToPoint};
 use parking_lot::Mutex;
-use project::CompletionIntent;
+use project::{lsp_store::CompletionDocumentation, CompletionIntent};
 use rope::Point;
 use std::{
    cell::RefCell,
@@ -121,7 +121,7 @@ impl SlashCommandCompletionProvider {
                        Some(project::Completion {
                            old_range: name_range.clone(),
                            documentation: Some(CompletionDocumentation::SingleLine(
-                                command.description(),
+                                command.description().into(),
                            )),
                            new_text,
                            label: command.label(cx),
@@ -163,7 +163,7 @@ impl SlashCommandCompletionProvider {
            let editor = self.editor.clone();
            let workspace = self.workspace.clone();
            let arguments = arguments.to_vec();
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                Ok(completions
                    .await?
                    .into_iter()
--- a/crates/assistant_context_editor/src/slash_command_picker.rs
+++ b/crates/assistant_context_editor/src/slash_command_picker.rs
@@ -1,17 +1,22 @@
 use std::sync::Arc;

 use assistant_slash_command::SlashCommandWorkingSet;
-use gpui::{AnyElement, DismissEvent, SharedString, Task, WeakEntity};
+use gpui::{AnyElement, AnyView, DismissEvent, SharedString, Task, WeakEntity};
 use picker::{Picker, PickerDelegate, PickerEditorPosition};
 use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip};

 use crate::context_editor::ContextEditor;

 #[derive(IntoElement)]
-pub(super) struct SlashCommandSelector<T: PopoverTrigger> {
+pub(super) struct SlashCommandSelector<T, TT>
+where
+    T: PopoverTrigger + ButtonCommon,
+    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
+{
    working_set: Arc<SlashCommandWorkingSet>,
    active_context_editor: WeakEntity<ContextEditor>,
    trigger: T,
+    tooltip: TT,
 }

 #[derive(Clone)]
@@ -48,16 +53,22 @@ pub(crate) struct SlashCommandDelegate {
    selected_index: usize,
 }

-impl<T: PopoverTrigger> SlashCommandSelector<T> {
+impl<T, TT> SlashCommandSelector<T, TT>
+where
+    T: PopoverTrigger + ButtonCommon,
+    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
+{
    pub(crate) fn new(
        working_set: Arc<SlashCommandWorkingSet>,
        active_context_editor: WeakEntity<ContextEditor>,
        trigger: T,
+        tooltip: TT,
    ) -> Self {
        SlashCommandSelector {
            working_set,
            active_context_editor,
            trigger,
+            tooltip,
        }
    }
 }
@@ -91,8 +102,7 @@ impl PickerDelegate for SlashCommandDelegate {
        let all_commands = self.all_commands.clone();
        cx.spawn_in(window, |this, mut cx| async move {
            let filtered_commands = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    if query.is_empty() {
                        all_commands
                    } else {
@@ -241,7 +251,11 @@ impl PickerDelegate for SlashCommandDelegate {
    }
 }

-impl<T: PopoverTrigger> RenderOnce for SlashCommandSelector<T> {
+impl<T, TT> RenderOnce for SlashCommandSelector<T, TT>
+where
+    T: PopoverTrigger + ButtonCommon,
+    TT: Fn(&mut Window, &mut App) -> AnyView + 'static,
+{
    fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
        let all_models = self
            .working_set
@@ -322,7 +336,7 @@ impl<T: PopoverTrigger> RenderOnce for SlashCommandSelector<T> {
            .ok();
        PopoverMenu::new("model-switcher")
            .menu(move |_window, _cx| Some(picker_view.clone()))
-            .trigger(self.trigger)
+            .trigger_with_tooltip(self.trigger, self.tooltip)
            .attach(gpui::Corner::TopLeft)
            .anchor(gpui::Corner::BottomLeft)
            .offset(gpui::Point {
--- a/crates/assistant_slash_command/src/extension_slash_command.rs
+++ b/crates/assistant_slash_command/src/extension_slash_command.rs
@@ -103,7 +103,7 @@ impl SlashCommand for ExtensionSlashCommand {
    ) -> Task<Result<Vec<ArgumentCompletion>>> {
        let command = self.command.clone();
        let arguments = arguments.to_owned();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let completions = self
                .extension
                .complete_slash_command_argument(command, arguments)
@@ -135,7 +135,7 @@ impl SlashCommand for ExtensionSlashCommand {
    ) -> Task<SlashCommandResult> {
        let command = self.command.clone();
        let arguments = arguments.to_owned();
-        let output = cx.background_executor().spawn(async move {
+        let output = cx.background_spawn(async move {
            let delegate =
                delegate.map(|delegate| Arc::new(WorktreeDelegateAdapter(delegate.clone())) as _);
            let output = self
--- a/crates/assistant_slash_commands/src/auto_command.rs
+++ b/crates/assistant_slash_commands/src/auto_command.rs
@@ -82,7 +82,7 @@ impl SlashCommand for AutoCommand {
                project_index.flush_summary_backlogs(cx)
            })?;

-            cx.background_executor().spawn(task).await;
+            cx.background_spawn(task).await;

            anyhow::Ok(Vec::new())
        })
@@ -129,7 +129,7 @@ impl SlashCommand for AutoCommand {
        // so you don't have to write it again.
        let original_prompt = argument.to_string();

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let commands = task.await?;
            let mut prompt = String::new();

@@ -285,57 +285,56 @@ async fn commands_for_summaries(
        })
        .collect::<Vec<_>>();

-    cx.background_executor()
-        .spawn(async move {
-            let futures = completion_streams
-                .into_iter()
-                .enumerate()
-                .map(|(ix, (stream, tx))| async move {
-                    let start = std::time::Instant::now();
-                    let events = stream.await?;
-                    log::info!("Time taken for awaiting /await chunk stream #{ix}: {:?}", start.elapsed());
+    cx.background_spawn(async move {
+        let futures = completion_streams
+            .into_iter()
+            .enumerate()
+            .map(|(ix, (stream, tx))| async move {
+                let start = std::time::Instant::now();
+                let events = stream.await?;
+                log::info!("Time taken for awaiting /await chunk stream #{ix}: {:?}", start.elapsed());

-                    let completion: String = events
-                        .filter_map(|event| async {
-                            if let Ok(LanguageModelCompletionEvent::Text(text)) = event {
-                                Some(text)
-                            } else {
-                                None
-                            }
-                        })
-                        .collect()
-                        .await;
-
-                    log::info!("Time taken for all /auto chunks to come back for #{ix}: {:?}", start.elapsed());
-
-                    for line in completion.split('\n') {
-                        if let Some(first_space) = line.find(' ') {
-                            let command = &line[..first_space].trim();
-                            let arg = &line[first_space..].trim();
-
-                            tx.send(CommandToRun {
-                                name: command.to_string(),
-                                arg: arg.to_string(),
-                            })
-                            .await?;
-                        } else if !line.trim().is_empty() {
-                            // All slash-commands currently supported in context inference need a space for the argument.
-                            log::warn!(
-                                "Context inference returned a non-blank line that contained no spaces (meaning no argument for the slash command): {:?}",
-                                line
-                            );
+                let completion: String = events
+                    .filter_map(|event| async {
+                        if let Ok(LanguageModelCompletionEvent::Text(text)) = event {
+                            Some(text)
+                        } else {
+                            None
                        }
+                    })
+                    .collect()
+                    .await;
+
+                log::info!("Time taken for all /auto chunks to come back for #{ix}: {:?}", start.elapsed());
+
+                for line in completion.split('\n') {
+                    if let Some(first_space) = line.find(' ') {
+                        let command = &line[..first_space].trim();
+                        let arg = &line[first_space..].trim();
+
+                        tx.send(CommandToRun {
+                            name: command.to_string(),
+                            arg: arg.to_string(),
+                        })
+                        .await?;
+                    } else if !line.trim().is_empty() {
+                        // All slash-commands currently supported in context inference need a space for the argument.
+                        log::warn!(
+                            "Context inference returned a non-blank line that contained no spaces (meaning no argument for the slash command): {:?}",
+                            line
+                        );
                    }
+                }

-                    anyhow::Ok(())
-                })
-                .collect::<Vec<_>>();
+                anyhow::Ok(())
+            })
+            .collect::<Vec<_>>();

-            let _ = futures::future::try_join_all(futures).await.log_err();
+        let _ = futures::future::try_join_all(futures).await.log_err();

-            let duration = all_start.elapsed();
-            eprintln!("All futures completed in {:?}", duration);
-        })
+        let duration = all_start.elapsed();
+        eprintln!("All futures completed in {:?}", duration);
+    })
        .await;

    drop(tx); // Close the channel so that rx.collect() won't hang. This is safe because all futures have completed.
--- a/crates/assistant_slash_commands/src/cargo_workspace_command.rs
+++ b/crates/assistant_slash_commands/src/cargo_workspace_command.rs
@@ -132,7 +132,7 @@ impl SlashCommand for CargoWorkspaceSlashCommand {
            let project = workspace.project().clone();
            let fs = workspace.project().read(cx).fs().clone();
            let path = Self::path_to_cargo_toml(project, cx);
-            let output = cx.background_executor().spawn(async move {
+            let output = cx.background_spawn(async move {
                let path = path.with_context(|| "Cargo.toml not found")?;
                Self::build_message(fs, &path).await
            });
--- a/crates/assistant_slash_commands/src/default_command.rs
+++ b/crates/assistant_slash_commands/src/default_command.rs
@@ -54,7 +54,7 @@ impl SlashCommand for DefaultSlashCommand {
        cx: &mut App,
    ) -> Task<SlashCommandResult> {
        let store = PromptStore::global(cx);
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let store = store.await?;
            let prompts = store.default_prompt_metadata();

--- a/crates/assistant_slash_commands/src/delta_command.rs
+++ b/crates/assistant_slash_commands/src/delta_command.rs
@@ -86,7 +86,7 @@ impl SlashCommand for DeltaSlashCommand {
            }
        }

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let mut output = SlashCommandOutput::default();
            let mut changes_detected = false;

--- a/crates/assistant_slash_commands/src/diagnostics_command.rs
+++ b/crates/assistant_slash_commands/src/diagnostics_command.rs
@@ -129,7 +129,7 @@ impl SlashCommand for DiagnosticsSlashCommand {

        let paths = self.search_paths(query.clone(), cancellation_flag.clone(), &workspace, cx);
        let executor = cx.background_executor().clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let mut matches: Vec<String> = paths
                .await
                .into_iter()
--- a/crates/assistant_slash_commands/src/docs_command.rs
+++ b/crates/assistant_slash_commands/src/docs_command.rs
@@ -176,7 +176,7 @@ impl SlashCommand for DocsSlashCommand {
            .provider()
            .ok_or_else(|| anyhow!("no docs provider specified"))
            .and_then(|provider| IndexedDocsStore::try_global(provider, cx));
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            fn build_completions(items: Vec<String>) -> Vec<ArgumentCompletion> {
                items
                    .into_iter()
@@ -284,7 +284,7 @@ impl SlashCommand for DocsSlashCommand {

        let args = DocsSlashCommandArgs::parse(arguments);
        let executor = cx.background_executor().clone();
-        let task = cx.background_executor().spawn({
+        let task = cx.background_spawn({
            let store = args
                .provider()
                .ok_or_else(|| anyhow!("no docs provider specified"))
--- a/crates/assistant_slash_commands/src/fetch_command.rs
+++ b/crates/assistant_slash_commands/src/fetch_command.rs
@@ -151,7 +151,7 @@ impl SlashCommand for FetchSlashCommand {
        let http_client = workspace.read(cx).client().http_client();
        let url = argument.to_string();

-        let text = cx.background_executor().spawn({
+        let text = cx.background_spawn({
            let url = url.clone();
            async move { Self::build_message(http_client, &url).await }
        });
--- a/crates/assistant_slash_commands/src/file_command.rs
+++ b/crates/assistant_slash_commands/src/file_command.rs
@@ -156,7 +156,7 @@ impl SlashCommand for FileSlashCommand {
            cx,
        );
        let comment_id = cx.theme().syntax().highlight_id("comment").map(HighlightId);
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            Ok(paths
                .await
                .into_iter()
--- a/crates/assistant_slash_commands/src/project_command.rs
+++ b/crates/assistant_slash_commands/src/project_command.rs
@@ -130,49 +130,48 @@ impl SlashCommand for ProjectSlashCommand {

            let results = SemanticDb::load_results(results, &fs, &cx).await?;

-            cx.background_executor()
-                .spawn(async move {
-                    let mut output = "Project context:\n".to_string();
-                    let mut sections = Vec::new();
+            cx.background_spawn(async move {
+                let mut output = "Project context:\n".to_string();
+                let mut sections = Vec::new();

-                    for (ix, query) in search_queries.into_iter().enumerate() {
-                        let start_ix = output.len();
-                        writeln!(&mut output, "Results for {query}:").unwrap();
-                        let mut has_results = false;
-                        for result in &results {
-                            if result.query_index == ix {
-                                add_search_result_section(result, &mut output, &mut sections);
-                                has_results = true;
-                            }
-                        }
-                        if has_results {
-                            sections.push(SlashCommandOutputSection {
-                                range: start_ix..output.len(),
-                                icon: IconName::MagnifyingGlass,
-                                label: query.into(),
-                                metadata: None,
-                            });
-                            output.push('\n');
-                        } else {
-                            output.truncate(start_ix);
+                for (ix, query) in search_queries.into_iter().enumerate() {
+                    let start_ix = output.len();
+                    writeln!(&mut output, "Results for {query}:").unwrap();
+                    let mut has_results = false;
+                    for result in &results {
+                        if result.query_index == ix {
+                            add_search_result_section(result, &mut output, &mut sections);
+                            has_results = true;
                        }
                    }
-
-                    sections.push(SlashCommandOutputSection {
-                        range: 0..output.len(),
-                        icon: IconName::Book,
-                        label: "Project context".into(),
-                        metadata: None,
-                    });
-
-                    Ok(SlashCommandOutput {
-                        text: output,
-                        sections,
-                        run_commands_in_text: true,
+                    if has_results {
+                        sections.push(SlashCommandOutputSection {
+                            range: start_ix..output.len(),
+                            icon: IconName::MagnifyingGlass,
+                            label: query.into(),
+                            metadata: None,
+                        });
+                        output.push('\n');
+                    } else {
+                        output.truncate(start_ix);
                    }
-                    .to_event_stream())
-                })
-                .await
+                }
+
+                sections.push(SlashCommandOutputSection {
+                    range: 0..output.len(),
+                    icon: IconName::Book,
+                    label: "Project context".into(),
+                    metadata: None,
+                });
+
+                Ok(SlashCommandOutput {
+                    text: output,
+                    sections,
+                    run_commands_in_text: true,
+                }
+                .to_event_stream())
+            })
+            .await
        })
    }
 }
--- a/crates/assistant_slash_commands/src/prompt_command.rs
+++ b/crates/assistant_slash_commands/src/prompt_command.rs
@@ -43,7 +43,7 @@ impl SlashCommand for PromptSlashCommand {
    ) -> Task<Result<Vec<ArgumentCompletion>>> {
        let store = PromptStore::global(cx);
        let query = arguments.to_owned().join(" ");
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let prompts = store.await?.search(query).await;
            Ok(prompts
                .into_iter()
@@ -77,7 +77,7 @@ impl SlashCommand for PromptSlashCommand {

        let store = PromptStore::global(cx);
        let title = SharedString::from(title.clone());
-        let prompt = cx.background_executor().spawn({
+        let prompt = cx.background_spawn({
            let title = title.clone();
            async move {
                let store = store.await?;
--- a/crates/assistant_slash_commands/src/search_command.rs
+++ b/crates/assistant_slash_commands/src/search_command.rs
@@ -119,8 +119,7 @@ impl SlashCommand for SearchSlashCommand {
            let loaded_results = SemanticDb::load_results(results, &fs, &cx).await?;

            let output = cx
-                .background_executor()
-                .spawn(async move {
+                .background_spawn(async move {
                    let mut text = format!("Search results for {query}:\n");
                    let mut sections = Vec::new();
                    for loaded_result in &loaded_results {
--- a/crates/assistant_slash_commands/src/streaming_example_command.rs
+++ b/crates/assistant_slash_commands/src/streaming_example_command.rs
@@ -63,56 +63,55 @@ impl SlashCommand for StreamingExampleSlashCommand {
        cx: &mut App,
    ) -> Task<SlashCommandResult> {
        let (events_tx, events_rx) = mpsc::unbounded();
-        cx.background_executor()
-            .spawn(async move {
-                events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                    icon: IconName::FileRust,
-                    label: "Section 1".into(),
-                    metadata: None,
-                }))?;
-                events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                    SlashCommandContent::Text {
-                        text: "Hello".into(),
-                        run_commands_in_text: false,
-                    },
-                )))?;
-                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+        cx.background_spawn(async move {
+            events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
+                icon: IconName::FileRust,
+                label: "Section 1".into(),
+                metadata: None,
+            }))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
+                SlashCommandContent::Text {
+                    text: "Hello".into(),
+                    run_commands_in_text: false,
+                },
+            )))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;

+            Timer::after(Duration::from_secs(1)).await;
+
+            events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
+                icon: IconName::FileRust,
+                label: "Section 2".into(),
+                metadata: None,
+            }))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
+                SlashCommandContent::Text {
+                    text: "World".into(),
+                    run_commands_in_text: false,
+                },
+            )))?;
+            events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+
+            for n in 1..=10 {
                Timer::after(Duration::from_secs(1)).await;

                events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                    icon: IconName::FileRust,
-                    label: "Section 2".into(),
+                    icon: IconName::StarFilled,
+                    label: format!("Section {n}").into(),
                    metadata: None,
                }))?;
                events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
                    SlashCommandContent::Text {
-                        text: "World".into(),
+                        text: "lorem ipsum ".repeat(n).trim().into(),
                        run_commands_in_text: false,
                    },
                )))?;
                events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
+            }

-                for n in 1..=10 {
-                    Timer::after(Duration::from_secs(1)).await;
-
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::StartSection {
-                        icon: IconName::StarFilled,
-                        label: format!("Section {n}").into(),
-                        metadata: None,
-                    }))?;
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::Content(
-                        SlashCommandContent::Text {
-                            text: "lorem ipsum ".repeat(n).trim().into(),
-                            run_commands_in_text: false,
-                        },
-                    )))?;
-                    events_tx.unbounded_send(Ok(SlashCommandEvent::EndSection))?;
-                }
-
-                anyhow::Ok(())
-            })
-            .detach_and_log_err(cx);
+            anyhow::Ok(())
+        })
+        .detach_and_log_err(cx);

        Task::ready(Ok(events_rx.boxed()))
    }
--- a/crates/assistant_slash_commands/src/symbols_command.rs
+++ b/crates/assistant_slash_commands/src/symbols_command.rs
@@ -4,7 +4,7 @@ use assistant_slash_command::{
    SlashCommandResult,
 };
 use editor::Editor;
-use gpui::{Task, WeakEntity};
+use gpui::{AppContext as _, Task, WeakEntity};
 use language::{BufferSnapshot, LspAdapterDelegate};
 use std::sync::Arc;
 use std::{path::Path, sync::atomic::AtomicBool};
@@ -69,7 +69,7 @@ impl SlashCommand for OutlineSlashCommand {
            let snapshot = buffer.read(cx).snapshot();
            let path = snapshot.resolve_file_path(cx, true);

-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                let outline = snapshot
                    .outline(None)
                    .context("no symbols for active tab")?;
--- a/crates/assistant_slash_commands/src/tab_command.rs
+++ b/crates/assistant_slash_commands/src/tab_command.rs
@@ -152,7 +152,7 @@ impl SlashCommand for TabSlashCommand {
            cx,
        );

-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            let mut output = SlashCommandOutput::default();
            for (full_path, buffer, _) in tab_items_search.await? {
                append_buffer_to_output(&buffer, full_path.as_deref(), &mut output).log_err();
@@ -212,74 +212,73 @@ fn tab_items_for_queries(
                })??;

        let background_executor = cx.background_executor().clone();
-        cx.background_executor()
-            .spawn(async move {
-                open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
-                if empty_query
-                    || queries
-                        .iter()
-                        .any(|query| query == ALL_TABS_COMPLETION_ITEM)
-                {
-                    return Ok(open_buffers);
-                }
+        cx.background_spawn(async move {
+            open_buffers.sort_by_key(|(_, _, timestamp)| *timestamp);
+            if empty_query
+                || queries
+                    .iter()
+                    .any(|query| query == ALL_TABS_COMPLETION_ITEM)
+            {
+                return Ok(open_buffers);
+            }

-                let matched_items = if strict_match {
-                    let match_candidates = open_buffers
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(id, (full_path, ..))| {
-                            let path_string = full_path.as_deref()?.to_string_lossy().to_string();
-                            Some((id, path_string))
-                        })
-                        .fold(HashMap::default(), |mut candidates, (id, path_string)| {
-                            candidates
-                                .entry(path_string)
-                                .or_insert_with(Vec::new)
-                                .push(id);
-                            candidates
-                        });
-
-                    queries
-                        .iter()
-                        .filter_map(|query| match_candidates.get(query))
-                        .flatten()
-                        .copied()
-                        .filter_map(|id| open_buffers.get(id))
-                        .cloned()
-                        .collect()
-                } else {
-                    let match_candidates = open_buffers
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(id, (full_path, ..))| {
-                            let path_string = full_path.as_deref()?.to_string_lossy().to_string();
-                            Some(fuzzy::StringMatchCandidate::new(id, &path_string))
-                        })
-                        .collect::<Vec<_>>();
-                    let mut processed_matches = HashSet::default();
-                    let file_queries = queries.iter().map(|query| {
-                        fuzzy::match_strings(
-                            &match_candidates,
-                            query,
-                            true,
-                            usize::MAX,
-                            &cancel,
-                            background_executor.clone(),
-                        )
+            let matched_items = if strict_match {
+                let match_candidates = open_buffers
+                    .iter()
+                    .enumerate()
+                    .filter_map(|(id, (full_path, ..))| {
+                        let path_string = full_path.as_deref()?.to_string_lossy().to_string();
+                        Some((id, path_string))
+                    })
+                    .fold(HashMap::default(), |mut candidates, (id, path_string)| {
+                        candidates
+                            .entry(path_string)
+                            .or_insert_with(Vec::new)
+                            .push(id);
+                        candidates
                    });

-                    join_all(file_queries)
-                        .await
-                        .into_iter()
-                        .flatten()
-                        .filter(|string_match| processed_matches.insert(string_match.candidate_id))
-                        .filter_map(|string_match| open_buffers.get(string_match.candidate_id))
-                        .cloned()
-                        .collect()
-                };
-                Ok(matched_items)
-            })
-            .await
+                queries
+                    .iter()
+                    .filter_map(|query| match_candidates.get(query))
+                    .flatten()
+                    .copied()
+                    .filter_map(|id| open_buffers.get(id))
+                    .cloned()
+                    .collect()
+            } else {
+                let match_candidates = open_buffers
+                    .iter()
+                    .enumerate()
+                    .filter_map(|(id, (full_path, ..))| {
+                        let path_string = full_path.as_deref()?.to_string_lossy().to_string();
+                        Some(fuzzy::StringMatchCandidate::new(id, &path_string))
+                    })
+                    .collect::<Vec<_>>();
+                let mut processed_matches = HashSet::default();
+                let file_queries = queries.iter().map(|query| {
+                    fuzzy::match_strings(
+                        &match_candidates,
+                        query,
+                        true,
+                        usize::MAX,
+                        &cancel,
+                        background_executor.clone(),
+                    )
+                });
+
+                join_all(file_queries)
+                    .await
+                    .into_iter()
+                    .flatten()
+                    .filter(|string_match| processed_matches.insert(string_match.candidate_id))
+                    .filter_map(|string_match| open_buffers.get(string_match.candidate_id))
+                    .cloned()
+                    .collect()
+            };
+            Ok(matched_items)
+        })
+        .await
    })
 }

--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -513,7 +513,7 @@ impl AutoUpdater {
        should_show: bool,
        cx: &App,
    ) -> Task<Result<()>> {
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            if should_show {
                KEY_VALUE_STORE
                    .write_kvp(
@@ -531,7 +531,7 @@ impl AutoUpdater {
    }

    pub fn should_show_update_notification(&self, cx: &App) -> Task<Result<bool>> {
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            Ok(KEY_VALUE_STORE
                .read_kvp(SHOULD_SHOW_UPDATE_NOTIFICATION_KEY)?
                .is_some())
--- a/crates/auto_update_ui/Cargo.toml
+++ b/crates/auto_update_ui/Cargo.toml
@@ -19,7 +19,6 @@ editor.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 markdown_preview.workspace = true
-menu.workspace = true
 release_channel.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/auto_update_ui/src/auto_update_ui.rs
+++ b/crates/auto_update_ui/src/auto_update_ui.rs
@@ -1,19 +1,17 @@
-mod update_notification;
-
 use auto_update::AutoUpdater;
+use client::proto::UpdateNotification;
 use editor::{Editor, MultiBuffer};
-use gpui::{actions, prelude::*, App, Context, Entity, SharedString, Window};
+use gpui::{actions, prelude::*, App, Context, DismissEvent, Entity, SharedString, Window};
 use http_client::HttpClient;
 use markdown_preview::markdown_preview_view::{MarkdownPreviewMode, MarkdownPreviewView};
 use release_channel::{AppVersion, ReleaseChannel};
 use serde::Deserialize;
 use smol::io::AsyncReadExt;
 use util::ResultExt as _;
+use workspace::notifications::simple_message_notification::MessageNotification;
 use workspace::notifications::{show_app_notification, NotificationId};
 use workspace::Workspace;

-use crate::update_notification::UpdateNotification;
-
 actions!(auto_update, [ViewReleaseNotesLocally]);

 pub fn init(cx: &mut App) {
@@ -131,19 +129,32 @@ pub fn notify_if_app_was_updated(cx: &mut App) {
    let Some(updater) = AutoUpdater::get(cx) else {
        return;
    };
-    let version = updater.read(cx).current_version();
    let should_show_notification = updater.read(cx).should_show_update_notification(cx);
-
    cx.spawn(|cx| async move {
        let should_show_notification = should_show_notification.await?;
        if should_show_notification {
            cx.update(|cx| {
+                let version = updater.read(cx).current_version();
+                let app_name = ReleaseChannel::global(cx).display_name();
                show_app_notification(
                    NotificationId::unique::<UpdateNotification>(),
                    cx,
                    move |cx| {
                        let workspace_handle = cx.entity().downgrade();
-                        cx.new(|_| UpdateNotification::new(version, workspace_handle))
+                        cx.new(|_cx| {
+                            MessageNotification::new(format!("Updated to {app_name} {}", version))
+                                .primary_message("View Release Notes")
+                                .primary_on_click(move |window, cx| {
+                                    if let Some(workspace) = workspace_handle.upgrade() {
+                                        workspace.update(cx, |workspace, cx| {
+                                            crate::view_release_notes_locally(
+                                                workspace, window, cx,
+                                            );
+                                        })
+                                    }
+                                    cx.emit(DismissEvent);
+                                })
+                        })
                    },
                );
                updater.update(cx, |updater, cx| {
--- a/crates/auto_update_ui/src/update_notification.rs
+++ b/crates/auto_update_ui/src/update_notification.rs
@@ -1,70 +0,0 @@
-use gpui::{
-    div, Context, DismissEvent, EventEmitter, InteractiveElement, IntoElement, ParentElement,
-    Render, SemanticVersion, StatefulInteractiveElement, Styled, WeakEntity, Window,
-};
-use menu::Cancel;
-use release_channel::ReleaseChannel;
-use util::ResultExt;
-use workspace::{
-    ui::{h_flex, v_flex, Icon, IconName, Label, StyledExt},
-    Workspace,
-};
-
-pub struct UpdateNotification {
-    version: SemanticVersion,
-    workspace: WeakEntity<Workspace>,
-}
-
-impl EventEmitter<DismissEvent> for UpdateNotification {}
-
-impl Render for UpdateNotification {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let app_name = ReleaseChannel::global(cx).display_name();
-
-        v_flex()
-            .on_action(cx.listener(UpdateNotification::dismiss))
-            .elevation_3(cx)
-            .p_4()
-            .child(
-                h_flex()
-                    .justify_between()
-                    .child(Label::new(format!(
-                        "Updated to {app_name} {}",
-                        self.version
-                    )))
-                    .child(
-                        div()
-                            .id("cancel")
-                            .child(Icon::new(IconName::Close))
-                            .cursor_pointer()
-                            .on_click(cx.listener(|this, _, window, cx| {
-                                this.dismiss(&menu::Cancel, window, cx)
-                            })),
-                    ),
-            )
-            .child(
-                div()
-                    .id("notes")
-                    .child(Label::new("View the release notes"))
-                    .cursor_pointer()
-                    .on_click(cx.listener(|this, _, window, cx| {
-                        this.workspace
-                            .update(cx, |workspace, cx| {
-                                crate::view_release_notes_locally(workspace, window, cx);
-                            })
-                            .log_err();
-                        this.dismiss(&menu::Cancel, window, cx)
-                    })),
-            )
-    }
-}
-
-impl UpdateNotification {
-    pub fn new(version: SemanticVersion, workspace: WeakEntity<Workspace>) -> Self {
-        Self { version, workspace }
-    }
-
-    pub fn dismiss(&mut self, _: &Cancel, _: &mut Window, cx: &mut Context<Self>) {
-        cx.emit(DismissEvent);
-    }
-}
--- a/crates/buffer_diff/Cargo.toml
+++ b/crates/buffer_diff/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "diff"
+name = "buffer_diff"
 version = "0.1.0"
 edition.workspace = true
 publish.workspace = true
@@ -9,9 +9,13 @@ license = "GPL-3.0-or-later"
 workspace = true

 [lib]
-path = "src/diff.rs"
+path = "src/buffer_diff.rs"
+
+[features]
+test-support = []

 [dependencies]
+anyhow.workspace = true
 futures.workspace = true
 git2.workspace = true
 gpui.workspace = true
@@ -23,10 +27,11 @@ text.workspace = true
 util.workspace = true

 [dev-dependencies]
-unindent.workspace = true
-serde_json.workspace = true
+ctor.workspace = true
+env_logger.workspace = true
+gpui = { workspace = true, features = ["test-support"] }
 pretty_assertions.workspace = true
-text = {workspace = true, features = ["test-support"]}
-
-[features]
-test-support = []
+rand.workspace = true
+serde_json.workspace = true
+text = { workspace = true, features = ["test-support"] }
+unindent.workspace = true
--- a/crates/buffer_diff/LICENSE-GPL
+++ b/crates/buffer_diff/LICENSE-GPL
--- a/crates/buffer_diff/src/buffer_diff.rs
+++ b/crates/buffer_diff/src/buffer_diff.rs
--- a/crates/call/src/cross_platform/mod.rs
+++ b/crates/call/src/cross_platform/mod.rs
@@ -241,7 +241,7 @@ impl ActiveCall {
                })
                .shared();
            self.pending_room_creation = Some(room.clone());
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                room.await.map_err(|err| anyhow!("{:?}", err))?;
                anyhow::Ok(())
            })
@@ -278,7 +278,7 @@ impl ActiveCall {
        };

        let client = self.client.clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::CancelCall {
                    room_id,
--- a/crates/call/src/cross_platform/room.rs
+++ b/crates/call/src/cross_platform/room.rs
@@ -13,7 +13,7 @@ use client::{
 use collections::{BTreeMap, HashMap, HashSet};
 use fs::Fs;
 use futures::{FutureExt, StreamExt};
-use gpui::{App, AppContext, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
+use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter, Task, WeakEntity};
 use language::LanguageRegistry;
 #[cfg(not(all(target_os = "windows", target_env = "gnu")))]
 use livekit::{
@@ -255,7 +255,7 @@ impl Room {
    fn app_will_quit(&mut self, cx: &mut Context<Self>) -> impl Future<Output = ()> {
        let task = if self.status.is_online() {
            let leave = self.leave_internal(cx);
-            Some(cx.background_executor().spawn(async move {
+            Some(cx.background_spawn(async move {
                leave.await.log_err();
            }))
        } else {
@@ -322,7 +322,7 @@ impl Room {
        self.clear_state(cx);

        let leave_room = self.client.request(proto::LeaveRoom {});
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            leave_room.await?;
            anyhow::Ok(())
        })
@@ -1248,7 +1248,7 @@ impl Room {
        };

        cx.notify();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::UpdateParticipantLocation {
                    room_id,
@@ -1373,11 +1373,10 @@ impl Room {
                match publication {
                    Ok(publication) => {
                        if canceled {
-                            cx.background_executor()
-                                .spawn(async move {
-                                    participant.unpublish_track(&publication.sid()).await
-                                })
-                                .detach_and_log_err(cx)
+                            cx.background_spawn(async move {
+                                participant.unpublish_track(&publication.sid()).await
+                            })
+                            .detach_and_log_err(cx)
                        } else {
                            if live_kit.muted_by_user || live_kit.deafened {
                                publication.mute();
@@ -1465,11 +1464,10 @@ impl Room {
                match publication {
                    Ok(publication) => {
                        if canceled {
-                            cx.background_executor()
-                                .spawn(async move {
-                                    participant.unpublish_track(&publication.sid()).await
-                                })
-                                .detach()
+                            cx.background_spawn(async move {
+                                participant.unpublish_track(&publication.sid()).await
+                            })
+                            .detach()
                        } else {
                            live_kit.screen_track = LocalTrack::Published {
                                track_publication: publication,
@@ -1561,9 +1559,10 @@ impl Room {
                {
                    let local_participant = live_kit.room.local_participant();
                    let sid = track_publication.sid();
-                    cx.background_executor()
-                        .spawn(async move { local_participant.unpublish_track(&sid).await })
-                        .detach_and_log_err(cx);
+                    cx.background_spawn(
+                        async move { local_participant.unpublish_track(&sid).await },
+                    )
+                    .detach_and_log_err(cx);
                    cx.notify();
                }

@@ -1722,13 +1721,12 @@ impl LiveKitRoom {
        }

        let participant = self.room.local_participant();
-        cx.background_executor()
-            .spawn(async move {
-                for sid in tracks_to_unpublish {
-                    participant.unpublish_track(&sid).await.log_err();
-                }
-            })
-            .detach();
+        cx.background_spawn(async move {
+            for sid in tracks_to_unpublish {
+                participant.unpublish_track(&sid).await.log_err();
+            }
+        })
+        .detach();
    }
 }

--- a/crates/call/src/macos/mod.rs
+++ b/crates/call/src/macos/mod.rs
@@ -234,7 +234,7 @@ impl ActiveCall {
                })
                .shared();
            self.pending_room_creation = Some(room.clone());
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                room.await.map_err(|err| anyhow!("{:?}", err))?;
                anyhow::Ok(())
            })
@@ -271,7 +271,7 @@ impl ActiveCall {
        };

        let client = self.client.clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::CancelCall {
                    room_id,
--- a/crates/call/src/macos/room.rs
+++ b/crates/call/src/macos/room.rs
@@ -311,7 +311,7 @@ impl Room {
    fn app_will_quit(&mut self, cx: &mut Context<Self>) -> impl Future<Output = ()> {
        let task = if self.status.is_online() {
            let leave = self.leave_internal(cx);
-            Some(cx.background_executor().spawn(async move {
+            Some(cx.background_spawn(async move {
                leave.await.log_err();
            }))
        } else {
@@ -378,7 +378,7 @@ impl Room {
        self.clear_state(cx);

        let leave_room = self.client.request(proto::LeaveRoom {});
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            leave_room.await?;
            anyhow::Ok(())
        })
@@ -1268,7 +1268,7 @@ impl Room {
        };

        cx.notify();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::UpdateParticipantLocation {
                    room_id,
@@ -1385,9 +1385,7 @@ impl Room {
                                live_kit.room.unpublish_track(publication);
                            } else {
                                if live_kit.muted_by_user || live_kit.deafened {
-                                    cx.background_executor()
-                                        .spawn(publication.set_mute(true))
-                                        .detach();
+                                    cx.background_spawn(publication.set_mute(true)).detach();
                                }
                                live_kit.microphone_track = LocalTrack::Published {
                                    track_publication: publication,
--- a/crates/channel/src/channel_store.rs
+++ b/crates/channel/src/channel_store.rs
@@ -514,8 +514,7 @@ impl ChannelStore {
                }
            }
        };
-        cx.background_executor()
-            .spawn(async move { task.await.map_err(|error| anyhow!("{}", error)) })
+        cx.background_spawn(async move { task.await.map_err(|error| anyhow!("{}", error)) })
    }

    pub fn is_channel_admin(&self, channel_id: ChannelId) -> bool {
@@ -781,7 +780,7 @@ impl ChannelStore {
        cx: &mut Context<Self>,
    ) -> Task<Result<()>> {
        let client = self.client.clone();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            client
                .request(proto::RespondToChannelInvite {
                    channel_id: channel_id.0,
@@ -975,21 +974,18 @@ impl ChannelStore {

                                if let Some(operations) = operations {
                                    let client = this.client.clone();
-                                    cx.background_executor()
-                                        .spawn(async move {
-                                            let operations = operations.await;
-                                            for chunk in
-                                                language::proto::split_operations(operations)
-                                            {
-                                                client
-                                                    .send(proto::UpdateChannelBuffer {
-                                                        channel_id: channel_id.0,
-                                                        operations: chunk,
-                                                    })
-                                                    .ok();
-                                            }
-                                        })
-                                        .detach();
+                                    cx.background_spawn(async move {
+                                        let operations = operations.await;
+                                        for chunk in language::proto::split_operations(operations) {
+                                            client
+                                                .send(proto::UpdateChannelBuffer {
+                                                    channel_id: channel_id.0,
+                                                    operations: chunk,
+                                                })
+                                                .ok();
+                                        }
+                                    })
+                                    .detach();
                                    return true;
                                }
                            }
--- a/crates/cli/src/main.rs
+++ b/crates/cli/src/main.rs
@@ -121,7 +121,7 @@ fn main() -> Result<()> {
    // Intercept version designators
    #[cfg(target_os = "macos")]
    if let Some(channel) = std::env::args().nth(1).filter(|arg| arg.starts_with("--")) {
-        // When the first argument is a name of a release channel, we're gonna spawn off a cli of that version, with trailing args passed along.
+        // When the first argument is a name of a release channel, we're going to spawn off the CLI of that version, with trailing args passed along.
        use std::str::FromStr as _;

        if let Ok(channel) = release_channel::ReleaseChannel::from_str(&channel[2..]) {
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -22,6 +22,7 @@ async-tungstenite = { workspace = true, features = ["async-std", "async-tls"] }
 chrono = { workspace = true, features = ["serde"] }
 clock.workspace = true
 collections.workspace = true
+credentials_provider.workspace = true
 feature_flags.workspace = true
 futures.workspace = true
 gpui.workspace = true
@@ -33,8 +34,6 @@ postage.workspace = true
 rand.workspace = true
 release_channel.workspace = true
 rpc = { workspace = true, features = ["gpui"] }
-rustls-native-certs.workspace = true
-rustls.workspace = true
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -15,11 +15,12 @@ use async_tungstenite::tungstenite::{
 };
 use chrono::{DateTime, Utc};
 use clock::SystemClock;
+use credentials_provider::CredentialsProvider;
 use futures::{
    channel::oneshot, future::BoxFuture, AsyncReadExt, FutureExt, SinkExt, Stream, StreamExt,
    TryFutureExt as _, TryStreamExt,
 };
-use gpui::{actions, App, AsyncApp, Entity, Global, Task, WeakEntity};
+use gpui::{actions, App, AppContext as _, AsyncApp, Entity, Global, Task, WeakEntity};
 use http_client::{AsyncBody, HttpClient, HttpClientWithUrl};
 use parking_lot::RwLock;
 use postage::watch;
@@ -57,14 +58,6 @@ static ZED_SERVER_URL: LazyLock<Option<String>> =
    LazyLock::new(|| std::env::var("ZED_SERVER_URL").ok());
 static ZED_RPC_URL: LazyLock<Option<String>> = LazyLock::new(|| std::env::var("ZED_RPC_URL").ok());

-/// An environment variable whose presence indicates that the development auth
-/// provider should be used.
-///
-/// Only works in development. Setting this environment variable in other release
-/// channels is a no-op.
-pub static ZED_DEVELOPMENT_AUTH: LazyLock<bool> = LazyLock::new(|| {
-    std::env::var("ZED_DEVELOPMENT_AUTH").map_or(false, |value| !value.is_empty())
-});
 pub static IMPERSONATE_LOGIN: LazyLock<Option<String>> = LazyLock::new(|| {
    std::env::var("ZED_IMPERSONATE")
        .ok()
@@ -146,8 +139,6 @@ pub fn init_settings(cx: &mut App) {
 }

 pub fn init(client: &Arc<Client>, cx: &mut App) {
-    let _ = rustls::crypto::aws_lc_rs::default_provider().install_default();
-
    let client = Arc::downgrade(client);
    cx.on_action({
        let client = client.clone();
@@ -195,7 +186,7 @@ pub struct Client {
    peer: Arc<Peer>,
    http: Arc<HttpClientWithUrl>,
    telemetry: Arc<Telemetry>,
-    credentials_provider: Arc<dyn CredentialsProvider + Send + Sync + 'static>,
+    credentials_provider: ClientCredentialsProvider,
    state: RwLock<ClientState>,
    handler_set: parking_lot::Mutex<ProtoMessageHandlerSet>,

@@ -306,16 +297,46 @@ impl Credentials {
    }
 }

-/// A provider for [`Credentials`].
-///
-/// Used to abstract over reading and writing credentials to some form of
-/// persistence (like the system keychain).
-trait CredentialsProvider {
+pub struct ClientCredentialsProvider {
+    provider: Arc<dyn CredentialsProvider>,
+}
+
+impl ClientCredentialsProvider {
+    pub fn new(cx: &App) -> Self {
+        Self {
+            provider: <dyn CredentialsProvider>::global(cx),
+        }
+    }
+
+    fn server_url(&self, cx: &AsyncApp) -> Result<String> {
+        cx.update(|cx| ClientSettings::get_global(cx).server_url.clone())
+    }
+
    /// Reads the credentials from the provider.
    fn read_credentials<'a>(
        &'a self,
        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Option<Credentials>> + 'a>>;
+    ) -> Pin<Box<dyn Future<Output = Option<Credentials>> + 'a>> {
+        async move {
+            if IMPERSONATE_LOGIN.is_some() {
+                return None;
+            }
+
+            let server_url = self.server_url(cx).ok()?;
+            let (user_id, access_token) = self
+                .provider
+                .read_credentials(&server_url, cx)
+                .await
+                .log_err()
+                .flatten()?;
+
+            Some(Credentials {
+                user_id: user_id.parse().ok()?,
+                access_token: String::from_utf8(access_token).ok()?,
+            })
+        }
+        .boxed_local()
+    }

    /// Writes the credentials to the provider.
    fn write_credentials<'a>(
@@ -323,13 +344,32 @@ trait CredentialsProvider {
        user_id: u64,
        access_token: String,
        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+        async move {
+            let server_url = self.server_url(cx)?;
+            self.provider
+                .write_credentials(
+                    &server_url,
+                    &user_id.to_string(),
+                    access_token.as_bytes(),
+                    cx,
+                )
+                .await
+        }
+        .boxed_local()
+    }

    /// Deletes the credentials from the provider.
    fn delete_credentials<'a>(
        &'a self,
        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
+        async move {
+            let server_url = self.server_url(cx)?;
+            self.provider.delete_credentials(&server_url, cx).await
+        }
+        .boxed_local()
+    }
 }

 impl Default for ClientState {
@@ -486,27 +526,12 @@ impl Client {
        http: Arc<HttpClientWithUrl>,
        cx: &mut App,
    ) -> Arc<Self> {
-        let use_zed_development_auth = match ReleaseChannel::try_global(cx) {
-            Some(ReleaseChannel::Dev) => *ZED_DEVELOPMENT_AUTH,
-            Some(ReleaseChannel::Nightly | ReleaseChannel::Preview | ReleaseChannel::Stable)
-            | None => false,
-        };
-
-        let credentials_provider: Arc<dyn CredentialsProvider + Send + Sync + 'static> =
-            if use_zed_development_auth {
-                Arc::new(DevelopmentCredentialsProvider {
-                    path: paths::config_dir().join("development_auth"),
-                })
-            } else {
-                Arc::new(KeychainCredentialsProvider)
-            };
-
        Arc::new(Self {
            id: AtomicU64::new(0),
            peer: Peer::new(0),
            telemetry: Telemetry::new(clock, http.clone(), cx),
            http,
-            credentials_provider,
+            credentials_provider: ClientCredentialsProvider::new(cx),
            state: Default::default(),
            handler_set: Default::default(),

@@ -844,8 +869,7 @@ impl Client {
                    Ok(conn) => {
                        self.state.write().credentials = Some(credentials.clone());
                        if !read_from_provider && IMPERSONATE_LOGIN.is_none() {
-                                self.credentials_provider.write_credentials(credentials.user_id, credentials.access_token, cx).await.log_err();
-
+                            self.credentials_provider.write_credentials(credentials.user_id, credentials.access_token, cx).await.log_err();
                        }

                        futures::select_biased! {
@@ -1066,7 +1090,7 @@ impl Client {
        let rpc_url = self.rpc_url(http, release_channel);
        let system_id = self.telemetry.system_id();
        let metrics_id = self.telemetry.metrics_id();
-        cx.background_executor().spawn(async move {
+        cx.background_spawn(async move {
            use HttpOrHttps::*;

            #[derive(Debug)]
@@ -1126,24 +1150,11 @@ impl Client {

            match url_scheme {
                Https => {
-                    let client_config = {
-                        let mut root_store = rustls::RootCertStore::empty();
-
-                        let root_certs = rustls_native_certs::load_native_certs();
-                        for error in root_certs.errors {
-                            log::warn!("error loading native certs: {:?}", error);
-                        }
-                        root_store.add_parsable_certificates(root_certs.certs);
-                        rustls::ClientConfig::builder()
-                            .with_root_certificates(root_store)
-                            .with_no_client_auth()
-                    };
-
                    let (stream, _) =
                        async_tungstenite::async_tls::client_async_tls_with_connector(
                            request,
                            stream,
-                            Some(client_config.into()),
+                            Some(http_client::tls_config().into()),
                        )
                        .await?;
                    Ok(Connection::new(
@@ -1603,130 +1614,6 @@ impl ProtoClient for Client {
    }
 }

-#[derive(Serialize, Deserialize)]
-struct DevelopmentCredentials {
-    user_id: u64,
-    access_token: String,
-}
-
-/// A credentials provider that stores credentials in a local file.
-///
-/// This MUST only be used in development, as this is not a secure way of storing
-/// credentials on user machines.
-///
-/// Its existence is purely to work around the annoyance of having to constantly
-/// re-allow access to the system keychain when developing Zed.
-struct DevelopmentCredentialsProvider {
-    path: PathBuf,
-}
-
-impl CredentialsProvider for DevelopmentCredentialsProvider {
-    fn read_credentials<'a>(
-        &'a self,
-        _cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Option<Credentials>> + 'a>> {
-        async move {
-            if IMPERSONATE_LOGIN.is_some() {
-                return None;
-            }
-
-            let json = std::fs::read(&self.path).log_err()?;
-
-            let credentials: DevelopmentCredentials = serde_json::from_slice(&json).log_err()?;
-
-            Some(Credentials {
-                user_id: credentials.user_id,
-                access_token: credentials.access_token,
-            })
-        }
-        .boxed_local()
-    }
-
-    fn write_credentials<'a>(
-        &'a self,
-        user_id: u64,
-        access_token: String,
-        _cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            let json = serde_json::to_string(&DevelopmentCredentials {
-                user_id,
-                access_token,
-            })?;
-
-            std::fs::write(&self.path, json)?;
-
-            Ok(())
-        }
-        .boxed_local()
-    }
-
-    fn delete_credentials<'a>(
-        &'a self,
-        _cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move { Ok(std::fs::remove_file(&self.path)?) }.boxed_local()
-    }
-}
-
-/// A credentials provider that stores credentials in the system keychain.
-struct KeychainCredentialsProvider;
-
-impl CredentialsProvider for KeychainCredentialsProvider {
-    fn read_credentials<'a>(
-        &'a self,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Option<Credentials>> + 'a>> {
-        async move {
-            if IMPERSONATE_LOGIN.is_some() {
-                return None;
-            }
-
-            let (user_id, access_token) = cx
-                .update(|cx| cx.read_credentials(&ClientSettings::get_global(cx).server_url))
-                .log_err()?
-                .await
-                .log_err()??;
-
-            Some(Credentials {
-                user_id: user_id.parse().ok()?,
-                access_token: String::from_utf8(access_token).ok()?,
-            })
-        }
-        .boxed_local()
-    }
-
-    fn write_credentials<'a>(
-        &'a self,
-        user_id: u64,
-        access_token: String,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            cx.update(move |cx| {
-                cx.write_credentials(
-                    &ClientSettings::get_global(cx).server_url,
-                    &user_id.to_string(),
-                    access_token.as_bytes(),
-                )
-            })?
-            .await
-        }
-        .boxed_local()
-    }
-
-    fn delete_credentials<'a>(
-        &'a self,
-        cx: &'a AsyncApp,
-    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>> {
-        async move {
-            cx.update(move |cx| cx.delete_credentials(&ClientSettings::get_global(cx).server_url))?
-                .await
-        }
-        .boxed_local()
-    }
-}
-
 /// prefix for the zed:// url scheme
 pub const ZED_URL_SCHEME: &str = "zed";

@@ -1758,7 +1645,7 @@ mod tests {
    use crate::test::FakeServer;

    use clock::FakeSystemClock;
-    use gpui::{AppContext as _, BackgroundExecutor, TestAppContext};
+    use gpui::{BackgroundExecutor, TestAppContext};
    use http_client::FakeHttpClient;
    use parking_lot::Mutex;
    use proto::TypedEnvelope;
@@ -1821,7 +1708,7 @@ mod tests {

        // Time out when client tries to connect.
        client.override_authenticate(move |cx| {
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                Ok(Credentials {
                    user_id,
                    access_token: "token".into(),
@@ -1829,7 +1716,7 @@ mod tests {
            })
        });
        client.override_establish_connection(|_, cx| {
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                future::pending::<()>().await;
                unreachable!()
            })
@@ -1863,7 +1750,7 @@ mod tests {
        // Time out when re-establishing the connection.
        server.allow_connections();
        client.override_establish_connection(|_, cx| {
-            cx.background_executor().spawn(async move {
+            cx.background_spawn(async move {
                future::pending::<()>().await;
                unreachable!()
            })
@@ -1902,7 +1789,7 @@ mod tests {
            move |cx| {
                let auth_count = auth_count.clone();
                let dropped_auth_count = dropped_auth_count.clone();
-                cx.background_executor().spawn(async move {
+                cx.background_spawn(async move {
                    *auth_count.lock() += 1;
                    let _drop = util::defer(move || *dropped_auth_count.lock() += 1);
                    future::pending::<()>().await;
--- a/crates/client/src/telemetry.rs
+++ b/crates/client/src/telemetry.rs
@@ -5,7 +5,7 @@ use anyhow::Result;
 use clock::SystemClock;
 use futures::channel::mpsc;
 use futures::{Future, StreamExt};
-use gpui::{App, BackgroundExecutor, Task};
+use gpui::{App, AppContext as _, BackgroundExecutor, Task};
 use http_client::{self, AsyncBody, HttpClient, HttpClientWithUrl, Method, Request};
 use parking_lot::Mutex;
 use release_channel::ReleaseChannel;
@@ -219,18 +219,17 @@ impl Telemetry {
        }));
        Self::log_file_path();

-        cx.background_executor()
-            .spawn({
-                let state = state.clone();
-                let os_version = os_version();
-                state.lock().os_version = Some(os_version.clone());
-                async move {
-                    if let Some(tempfile) = File::create(Self::log_file_path()).log_err() {
-                        state.lock().log_file = Some(tempfile);
-                    }
+        cx.background_spawn({
+            let state = state.clone();
+            let os_version = os_version();
+            state.lock().os_version = Some(os_version.clone());
+            async move {
+                if let Some(tempfile) = File::create(Self::log_file_path()).log_err() {
+                    state.lock().log_file = Some(tempfile);
                }
-            })
-            .detach();
+            }
+        })
+        .detach();

        cx.observe_global::<SettingsStore>({
            let state = state.clone();
@@ -252,17 +251,16 @@ impl Telemetry {
        let (tx, mut rx) = mpsc::unbounded();
        ::telemetry::init(tx);

-        cx.background_executor()
-            .spawn({
-                let this = Arc::downgrade(&this);
-                async move {
-                    while let Some(event) = rx.next().await {
-                        let Some(state) = this.upgrade() else { break };
-                        state.report_event(Event::Flexible(event))
-                    }
+        cx.background_spawn({
+            let this = Arc::downgrade(&this);
+            async move {
+                while let Some(event) = rx.next().await {
+                    let Some(state) = this.upgrade() else { break };
+                    state.report_event(Event::Flexible(event))
                }
-            })
-            .detach();
+            }
+        })
+        .detach();

        // We should only ever have one instance of Telemetry, leak the subscription to keep it alive
        // rather than store in TelemetryState, complicating spawn as subscriptions are not Send
--- a/crates/client/src/test.rs
+++ b/crates/client/src/test.rs
@@ -85,7 +85,7 @@ impl FakeServer {
                            Connection::in_memory(cx.background_executor().clone());
                        let (connection_id, io, incoming) =
                            peer.add_test_connection(server_conn, cx.background_executor().clone());
-                        cx.background_executor().spawn(io).detach();
+                        cx.background_spawn(io).detach();
                        {
                            let mut state = state.lock();
                            state.connection_id = Some(connection_id);
--- a/crates/collab/.env.toml
+++ b/crates/collab/.env.toml
@@ -18,6 +18,7 @@ SEED_PATH = "crates/collab/seed.default.json"
 LLM_DATABASE_URL = "postgres://postgres@localhost/zed_llm"
 LLM_DATABASE_MAX_CONNECTIONS = 5
 LLM_API_SECRET = "llm-secret"
+OPENAI_API_KEY = "llm-secret"

 # SLACK_PANICS_WEBHOOK = ""

--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -33,14 +33,14 @@ clock.workspace = true
 collections.workspace = true
 dashmap.workspace = true
 derive_more.workspace = true
-diff.workspace = true
+buffer_diff.workspace = true
 envy = "0.4.2"
 futures.workspace = true
 google_ai.workspace = true
 hex.workspace = true
 http_client.workspace = true
 jsonwebtoken.workspace = true
-livekit_server.workspace = true
+livekit_api.workspace = true
 log.workspace = true
 nanoid.workspace = true
 open_ai.workspace = true
@@ -131,7 +131,7 @@ worktree = { workspace = true, features = ["test-support"] }
 livekit_client_macos = { workspace = true, features = ["test-support"] }

 [target.'cfg(not(target_os = "macos"))'.dev-dependencies]
-livekit_client =  {workspace = true, features = ["test-support"] }
+livekit_client =  { workspace = true, features = ["test-support"] }

 [package.metadata.cargo-machete]
 ignored = ["async-stripe"]
--- a/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
+++ b/crates/collab/migrations.sqlite/20221109000000_test_schema.sql
@@ -101,6 +101,7 @@ CREATE TABLE "worktree_repositories" (
    "scan_id" INTEGER NOT NULL,
    "is_deleted" BOOL NOT NULL,
    "current_merge_conflicts" VARCHAR,
+    "branch_summary" VARCHAR,
    PRIMARY KEY(project_id, worktree_id, work_directory_id),
    FOREIGN KEY(project_id, worktree_id) REFERENCES worktrees (project_id, id) ON DELETE CASCADE,
    FOREIGN KEY(project_id, worktree_id, work_directory_id) REFERENCES worktree_entries (project_id, worktree_id, id) ON DELETE CASCADE
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Mistral</title><g><path d="M15 6v4h-2V6h2zm4-4v4h-2V2h2zM3 2H1h2zM1 2h2v20H1V2zm8 12h2v4H9v-4zm8 0h2v8h-2v-8z"></path><path d="M19 2h4v4h-4V2zM3 2h4v4H3V2z" opacity=".4"></path><path d="M15 10V6h8v4h-8zM3 10V6h8v4H3z" opacity=".5"></path><path d="M3 14v-4h20v4z" opacity=".6"></path><path d="M11 14h4v4h-4v-4zm8 0h4v4h-4v-4zM3 14h4v4H3v-4z" opacity=".7"></path><path d="M19 18h4v4h-4v-4zM3 18h4v4H3v-4z" opacity=".8"></path></g></svg>