WIP

.github/ISSUE_TEMPLATE/1_bug_report.yml

@@ -10,39 +10,16 @@ body:
       value: |
         <!-- Please insert a one line summary of the issue below -->
 
-        SUMMARY_SENTENCE_HERE
-
-        <!-- Be verbose: Include all steps necessary to reproduce from a clean Zed installation. -->
-        <!-- Code snippets are better than images, a repository link that reproduces the issue is ideal. -->
-
+        <!-- Include all steps necessary to reproduce from a clean Zed installation. Be verbose -->
         Steps to trigger the problem:
         1.
         2.
         3.
-        4.
 
         Actual Behavior:
 
         Expected Behavior:
 
-        <!--
-          Is there anything additional necessary to reproduce this issue?
-            - settings.json, keymap.json, .editorconfig etc?
-            - Does it happen intermittently or only with specific projects / file types?
-            - Have you found a workaround?
-
-          Did you check your Zed.log to see if there is any relevant details there?
-            - When including large items (videos, screenshots, logs, configs) please wrap with:
-
-          <details><summary>See inside for XXXXYYY</summary>
-
-          ```shell
-          code
-          ```
-
-          </details>
-        -->
-
     validations:
       required: true
 

.github/workflows/ci.yml

@@ -109,16 +109,8 @@ jobs:
       - name: cargo clippy
         run: ./script/clippy
 
-      - name: Install cargo-machete
-        uses: clechasseur/rs-cargo@v2
-        with:
-          command: install
-          args: cargo-machete@0.7.0
-
       - name: Check unused dependencies
-        uses: clechasseur/rs-cargo@v2
-        with:
-          command: machete
+        uses: bnjbvr/cargo-machete@main
 
       - name: Check licenses
         run: |
@@ -306,9 +298,8 @@ jobs:
     env:
       MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
       MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
+      APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+      APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
       ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}

.github/workflows/community_update_all_top_ranking_issues.yml

@@ -1,25 +0,0 @@
-name: Update All Top Ranking Issues
-
-on:
-  schedule:
-    - cron: "0 */12 * * *"
-  workflow_dispatch:
-
-jobs:
-  update_top_ranking_issues:
-    runs-on: ubuntu-latest
-    if: github.repository == 'zed-industries/zed'
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@caf0cab7a618c569241d31dcd442f54681755d39 # v3
-        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 5393

.github/workflows/community_update_weekly_top_ranking_issues.yml

@@ -1,25 +0,0 @@
-name: Update Weekly Top Ranking Issues
-
-on:
-  schedule:
-    - cron: "0 15 * * *"
-  workflow_dispatch:
-
-jobs:
-  update_top_ranking_issues:
-    runs-on: ubuntu-latest
-    if: github.repository == 'zed-industries/zed'
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Set up uv
-        uses: astral-sh/setup-uv@caf0cab7a618c569241d31dcd442f54681755d39 # v3
-        with:
-          version: "latest"
-          enable-cache: true
-          cache-dependency-glob: "script/update_top_ranking_issues/pyproject.toml"
-      - name: Install Python 3.13
-        run: uv python install 3.13
-      - name: Install dependencies
-        run: uv sync --project script/update_top_ranking_issues -p 3.13
-      - name: Run script
-        run: uv run --project script/update_top_ranking_issues script/update_top_ranking_issues/main.py --github-token ${{ secrets.GITHUB_TOKEN }} --issue-reference-number 6952 --query-day-interval 7

.github/workflows/release_nightly.yml

@@ -62,9 +62,8 @@ jobs:
     env:
       MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
       MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
-      APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
-      APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-      APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
+      APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
+      APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
       DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
       DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
       ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}

.gitignore

@@ -26,7 +26,6 @@
 /dev.zed.Zed*.json
 /plugins/bin
 /script/node_modules
-/snap
 /zed.xcworkspace
 DerivedData/
 Packages

.zed/debug.json

@@ -1,19 +0,0 @@
-[
-  {
-    "label": "Debug Zed with LLDB",
-    "adapter": "lldb",
-    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug Zed with GDB",
-    "adapter": "gdb",
-    "program": "$ZED_WORKTREE_ROOT/target/debug/zed",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "initialize_args": {
-      "stopAtBeginningOfMainSubprogram": true
-    }
-  }
-]

Cargo.lock

@@ -13,6 +13,7 @@ dependencies = [
  "futures 0.3.31",
  "gpui",
  "language",
+ "lsp",
  "project",
  "smallvec",
  "ui",
@@ -82,8 +83,9 @@ dependencies = [
 
 [[package]]
 name = "alacritty_terminal"
-version = "0.25.1-dev"
-source = "git+https://github.com/zed-industries/alacritty.git?rev=03c2907b44b4189aac5fdeaea331f5aab5c7072e#03c2907b44b4189aac5fdeaea331f5aab5c7072e"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bccc2e60c2112dc8e8a722d6d30f2bb1a6a7b5d0e65fa695e09e57415dca7f7"
 dependencies = [
  "base64 0.22.1",
  "bitflags 2.8.0",
@@ -256,9 +258,9 @@ checksum = "34cd60c5e3152cef0a592f1b296f1cc93715d89d2551d85315828c3a09575ff4"
 
 [[package]]
 name = "anyhow"
-version = "1.0.96"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "approx"
@@ -394,6 +396,7 @@ dependencies = [
  "language",
  "language_model",
  "language_model_selector",
+ "language_models",
  "languages",
  "log",
  "lsp",
@@ -413,6 +416,7 @@ dependencies = [
  "serde",
  "serde_json_lenient",
  "settings",
+ "similar",
  "smol",
  "streaming_diff",
  "telemetry",
@@ -461,6 +465,7 @@ dependencies = [
  "language",
  "language_model",
  "language_model_selector",
+ "language_models",
  "log",
  "lsp",
  "markdown",
@@ -477,6 +482,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "similar",
  "smol",
  "streaming_diff",
  "telemetry_events",
@@ -515,6 +521,7 @@ dependencies = [
  "language",
  "language_model",
  "language_model_selector",
+ "language_models",
  "languages",
  "log",
  "multi_buffer",
@@ -1265,30 +1272,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "aws-sdk-bedrockruntime"
-version = "1.74.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6938541d1948a543bca23303fec4cff9c36bf0e63b8fa3ae1b337bcb9d5b81af"
-dependencies = [
- "aws-credential-types",
- "aws-runtime",
- "aws-smithy-async",
- "aws-smithy-eventstream",
- "aws-smithy-http",
- "aws-smithy-json",
- "aws-smithy-runtime",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "aws-types",
- "bytes 1.10.0",
- "fastrand 2.3.0",
- "http 0.2.12",
- "once_cell",
- "regex-lite",
- "tracing",
-]
-
 [[package]]
 name = "aws-sdk-kinesis"
 version = "1.61.0"
@@ -1618,17 +1601,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "aws_http_client"
-version = "0.1.0"
-dependencies = [
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "futures 0.3.31",
- "http_client",
- "tokio",
-]
-
 [[package]]
 name = "axum"
 version = "0.6.20"
@@ -1758,22 +1730,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
-[[package]]
-name = "bedrock"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "aws-sdk-bedrockruntime",
- "aws-smithy-types",
- "futures 0.3.31",
- "schemars",
- "serde",
- "serde_json",
- "strum",
- "thiserror 1.0.69",
- "tokio",
-]
-
 [[package]]
 name = "bigdecimal"
 version = "0.4.7"
@@ -1964,16 +1920,15 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.6.0"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1230237285e3e10cde447185e8975408ae24deaa67205ce684805c25bc0c7937"
+checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e"
 dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
  "cfg-if",
  "constant_time_eq 0.3.1",
- "memmap2",
 ]
 
 [[package]]
@@ -2585,9 +2540,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.30"
+version = "4.5.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
+checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2595,9 +2550,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.30"
+version = "4.5.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
+checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2666,7 +2621,6 @@ dependencies = [
  "clock",
  "cocoa 0.26.0",
  "collections",
- "credentials_provider",
  "feature_flags",
  "futures 0.3.31",
  "gpui",
@@ -2819,12 +2773,9 @@ dependencies = [
  "clock",
  "collab_ui",
  "collections",
- "command_palette_hooks",
  "context_server",
  "ctor",
- "dap",
  "dashmap 6.1.0",
- "debugger_ui",
  "derive_more",
  "editor",
  "env_logger 0.11.6",
@@ -3162,9 +3113,7 @@ dependencies = [
  "clock",
  "collections",
  "command_palette_hooks",
- "ctor",
  "editor",
- "env_logger 0.11.6",
  "fs",
  "futures 0.3.31",
  "gpui",
@@ -3172,7 +3121,6 @@ dependencies = [
  "indoc",
  "inline_completion",
  "language",
- "log",
  "lsp",
  "menu",
  "node_runtime",
@@ -3531,19 +3479,6 @@ dependencies = [
  "crc",
 ]
 
-[[package]]
-name = "credentials_provider"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "gpui",
- "paths",
- "release_channel",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "criterion"
 version = "0.5.1"
@@ -3664,18 +3599,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.3.6"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21d960ecacd0a1bf55e73144b72de745e7bf275c7952c50e36e8af0a0cb7ab1f"
-dependencies = [
- "ctor-proc-macro",
-]
-
-[[package]]
-name = "ctor-proc-macro"
-version = "0.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c426d2ba3e525b39c1f0a9ba41b9fe61878dee11fa4e4a76b6ab440f46c5db5d"
+checksum = "bba74424191d99c617a172ef126d429f62fe54aba1002c4d36e49403ce4b00a2"
 
 [[package]]
 name = "ctrlc"
@@ -3752,67 +3678,6 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "dap"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-compression",
- "async-pipe",
- "async-tar",
- "async-trait",
- "client",
- "collections",
- "dap-types",
- "env_logger 0.11.6",
- "fs",
- "futures 0.3.31",
- "gpui",
- "http_client",
- "language",
- "log",
- "node_runtime",
- "parking_lot",
- "paths",
- "schemars",
- "serde",
- "serde_json",
- "settings",
- "smallvec",
- "smol",
- "sysinfo",
- "task",
- "util",
-]
-
-[[package]]
-name = "dap-types"
-version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=bf5632dc19f806e8a435c9f04a4bfe7322badea2#bf5632dc19f806e8a435c9f04a4bfe7322badea2"
-dependencies = [
- "schemars",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "dap_adapters"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "dap",
- "gpui",
- "language",
- "paths",
- "regex",
- "serde",
- "serde_json",
- "sysinfo",
- "task",
- "util",
-]
-
 [[package]]
 name = "dashmap"
 version = "5.5.3"
@@ -3886,59 +3751,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "debugger_tools"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "dap",
- "editor",
- "futures 0.3.31",
- "gpui",
- "project",
- "serde_json",
- "settings",
- "smol",
- "util",
- "workspace",
-]
-
-[[package]]
-name = "debugger_ui"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "collections",
- "command_palette_hooks",
- "dap",
- "editor",
- "env_logger 0.11.6",
- "feature_flags",
- "fuzzy",
- "gpui",
- "language",
- "log",
- "menu",
- "picker",
- "pretty_assertions",
- "project",
- "rpc",
- "serde",
- "serde_json",
- "settings",
- "sum_tree",
- "sysinfo",
- "task",
- "tasks_ui",
- "terminal_view",
- "theme",
- "ui",
- "unindent",
- "util",
- "workspace",
-]
-
 [[package]]
 name = "deepseek"
 version = "0.1.0"
@@ -4027,6 +3839,7 @@ dependencies = [
  "pretty_assertions",
  "project",
  "rand 0.8.5",
+ "schemars",
  "serde",
  "serde_json",
  "settings",
@@ -4239,7 +4052,6 @@ dependencies = [
  "log",
  "lsp",
  "markdown",
- "menu",
  "multi_buffer",
  "ordered-float 2.10.1",
  "parking_lot",
@@ -4252,6 +4064,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "similar",
  "smallvec",
  "smol",
  "snippet",
@@ -5463,7 +5276,6 @@ dependencies = [
  "pretty_assertions",
  "regex",
  "rope",
- "schemars",
  "serde",
  "serde_json",
  "smol",
@@ -6564,15 +6376,6 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285"
 
-[[package]]
-name = "imara-diff"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2"
-dependencies = [
- "hashbrown 0.15.2",
-]
-
 [[package]]
 name = "imgref"
 version = "1.11.0"
@@ -7065,7 +6868,6 @@ dependencies = [
  "globset",
  "gpui",
  "http_client",
- "imara-diff",
  "indoc",
  "itertools 0.14.0",
  "log",
@@ -7073,6 +6875,7 @@ dependencies = [
  "parking_lot",
  "postage",
  "pretty_assertions",
+ "pulldown-cmark 0.12.2",
  "rand 0.8.5",
  "regex",
  "rpc",
@@ -7080,6 +6883,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "similar",
  "smallvec",
  "smol",
  "streaming-iterator",
@@ -7128,14 +6932,17 @@ dependencies = [
  "anthropic",
  "anyhow",
  "base64 0.22.1",
- "client",
  "collections",
+ "deepseek",
  "futures 0.3.31",
  "google_ai",
  "gpui",
  "http_client",
  "image",
+ "lmstudio",
  "log",
+ "mistral",
+ "ollama",
  "open_ai",
  "parking_lot",
  "proto",
@@ -7144,7 +6951,6 @@ dependencies = [
  "serde_json",
  "smol",
  "strum",
- "telemetry_events",
  "thiserror 1.0.69",
  "ui",
  "util",
@@ -7171,14 +6977,9 @@ version = "0.1.0"
 dependencies = [
  "anthropic",
  "anyhow",
- "aws-config",
- "aws-credential-types",
- "aws_http_client",
- "bedrock",
  "client",
  "collections",
  "copilot",
- "credentials_provider",
  "deepseek",
  "editor",
  "feature_flags",
@@ -7186,7 +6987,6 @@ dependencies = [
  "futures 0.3.31",
  "google_ai",
  "gpui",
- "gpui_tokio",
  "http_client",
  "language_model",
  "lmstudio",
@@ -7202,9 +7002,10 @@ dependencies = [
  "settings",
  "smol",
  "strum",
+ "telemetry_events",
  "theme",
+ "thiserror 1.0.69",
  "tiktoken-rs",
- "tokio",
  "ui",
  "util",
 ]
@@ -7954,9 +7755,9 @@ dependencies = [
 
 [[package]]
 name = "mdbook"
-version = "0.4.45"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b07d36d96ffe1b5b16ddf2bc80b3b26bb7a498b2a6591061250bf0af8e8095ad"
+checksum = "f9da1e54401fe5d45a664c57e112e70f18e8c5a73e268c179305b932ee864574"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -9442,7 +9243,7 @@ name = "perplexity"
 version = "0.1.0"
 dependencies = [
  "serde",
- "zed_extension_api 0.3.0",
+ "zed_extension_api 0.2.0",
 ]
 
 [[package]]
@@ -10295,8 +10096,6 @@ dependencies = [
  "client",
  "clock",
  "collections",
- "dap",
- "dap_adapters",
  "env_logger 0.11.6",
  "fancy-regex 0.14.0",
  "fs",
@@ -10308,7 +10107,6 @@ dependencies = [
  "gpui",
  "http_client",
  "image",
- "indexmap",
  "itertools 0.14.0",
  "language",
  "log",
@@ -10332,6 +10130,7 @@ dependencies = [
  "sha2",
  "shellexpand 2.1.2",
  "shlex",
+ "similar",
  "smol",
  "snippet",
  "snippet_provider",
@@ -10957,7 +10756,6 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "auto_update",
- "dap",
  "editor",
  "extension_host",
  "file_finder",
@@ -11941,9 +11739,9 @@ dependencies = [
 
 [[package]]
 name = "sea-orm"
-version = "1.1.5"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00733e5418e8ae3758cdb988c3654174e716230cc53ee2cb884207cf86a23029"
+checksum = "1a93194430b419da0801f404baf3b986399d6a2a4f43bc79bc96dea83f92ca43"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -11969,9 +11767,9 @@ dependencies = [
 
 [[package]]
 name = "sea-orm-macros"
-version = "1.1.5"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a98408f82fb4875d41ef469a79944a7da29767c7b3e4028e22188a3dd613b10f"
+checksum = "d19e8f22fb474a8a622eb516c46885a080535d8d559386188f525977eaad32b3"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -12044,7 +11842,6 @@ dependencies = [
  "unindent",
  "util",
  "workspace",
- "zed_actions",
 ]
 
 [[package]]
@@ -12204,9 +12001,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.139"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "indexmap",
  "itoa",
@@ -12474,6 +12271,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
+[[package]]
+name = "similar"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec"
+
 [[package]]
 name = "simple_asn1"
 version = "0.6.2"
@@ -12555,9 +12358,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 dependencies = [
  "serde",
 ]
@@ -13477,7 +13280,6 @@ dependencies = [
  "parking_lot",
  "schemars",
  "serde",
- "serde_json",
  "serde_json_lenient",
  "sha2",
  "shellexpand 2.1.2",
@@ -13532,9 +13334,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.17.1"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
+checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
 dependencies = [
  "cfg-if",
  "fastrand 2.3.0",
@@ -14892,9 +14694,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.13.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c1f41ffb7cf259f1ecc2876861a17e7142e63ead296f671f81f6ae85903e0d6"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
 dependencies = [
  "getrandom 0.3.1",
  "serde",
@@ -15061,16 +14863,26 @@ dependencies = [
 
 [[package]]
 name = "vte"
-version = "0.15.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd"
+checksum = "9a0b683b20ef64071ff03745b14391751f6beab06a54347885459b77a3f2caa5"
 dependencies = [
- "arrayvec",
  "bitflags 2.8.0",
  "cursor-icon",
  "log",
- "memchr",
  "serde",
+ "utf8parse",
+ "vte_generate_state_changes",
+]
+
+[[package]]
+name = "vte_generate_state_changes"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
+dependencies = [
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -16852,7 +16664,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.176.0"
+version = "0.175.0"
 dependencies = [
  "activity_indicator",
  "anyhow",
@@ -16882,8 +16694,6 @@ dependencies = [
  "component_preview",
  "copilot",
  "db",
- "debugger_tools",
- "debugger_ui",
  "diagnostics",
  "editor",
  "env_logger 0.11.6",
@@ -16999,7 +16809,7 @@ dependencies = [
 
 [[package]]
 name = "zed_deno"
-version = "0.1.0"
+version = "0.0.2"
 dependencies = [
  "zed_extension_api 0.1.0",
 ]
@@ -17008,7 +16818,7 @@ dependencies = [
 name = "zed_elixir"
 version = "0.1.4"
 dependencies = [
- "zed_extension_api 0.2.0",
+ "zed_extension_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -17039,8 +16849,6 @@ dependencies = [
 [[package]]
 name = "zed_extension_api"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fd16b8b30a9dc920fc1678ff852f696b5bdf5b5843bc745a128be0aac29859e"
 dependencies = [
  "serde",
  "serde_json",
@@ -17049,7 +16857,9 @@ dependencies = [
 
 [[package]]
 name = "zed_extension_api"
-version = "0.3.0"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fd16b8b30a9dc920fc1678ff852f696b5bdf5b5843bc745a128be0aac29859e"
 dependencies = [
  "serde",
  "serde_json",
@@ -17135,12 +16945,12 @@ dependencies = [
 name = "zed_test_extension"
 version = "0.1.0"
 dependencies = [
- "zed_extension_api 0.3.0",
+ "zed_extension_api 0.2.0",
 ]
 
 [[package]]
 name = "zed_toml"
-version = "0.1.3"
+version = "0.1.2"
 dependencies = [
  "zed_extension_api 0.1.0",
 ]
@@ -17317,7 +17127,7 @@ dependencies = [
  "indoc",
  "inline_completion",
  "language",
- "language_model",
+ "language_models",
  "log",
  "menu",
  "migrator",
@@ -17331,6 +17141,7 @@ dependencies = [
  "serde",
  "serde_json",
  "settings",
+ "similar",
  "telemetry",
  "telemetry_events",
  "theme",

Cargo.toml

@@ -15,10 +15,7 @@ members = [
     "crates/audio",
     "crates/auto_update",
     "crates/auto_update_ui",
-    "crates/aws_http_client",
-    "crates/bedrock",
     "crates/breadcrumbs",
-    "crates/buffer_diff",
     "crates/call",
     "crates/channel",
     "crates/cli",
@@ -34,14 +31,10 @@ members = [
     "crates/context_server",
     "crates/context_server_settings",
     "crates/copilot",
-    "crates/credentials_provider",
-    "crates/dap",
-    "crates/dap_adapters",
-    "crates/debugger_tools",
-    "crates/debugger_ui",
     "crates/db",
     "crates/deepseek",
     "crates/diagnostics",
+    "crates/buffer_diff",
     "crates/docs_preprocessor",
     "crates/editor",
     "crates/evals",
@@ -224,8 +217,6 @@ assistant_tools = { path = "crates/assistant_tools" }
 audio = { path = "crates/audio" }
 auto_update = { path = "crates/auto_update" }
 auto_update_ui = { path = "crates/auto_update_ui" }
-aws_http_client = { path = "crates/aws_http_client" }
-bedrock = { path = "crates/bedrock" }
 breadcrumbs = { path = "crates/breadcrumbs" }
 call = { path = "crates/call" }
 channel = { path = "crates/channel" }
@@ -242,12 +233,7 @@ 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" }
-dap = { path = "crates/dap" }
-dap_adapters = { path = "crates/dap_adapters" }
 db = { path = "crates/db" }
-debugger_ui = { path = "crates/debugger_ui" }
-debugger_tools = { path = "crates/debugger_tools" }
 deepseek = { path = "crates/deepseek" }
 diagnostics = { path = "crates/diagnostics" }
 buffer_diff = { path = "crates/buffer_diff" }
@@ -378,7 +364,7 @@ zeta = { path = "crates/zeta" }
 #
 
 aho-corasick = "1.1"
-alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", rev = "03c2907b44b4189aac5fdeaea331f5aab5c7072e"}
+alacritty_terminal = "0.25"
 any_vec = "0.14"
 anyhow = "1.0.86"
 arrayvec = { version = "0.7.4", features = ["serde"] }
@@ -394,11 +380,6 @@ async-trait = "0.1"
 async-tungstenite = "0.28"
 async-watch = "0.3.1"
 async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
-aws-config = { version = "1.5.16", features = ["behavior-version-latest"] }
-aws-credential-types = { version = "1.2.1", features = ["hardcoded-credentials"] }
-aws-sdk-bedrockruntime = { version = "1.73.0", features = ["behavior-version-latest"] }
-aws-smithy-runtime-api = { version = "1.7.3", features = ["http-1x", "client"] }
-aws-smithy-types = { version = "1.2.13", features = ["http-body-1-x"] }
 base64 = "0.22"
 bitflags = "2.6.0"
 blade-graphics = { git = "https://github.com/kvark/blade", rev = "b16f5c7bd873c7126f48c82c39e7ae64602ae74f" }
@@ -440,7 +421,6 @@ 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"
@@ -519,6 +499,7 @@ 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"
@@ -720,6 +701,7 @@ codegen-units = 16
 [workspace.lints.clippy]
 dbg_macro = "deny"
 todo = "deny"
+too_many_arguments = "allow"
 
 # Motivation: We use `vec![a..b]` a lot when dealing with ranges in text, so
 # warning on this rule produces a lot of noise.

assets/icons/ai_bedrock.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="283.6413 127.3453 56 55.9999" width="16px" height="16px">
-  <path d="M 808.592 158.131 C 807.489 158.131 806.592 157.234 806.592 156.131 C 806.592 155.028 807.489 154.131 808.592 154.131 C 809.695 154.131 810.592 155.028 810.592 156.131 C 810.592 157.234 809.695 158.131 808.592 158.131 Z M 776.705 185.039 L 773.457 183.145 L 780.122 178.979 L 779.062 177.283 L 771.505 182.006 L 765.592 178.557 L 765.592 169.666 L 771.147 165.963 L 770.037 164.299 L 764.551 167.956 L 758.592 164.551 L 758.592 159.711 L 765.088 155.999 L 764.096 154.263 L 758.592 157.408 L 758.592 153.711 L 764.592 150.283 L 770.592 153.711 L 770.592 157.565 L 766.077 160.274 L 767.107 161.988 L 771.592 159.297 L 776.077 161.988 L 777.107 160.274 L 772.592 157.565 L 772.592 153.666 L 778.147 149.963 C 778.425 149.777 778.592 149.465 778.592 149.131 L 778.592 142.131 L 776.592 142.131 L 776.592 148.596 L 771.551 151.956 L 765.592 148.551 L 765.592 139.705 L 770.592 136.789 L 770.592 145.131 L 772.592 145.131 L 772.592 135.622 L 776.705 133.223 L 784.592 135.852 L 784.592 164.565 L 770.077 173.274 L 771.107 174.988 L 784.592 166.897 L 784.592 182.41 L 776.705 185.039 Z M 806.592 169.131 C 806.592 170.234 805.695 171.131 804.592 171.131 C 803.489 171.131 802.592 170.234 802.592 169.131 C 802.592 168.028 803.489 167.131 804.592 167.131 C 805.695 167.131 806.592 168.028 806.592 169.131 Z M 796.592 179.131 C 796.592 180.234 795.695 181.131 794.592 181.131 C 793.489 181.131 792.592 180.234 792.592 179.131 C 792.592 178.028 793.489 177.131 794.592 177.131 C 795.695 177.131 796.592 178.028 796.592 179.131 Z M 795.592 139.131 C 795.592 138.028 796.489 137.131 797.592 137.131 C 798.695 137.131 799.592 138.028 799.592 139.131 C 799.592 140.234 798.695 141.131 797.592 141.131 C 796.489 141.131 795.592 140.234 795.592 139.131 Z M 808.592 152.131 C 806.733 152.131 805.181 153.411 804.734 155.131 L 786.592 155.131 L 786.592 150.131 L 797.592 150.131 C 798.145 150.131 798.592 149.683 798.592 149.131 L 798.592 142.989 C 800.312 142.542 801.592 140.989 801.592 139.131 C 801.592 136.925 799.798 135.131 797.592 135.131 C 795.386 135.131 793.592 136.925 793.592 139.131 C 793.592 140.989 794.872 142.542 796.592 142.989 L 796.592 148.131 L 786.592 148.131 L 786.592 135.131 C 786.592 134.7 786.317 134.319 785.908 134.182 L 776.908 131.182 C 776.634 131.092 776.336 131.122 776.088 131.267 L 764.088 138.267 C 763.78 138.446 763.592 138.776 763.592 139.131 L 763.592 148.551 L 757.096 152.263 C 756.784 152.441 756.592 152.772 756.592 153.131 L 756.592 165.131 C 756.592 165.49 756.784 165.821 757.096 165.999 L 763.592 169.711 L 763.592 179.131 C 763.592 179.486 763.78 179.816 764.088 179.995 L 776.088 186.995 C 776.242 187.085 776.417 187.131 776.592 187.131 C 776.698 187.131 776.805 187.114 776.908 187.08 L 785.908 184.08 C 786.317 183.943 786.592 183.562 786.592 183.131 L 786.592 171.131 L 793.592 171.131 L 793.592 175.273 C 791.872 175.72 790.592 177.273 790.592 179.131 C 790.592 181.337 792.386 183.131 794.592 183.131 C 796.798 183.131 798.592 181.337 798.592 179.131 C 798.592 177.273 797.312 175.72 795.592 175.273 L 795.592 170.131 C 795.592 169.579 795.145 169.131 794.592 169.131 L 786.592 169.131 L 786.592 164.131 L 799.092 164.131 L 801.23 166.981 C 800.831 167.603 800.592 168.338 800.592 169.131 C 800.592 171.337 802.386 173.131 804.592 173.131 C 806.798 173.131 808.592 171.337 808.592 169.131 C 808.592 166.925 806.798 165.131 804.592 165.131 C 803.908 165.131 803.274 165.319 802.711 165.623 L 800.392 162.531 C 800.203 162.279 799.906 162.131 799.592 162.131 L 786.592 162.131 L 786.592 157.131 L 804.734 157.131 C 805.181 158.851 806.733 160.131 808.592 160.131 C 810.798 160.131 812.592 158.337 812.592 156.131 C 812.592 153.925 810.798 152.131 808.592 152.131 Z" fill-rule="evenodd" fill-opacity="1" style="" id="object-0" transform="matrix(1, 0, 0, 1, -472.9506530761719, -3.7858259677886963)"/>
-</svg>

assets/icons/debug.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bug"><path d="m8 2 1.88 1.88"/><path d="M14.12 3.88 16 2"/><path d="M9 7.13v-1a3.003 3.003 0 1 1 6 0v1"/><path d="M12 20c-3.3 0-6-2.7-6-6v-3a4 4 0 0 1 4-4h4a4 4 0 0 1 4 4v3c0 3.3-2.7 6-6 6"/><path d="M12 20v-9"/><path d="M6.53 9C4.6 8.8 3 7.1 3 5"/><path d="M6 13H2"/><path d="M3 21c0-2.1 1.7-3.9 3.8-4"/><path d="M20.97 5c0 2.1-1.6 3.8-3.5 4"/><path d="M22 13h-4"/><path d="M17.2 17c2.1.1 3.8 1.9 3.8 4"/></svg>

assets/icons/debug_breakpoint.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle"><circle cx="12" cy="12" r="10"/></svg>

assets/icons/debug_continue.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-step-forward"><line x1="6" x2="6" y1="4" y2="20"/><polygon points="10,4 20,12 10,20"/></svg>

assets/icons/debug_disconnect.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-unplug"><path d="m19 5 3-3"/><path d="m2 22 3-3"/><path d="M6.3 20.3a2.4 2.4 0 0 0 3.4 0L12 18l-6-6-2.3 2.3a2.4 2.4 0 0 0 0 3.4Z"/><path d="M7.5 13.5 10 11"/><path d="M10.5 16.5 13 14"/><path d="m12 6 6 6 2.3-2.3a2.4 2.4 0 0 0 0-3.4l-2.6-2.6a2.4 2.4 0 0 0-3.4 0Z"/></svg>

assets/icons/debug_ignore_breakpoints.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-circle-off"><path d="m2 2 20 20"/><path d="M8.35 2.69A10 10 0 0 1 21.3 15.65"/><path d="M19.08 19.08A10 10 0 1 1 4.92 4.92"/></svg>

assets/icons/debug_log_breakpoint.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-circle"><path d="M7.9 20A9 9 0 1 0 4 16.1L2 22Z"/></svg>

assets/icons/debug_pause.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-pause"><rect x="14" y="4" width="4" height="16" rx="1"/><rect x="6" y="4" width="4" height="16" rx="1"/></svg>

assets/icons/debug_restart.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-rotate-ccw"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>

assets/icons/debug_step_back.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-undo-dot"><path d="M21 17a9 9 0 0 0-15-6.7L3 13"/><path d="M3 7v6h6"/><circle cx="12" cy="17" r="1"/></svg>

assets/icons/debug_step_into.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-dot">
-  <path d="m5 15 7 7 7-7"/>
-  <path d="M12 8v14"/>
-  <circle cx="12" cy="3" r="1"/>
-</svg>

assets/icons/debug_step_out.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-arrow-up-from-dot">
-  <path d="m3 10 9-8 9 8"/>
-  <path d="M12 17V2"/>
-  <circle cx="12" cy="21" r="1"/>
-</svg>

assets/icons/debug_step_over.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-redo-dot">
-  <circle cx="12" cy="17" r="1"/>
-  <path d="M21 7v6h-6"/>
-  <path d="M3 17a9 9 0 0 1 9-9 9 9 0 0 1 6 2.3l3 2.7"/>
-</svg>

assets/icons/debug_stop.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-square"><rect width="18" height="18" x="3" y="3" rx="2"/></svg>

assets/keymaps/default-linux.json

@@ -84,12 +84,12 @@
       "pageup": "editor::MovePageUp",
       "alt-pageup": "editor::PageUp",
       "shift-pageup": "editor::SelectPageUp",
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true }],
+      "home": "editor::MoveToBeginningOfLine",
       "down": "editor::MoveDown",
       "pagedown": "editor::MovePageDown",
       "alt-pagedown": "editor::PageDown",
       "shift-pagedown": "editor::SelectPageDown",
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
+      "end": "editor::MoveToEndOfLine",
       "left": "editor::MoveLeft",
       "right": "editor::MoveRight",
       "ctrl-left": "editor::MoveToPreviousWordStart",
@@ -116,9 +116,9 @@
       // "alt-v": ["editor::MovePageUp", { "center_cursor": true }],
       "ctrl-alt-space": "editor::ShowCharacterPalette",
       "ctrl-;": "editor::ToggleLineNumbers",
-      "ctrl-k ctrl-r": "git::Restore",
+      "ctrl-k ctrl-r": "editor::RevertSelectedHunks",
       "ctrl-'": "editor::ToggleSelectedDiffHunks",
-      "ctrl-\"": "editor::ExpandAllDiffHunks",
+      "ctrl-\"": "editor::ExpandAllHunkDiffs",
       "ctrl-i": "editor::ShowSignatureHelp",
       "alt-g b": "editor::ToggleGitBlame",
       "menu": "editor::OpenContextMenu",
@@ -184,9 +184,8 @@
       "ctrl-alt-/": "assistant::ToggleModelSelector",
       "ctrl-k h": "assistant::DeployHistory",
       "ctrl-k l": "assistant::DeployPromptLibrary",
-      "new": "assistant::NewChat",
-      "ctrl-t": "assistant::NewChat",
-      "ctrl-n": "assistant::NewChat"
+      "new": "assistant::NewContext",
+      "ctrl-n": "assistant::NewContext"
     }
   },
   {
@@ -344,9 +343,9 @@
       "alt-ctrl-f12": "editor::GoToTypeDefinitionSplit",
       "alt-shift-f12": "editor::FindAllReferences",
       "ctrl-m": "editor::MoveToEnclosingBracket",
-      "ctrl-|": "editor::MoveToEnclosingBracket",
-      "ctrl-{": "editor::Fold",
-      "ctrl-}": "editor::UnfoldLines",
+      "ctrl-shift-\\": "editor::MoveToEnclosingBracket",
+      "ctrl-shift-[": "editor::Fold",
+      "ctrl-shift-]": "editor::UnfoldLines",
       "ctrl-k ctrl-l": "editor::ToggleFold",
       "ctrl-k ctrl-[": "editor::FoldRecursive",
       "ctrl-k ctrl-]": "editor::UnfoldRecursive",
@@ -368,12 +367,7 @@
       "ctrl-\\": "pane::SplitRight",
       "ctrl-k v": "markdown::OpenPreviewToTheSide",
       "ctrl-shift-v": "markdown::OpenPreview",
-      "ctrl-alt-shift-c": "editor::DisplayCursorNames",
-      "ctrl-alt-y": "git::ToggleStaged",
-      "alt-y": "git::StageAndNext",
-      "alt-shift-y": "git::UnstageAndNext",
-      "alt-.": "editor::GoToHunk",
-      "alt-,": "editor::GoToPrevHunk"
+      "ctrl-alt-shift-c": "editor::DisplayCursorNames"
     }
   },
   {
@@ -710,6 +704,12 @@
       "space": "project_panel::Open"
     }
   },
+  {
+    "context": "GitPanel && !CommitEditor",
+    "bindings": {
+      "escape": "git_panel::Close"
+    }
+  },
   {
     "context": "GitPanel && ChangesList",
     "bindings": {
@@ -721,36 +721,19 @@
       "ctrl-shift-space": "git::UnstageAll",
       "tab": "git_panel::FocusEditor",
       "shift-tab": "git_panel::FocusEditor",
-      "escape": "git_panel::ToggleFocus",
-      "ctrl-enter": "git::Commit",
-      "alt-enter": "menu::SecondaryConfirm"
-    }
-  },
-  {
-    "context": "GitCommit > Editor",
-    "bindings": {
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit"
+      "escape": "git_panel::ToggleFocus"
     }
   },
   {
     "context": "GitPanel > Editor",
     "bindings": {
       "escape": "git_panel::FocusChanges",
+      "ctrl-enter": "git::Commit",
       "tab": "git_panel::FocusChanges",
       "shift-tab": "git_panel::FocusChanges",
-      "ctrl-enter": "git::Commit",
       "alt-up": "git_panel::FocusChanges"
     }
   },
-  {
-    "context": "GitCommit > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::Newline",
-      "ctrl-enter": "git::Commit"
-    }
-  },
   {
     "context": "CollabPanel && not_editing",
     "bindings": {
@@ -829,7 +812,6 @@
       "pagedown": ["terminal::SendKeystroke", "pagedown"],
       "escape": ["terminal::SendKeystroke", "escape"],
       "enter": ["terminal::SendKeystroke", "enter"],
-      "ctrl-b": ["terminal::SendKeystroke", "ctrl-b"],
       "ctrl-c": ["terminal::SendKeystroke", "ctrl-c"],
       "shift-pageup": "terminal::ScrollPageUp",
       "shift-pagedown": "terminal::ScrollPageDown",

assets/keymaps/default-macos.json

@@ -91,16 +91,14 @@
       "ctrl-l": "editor::ScrollCursorCenter",
       "alt-left": "editor::MoveToPreviousWordStart",
       "alt-right": "editor::MoveToNextWordEnd",
-      "cmd-left": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-a": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": false }],
-      "home": ["editor::MoveToBeginningOfLine", { "stop_at_soft_wraps": true }],
-      "cmd-right": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "ctrl-e": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": false }],
-      "end": ["editor::MoveToEndOfLine", { "stop_at_soft_wraps": true }],
-      "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`
+      "cmd-left": "editor::MoveToBeginningOfLine",
+      "ctrl-a": "editor::MoveToBeginningOfLine",
+      "home": "editor::MoveToBeginningOfLine",
+      "cmd-right": "editor::MoveToEndOfLine",
+      "ctrl-e": "editor::MoveToEndOfLine",
+      "end": "editor::MoveToEndOfLine",
+      "cmd-up": "editor::MoveToBeginning",
+      "cmd-down": "editor::MoveToEnd",
       "shift-up": "editor::SelectUp",
       "ctrl-shift-p": "editor::SelectUp",
       "shift-down": "editor::SelectDown",
@@ -113,8 +111,8 @@
       "alt-shift-right": "editor::SelectToNextWordEnd", // cursorWordRightSelect
       "ctrl-shift-up": "editor::SelectToStartOfParagraph",
       "ctrl-shift-down": "editor::SelectToEndOfParagraph",
-      "cmd-shift-up": "editor::SelectToStartOfExcerpt",
-      "cmd-shift-down": "editor::SelectToEndOfExcerpt",
+      "cmd-shift-up": "editor::SelectToBeginning",
+      "cmd-shift-down": "editor::SelectToEnd",
       "cmd-a": "editor::SelectAll",
       "cmd-l": "editor::SelectLine",
       "cmd-shift-i": "editor::Format",
@@ -128,12 +126,9 @@
       "ctrl-shift-v": ["editor::MovePageUp", { "center_cursor": true }],
       "ctrl-cmd-space": "editor::ShowCharacterPalette",
       "cmd-;": "editor::ToggleLineNumbers",
-      "cmd-alt-z": "git::Restore",
-      "cmd-alt-y": "git::ToggleStaged",
-      "cmd-y": "git::StageAndNext",
-      "cmd-shift-y": "git::UnstageAndNext",
+      "cmd-alt-z": "editor::RevertSelectedHunks",
       "cmd-'": "editor::ToggleSelectedDiffHunks",
-      "cmd-\"": "editor::ExpandAllDiffHunks",
+      "cmd-\"": "editor::ExpandAllHunkDiffs",
       "cmd-alt-g b": "editor::ToggleGitBlame",
       "cmd-i": "editor::ShowSignatureHelp",
       "ctrl-f12": "editor::GoToDeclaration",
@@ -211,8 +206,7 @@
       "cmd-alt-/": "assistant::ToggleModelSelector",
       "cmd-k h": "assistant::DeployHistory",
       "cmd-k l": "assistant::DeployPromptLibrary",
-      "cmd-t": "assistant::NewChat",
-      "cmd-n": "assistant::NewChat"
+      "cmd-n": "assistant::NewContext"
     }
   },
   {
@@ -289,8 +283,7 @@
       "alt-enter": "search::SelectAllMatches",
       "cmd-f": "search::FocusSearch",
       "cmd-alt-f": "search::ToggleReplace",
-      "cmd-alt-l": "search::ToggleSelection",
-      "cmd-shift-o": "outline::Toggle"
+      "cmd-alt-l": "search::ToggleSelection"
     }
   },
   {
@@ -468,7 +461,7 @@
       "ctrl-9": ["pane::ActivateItem", 8],
       "ctrl-0": "pane::ActivateLastItem",
       "ctrl--": "pane::GoBack",
-      "ctrl-_": "pane::GoForward",
+      "ctrl-shift--": "pane::GoForward",
       "cmd-shift-f": "pane::DeploySearch"
     }
   },
@@ -724,14 +717,6 @@
       "space": "project_panel::Open"
     }
   },
-  {
-    "context": "VariableList",
-    "use_key_equivalents": true,
-    "bindings": {
-      "left": "variable_list::CollapseSelectedEntry",
-      "right": "variable_list::ExpandSelectedEntry"
-    }
-  },
   {
     "context": "GitPanel && ChangesList",
     "use_key_equivalents": true,
@@ -761,14 +746,6 @@
       "alt-up": "git_panel::FocusChanges"
     }
   },
-  {
-    "context": "GitCommit > Editor",
-    "use_key_equivalents": true,
-    "bindings": {
-      "enter": "editor::Newline",
-      "cmd-enter": "git::Commit"
-    }
-  },
   {
     "context": "CollabPanel && not_editing",
     "use_key_equivalents": true,

assets/keymaps/linux/emacs.json

@@ -48,8 +48,6 @@
       "ctrl-_": "editor::Undo", // undo
       "ctrl-/": "editor::Undo", // undo
       "ctrl-x u": "editor::Undo", // undo
-      "alt-{": "editor::MoveToStartOfParagraph", // backward-paragraph
-      "alt-}": "editor::MoveToEndOfParagraph", // forward-paragraph
       "ctrl-v": "editor::MovePageDown", // scroll-up
       "alt-v": "editor::MovePageUp", // scroll-down
       "ctrl-x [": "editor::MoveToBeginning", // beginning-of-buffer

assets/keymaps/linux/jetbrains.json

@@ -2,8 +2,8 @@
   {
     "bindings": {
       "ctrl-alt-s": "zed::OpenSettings",
-      "ctrl-{": "pane::ActivatePrevItem",
-      "ctrl-}": "pane::ActivateNextItem"
+      "ctrl-shift-[": "pane::ActivatePrevItem",
+      "ctrl-shift-]": "pane::ActivateNextItem"
     }
   },
   {
@@ -44,7 +44,7 @@
       "shift-f2": "editor::GoToPrevDiagnostic",
       "ctrl-alt-shift-down": "editor::GoToHunk",
       "ctrl-alt-shift-up": "editor::GoToPrevHunk",
-      "ctrl-alt-z": "git::Restore",
+      "ctrl-alt-z": "editor::RevertSelectedHunks",
       "ctrl-home": "editor::MoveToBeginning",
       "ctrl-end": "editor::MoveToEnd",
       "ctrl-shift-home": "editor::SelectToBeginning",

assets/keymaps/linux/sublime_text.json

@@ -1,8 +1,8 @@
 [
   {
     "bindings": {
-      "ctrl-{": "pane::ActivatePrevItem",
-      "ctrl-}": "pane::ActivateNextItem",
+      "ctrl-shift-[": "pane::ActivatePrevItem",
+      "ctrl-shift-]": "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-!": ["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 }]
+      "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 }]
     }
   },
   {

assets/keymaps/macos/emacs.json

@@ -48,8 +48,6 @@
       "ctrl-_": "editor::Undo", // undo
       "ctrl-/": "editor::Undo", // undo
       "ctrl-x u": "editor::Undo", // undo
-      "alt-{": "editor::MoveToStartOfParagraph", // backward-paragraph
-      "alt-}": "editor::MoveToEndOfParagraph", // forward-paragraph
       "ctrl-v": "editor::MovePageDown", // scroll-up
       "alt-v": "editor::MovePageUp", // scroll-down
       "ctrl-x [": "editor::MoveToBeginning", // beginning-of-buffer

assets/keymaps/macos/jetbrains.json

@@ -1,8 +1,8 @@
 [
   {
     "bindings": {
-      "cmd-{": "pane::ActivatePrevItem",
-      "cmd-}": "pane::ActivateNextItem"
+      "cmd-shift-[": "pane::ActivatePrevItem",
+      "cmd-shift-]": "pane::ActivateNextItem"
     }
   },
   {

assets/keymaps/macos/sublime_text.json

@@ -1,8 +1,8 @@
 [
   {
     "bindings": {
-      "cmd-{": "pane::ActivatePrevItem",
-      "cmd-}": "pane::ActivateNextItem",
+      "cmd-shift-[": "pane::ActivatePrevItem",
+      "cmd-shift-]": "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-!": ["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 }]
+      "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 }]
     }
   },
   {

assets/keymaps/vim.json

@@ -293,7 +293,6 @@
       "!": "vim::ShellCommand",
       "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::PushRegister",
@@ -437,7 +436,6 @@
     "context": "vim_operator == c",
     "bindings": {
       "c": "vim::CurrentLine",
-      "x": "vim::Exchange",
       "d": "editor::Rename", // zed specific
       "s": ["vim::PushChangeSurrounds", {}]
     }
@@ -448,7 +446,7 @@
       "d": "vim::CurrentLine",
       "s": "vim::PushDeleteSurrounds",
       "o": "editor::ToggleSelectedDiffHunks", // "d o"
-      "p": "git::Restore" // "d p"
+      "p": "editor::RevertSelectedHunks" // "d p"
     }
   },
   {
@@ -524,19 +522,6 @@
       "c": "vim::CurrentLine"
     }
   },
-  {
-    "context": "vim_operator == gr",
-    "bindings": {
-      "r": "vim::CurrentLine"
-    }
-  },
-  {
-    "context": "vim_operator == cx",
-    "bindings": {
-      "x": "vim::CurrentLine",
-      "c": "vim::ClearExchange"
-    }
-  },
   {
     "context": "vim_mode == literal",
     "bindings": {

assets/settings/default.json

@@ -126,13 +126,6 @@
   //  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,
@@ -211,23 +204,6 @@
   // 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::ShowEditPrediction` (false).
   "show_edit_predictions": true,
@@ -581,7 +557,7 @@
       // The provider to use.
       "provider": "zed.dev",
       // The model to use.
-      "model": "claude-3-5-sonnet-latest"
+      "model": "claude-3-5-sonnet"
     }
   },
   // The settings for slash commands.
@@ -758,25 +734,7 @@
   // Diagnostics configuration.
   "diagnostics": {
     // Whether to show warnings or not by default.
-    "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
-    }
+    "include_warnings": true
   },
   // 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`.
@@ -1093,7 +1051,6 @@
       "tab_size": 2
     },
     "Diff": {
-      "show_edit_predictions": false,
       "remove_trailing_whitespace_on_save": false,
       "ensure_final_newline_on_save": false
     },
@@ -1103,9 +1060,6 @@
     "Erlang": {
       "language_servers": ["erlang-ls", "!elp", "..."]
     },
-    "Git Commit": {
-      "allow_rewrap": "anywhere"
-    },
     "Go": {
       "code_actions_on_format": {
         "source.organizeImports": true
@@ -1149,7 +1103,6 @@
     "Markdown": {
       "format_on_save": "off",
       "use_on_type_format": false,
-      "allow_rewrap": "anywhere",
       "prettier": {
         "allowed": true
       }
@@ -1162,9 +1115,6 @@
         "parser": "php"
       }
     },
-    "Plain Text": {
-      "allow_rewrap": "anywhere"
-    },
     "Ruby": {
       "language_servers": ["solargraph", "!ruby-lsp", "!rubocop", "..."]
     },
@@ -1376,12 +1326,6 @@
   //   }
   // ]
   "ssh_connections": [],
-
   // Configures context servers for use in the Assistant.
-  "context_servers": {},
-  "debugger": {
-    "stepping_granularity": "line",
-    "save_breakpoints": true,
-    "button": true
-  }
+  "context_servers": {}
 }

assets/settings/initial_debug_tasks.json

@@ -1,32 +0,0 @@
-[
-  {
-    "label": "Debug active PHP file",
-    "adapter": "php",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active Python file",
-    "adapter": "python",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "Debug active JavaScript file",
-    "adapter": "javascript",
-    "program": "$ZED_FILE",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT"
-  },
-  {
-    "label": "JavaScript debug terminal",
-    "adapter": "javascript",
-    "request": "launch",
-    "cwd": "$ZED_WORKTREE_ROOT",
-    "initialize_args": {
-      "console": "integratedTerminal"
-    }
-  }
-]

assets/themes/gruvbox/gruvbox.json

@@ -105,9 +105,6 @@
         "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",
@@ -379,7 +376,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#ebdbb2ff",
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -493,9 +490,6 @@
         "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",
@@ -767,7 +761,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#ebdbb2ff",
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -881,9 +875,6 @@
         "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",
@@ -1155,7 +1146,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#ebdbb2ff",
+            "color": "#83a598ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1269,9 +1260,6 @@
         "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",
@@ -1543,7 +1531,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#282828ff",
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -1657,9 +1645,6 @@
         "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",
@@ -1931,7 +1916,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#282828ff",
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },
@@ -2045,9 +2030,6 @@
         "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",
@@ -2319,7 +2301,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#282828ff",
+            "color": "#066578ff",
             "font_style": null,
             "font_weight": null
           },

assets/themes/one/one.json

@@ -96,9 +96,6 @@
         "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",
@@ -365,7 +362,7 @@
             "font_weight": null
           },
           "variable": {
-            "color": "#acb2beff",
+            "color": "#dce0e5ff",
             "font_style": null,
             "font_weight": null
           },
@@ -475,9 +472,6 @@
         "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",

crates/activity_indicator/Cargo.toml

@@ -20,6 +20,7 @@ extension_host.workspace = true
 futures.workspace = true
 gpui.workspace = true
 language.workspace = true
+lsp.workspace = true
 project.workspace = true
 smallvec.workspace = true
 ui.workspace = true

crates/activity_indicator/src/activity_indicator.rs

@@ -7,7 +7,8 @@ use gpui::{
     EventEmitter, InteractiveElement as _, ParentElement as _, Render, SharedString,
     StatefulInteractiveElement, Styled, Transformation, Window,
 };
-use language::{BinaryStatus, LanguageRegistry, LanguageServerId};
+use language::{LanguageRegistry, LanguageServerBinaryStatus, LanguageServerId};
+use lsp::LanguageServerName;
 use project::{EnvironmentErrorMessage, LanguageServerProgress, Project, WorktreeId};
 use smallvec::SmallVec;
 use std::{cmp::Reverse, fmt::Write, sync::Arc, time::Duration};
@@ -19,21 +20,21 @@ actions!(activity_indicator, [ShowErrorMessage]);
 
 pub enum Event {
     ShowError {
-        server_name: SharedString,
+        lsp_name: LanguageServerName,
         error: String,
     },
 }
 
 pub struct ActivityIndicator {
-    statuses: Vec<ServerStatus>,
+    statuses: Vec<LspStatus>,
     project: Entity<Project>,
     auto_updater: Option<Entity<AutoUpdater>>,
     context_menu_handle: PopoverMenuHandle<ContextMenu>,
 }
 
-struct ServerStatus {
-    name: SharedString,
-    status: BinaryStatus,
+struct LspStatus {
+    name: LanguageServerName,
+    status: LanguageServerBinaryStatus,
 }
 
 struct PendingWork<'a> {
@@ -64,20 +65,7 @@ impl ActivityIndicator {
                 while let Some((name, status)) = status_events.next().await {
                     this.update(&mut cx, |this: &mut ActivityIndicator, cx| {
                         this.statuses.retain(|s| s.name != name);
-                        this.statuses.push(ServerStatus { name, status });
-                        cx.notify();
-                    })?;
-                }
-                anyhow::Ok(())
-            })
-            .detach();
-
-            let mut status_events = languages.dap_server_binary_statuses();
-            cx.spawn(|this, mut cx| async move {
-                while let Some((name, status)) = status_events.next().await {
-                    this.update(&mut cx, |this, cx| {
-                        this.statuses.retain(|s| s.name != name);
-                        this.statuses.push(ServerStatus { name, status });
+                        this.statuses.push(LspStatus { name, status });
                         cx.notify();
                     })?;
                 }
@@ -100,18 +88,18 @@ impl ActivityIndicator {
         });
 
         cx.subscribe_in(&this, window, move |_, _, event, window, cx| match event {
-            Event::ShowError { server_name, error } => {
+            Event::ShowError { lsp_name, error } => {
                 let create_buffer = project.update(cx, |project, cx| project.create_buffer(cx));
                 let project = project.clone();
                 let error = error.clone();
-                let server_name = server_name.clone();
+                let lsp_name = lsp_name.clone();
                 cx.spawn_in(window, |workspace, mut cx| async move {
                     let buffer = create_buffer.await?;
                     buffer.update(&mut cx, |buffer, cx| {
                         buffer.edit(
                             [(
                                 0..0,
-                                format!("Language server error: {}\n\n{}", server_name, error),
+                                format!("Language server error: {}\n\n{}", lsp_name, error),
                             )],
                             None,
                             cx,
@@ -141,9 +129,9 @@ impl ActivityIndicator {
 
     fn show_error_message(&mut self, _: &ShowErrorMessage, _: &mut Window, cx: &mut Context<Self>) {
         self.statuses.retain(|status| {
-            if let BinaryStatus::Failed { error } = &status.status {
+            if let LanguageServerBinaryStatus::Failed { error } = &status.status {
                 cx.emit(Event::ShowError {
-                    server_name: status.name.clone(),
+                    lsp_name: status.name.clone(),
                     error: error.clone(),
                 });
                 false
@@ -272,10 +260,12 @@ impl ActivityIndicator {
         let mut failed = SmallVec::<[_; 3]>::new();
         for status in &self.statuses {
             match status.status {
-                BinaryStatus::CheckingForUpdate => checking_for_update.push(status.name.clone()),
-                BinaryStatus::Downloading => downloading.push(status.name.clone()),
-                BinaryStatus::Failed { .. } => failed.push(status.name.clone()),
-                BinaryStatus::None => {}
+                LanguageServerBinaryStatus::CheckingForUpdate => {
+                    checking_for_update.push(status.name.clone())
+                }
+                LanguageServerBinaryStatus::Downloading => downloading.push(status.name.clone()),
+                LanguageServerBinaryStatus::Failed { .. } => failed.push(status.name.clone()),
+                LanguageServerBinaryStatus::None => {}
             }
         }
 
@@ -288,7 +278,7 @@ impl ActivityIndicator {
                 ),
                 message: format!(
                     "Downloading {}...",
-                    downloading.iter().map(|name| name.as_ref()).fold(
+                    downloading.iter().map(|name| name.0.as_ref()).fold(
                         String::new(),
                         |mut acc, s| {
                             if !acc.is_empty() {
@@ -316,7 +306,7 @@ impl ActivityIndicator {
                 ),
                 message: format!(
                     "Checking for updates to {}...",
-                    checking_for_update.iter().map(|name| name.as_ref()).fold(
+                    checking_for_update.iter().map(|name| name.0.as_ref()).fold(
                         String::new(),
                         |mut acc, s| {
                             if !acc.is_empty() {
@@ -346,7 +336,7 @@ impl ActivityIndicator {
                     "Failed to run {}. Click to show error.",
                     failed
                         .iter()
-                        .map(|name| name.as_ref())
+                        .map(|name| name.0.as_ref())
                         .fold(String::new(), |mut acc, s| {
                             if !acc.is_empty() {
                                 acc.push_str(", ");

crates/anthropic/src/anthropic.rs

@@ -30,8 +30,6 @@ pub enum Model {
     #[default]
     #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
     Claude3_5Sonnet,
-    #[serde(rename = "claude-3-7-sonnet", alias = "claude-3-7-sonnet-latest")]
-    Claude3_7Sonnet,
     #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
     Claude3_5Haiku,
     #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
@@ -61,8 +59,6 @@ impl Model {
     pub fn from_id(id: &str) -> Result<Self> {
         if id.starts_with("claude-3-5-sonnet") {
             Ok(Self::Claude3_5Sonnet)
-        } else if id.starts_with("claude-3-7-sonnet") {
-            Ok(Self::Claude3_7Sonnet)
         } else if id.starts_with("claude-3-5-haiku") {
             Ok(Self::Claude3_5Haiku)
         } else if id.starts_with("claude-3-opus") {
@@ -79,7 +75,6 @@ impl Model {
     pub fn id(&self) -> &str {
         match self {
             Model::Claude3_5Sonnet => "claude-3-5-sonnet-latest",
-            Model::Claude3_7Sonnet => "claude-3-7-sonnet-latest",
             Model::Claude3_5Haiku => "claude-3-5-haiku-latest",
             Model::Claude3Opus => "claude-3-opus-latest",
             Model::Claude3Sonnet => "claude-3-sonnet-20240229",
@@ -90,7 +85,6 @@ impl Model {
 
     pub fn display_name(&self) -> &str {
         match self {
-            Self::Claude3_7Sonnet => "Claude 3.7 Sonnet",
             Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
             Self::Claude3_5Haiku => "Claude 3.5 Haiku",
             Self::Claude3Opus => "Claude 3 Opus",
@@ -104,14 +98,13 @@ impl Model {
 
     pub fn cache_configuration(&self) -> Option<AnthropicModelCacheConfiguration> {
         match self {
-            Self::Claude3_5Sonnet
-            | Self::Claude3_5Haiku
-            | Self::Claude3_7Sonnet
-            | Self::Claude3Haiku => Some(AnthropicModelCacheConfiguration {
-                min_total_token: 2_048,
-                should_speculate: true,
-                max_cache_anchors: 4,
-            }),
+            Self::Claude3_5Sonnet | Self::Claude3_5Haiku | Self::Claude3Haiku => {
+                Some(AnthropicModelCacheConfiguration {
+                    min_total_token: 2_048,
+                    should_speculate: true,
+                    max_cache_anchors: 4,
+                })
+            }
             Self::Custom {
                 cache_configuration,
                 ..
@@ -124,7 +117,6 @@ impl Model {
         match self {
             Self::Claude3_5Sonnet
             | Self::Claude3_5Haiku
-            | Self::Claude3_7Sonnet
             | Self::Claude3Opus
             | Self::Claude3Sonnet
             | Self::Claude3Haiku => 200_000,
@@ -135,7 +127,7 @@ impl Model {
     pub fn max_output_tokens(&self) -> u32 {
         match self {
             Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3Haiku => 4_096,
-            Self::Claude3_5Sonnet | Self::Claude3_7Sonnet | Self::Claude3_5Haiku => 8_192,
+            Self::Claude3_5Sonnet | Self::Claude3_5Haiku => 8_192,
             Self::Custom {
                 max_output_tokens, ..
             } => max_output_tokens.unwrap_or(4_096),
@@ -145,7 +137,6 @@ impl Model {
     pub fn default_temperature(&self) -> f32 {
         match self {
             Self::Claude3_5Sonnet
-            | Self::Claude3_7Sonnet
             | Self::Claude3_5Haiku
             | Self::Claude3Opus
             | Self::Claude3Sonnet

crates/assistant/Cargo.toml

@@ -43,6 +43,7 @@ indoc.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
+language_models.workspace = true
 log.workspace = true
 lsp.workspace = true
 menu.workspace = true
@@ -58,6 +59,7 @@ 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

crates/assistant/src/assistant.rs

@@ -33,7 +33,7 @@ actions!(
     [
         InsertActivePrompt,
         DeployHistory,
-        NewChat,
+        NewContext,
         CycleNextInlineAssist,
         CyclePreviousInlineAssist
     ]

crates/assistant/src/assistant_panel.rs

@@ -1,6 +1,6 @@
 use crate::assistant_configuration::{ConfigurationView, ConfigurationViewEvent};
 use crate::{
-    terminal_inline_assistant::TerminalInlineAssistant, DeployHistory, InlineAssistant, NewChat,
+    terminal_inline_assistant::TerminalInlineAssistant, DeployHistory, InlineAssistant, NewContext,
 };
 use anyhow::{anyhow, Result};
 use assistant_context_editor::{
@@ -129,7 +129,7 @@ impl AssistantPanel {
                 workspace.project().clone(),
                 Default::default(),
                 None,
-                NewChat.boxed_clone(),
+                NewContext.boxed_clone(),
                 window,
                 cx,
             );
@@ -228,12 +228,12 @@ impl AssistantPanel {
                         IconButton::new("new-chat", IconName::Plus)
                             .icon_size(IconSize::Small)
                             .on_click(cx.listener(|_, _, window, cx| {
-                                window.dispatch_action(NewChat.boxed_clone(), cx)
+                                window.dispatch_action(NewContext.boxed_clone(), cx)
                             }))
                             .tooltip(move |window, cx| {
                                 Tooltip::for_action_in(
                                     "New Chat",
-                                    &NewChat,
+                                    &NewContext,
                                     &focus_handle,
                                     window,
                                     cx,
@@ -256,7 +256,7 @@ impl AssistantPanel {
                                 let focus_handle = _pane.focus_handle(cx);
                                 Some(ContextMenu::build(window, cx, move |menu, _, _| {
                                     menu.context(focus_handle.clone())
-                                        .action("New Chat", Box::new(NewChat))
+                                        .action("New Chat", Box::new(NewContext))
                                         .action("History", Box::new(DeployHistory))
                                         .action("Prompt Library", Box::new(DeployPromptLibrary))
                                         .action("Configure", Box::new(ShowConfiguration))
@@ -760,7 +760,7 @@ impl AssistantPanel {
 
     pub fn create_new_context(
         workspace: &mut Workspace,
-        _: &NewChat,
+        _: &NewContext,
         window: &mut Window,
         cx: &mut Context<Workspace>,
     ) {
@@ -978,7 +978,7 @@ impl AssistantPanel {
                             .active_provider()
                             .map_or(true, |p| p.id() != provider.id())
                         {
-                            if let Some(model) = provider.default_model(cx) {
+                            if let Some(model) = provider.provided_models(cx).first().cloned() {
                                 update_settings_file::<AssistantSettings>(
                                     this.fs.clone(),
                                     cx,
@@ -1206,7 +1206,7 @@ impl Render for AssistantPanel {
         v_flex()
             .key_context("AssistantPanel")
             .size_full()
-            .on_action(cx.listener(|this, _: &NewChat, window, cx| {
+            .on_action(cx.listener(|this, _: &NewContext, window, cx| {
                 this.new_context(window, cx);
             }))
             .on_action(cx.listener(|this, _: &ShowConfiguration, window, cx| {

crates/assistant/src/inline_assistant.rs

@@ -30,12 +30,13 @@ use gpui::{
     EventEmitter, FocusHandle, Focusable, FontWeight, Global, HighlightStyle, Subscription, Task,
     TextStyle, UpdateGlobal, WeakEntity, Window,
 };
-use language::{line_diff, Buffer, IndentKind, Point, Selection, TransactionId};
+use language::{Buffer, IndentKind, Point, Selection, TransactionId};
 use language_model::{
-    report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelTextStream, Role,
+    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelTextStream, Role,
 };
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_models::report_assistant_event;
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
@@ -386,7 +387,6 @@ impl InlineAssistant {
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn suggest_assist(
         &mut self,
         editor: &Entity<Editor>,
@@ -1674,7 +1674,6 @@ impl Focusable for PromptEditor {
 impl PromptEditor {
     const MAX_LINES: u8 = 8;
 
-    #[allow(clippy::too_many_arguments)]
     fn new(
         id: InlineAssistId,
         gutter_dimensions: Arc<Mutex<GutterDimensions>>,
@@ -2226,7 +2225,7 @@ impl PromptEditor {
             },
             font_family: settings.buffer_font.family.clone(),
             font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
+            font_size: settings.buffer_font_size.into(),
             font_weight: settings.buffer_font.weight,
             line_height: relative(settings.buffer_line_height.value()),
             ..Default::default()
@@ -2333,7 +2332,6 @@ struct InlineAssist {
 }
 
 impl InlineAssist {
-    #[allow(clippy::too_many_arguments)]
     fn new(
         assist_id: InlineAssistId,
         group_id: InlineAssistGroupId,
@@ -3349,29 +3347,52 @@ impl CodegenAlternative {
                         )
                         .collect::<String>();
 
-                    let old_start_row = old_range.start.row;
-                    let new_start_row = new_range.start.row;
+                    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 mut deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)> = Vec::new();
                     let mut inserted_row_ranges = Vec::new();
-                    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);
+                    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;
+                            }
                         }
                     }
+
                     (deleted_row_ranges, inserted_row_ranges)
                 })
                 .await;

crates/assistant/src/terminal_inline_assistant.rs

@@ -16,10 +16,10 @@ use gpui::{
 };
 use language::Buffer;
 use language_model::{
-    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
+    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
 use language_model_selector::{LanguageModelSelector, LanguageModelSelectorPopoverMenu};
+use language_models::report_assistant_event;
 use prompt_library::PromptBuilder;
 use settings::{update_settings_file, Settings};
 use std::{
@@ -702,7 +702,6 @@ impl Focusable for PromptEditor {
 impl PromptEditor {
     const MAX_LINES: u8 = 8;
 
-    #[allow(clippy::too_many_arguments)]
     fn new(
         id: TerminalInlineAssistId,
         prompt_history: VecDeque<String>,
@@ -1049,7 +1048,7 @@ impl PromptEditor {
             },
             font_family: settings.buffer_font.family.clone(),
             font_fallbacks: settings.buffer_font.fallbacks.clone(),
-            font_size: settings.buffer_font_size(cx).into(),
+            font_size: settings.buffer_font_size.into(),
             font_weight: settings.buffer_font.weight,
             line_height: relative(settings.buffer_line_height.value()),
             ..Default::default()

crates/assistant2/Cargo.toml

@@ -46,6 +46,7 @@ itertools.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
+language_models.workspace = true
 log.workspace = true
 lsp.workspace = true
 markdown.workspace = true
@@ -61,6 +62,7 @@ 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
@@ -77,10 +79,5 @@ 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

crates/assistant2/src/active_thread.rs

@@ -183,6 +183,7 @@ impl ActiveThread {
                 markdown_style,
                 Some(self.language_registry.clone()),
                 None,
+                window,
                 cx,
             )
         });
@@ -214,7 +215,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, cx);
+                        markdown.append(text, window, cx);
                     });
                 }
             }

crates/assistant2/src/assistant.rs

@@ -7,7 +7,6 @@ mod context;
 mod context_picker;
 mod context_store;
 mod context_strip;
-mod history_store;
 mod inline_assistant;
 mod inline_prompt_editor;
 mod message_editor;
@@ -41,6 +40,7 @@ actions!(
         ToggleModelSelector,
         RemoveAllContext,
         OpenHistory,
+        OpenPromptEditorHistory,
         OpenConfiguration,
         RemoveSelectedThread,
         Chat,

crates/assistant2/src/assistant_panel.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use anyhow::{anyhow, Result};
 use assistant_context_editor::{
     make_lsp_adapter_delegate, render_remaining_tokens, AssistantPanelDelegate, ConfigurationError,
-    ContextEditor, SlashCommandCompletionProvider,
+    ContextEditor, ContextHistory, SlashCommandCompletionProvider,
 };
 use assistant_settings::{AssistantDockPosition, AssistantSettings};
 use assistant_slash_command::SlashCommandWorkingSet;
@@ -31,12 +31,14 @@ 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::{PastContext, PastThread, ThreadHistory};
+use crate::thread_history::{PastThread, ThreadHistory};
 use crate::thread_store::ThreadStore;
-use crate::{InlineAssistant, NewPromptEditor, NewThread, OpenConfiguration, OpenHistory};
+use crate::{
+    InlineAssistant, NewPromptEditor, NewThread, OpenConfiguration, OpenHistory,
+    OpenPromptEditorHistory,
+};
 
 pub fn init(cx: &mut App) {
     cx.observe_new(
@@ -60,6 +62,12 @@ 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);
@@ -75,6 +83,7 @@ enum ActiveView {
     Thread,
     PromptEditor,
     History,
+    PromptEditorHistory,
     Configuration,
 }
 
@@ -88,14 +97,15 @@ 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>,
 }
@@ -163,9 +173,6 @@ 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(),
@@ -187,6 +194,7 @@ impl AssistantPanel {
             message_editor,
             context_store,
             context_editor: None,
+            context_history: None,
             configuration: None,
             configuration_subscription: None,
             tools,
@@ -194,9 +202,9 @@ impl AssistantPanel {
                 chrono::Local::now().offset().local_minus_utc(),
             )
             .unwrap(),
-            history_store: history_store.clone(),
-            history: cx.new(|cx| ThreadHistory::new(weak_self, history_store, cx)),
+            history: cx.new(|cx| ThreadHistory::new(weak_self, thread_store, cx)),
             new_item_context_menu_handle: PopoverMenuHandle::default(),
+            open_history_context_menu_handle: PopoverMenuHandle::default(),
             width: None,
             height: None,
         }
@@ -323,7 +331,26 @@ impl AssistantPanel {
         cx.notify();
     }
 
-    pub(crate) fn open_saved_prompt_editor(
+    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(
         &mut self,
         path: PathBuf,
         window: &mut Window,
@@ -431,7 +458,7 @@ impl AssistantPanel {
                         active_provider.id() != provider.id()
                     })
                 {
-                    if let Some(model) = provider.default_model(cx) {
+                    if let Some(model) = provider.provided_models(cx).first().cloned() {
                         update_settings_file::<AssistantSettings>(
                             self.fs.clone(),
                             cx,
@@ -472,6 +499,13 @@ 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)
@@ -584,10 +618,18 @@ impl AssistantPanel {
                     SharedString::from(context_editor.read(cx).title(cx).to_string())
                 })
                 .unwrap_or_else(|| SharedString::from("Loading Summary…")),
-            ActiveView::History => "History".into(),
+            ActiveView::History | ActiveView::PromptEditorHistory => "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))
@@ -603,7 +645,24 @@ impl AssistantPanel {
                     .w_full()
                     .gap_1()
                     .justify_between()
-                    .child(Label::new(title))
+                    .child(
+                        h_flex()
+                            .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()
@@ -637,23 +696,23 @@ impl AssistantPanel {
                             }),
                     )
                     .child(
-                        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);
+                        PopoverMenu::new("assistant-toolbar-history-popover-menu")
+                            .trigger_with_tooltip(
+                                IconButton::new("open-history", IconName::HistoryRerun)
+                                    .icon_size(IconSize::Small)
+                                    .style(ButtonStyle::Subtle),
+                                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(),
+                                        )
+                                }))
                             }),
                     )
                     .child(
@@ -703,9 +762,9 @@ impl AssistantPanel {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
-        let recent_history = self
-            .history_store
-            .update(cx, |this, cx| this.recent_entries(3, cx));
+        let recent_threads = self
+            .thread_store
+            .update(cx, |this, _cx| this.recent_threads(3));
 
         let create_welcome_heading = || {
             h_flex()
@@ -732,8 +791,7 @@ 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()
@@ -760,24 +818,34 @@ 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_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| {
+            .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| {
                 parent
                     .child(
                         h_flex().w_full().justify_center().child(
@@ -787,18 +855,9 @@ impl AssistantPanel {
                         ),
                     )
                     .child(v_flex().mx_auto().w_4_5().gap_2().children(
-                        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()
-                                }
-                            }
+                        recent_threads.into_iter().map(|thread| {
+                            // TODO: keyboard navigation
+                            PastThread::new(thread, cx.entity().downgrade(), false)
                         }),
                     ))
                     .child(
@@ -810,7 +869,7 @@ impl AssistantPanel {
                                     &OpenHistory,
                                     &self.focus_handle(cx),
                                     window,
-                                    cx,
+                                    cx
                                 ))
                                 .on_click(move |_event, window, cx| {
                                     window.dispatch_action(OpenHistory.boxed_clone(), cx);
@@ -1009,6 +1068,7 @@ 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()),
             })
     }

crates/assistant2/src/buffer_codegen.rs

@@ -7,11 +7,12 @@ 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::{line_diff, Buffer, IndentKind, Point, TransactionId};
+use language::{Buffer, IndentKind, Point, TransactionId};
 use language_model::{
-    report_assistant_event, LanguageModel, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelTextStream, Role,
+    LanguageModel, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelTextStream, Role,
 };
+use language_models::report_assistant_event;
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use prompt_library::PromptBuilder;
@@ -826,29 +827,52 @@ impl CodegenAlternative {
                         )
                         .collect::<String>();
 
-                    let old_start_row = old_range.start.row;
-                    let new_start_row = new_range.start.row;
+                    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 mut deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)> = Vec::new();
                     let mut inserted_row_ranges = Vec::new();
-                    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);
+                    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;
+                            }
                         }
                     }
+
                     (deleted_row_ranges, inserted_row_ranges)
                 })
                 .await;

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, AnchorRangeExt, Editor, FoldPlaceholder, ToPoint};
+use editor::{Anchor, Editor, FoldPlaceholder, ToPoint};
 use file_icons::FileIcons;
 use fuzzy::PathMatch;
 use gpui::{
-    AnyElement, App, AppContext, DismissEvent, Empty, Entity, FocusHandle, Focusable, Stateful,
-    Task, WeakEntity,
+    AnyElement, App, 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, ListItem, TintColor, Tooltip};
+use ui::{prelude::*, ButtonLike, Disclosure, ElevationIndex, ListItem, 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_entity) = self.editor.upgrade() else {
+        let Some(editor) = self.editor.upgrade() else {
             return;
         };
 
-        editor_entity.update(cx, |editor, cx| {
+        editor.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.
                 {
@@ -292,11 +292,7 @@ impl PickerDelegate for FileContextPickerDelegate {
                     .unwrap_or_else(|| SharedString::new(""));
 
                 let placeholder = FoldPlaceholder {
-                    render: render_fold_icon_button(
-                        file_icon,
-                        file_name.into(),
-                        editor_entity.downgrade(),
-                    ),
+                    render: render_fold_icon_button(file_icon, file_name.into()),
                     ..Default::default()
                 };
 
@@ -468,50 +464,11 @@ pub fn render_file_context_entry(
 fn render_fold_icon_button(
     icon: SharedString,
     label: SharedString,
-    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()
-            })
-        });
-
+) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut Window, &mut App) -> AnyElement> {
+    Arc::new(move |fold_id, _fold_range, _window, _cx| {
         ButtonLike::new(fold_id)
             .style(ButtonStyle::Filled)
-            .selected_style(ButtonStyle::Tinted(TintColor::Accent))
-            .toggle_state(is_in_text_selection)
+            .layer(ElevationIndex::ElevatedSurface)
             .child(
                 h_flex()
                     .gap_1()

crates/assistant2/src/context_strip.rs

@@ -36,7 +36,6 @@ pub struct ContextStrip {
 }
 
 impl ContextStrip {
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         context_store: Entity<ContextStore>,
         workspace: WeakEntity<Workspace>,

crates/assistant2/src/history_store.rs

@@ -1,61 +0,0 @@
-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()
-    }
-}

crates/assistant2/src/inline_assistant.rs

@@ -24,7 +24,8 @@ use gpui::{
     UpdateGlobal, WeakEntity, Window,
 };
 use language::{Buffer, Point, Selection, TransactionId};
-use language_model::{report_assistant_event, LanguageModelRegistry};
+use language_model::LanguageModelRegistry;
+use language_models::report_assistant_event;
 use multi_buffer::MultiBufferRow;
 use parking_lot::Mutex;
 use project::{CodeAction, ProjectTransaction};
@@ -479,7 +480,6 @@ impl InlineAssistant {
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn suggest_assist(
         &mut self,
         editor: &Entity<Editor>,
@@ -1450,7 +1450,6 @@ struct InlineAssistScrollLock {
 }
 
 impl EditorInlineAssists {
-    #[allow(clippy::too_many_arguments)]
     fn new(editor: &Entity<Editor>, window: &mut Window, cx: &mut App) -> Self {
         let (highlight_updates_tx, mut highlight_updates_rx) = async_watch::channel(());
         Self {
@@ -1562,7 +1561,6 @@ pub struct InlineAssist {
 }
 
 impl InlineAssist {
-    #[allow(clippy::too_many_arguments)]
     fn new(
         assist_id: InlineAssistId,
         group_id: InlineAssistGroupId,

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(cx);
+        let ui_font_size = ThemeSettings::get_global(cx).ui_font_size;
         let mut buttons = Vec::new();
 
         let left_gutter_width = match &self.mode {
@@ -823,7 +823,6 @@ impl InlineAssistId {
 }
 
 impl PromptEditor<BufferCodegen> {
-    #[allow(clippy::too_many_arguments)]
     pub fn new_buffer(
         id: InlineAssistId,
         gutter_dimensions: Arc<Mutex<GutterDimensions>>,
@@ -984,7 +983,6 @@ impl TerminalInlineAssistId {
 }
 
 impl PromptEditor<TerminalCodegen> {
-    #[allow(clippy::too_many_arguments)]
     pub fn new_terminal(
         id: TerminalInlineAssistId,
         prompt_history: VecDeque<String>,

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,7 +369,7 @@ impl Render for MessageEditor {
                             .anchor(gpui::Corner::BottomLeft)
                             .offset(gpui::Point {
                                 x: px(0.0),
-                                y: (-ThemeSettings::get_global(cx).ui_font_size(cx) * 2) - px(4.0),
+                                y: (-get_ui_font_size(cx) * 2) - px(4.0),
                             })
                             .with_handle(self.inline_context_picker_menu_handle.clone()),
                     )

crates/assistant2/src/terminal_codegen.rs

@@ -2,7 +2,8 @@ use crate::inline_prompt_editor::CodegenStatus;
 use client::telemetry::Telemetry;
 use futures::{channel::mpsc, SinkExt, StreamExt};
 use gpui::{App, AppContext as _, Context, Entity, EventEmitter, Task};
-use language_model::{report_assistant_event, LanguageModelRegistry, LanguageModelRequest};
+use language_model::{LanguageModelRegistry, LanguageModelRequest};
+use language_models::report_assistant_event;
 use std::{sync::Arc, time::Instant};
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};
 use terminal::Terminal;

crates/assistant2/src/terminal_inline_assistant.rs

@@ -13,9 +13,9 @@ use fs::Fs;
 use gpui::{App, Entity, Focusable, Global, Subscription, UpdateGlobal, WeakEntity};
 use language::Buffer;
 use language_model::{
-    report_assistant_event, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, Role,
+    LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage, Role,
 };
+use language_models::report_assistant_event;
 use prompt_library::PromptBuilder;
 use std::sync::Arc;
 use telemetry_events::{AssistantEvent, AssistantKind, AssistantPhase};

crates/assistant2/src/thread.rs

@@ -10,9 +10,9 @@ use gpui::{App, Context, EventEmitter, SharedString, Task};
 use language_model::{
     LanguageModel, LanguageModelCompletionEvent, LanguageModelRegistry, LanguageModelRequest,
     LanguageModelRequestMessage, LanguageModelToolResult, LanguageModelToolUse,
-    LanguageModelToolUseId, MaxMonthlySpendReachedError, MessageContent, PaymentRequiredError,
-    Role, StopReason,
+    LanguageModelToolUseId, MessageContent, Role, StopReason,
 };
+use language_models::provider::cloud::{MaxMonthlySpendReachedError, PaymentRequiredError};
 use serde::{Deserialize, Serialize};
 use util::{post_inc, TryFutureExt as _};
 use uuid::Uuid;

crates/assistant2/src/thread_history.rs

@@ -1,4 +1,3 @@
-use assistant_context_editor::SavedContextMetadata;
 use gpui::{
     uniform_list, App, Entity, FocusHandle, Focusable, ScrollStrategy, UniformListScrollHandle,
     WeakEntity,
@@ -6,14 +5,13 @@ use gpui::{
 use time::{OffsetDateTime, UtcOffset};
 use ui::{prelude::*, IconButtonShape, ListItem, ListItemSpacing, Tooltip};
 
-use crate::history_store::{HistoryEntry, HistoryStore};
-use crate::thread_store::SavedThreadMetadata;
+use crate::thread_store::{SavedThreadMetadata, ThreadStore};
 use crate::{AssistantPanel, RemoveSelectedThread};
 
 pub struct ThreadHistory {
     focus_handle: FocusHandle,
     assistant_panel: WeakEntity<AssistantPanel>,
-    history_store: Entity<HistoryStore>,
+    thread_store: Entity<ThreadStore>,
     scroll_handle: UniformListScrollHandle,
     selected_index: usize,
 }
@@ -21,13 +19,14 @@ pub struct ThreadHistory {
 impl ThreadHistory {
     pub(crate) fn new(
         assistant_panel: WeakEntity<AssistantPanel>,
-        history_store: Entity<HistoryStore>,
+        thread_store: Entity<ThreadStore>,
+
         cx: &mut Context<Self>,
     ) -> Self {
         Self {
             focus_handle: cx.focus_handle(),
             assistant_panel,
-            history_store,
+            thread_store,
             scroll_handle: UniformListScrollHandle::default(),
             selected_index: 0,
         }
@@ -39,9 +38,7 @@ impl ThreadHistory {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let count = self
-            .history_store
-            .update(cx, |this, cx| this.entry_count(cx));
+        let count = self.thread_store.read(cx).thread_count();
         if count > 0 {
             if self.selected_index == 0 {
                 self.set_selected_index(count - 1, window, cx);
@@ -57,9 +54,7 @@ impl ThreadHistory {
         window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let count = self
-            .history_store
-            .update(cx, |this, cx| this.entry_count(cx));
+        let count = self.thread_store.read(cx).thread_count();
         if count > 0 {
             if self.selected_index == count - 1 {
                 self.set_selected_index(0, window, cx);
@@ -70,18 +65,14 @@ impl ThreadHistory {
     }
 
     fn select_first(&mut self, _: &menu::SelectFirst, window: &mut Window, cx: &mut Context<Self>) {
-        let count = self
-            .history_store
-            .update(cx, |this, cx| this.entry_count(cx));
+        let count = self.thread_store.read(cx).thread_count();
         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
-            .history_store
-            .update(cx, |this, cx| this.entry_count(cx));
+        let count = self.thread_store.read(cx).thread_count();
         if count > 0 {
             self.set_selected_index(count - 1, window, cx);
         }
@@ -95,23 +86,12 @@ impl ThreadHistory {
     }
 
     fn confirm(&mut self, _: &menu::Confirm, window: &mut Window, cx: &mut Context<Self>) {
-        let entries = self.history_store.update(cx, |this, cx| this.entries(cx));
+        let threads = self.thread_store.update(cx, |this, _cx| this.threads());
 
-        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();
-                }
-            }
+        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();
 
             cx.notify();
         }
@@ -123,19 +103,14 @@ impl ThreadHistory {
         _window: &mut Window,
         cx: &mut Context<Self>,
     ) {
-        let entries = self.history_store.update(cx, |this, cx| this.entries(cx));
+        let threads = self.thread_store.update(cx, |this, _cx| this.threads());
 
-        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) => {}
-            }
+        if let Some(thread) = threads.get(self.selected_index) {
+            self.assistant_panel
+                .update(cx, |this, cx| {
+                    this.delete_thread(&thread.id, cx);
+                })
+                .ok();
 
             cx.notify();
         }
@@ -150,7 +125,7 @@ impl Focusable for ThreadHistory {
 
 impl Render for ThreadHistory {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let history_entries = self.history_store.update(cx, |this, cx| this.entries(cx));
+        let threads = self.thread_store.update(cx, |this, _cx| this.threads());
         let selected_index = self.selected_index;
 
         v_flex()
@@ -167,7 +142,7 @@ impl Render for ThreadHistory {
             .on_action(cx.listener(Self::confirm))
             .on_action(cx.listener(Self::remove_selected_thread))
             .map(|history| {
-                if history_entries.is_empty() {
+                if threads.is_empty() {
                     history
                         .justify_center()
                         .child(
@@ -181,26 +156,17 @@ impl Render for ThreadHistory {
                         uniform_list(
                             cx.entity().clone(),
                             "thread-history",
-                            history_entries.len(),
+                            threads.len(),
                             move |history, range, _window, _cx| {
-                                history_entries[range]
+                                threads[range]
                                     .iter()
                                     .enumerate()
-                                    .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(),
-                                        })
+                                    .map(|(index, thread)| {
+                                        h_flex().w_full().pb_1().child(PastThread::new(
+                                            thread.clone(),
+                                            history.assistant_panel.clone(),
+                                            selected_index == index,
+                                        ))
                                     })
                                     .collect()
                             },
@@ -296,71 +262,3 @@ 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();
-            }
-        })
-    }
-}

crates/assistant_context_editor/Cargo.toml

@@ -30,6 +30,7 @@ indexed_docs.workspace = true
 language.workspace = true
 language_model.workspace = true
 language_model_selector.workspace = true
+language_models.workspace = true
 log.workspace = true
 multi_buffer.workspace = true
 open_ai.workspace = true

crates/assistant_context_editor/src/context.rs

@@ -19,10 +19,13 @@ use gpui::{
 };
 use language::{AnchorRangeExt, Bias, Buffer, LanguageRegistry, OffsetRangeExt, Point, ToOffset};
 use language_model::{
-    report_assistant_event, LanguageModel, LanguageModelCacheConfiguration,
-    LanguageModelCompletionEvent, LanguageModelImage, LanguageModelRegistry, LanguageModelRequest,
-    LanguageModelRequestMessage, LanguageModelToolUseId, MaxMonthlySpendReachedError,
-    MessageContent, PaymentRequiredError, Role, StopReason,
+    LanguageModel, LanguageModelCacheConfiguration, LanguageModelCompletionEvent,
+    LanguageModelImage, LanguageModelRegistry, LanguageModelRequest, LanguageModelRequestMessage,
+    LanguageModelToolUseId, MessageContent, Role, StopReason,
+};
+use language_models::{
+    provider::cloud::{MaxMonthlySpendReachedError, PaymentRequiredError},
+    report_assistant_event,
 };
 use open_ai::Model as OpenAiModel;
 use paths::contexts_dir;
@@ -647,7 +650,6 @@ impl AssistantContext {
         )
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn new(
         id: ContextId,
         replica_id: ReplicaId,
@@ -768,7 +770,6 @@ impl AssistantContext {
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn deserialize(
         saved_context: SavedContext,
         path: PathBuf,
@@ -3363,7 +3364,7 @@ impl SavedContextV0_1_0 {
     }
 }
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct SavedContextMetadata {
     pub title: String,
     pub path: PathBuf,

crates/assistant_context_editor/src/context_editor.rs

@@ -517,7 +517,6 @@ impl ContextEditor {
         }
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn run_command(
         &mut self,
         command_range: Range<language::Anchor>,
@@ -634,7 +633,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 = {
@@ -1234,8 +1233,8 @@ impl ContextEditor {
                     .px_1()
                     .mr_0p5()
                     .border_1()
-                    .border_color(colors.border_variant.alpha(0.6))
-                    .bg(colors.element_background.alpha(0.6))
+                    .border_color(theme::color_alpha(colors.border_variant, 0.6))
+                    .bg(theme::color_alpha(colors.element_background, 0.6))
                     .child("esc"),
             )
             .child("to cancel")
@@ -1514,11 +1513,15 @@ impl ContextEditor {
 
                 (!text.is_empty()).then_some((text, true))
             } else {
-                let selection = context_editor.selections.newest_adjusted(cx);
-                let buffer = context_editor.buffer().read(cx).snapshot(cx);
-                let selected_text = buffer.text_for_range(selection.range()).collect::<String>();
+                let anchor = context_editor.selections.newest_anchor();
+                let text = context_editor
+                    .buffer()
+                    .read(cx)
+                    .read(cx)
+                    .text_for_range(anchor.range())
+                    .collect::<String>();
 
-                (!selected_text.is_empty()).then_some((selected_text, false))
+                (!text.is_empty()).then_some((text, false))
             }
         })
     }
@@ -1773,16 +1776,23 @@ impl ContextEditor {
         &mut self,
         cx: &mut Context<Self>,
     ) -> (String, CopyMetadata, Vec<text::Selection<usize>>) {
-        let (selection, creases) = self.editor.update(cx, |editor, cx| {
-            let mut selection = editor.selections.newest_adjusted(cx);
+        let (snapshot, selection, creases) = self.editor.update(cx, |editor, cx| {
+            let mut selection = editor.selections.newest::<Point>(cx);
             let snapshot = editor.buffer().read(cx).snapshot(cx);
 
-            selection.goal = SelectionGoal::None;
+            let is_entire_line = selection.is_empty() || editor.selections.line_mode;
+            if is_entire_line {
+                selection.start = Point::new(selection.start.row, 0);
+                selection.end =
+                    cmp::min(snapshot.max_point(), Point::new(selection.start.row + 1, 0));
+                selection.goal = SelectionGoal::None;
+            }
 
             let selection_start = snapshot.point_to_offset(selection.start);
 
             (
-                selection.map(|point| snapshot.point_to_offset(point)),
+                snapshot.clone(),
+                selection.clone(),
                 editor.display_map.update(cx, |display_map, cx| {
                     display_map
                         .snapshot(cx)
@@ -1822,6 +1832,7 @@ impl ContextEditor {
             )
         });
 
+        let selection = selection.map(|point| snapshot.point_to_offset(point));
         let context = self.context.read(cx);
 
         let mut text = String::new();
@@ -2031,15 +2042,6 @@ 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)
@@ -2055,7 +2057,6 @@ impl ContextEditor {
             .unwrap_or_else(|| Cow::Borrowed(DEFAULT_TAB_TITLE))
     }
 
-    #[allow(clippy::too_many_arguments)]
     fn render_patch_block(
         &mut self,
         range: Range<text::Anchor>,
@@ -2656,8 +2657,8 @@ fn render_fold_icon_button(
     editor: WeakEntity<Editor>,
     icon: IconName,
     label: SharedString,
-) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut App) -> AnyElement> {
-    Arc::new(move |fold_id, fold_range, _cx| {
+) -> Arc<dyn Send + Sync + Fn(FoldId, Range<Anchor>, &mut Window, &mut App) -> AnyElement> {
+    Arc::new(move |fold_id, fold_range, _window, _cx| {
         let editor = editor.clone();
         ButtonLike::new(fold_id)
             .style(ButtonStyle::Filled)
@@ -2717,7 +2718,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, _cx| {
+            move |fold_id, fold_range, _window, _cx| {
                 let editor = editor.clone();
                 ButtonLike::new(fold_id)
                     .style(ButtonStyle::Filled)
@@ -2883,7 +2884,6 @@ 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(
@@ -3401,7 +3401,7 @@ fn invoked_slash_command_fold_placeholder(
     FoldPlaceholder {
         constrain_width: false,
         merge_adjacent: false,
-        render: Arc::new(move |fold_id, _, cx| {
+        render: Arc::new(move |fold_id, _, _window, cx| {
             let Some(context) = context.upgrade() else {
                 return Empty.into_any();
             };

crates/assistant_context_editor/src/context_store.rs

@@ -350,12 +350,6 @@ 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(

crates/assistant_context_editor/src/patch.rs

@@ -140,7 +140,7 @@ impl ResolvedPatch {
             buffer.edit(
                 edits,
                 Some(AutoindentMode::Block {
-                    original_start_columns: Vec::new(),
+                    original_indent_columns: Vec::new(),
                 }),
                 cx,
             );

crates/assistant_context_editor/src/slash_command.rs

@@ -136,7 +136,6 @@ impl SlashCommandCompletionProvider {
         })
     }
 
-    #[allow(clippy::too_many_arguments)]
     fn complete_command_argument(
         &self,
         command_name: &str,

crates/assistant_settings/src/assistant_settings.rs

@@ -359,7 +359,6 @@ fn providers_schema(_: &mut schemars::gen::SchemaGenerator) -> schemars::schema:
     schemars::schema::SchemaObject {
         enum_values: Some(vec![
             "anthropic".into(),
-            "bedrock".into(),
             "google".into(),
             "lmstudio".into(),
             "ollama".into(),
@@ -513,7 +512,7 @@ mod tests {
                 AssistantSettings::get_global(cx).default_model,
                 LanguageModelSelection {
                     provider: "zed.dev".into(),
-                    model: "claude-3-5-sonnet-latest".into(),
+                    model: "claude-3-5-sonnet".into(),
                 }
             );
         });

crates/assistant_slash_command/src/assistant_slash_command.rs

@@ -88,7 +88,7 @@ pub trait SlashCommand: 'static + Send + Sync {
     fn accepts_arguments(&self) -> bool {
         self.requires_argument()
     }
-    #[allow(clippy::too_many_arguments)]
+
     fn run(
         self: Arc<Self>,
         arguments: &[String],

crates/assistant_tools/src/now_tool.rs

@@ -17,7 +17,7 @@ pub enum Timezone {
 }
 
 #[derive(Debug, Serialize, Deserialize, JsonSchema)]
-pub struct NowToolInput {
+pub struct FileToolInput {
     /// The timezone to use for the datetime.
     timezone: Timezone,
 }
@@ -34,7 +34,7 @@ impl Tool for NowTool {
     }
 
     fn input_schema(&self) -> serde_json::Value {
-        let schema = schemars::schema_for!(NowToolInput);
+        let schema = schemars::schema_for!(FileToolInput);
         serde_json::to_value(&schema).unwrap()
     }
 
@@ -45,7 +45,7 @@ impl Tool for NowTool {
         _window: &mut Window,
         _cx: &mut App,
     ) -> Task<Result<String>> {
-        let input: NowToolInput = match serde_json::from_value(input) {
+        let input: FileToolInput = match serde_json::from_value(input) {
             Ok(input) => input,
             Err(err) => return Task::ready(Err(anyhow!(err))),
         };

crates/aws_http_client/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "aws_http_client"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/aws_http_client.rs"
-
-[features]
-default = []
-
-[dependencies]
-aws-smithy-runtime-api.workspace = true
-aws-smithy-types.workspace = true
-futures.workspace = true
-http_client.workspace = true
-tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }

crates/aws_http_client/LICENSE-GPL

@@ -1 +0,0 @@
-../../LICENSE-GPL

crates/aws_http_client/src/aws_http_client.rs

@@ -1,118 +0,0 @@
-use std::fmt;
-use std::sync::Arc;
-
-use aws_smithy_runtime_api::client::http::{
-    HttpClient as AwsClient, HttpConnector as AwsConnector,
-    HttpConnectorFuture as AwsConnectorFuture, HttpConnectorFuture, HttpConnectorSettings,
-    SharedHttpConnector,
-};
-use aws_smithy_runtime_api::client::orchestrator::{HttpRequest as AwsHttpRequest, HttpResponse};
-use aws_smithy_runtime_api::client::result::ConnectorError;
-use aws_smithy_runtime_api::client::runtime_components::RuntimeComponents;
-use aws_smithy_runtime_api::http::StatusCode;
-use aws_smithy_types::body::SdkBody;
-use futures::AsyncReadExt;
-use http_client::{AsyncBody, Inner};
-use http_client::{HttpClient, Request};
-use tokio::runtime::Handle;
-
-struct AwsHttpConnector {
-    client: Arc<dyn HttpClient>,
-    handle: Handle,
-}
-
-impl std::fmt::Debug for AwsHttpConnector {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("AwsHttpConnector").finish()
-    }
-}
-
-impl AwsConnector for AwsHttpConnector {
-    fn call(&self, request: AwsHttpRequest) -> AwsConnectorFuture {
-        let req = match request.try_into_http1x() {
-            Ok(req) => req,
-            Err(err) => {
-                return HttpConnectorFuture::ready(Err(ConnectorError::other(err.into(), None)))
-            }
-        };
-
-        let (parts, body) = req.into_parts();
-
-        let response = self
-            .client
-            .send(Request::from_parts(parts, convert_to_async_body(body)));
-
-        let handle = self.handle.clone();
-
-        HttpConnectorFuture::new(async move {
-            let response = match response.await {
-                Ok(response) => response,
-                Err(err) => return Err(ConnectorError::other(err.into(), None)),
-            };
-            let (parts, body) = response.into_parts();
-            let body = convert_to_sdk_body(body, handle).await;
-
-            Ok(HttpResponse::new(
-                StatusCode::try_from(parts.status.as_u16()).unwrap(),
-                body,
-            ))
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct AwsHttpClient {
-    client: Arc<dyn HttpClient>,
-    handler: Handle,
-}
-
-impl std::fmt::Debug for AwsHttpClient {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("AwsHttpClient").finish()
-    }
-}
-
-impl AwsHttpClient {
-    pub fn new(client: Arc<dyn HttpClient>, handle: Handle) -> Self {
-        Self {
-            client,
-            handler: handle,
-        }
-    }
-}
-
-impl AwsClient for AwsHttpClient {
-    fn http_connector(
-        &self,
-        _settings: &HttpConnectorSettings,
-        _components: &RuntimeComponents,
-    ) -> SharedHttpConnector {
-        SharedHttpConnector::new(AwsHttpConnector {
-            client: self.client.clone(),
-            handle: self.handler.clone(),
-        })
-    }
-}
-
-pub async fn convert_to_sdk_body(body: AsyncBody, handle: Handle) -> SdkBody {
-    match body.0 {
-        Inner::Empty => SdkBody::empty(),
-        Inner::Bytes(bytes) => SdkBody::from(bytes.into_inner()),
-        Inner::AsyncReader(mut reader) => {
-            let buffer = handle.spawn(async move {
-                let mut buffer = Vec::new();
-                let _ = reader.read_to_end(&mut buffer).await;
-                buffer
-            });
-
-            SdkBody::from(buffer.await.unwrap_or_default())
-        }
-    }
-}
-
-pub fn convert_to_async_body(body: SdkBody) -> AsyncBody {
-    match body.bytes() {
-        Some(bytes) => AsyncBody::from((*bytes).to_vec()),
-        None => AsyncBody::empty(),
-    }
-}

crates/bedrock/Cargo.toml

@@ -1,28 +0,0 @@
-[package]
-name = "bedrock"
-version = "0.1.0"
-edition.workspace = true
-publish.workspace = true
-license = "GPL-3.0-or-later"
-
-[lints]
-workspace = true
-
-[lib]
-path = "src/bedrock.rs"
-
-[features]
-default = []
-schemars = ["dep:schemars"]
-
-[dependencies]
-anyhow.workspace = true
-aws-sdk-bedrockruntime = { workspace = true, features = ["behavior-version-latest"] }
-aws-smithy-types = {workspace = true}
-futures.workspace = true
-schemars = { workspace = true, optional = true }
-serde.workspace = true
-serde_json.workspace = true
-strum.workspace = true
-thiserror.workspace = true
-tokio = { workspace = true, features = ["rt", "rt-multi-thread"] }

crates/bedrock/LICENSE-GPL

@@ -1 +0,0 @@
-../../LICENSE-GPL

crates/bedrock/src/bedrock.rs

@@ -1,166 +0,0 @@
-mod models;
-
-use std::pin::Pin;
-
-use anyhow::{anyhow, Context, Error, Result};
-use aws_sdk_bedrockruntime as bedrock;
-pub use aws_sdk_bedrockruntime as bedrock_client;
-pub use aws_sdk_bedrockruntime::types::{
-    ContentBlock as BedrockInnerContent, SpecificToolChoice as BedrockSpecificTool,
-    ToolChoice as BedrockToolChoice, ToolInputSchema as BedrockToolInputSchema,
-    ToolSpecification as BedrockTool,
-};
-use aws_smithy_types::{Document, Number as AwsNumber};
-pub use bedrock::operation::converse_stream::ConverseStreamInput as BedrockStreamingRequest;
-pub use bedrock::types::{
-    ContentBlock as BedrockRequestContent, ConversationRole as BedrockRole,
-    ConverseOutput as BedrockResponse, ConverseStreamOutput as BedrockStreamingResponse,
-    Message as BedrockMessage, ResponseStream as BedrockResponseStream,
-};
-use futures::stream::{self, BoxStream, Stream};
-use serde::{Deserialize, Serialize};
-use serde_json::{Number, Value};
-use thiserror::Error;
-
-pub use crate::models::*;
-
-pub async fn complete(
-    client: &bedrock::Client,
-    request: Request,
-) -> Result<BedrockResponse, BedrockError> {
-    let response = bedrock::Client::converse(client)
-        .model_id(request.model.clone())
-        .set_messages(request.messages.into())
-        .send()
-        .await
-        .context("failed to send request to Bedrock");
-
-    match response {
-        Ok(output) => output
-            .output
-            .ok_or_else(|| BedrockError::Other(anyhow!("no output"))),
-        Err(err) => Err(BedrockError::Other(err)),
-    }
-}
-
-pub async fn stream_completion(
-    client: bedrock::Client,
-    request: Request,
-    handle: tokio::runtime::Handle,
-) -> Result<BoxStream<'static, Result<BedrockStreamingResponse, BedrockError>>, Error> {
-    handle
-        .spawn(async move {
-            let response = bedrock::Client::converse_stream(&client)
-                .model_id(request.model.clone())
-                .set_messages(request.messages.into())
-                .send()
-                .await;
-
-            match response {
-                Ok(output) => {
-                    let stream: Pin<
-                        Box<
-                            dyn Stream<Item = Result<BedrockStreamingResponse, BedrockError>>
-                                + Send,
-                        >,
-                    > = Box::pin(stream::unfold(output.stream, |mut stream| async move {
-                        match stream.recv().await {
-                            Ok(Some(output)) => Some((Ok(output), stream)),
-                            Ok(None) => None,
-                            Err(err) => {
-                                Some((
-                                    // TODO: Figure out how we can capture Throttling Exceptions
-                                    Err(BedrockError::ClientError(anyhow!(
-                                        "{:?}",
-                                        aws_sdk_bedrockruntime::error::DisplayErrorContext(err)
-                                    ))),
-                                    stream,
-                                ))
-                            }
-                        }
-                    }));
-                    Ok(stream)
-                }
-                Err(err) => Err(anyhow!(
-                    "{:?}",
-                    aws_sdk_bedrockruntime::error::DisplayErrorContext(err)
-                )),
-            }
-        })
-        .await
-        .map_err(|err| anyhow!("failed to spawn task: {err:?}"))?
-}
-
-pub fn aws_document_to_value(document: &Document) -> Value {
-    match document {
-        Document::Null => Value::Null,
-        Document::Bool(value) => Value::Bool(*value),
-        Document::Number(value) => match *value {
-            AwsNumber::PosInt(value) => Value::Number(Number::from(value)),
-            AwsNumber::NegInt(value) => Value::Number(Number::from(value)),
-            AwsNumber::Float(value) => Value::Number(Number::from_f64(value).unwrap()),
-        },
-        Document::String(value) => Value::String(value.clone()),
-        Document::Array(array) => Value::Array(array.iter().map(aws_document_to_value).collect()),
-        Document::Object(map) => Value::Object(
-            map.iter()
-                .map(|(key, value)| (key.clone(), aws_document_to_value(value)))
-                .collect(),
-        ),
-    }
-}
-
-pub fn value_to_aws_document(value: &Value) -> Document {
-    match value {
-        Value::Null => Document::Null,
-        Value::Bool(value) => Document::Bool(*value),
-        Value::Number(value) => {
-            if let Some(value) = value.as_u64() {
-                Document::Number(AwsNumber::PosInt(value))
-            } else if let Some(value) = value.as_i64() {
-                Document::Number(AwsNumber::NegInt(value))
-            } else if let Some(value) = value.as_f64() {
-                Document::Number(AwsNumber::Float(value))
-            } else {
-                Document::Null
-            }
-        }
-        Value::String(value) => Document::String(value.clone()),
-        Value::Array(array) => Document::Array(array.iter().map(value_to_aws_document).collect()),
-        Value::Object(map) => Document::Object(
-            map.iter()
-                .map(|(key, value)| (key.clone(), value_to_aws_document(value)))
-                .collect(),
-        ),
-    }
-}
-
-#[derive(Debug)]
-pub struct Request {
-    pub model: String,
-    pub max_tokens: u32,
-    pub messages: Vec<BedrockMessage>,
-    pub tools: Vec<BedrockTool>,
-    pub tool_choice: Option<BedrockToolChoice>,
-    pub system: Option<String>,
-    pub metadata: Option<Metadata>,
-    pub stop_sequences: Vec<String>,
-    pub temperature: Option<f32>,
-    pub top_k: Option<u32>,
-    pub top_p: Option<f32>,
-}
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct Metadata {
-    pub user_id: Option<String>,
-}
-
-#[derive(Error, Debug)]
-pub enum BedrockError {
-    #[error("client error: {0}")]
-    ClientError(anyhow::Error),
-    #[error("extension error: {0}")]
-    ExtensionError(anyhow::Error),
-    #[error(transparent)]
-    Other(#[from] anyhow::Error),
-}

crates/bedrock/src/models.rs

@@ -1,199 +0,0 @@
-use anyhow::anyhow;
-use serde::{Deserialize, Serialize};
-use strum::EnumIter;
-
-#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
-#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, EnumIter)]
-pub enum Model {
-    // Anthropic models (already included)
-    #[default]
-    #[serde(rename = "claude-3-5-sonnet", alias = "claude-3-5-sonnet-latest")]
-    Claude3_5Sonnet,
-    #[serde(rename = "claude-3-opus", alias = "claude-3-opus-latest")]
-    Claude3Opus,
-    #[serde(rename = "claude-3-sonnet", alias = "claude-3-sonnet-latest")]
-    Claude3Sonnet,
-    #[serde(rename = "claude-3-5-haiku", alias = "claude-3-5-haiku-latest")]
-    Claude3_5Haiku,
-    // Amazon Nova Models
-    AmazonNovaLite,
-    AmazonNovaMicro,
-    AmazonNovaPro,
-    // AI21 models
-    AI21J2GrandeInstruct,
-    AI21J2JumboInstruct,
-    AI21J2Mid,
-    AI21J2MidV1,
-    AI21J2Ultra,
-    AI21J2UltraV1_8k,
-    AI21J2UltraV1,
-    AI21JambaInstructV1,
-    AI21Jamba15LargeV1,
-    AI21Jamba15MiniV1,
-    // Cohere models
-    CohereCommandTextV14_4k,
-    CohereCommandRV1,
-    CohereCommandRPlusV1,
-    CohereCommandLightTextV14_4k,
-    // Meta models
-    MetaLlama38BInstructV1,
-    MetaLlama370BInstructV1,
-    MetaLlama318BInstructV1_128k,
-    MetaLlama318BInstructV1,
-    MetaLlama3170BInstructV1_128k,
-    MetaLlama3170BInstructV1,
-    MetaLlama3211BInstructV1,
-    MetaLlama3290BInstructV1,
-    MetaLlama321BInstructV1,
-    MetaLlama323BInstructV1,
-    // Mistral models
-    MistralMistral7BInstructV0,
-    MistralMixtral8x7BInstructV0,
-    MistralMistralLarge2402V1,
-    MistralMistralSmall2402V1,
-    #[serde(rename = "custom")]
-    Custom {
-        name: String,
-        max_tokens: usize,
-        /// The name displayed in the UI, such as in the assistant panel model dropdown menu.
-        display_name: Option<String>,
-        max_output_tokens: Option<u32>,
-        default_temperature: Option<f32>,
-    },
-}
-
-impl Model {
-    pub fn from_id(id: &str) -> anyhow::Result<Self> {
-        if id.starts_with("claude-3-5-sonnet") {
-            Ok(Self::Claude3_5Sonnet)
-        } else if id.starts_with("claude-3-opus") {
-            Ok(Self::Claude3Opus)
-        } else if id.starts_with("claude-3-sonnet") {
-            Ok(Self::Claude3Sonnet)
-        } else if id.starts_with("claude-3-5-haiku") {
-            Ok(Self::Claude3_5Haiku)
-        } else {
-            Err(anyhow!("invalid model id"))
-        }
-    }
-
-    pub fn id(&self) -> &str {
-        match self {
-            Model::Claude3_5Sonnet => "us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-            Model::Claude3Opus => "us.anthropic.claude-3-opus-20240229-v1:0",
-            Model::Claude3Sonnet => "us.anthropic.claude-3-sonnet-20240229-v1:0",
-            Model::Claude3_5Haiku => "us.anthropic.claude-3-5-haiku-20241022-v1:0",
-            Model::AmazonNovaLite => "us.amazon.nova-lite-v1:0",
-            Model::AmazonNovaMicro => "us.amazon.nova-micro-v1:0",
-            Model::AmazonNovaPro => "us.amazon.nova-pro-v1:0",
-            Model::AI21J2GrandeInstruct => "ai21.j2-grande-instruct",
-            Model::AI21J2JumboInstruct => "ai21.j2-jumbo-instruct",
-            Model::AI21J2Mid => "ai21.j2-mid",
-            Model::AI21J2MidV1 => "ai21.j2-mid-v1",
-            Model::AI21J2Ultra => "ai21.j2-ultra",
-            Model::AI21J2UltraV1_8k => "ai21.j2-ultra-v1:0:8k",
-            Model::AI21J2UltraV1 => "ai21.j2-ultra-v1",
-            Model::AI21JambaInstructV1 => "ai21.jamba-instruct-v1:0",
-            Model::AI21Jamba15LargeV1 => "ai21.jamba-1-5-large-v1:0",
-            Model::AI21Jamba15MiniV1 => "ai21.jamba-1-5-mini-v1:0",
-            Model::CohereCommandTextV14_4k => "cohere.command-text-v14:7:4k",
-            Model::CohereCommandRV1 => "cohere.command-r-v1:0",
-            Model::CohereCommandRPlusV1 => "cohere.command-r-plus-v1:0",
-            Model::CohereCommandLightTextV14_4k => "cohere.command-light-text-v14:7:4k",
-            Model::MetaLlama38BInstructV1 => "meta.llama3-8b-instruct-v1:0",
-            Model::MetaLlama370BInstructV1 => "meta.llama3-70b-instruct-v1:0",
-            Model::MetaLlama318BInstructV1_128k => "meta.llama3-1-8b-instruct-v1:0:128k",
-            Model::MetaLlama318BInstructV1 => "meta.llama3-1-8b-instruct-v1:0",
-            Model::MetaLlama3170BInstructV1_128k => "meta.llama3-1-70b-instruct-v1:0:128k",
-            Model::MetaLlama3170BInstructV1 => "meta.llama3-1-70b-instruct-v1:0",
-            Model::MetaLlama3211BInstructV1 => "meta.llama3-2-11b-instruct-v1:0",
-            Model::MetaLlama3290BInstructV1 => "meta.llama3-2-90b-instruct-v1:0",
-            Model::MetaLlama321BInstructV1 => "meta.llama3-2-1b-instruct-v1:0",
-            Model::MetaLlama323BInstructV1 => "meta.llama3-2-3b-instruct-v1:0",
-            Model::MistralMistral7BInstructV0 => "mistral.mistral-7b-instruct-v0:2",
-            Model::MistralMixtral8x7BInstructV0 => "mistral.mixtral-8x7b-instruct-v0:1",
-            Model::MistralMistralLarge2402V1 => "mistral.mistral-large-2402-v1:0",
-            Model::MistralMistralSmall2402V1 => "mistral.mistral-small-2402-v1:0",
-            Self::Custom { name, .. } => name,
-        }
-    }
-
-    pub fn display_name(&self) -> &str {
-        match self {
-            Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
-            Self::Claude3Opus => "Claude 3 Opus",
-            Self::Claude3Sonnet => "Claude 3 Sonnet",
-            Self::Claude3_5Haiku => "Claude 3.5 Haiku",
-            Self::AmazonNovaLite => "Amazon Nova Lite",
-            Self::AmazonNovaMicro => "Amazon Nova Micro",
-            Self::AmazonNovaPro => "Amazon Nova Pro",
-            Self::AI21J2GrandeInstruct => "AI21 Jurassic2 Grande Instruct",
-            Self::AI21J2JumboInstruct => "AI21 Jurassic2 Jumbo Instruct",
-            Self::AI21J2Mid => "AI21 Jurassic2 Mid",
-            Self::AI21J2MidV1 => "AI21 Jurassic2 Mid V1",
-            Self::AI21J2Ultra => "AI21 Jurassic2 Ultra",
-            Self::AI21J2UltraV1_8k => "AI21 Jurassic2 Ultra V1 8K",
-            Self::AI21J2UltraV1 => "AI21 Jurassic2 Ultra V1",
-            Self::AI21JambaInstructV1 => "AI21 Jamba Instruct",
-            Self::AI21Jamba15LargeV1 => "AI21 Jamba 1.5 Large",
-            Self::AI21Jamba15MiniV1 => "AI21 Jamba 1.5 Mini",
-            Self::CohereCommandTextV14_4k => "Cohere Command Text V14 4K",
-            Self::CohereCommandRV1 => "Cohere Command R V1",
-            Self::CohereCommandRPlusV1 => "Cohere Command R Plus V1",
-            Self::CohereCommandLightTextV14_4k => "Cohere Command Light Text V14 4K",
-            Self::MetaLlama38BInstructV1 => "Meta Llama 3 8B Instruct V1",
-            Self::MetaLlama370BInstructV1 => "Meta Llama 3 70B Instruct V1",
-            Self::MetaLlama318BInstructV1_128k => "Meta Llama 3 1.8B Instruct V1 128K",
-            Self::MetaLlama318BInstructV1 => "Meta Llama 3 1.8B Instruct V1",
-            Self::MetaLlama3170BInstructV1_128k => "Meta Llama 3 1 70B Instruct V1 128K",
-            Self::MetaLlama3170BInstructV1 => "Meta Llama 3 1 70B Instruct V1",
-            Self::MetaLlama3211BInstructV1 => "Meta Llama 3 2 11B Instruct V1",
-            Self::MetaLlama3290BInstructV1 => "Meta Llama 3 2 90B Instruct V1",
-            Self::MetaLlama321BInstructV1 => "Meta Llama 3 2 1B Instruct V1",
-            Self::MetaLlama323BInstructV1 => "Meta Llama 3 2 3B Instruct V1",
-            Self::MistralMistral7BInstructV0 => "Mistral 7B Instruct V0",
-            Self::MistralMixtral8x7BInstructV0 => "Mistral Mixtral 8x7B Instruct V0",
-            Self::MistralMistralLarge2402V1 => "Mistral Large 2402 V1",
-            Self::MistralMistralSmall2402V1 => "Mistral Small 2402 V1",
-            Self::Custom {
-                display_name, name, ..
-            } => display_name.as_deref().unwrap_or(name),
-        }
-    }
-
-    pub fn max_token_count(&self) -> usize {
-        match self {
-            Self::Claude3_5Sonnet
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3_5Haiku => 200_000,
-            Self::Custom { max_tokens, .. } => *max_tokens,
-            _ => 200_000,
-        }
-    }
-
-    pub fn max_output_tokens(&self) -> u32 {
-        match self {
-            Self::Claude3Opus | Self::Claude3Sonnet | Self::Claude3_5Haiku => 4_096,
-            Self::Claude3_5Sonnet => 8_192,
-            Self::Custom {
-                max_output_tokens, ..
-            } => max_output_tokens.unwrap_or(4_096),
-            _ => 4_096,
-        }
-    }
-
-    pub fn default_temperature(&self) -> f32 {
-        match self {
-            Self::Claude3_5Sonnet
-            | Self::Claude3Opus
-            | Self::Claude3Sonnet
-            | Self::Claude3_5Haiku => 1.0,
-            Self::Custom {
-                default_temperature,
-                ..
-            } => default_temperature.unwrap_or(1.0),
-            _ => 1.0,
-        }
-    }
-}

crates/buffer_diff/src/buffer_diff.rs

@@ -3,8 +3,7 @@ use git2::{DiffLineType as GitDiffLineType, DiffOptions as GitOptions, Patch as
 use gpui::{App, AppContext as _, AsyncApp, Context, Entity, EventEmitter};
 use language::{Language, LanguageRegistry};
 use rope::Rope;
-use std::cmp::Ordering;
-use std::{future::Future, iter, ops::Range, sync::Arc};
+use std::{cmp, future::Future, iter, ops::Range, sync::Arc};
 use sum_tree::SumTree;
 use text::ToOffset as _;
 use text::{Anchor, Bias, BufferId, OffsetRangeExt, Point};
@@ -30,16 +29,10 @@ struct BufferDiffInner {
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DiffHunkStatus {
-    pub kind: DiffHunkStatusKind,
-    pub secondary: DiffHunkSecondaryStatus,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub enum DiffHunkStatusKind {
-    Added,
-    Modified,
-    Deleted,
+pub enum DiffHunkStatus {
+    Added(DiffHunkSecondaryStatus),
+    Modified(DiffHunkSecondaryStatus),
+    Removed(DiffHunkSecondaryStatus),
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -49,16 +42,6 @@ pub enum DiffHunkSecondaryStatus {
     None,
 }
 
-impl DiffHunkSecondaryStatus {
-    pub fn is_secondary(&self) -> bool {
-        match self {
-            DiffHunkSecondaryStatus::HasSecondaryHunk => true,
-            DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk => true,
-            DiffHunkSecondaryStatus::None => false,
-        }
-    }
-}
-
 /// A diff hunk resolved to rows in the buffer.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DiffHunk {
@@ -69,6 +52,7 @@ pub struct DiffHunk {
     /// The range in the buffer's diff base text to which this hunk corresponds.
     pub diff_base_byte_range: Range<usize>,
     pub secondary_status: DiffHunkSecondaryStatus,
+    pub secondary_diff_base_byte_range: Option<Range<usize>>,
 }
 
 /// We store [`InternalDiffHunk`]s internally so we don't need to store the additional row range.
@@ -110,17 +94,12 @@ impl sum_tree::Summary for DiffHunkSummary {
 }
 
 impl<'a> sum_tree::SeekTarget<'a, DiffHunkSummary, DiffHunkSummary> for Anchor {
-    fn cmp(&self, cursor_location: &DiffHunkSummary, buffer: &text::BufferSnapshot) -> Ordering {
-        if self
-            .cmp(&cursor_location.buffer_range.start, buffer)
-            .is_lt()
-        {
-            Ordering::Less
-        } else if self.cmp(&cursor_location.buffer_range.end, buffer).is_gt() {
-            Ordering::Greater
-        } else {
-            Ordering::Equal
-        }
+    fn cmp(
+        &self,
+        cursor_location: &DiffHunkSummary,
+        buffer: &text::BufferSnapshot,
+    ) -> cmp::Ordering {
+        self.cmp(&cursor_location.buffer_range.end, buffer)
     }
 }
 
@@ -176,96 +155,97 @@ impl BufferDiffSnapshot {
         }
     }
 
-    pub fn new_secondary_text_for_stage_or_unstage(
+    fn buffer_range_to_unchanged_diff_base_range(
+        &self,
+        buffer_range: Range<Anchor>,
+        buffer: &text::BufferSnapshot,
+    ) -> Option<Range<usize>> {
+        let mut hunks = self.inner.hunks.iter();
+        let mut start = 0;
+        let mut pos = buffer.anchor_before(0);
+        while let Some(hunk) = hunks.next() {
+            assert!(buffer_range.start.cmp(&pos, buffer).is_ge());
+            assert!(hunk.buffer_range.start.cmp(&pos, buffer).is_ge());
+            if hunk
+                .buffer_range
+                .start
+                .cmp(&buffer_range.end, buffer)
+                .is_ge()
+            {
+                // target buffer range is contained in the unchanged stretch leading up to this next hunk,
+                // so do a final adjustment based on that
+                break;
+            }
+
+            // if the target buffer range intersects this hunk at all, no dice
+            if buffer_range
+                .start
+                .cmp(&hunk.buffer_range.end, buffer)
+                .is_lt()
+            {
+                return None;
+            }
+
+            start += hunk.buffer_range.start.to_offset(buffer) - pos.to_offset(buffer);
+            start += hunk.diff_base_byte_range.end - hunk.diff_base_byte_range.start;
+            pos = hunk.buffer_range.end;
+        }
+        start += buffer_range.start.to_offset(buffer) - pos.to_offset(buffer);
+        let end = start + buffer_range.end.to_offset(buffer) - buffer_range.start.to_offset(buffer);
+        Some(start..end)
+    }
+
+    pub fn secondary_edits_for_stage_or_unstage(
         &self,
         stage: bool,
-        hunks: impl Iterator<Item = (Range<Anchor>, Range<usize>)>,
+        hunks: impl Iterator<Item = (Range<usize>, Option<Range<usize>>, Range<Anchor>)>,
         buffer: &text::BufferSnapshot,
-        cx: &mut App,
-    ) -> Option<Rope> {
-        let secondary_diff = self.secondary_diff()?;
-        let index_base = if let Some(index_base) = secondary_diff.base_text() {
-            index_base.text.as_rope().clone()
-        } else if stage {
-            Rope::from("")
-        } else {
-            return None;
+    ) -> Vec<(Range<usize>, String)> {
+        let Some(secondary_diff) = self.secondary_diff() else {
+            log::debug!("no secondary diff");
+            return Vec::new();
         };
+        let index_base = secondary_diff.base_text().map_or_else(
+            || Rope::from(""),
+            |snapshot| snapshot.text.as_rope().clone(),
+        );
         let head_base = self.base_text().map_or_else(
             || Rope::from(""),
             |snapshot| snapshot.text.as_rope().clone(),
         );
-
-        let mut secondary_cursor = secondary_diff.inner.hunks.cursor::<DiffHunkSummary>(buffer);
-        secondary_cursor.next(buffer);
+        log::debug!("original: {:?}", index_base.to_string());
         let mut edits = Vec::new();
-        let mut prev_secondary_hunk_buffer_offset = 0;
-        let mut prev_secondary_hunk_base_text_offset = 0;
-        for (buffer_range, diff_base_byte_range) in hunks {
-            let skipped_hunks = secondary_cursor.slice(&buffer_range.start, Bias::Left, buffer);
-
-            if let Some(secondary_hunk) = skipped_hunks.last() {
-                prev_secondary_hunk_base_text_offset = secondary_hunk.diff_base_byte_range.end;
-                prev_secondary_hunk_buffer_offset =
-                    secondary_hunk.buffer_range.end.to_offset(buffer);
-            }
-
-            let mut buffer_offset_range = buffer_range.to_offset(buffer);
-            let start_overshoot = buffer_offset_range.start - prev_secondary_hunk_buffer_offset;
-            let mut secondary_base_text_start =
-                prev_secondary_hunk_base_text_offset + start_overshoot;
-
-            while let Some(secondary_hunk) = secondary_cursor.item().filter(|item| {
-                item.buffer_range
-                    .start
-                    .cmp(&buffer_range.end, buffer)
-                    .is_le()
-            }) {
-                let secondary_hunk_offset_range = secondary_hunk.buffer_range.to_offset(buffer);
-                prev_secondary_hunk_base_text_offset = secondary_hunk.diff_base_byte_range.end;
-                prev_secondary_hunk_buffer_offset = secondary_hunk_offset_range.end;
-
-                secondary_base_text_start =
-                    secondary_base_text_start.min(secondary_hunk.diff_base_byte_range.start);
-                buffer_offset_range.start = buffer_offset_range
-                    .start
-                    .min(secondary_hunk_offset_range.start);
-
-                secondary_cursor.next(buffer);
-            }
-
-            let end_overshoot = buffer_offset_range
-                .end
-                .saturating_sub(prev_secondary_hunk_buffer_offset);
-            let secondary_base_text_end = prev_secondary_hunk_base_text_offset + end_overshoot;
-
-            let secondary_base_text_range = secondary_base_text_start..secondary_base_text_end;
-            buffer_offset_range.end = buffer_offset_range
-                .end
-                .max(prev_secondary_hunk_buffer_offset);
-
-            let replacement_text = if stage {
+        for (diff_base_byte_range, secondary_diff_base_byte_range, buffer_range) in hunks {
+            let (index_byte_range, replacement_text) = if stage {
                 log::debug!("staging");
-                buffer
-                    .text_for_range(buffer_offset_range)
-                    .collect::<String>()
+                let mut replacement_text = String::new();
+                let Some(index_byte_range) = secondary_diff_base_byte_range.clone() else {
+                    log::debug!("not a stageable hunk");
+                    continue;
+                };
+                log::debug!("using {:?}", index_byte_range);
+                for chunk in buffer.text_for_range(buffer_range.clone()) {
+                    replacement_text.push_str(chunk);
+                }
+                (index_byte_range, replacement_text)
             } else {
                 log::debug!("unstaging");
-                head_base
-                    .chunks_in_range(diff_base_byte_range.clone())
-                    .collect::<String>()
+                let mut replacement_text = String::new();
+                let Some(index_byte_range) = secondary_diff
+                    .buffer_range_to_unchanged_diff_base_range(buffer_range.clone(), &buffer)
+                else {
+                    log::debug!("not an unstageable hunk");
+                    continue;
+                };
+                for chunk in head_base.chunks_in_range(diff_base_byte_range.clone()) {
+                    replacement_text.push_str(chunk);
+                }
+                (index_byte_range, replacement_text)
             };
-            edits.push((secondary_base_text_range, replacement_text));
+            edits.push((index_byte_range, replacement_text));
         }
-
-        let buffer = cx.new(|cx| {
-            language::Buffer::local_normalized(index_base, text::LineEnding::default(), cx)
-        });
-        let new_text = buffer.update(cx, |buffer, cx| {
-            buffer.edit(edits, None, cx);
-            buffer.as_rope().clone()
-        });
-        Some(new_text)
+        log::debug!("edits: {edits:?}");
+        edits
     }
 }
 
@@ -326,12 +306,13 @@ impl BufferDiffInner {
             }
 
             let mut secondary_status = DiffHunkSecondaryStatus::None;
+            let mut secondary_diff_base_byte_range = None;
             if let Some(secondary_cursor) = secondary_cursor.as_mut() {
                 if start_anchor
                     .cmp(&secondary_cursor.start().buffer_range.start, buffer)
                     .is_gt()
                 {
-                    secondary_cursor.seek_forward(&start_anchor, Bias::Left, buffer);
+                    secondary_cursor.seek_forward(&end_anchor, Bias::Left, buffer);
                 }
 
                 if let Some(secondary_hunk) = secondary_cursor.item() {
@@ -342,12 +323,12 @@ impl BufferDiffInner {
                     }
                     if secondary_range == (start_point..end_point) {
                         secondary_status = DiffHunkSecondaryStatus::HasSecondaryHunk;
+                        secondary_diff_base_byte_range =
+                            Some(secondary_hunk.diff_base_byte_range.clone());
                     } else if secondary_range.start <= end_point {
                         secondary_status = DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk;
                     }
                 }
-            } else {
-                log::debug!("no secondary cursor!!");
             }
 
             return Some(DiffHunk {
@@ -355,6 +336,7 @@ impl BufferDiffInner {
                 diff_base_byte_range: start_base..end_base,
                 buffer_range: start_anchor..end_anchor,
                 secondary_status,
+                secondary_diff_base_byte_range,
             });
         })
     }
@@ -389,6 +371,7 @@ impl BufferDiffInner {
                 buffer_range: hunk.buffer_range.clone(),
                 // The secondary status is not used by callers of this method.
                 secondary_status: DiffHunkSecondaryStatus::None,
+                secondary_diff_base_byte_range: None,
             })
         })
     }
@@ -409,12 +392,12 @@ impl BufferDiffInner {
                         .start
                         .cmp(&old_hunk.buffer_range.start, new_snapshot)
                     {
-                        Ordering::Less => {
+                        cmp::Ordering::Less => {
                             start.get_or_insert(new_hunk.buffer_range.start);
                             end.replace(new_hunk.buffer_range.end);
                             new_cursor.next(new_snapshot);
                         }
-                        Ordering::Equal => {
+                        cmp::Ordering::Equal => {
                             if new_hunk != old_hunk {
                                 start.get_or_insert(new_hunk.buffer_range.start);
                                 if old_hunk
@@ -432,7 +415,7 @@ impl BufferDiffInner {
                             new_cursor.next(new_snapshot);
                             old_cursor.next(new_snapshot);
                         }
-                        Ordering::Greater => {
+                        cmp::Ordering::Greater => {
                             start.get_or_insert(old_hunk.buffer_range.start);
                             end.replace(old_hunk.buffer_range.end);
                             old_cursor.next(new_snapshot);
@@ -736,7 +719,6 @@ impl BufferDiff {
         Some(start..end)
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub async fn update_diff(
         this: Entity<BufferDiff>,
         buffer: text::BufferSnapshot,
@@ -944,76 +926,34 @@ impl BufferDiff {
 
 impl DiffHunk {
     pub fn status(&self) -> DiffHunkStatus {
-        let kind = if self.buffer_range.start == self.buffer_range.end {
-            DiffHunkStatusKind::Deleted
+        if self.buffer_range.start == self.buffer_range.end {
+            DiffHunkStatus::Removed(self.secondary_status)
         } else if self.diff_base_byte_range.is_empty() {
-            DiffHunkStatusKind::Added
+            DiffHunkStatus::Added(self.secondary_status)
         } else {
-            DiffHunkStatusKind::Modified
-        };
-        DiffHunkStatus {
-            kind,
-            secondary: self.secondary_status,
+            DiffHunkStatus::Modified(self.secondary_status)
         }
     }
 }
 
 impl DiffHunkStatus {
-    pub fn is_deleted(&self) -> bool {
-        self.kind == DiffHunkStatusKind::Deleted
-    }
-
-    pub fn is_added(&self) -> bool {
-        self.kind == DiffHunkStatusKind::Added
-    }
-
-    pub fn is_modified(&self) -> bool {
-        self.kind == DiffHunkStatusKind::Modified
-    }
-
-    pub fn added(secondary: DiffHunkSecondaryStatus) -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Added,
-            secondary,
-        }
-    }
-
-    pub fn modified(secondary: DiffHunkSecondaryStatus) -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Modified,
-            secondary,
-        }
-    }
-
-    pub fn deleted(secondary: DiffHunkSecondaryStatus) -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Deleted,
-            secondary,
-        }
+    pub fn is_removed(&self) -> bool {
+        matches!(self, DiffHunkStatus::Removed(_))
     }
 
     #[cfg(any(test, feature = "test-support"))]
-    pub fn deleted_none() -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Deleted,
-            secondary: DiffHunkSecondaryStatus::None,
-        }
+    pub fn removed() -> Self {
+        DiffHunkStatus::Removed(DiffHunkSecondaryStatus::None)
     }
 
     #[cfg(any(test, feature = "test-support"))]
-    pub fn added_none() -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Added,
-            secondary: DiffHunkSecondaryStatus::None,
-        }
+    pub fn added() -> Self {
+        DiffHunkStatus::Added(DiffHunkSecondaryStatus::None)
     }
 
     #[cfg(any(test, feature = "test-support"))]
-    pub fn modified_none() -> Self {
-        Self {
-            kind: DiffHunkStatusKind::Modified,
-            secondary: DiffHunkSecondaryStatus::None,
-        }
+    pub fn modified() -> Self {
+        DiffHunkStatus::Modified(DiffHunkSecondaryStatus::None)
     }
 }
 
@@ -1060,7 +1000,6 @@ mod tests {
     use rand::{rngs::StdRng, Rng as _};
     use text::{Buffer, BufferId, Rope};
     use unindent::Unindent as _;
-    use util::test::marked_text_ranges;
 
     #[ctor::ctor]
     fn init_logger() {
@@ -1091,7 +1030,7 @@ mod tests {
             diff.hunks_intersecting_range(Anchor::MIN..Anchor::MAX, &buffer, None),
             &buffer,
             &diff_base,
-            &[(1..2, "two\n", "HELLO\n", DiffHunkStatus::modified_none())],
+            &[(1..2, "two\n", "HELLO\n", DiffHunkStatus::modified())],
         );
 
         buffer.edit([(0..0, "point five\n")]);
@@ -1101,8 +1040,8 @@ mod tests {
             &buffer,
             &diff_base,
             &[
-                (0..1, "", "point five\n", DiffHunkStatus::added_none()),
-                (2..3, "two\n", "HELLO\n", DiffHunkStatus::modified_none()),
+                (0..1, "", "point five\n", DiffHunkStatus::added()),
+                (2..3, "two\n", "HELLO\n", DiffHunkStatus::modified()),
             ],
         );
 
@@ -1165,18 +1104,23 @@ mod tests {
         let uncommitted_diff = BufferDiff::build_sync(buffer.clone(), head_text.clone(), cx);
 
         let expected_hunks = vec![
-            (2..3, "two\n", "TWO\n", DiffHunkStatus::modified_none()),
+            (
+                2..3,
+                "two\n",
+                "TWO\n",
+                DiffHunkStatus::Modified(DiffHunkSecondaryStatus::None),
+            ),
             (
                 4..6,
                 "four\nfive\n",
                 "FOUR\nFIVE\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
+                DiffHunkStatus::Modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
             ),
             (
                 7..8,
                 "seven\n",
                 "SEVEN\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
+                DiffHunkStatus::Modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
             ),
         ];
 
@@ -1252,215 +1196,13 @@ mod tests {
             &buffer,
             &diff_base,
             &[
-                (6..7, "", "HELLO\n", DiffHunkStatus::added_none()),
-                (9..10, "six\n", "SIXTEEN\n", DiffHunkStatus::modified_none()),
-                (12..13, "", "WORLD\n", DiffHunkStatus::added_none()),
+                (6..7, "", "HELLO\n", DiffHunkStatus::added()),
+                (9..10, "six\n", "SIXTEEN\n", DiffHunkStatus::modified()),
+                (12..13, "", "WORLD\n", DiffHunkStatus::added()),
             ],
         );
     }
 
-    #[gpui::test]
-    async fn test_stage_hunk(cx: &mut TestAppContext) {
-        struct Example {
-            name: &'static str,
-            head_text: String,
-            index_text: String,
-            buffer_marked_text: String,
-            final_index_text: String,
-        }
-
-        let table = [
-            Example {
-                name: "uncommitted hunk straddles end of unstaged hunk",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    TWO_HUNDRED
-                    three
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    ZERO
-                    one
-                    two
-                    «THREE_HUNDRED
-                    FOUR_HUNDRED»
-                    five
-                    SIX
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    two
-                    THREE_HUNDRED
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-            },
-            Example {
-                name: "uncommitted hunk straddles start of unstaged hunk",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    TWO_HUNDRED
-                    three
-                    FOUR_HUNDRED
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    ZERO
-                    one
-                    «TWO_HUNDRED
-                    THREE_HUNDRED»
-                    four
-                    five
-                    SIX
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    TWO_HUNDRED
-                    THREE_HUNDRED
-                    four
-                    five
-                "
-                .unindent(),
-            },
-            Example {
-                name: "uncommitted hunk strictly contains unstaged hunks",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                    six
-                    seven
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    TWO
-                    THREE
-                    FOUR
-                    FIVE
-                    SIX
-                    seven
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    one
-                    TWO
-                    «THREE_HUNDRED
-                    FOUR
-                    FIVE_HUNDRED»
-                    SIX
-                    seven
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    TWO
-                    THREE_HUNDRED
-                    FOUR
-                    FIVE_HUNDRED
-                    SIX
-                    seven
-                "
-                .unindent(),
-            },
-            Example {
-                name: "uncommitted deletion hunk",
-                head_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                index_text: "
-                    one
-                    two
-                    three
-                    four
-                    five
-                "
-                .unindent(),
-                buffer_marked_text: "
-                    one
-                    ˇfive
-                "
-                .unindent(),
-                final_index_text: "
-                    one
-                    five
-                "
-                .unindent(),
-            },
-        ];
-
-        for example in table {
-            let (buffer_text, ranges) = marked_text_ranges(&example.buffer_marked_text, false);
-            let buffer = Buffer::new(0, BufferId::new(1).unwrap(), buffer_text);
-            let uncommitted_diff =
-                BufferDiff::build_sync(buffer.clone(), example.head_text.clone(), cx);
-            let unstaged_diff =
-                BufferDiff::build_sync(buffer.clone(), example.index_text.clone(), cx);
-            let uncommitted_diff = BufferDiffSnapshot {
-                inner: uncommitted_diff,
-                secondary_diff: Some(Box::new(BufferDiffSnapshot {
-                    inner: unstaged_diff,
-                    is_single_insertion: false,
-                    secondary_diff: None,
-                })),
-                is_single_insertion: false,
-            };
-
-            let range = buffer.anchor_before(ranges[0].start)..buffer.anchor_before(ranges[0].end);
-
-            let new_index_text = cx
-                .update(|cx| {
-                    uncommitted_diff.new_secondary_text_for_stage_or_unstage(
-                        true,
-                        uncommitted_diff
-                            .hunks_intersecting_range(range, &buffer)
-                            .map(|hunk| {
-                                (hunk.buffer_range.clone(), hunk.diff_base_byte_range.clone())
-                            }),
-                        &buffer,
-                        cx,
-                    )
-                })
-                .unwrap()
-                .to_string();
-            pretty_assertions::assert_eq!(
-                new_index_text,
-                example.final_index_text,
-                "example: {}",
-                example.name
-            );
-        }
-    }
-
     #[gpui::test]
     async fn test_buffer_diff_compare(cx: &mut TestAppContext) {
         let base_text = "
@@ -1586,7 +1328,7 @@ mod tests {
     }
 
     #[gpui::test(iterations = 100)]
-    async fn test_staging_and_unstaging_hunks(cx: &mut TestAppContext, mut rng: StdRng) {
+    async fn test_secondary_edits_for_stage_unstage(cx: &mut TestAppContext, mut rng: StdRng) {
         fn gen_line(rng: &mut StdRng) -> String {
             if rng.gen_bool(0.2) {
                 "\n".to_owned()
@@ -1651,7 +1393,7 @@ mod tests {
 
         fn uncommitted_diff(
             working_copy: &language::BufferSnapshot,
-            index_text: &Rope,
+            index_text: &Entity<language::Buffer>,
             head_text: String,
             cx: &mut TestAppContext,
         ) -> BufferDiff {
@@ -1660,7 +1402,7 @@ mod tests {
                 buffer_id: working_copy.remote_id(),
                 inner: BufferDiff::build_sync(
                     working_copy.text.clone(),
-                    index_text.to_string(),
+                    index_text.read_with(cx, |index_text, _| index_text.text()),
                     cx,
                 ),
                 secondary_diff: None,
@@ -1691,11 +1433,17 @@ mod tests {
             )
         });
         let working_copy = working_copy.read_with(cx, |working_copy, _| working_copy.snapshot());
-        let mut index_text = if rng.gen() {
-            Rope::from(head_text.as_str())
-        } else {
-            working_copy.as_rope().clone()
-        };
+        let index_text = cx.new(|cx| {
+            language::Buffer::local_normalized(
+                if rng.gen() {
+                    Rope::from(head_text.as_str())
+                } else {
+                    working_copy.as_rope().clone()
+                },
+                text::LineEnding::default(),
+                cx,
+            )
+        });
 
         let mut diff = uncommitted_diff(&working_copy, &index_text, head_text.clone(), cx);
         let mut hunks = cx.update(|cx| {
@@ -1709,29 +1457,37 @@ mod tests {
         for _ in 0..operations {
             let i = rng.gen_range(0..hunks.len());
             let hunk = &mut hunks[i];
-            let stage = match hunk.secondary_status {
-                DiffHunkSecondaryStatus::HasSecondaryHunk => {
+            let hunk_fields = (
+                hunk.diff_base_byte_range.clone(),
+                hunk.secondary_diff_base_byte_range.clone(),
+                hunk.buffer_range.clone(),
+            );
+            let stage = match (
+                hunk.secondary_status,
+                hunk.secondary_diff_base_byte_range.clone(),
+            ) {
+                (DiffHunkSecondaryStatus::HasSecondaryHunk, Some(_)) => {
                     hunk.secondary_status = DiffHunkSecondaryStatus::None;
+                    hunk.secondary_diff_base_byte_range = None;
                     true
                 }
-                DiffHunkSecondaryStatus::None => {
+                (DiffHunkSecondaryStatus::None, None) => {
                     hunk.secondary_status = DiffHunkSecondaryStatus::HasSecondaryHunk;
+                    // We don't look at this, just notice whether it's Some or not.
+                    hunk.secondary_diff_base_byte_range = Some(17..17);
                     false
                 }
                 _ => unreachable!(),
             };
 
             let snapshot = cx.update(|cx| diff.snapshot(cx));
-            index_text = cx.update(|cx| {
-                snapshot
-                    .new_secondary_text_for_stage_or_unstage(
-                        stage,
-                        [(hunk.buffer_range.clone(), hunk.diff_base_byte_range.clone())]
-                            .into_iter(),
-                        &working_copy,
-                        cx,
-                    )
-                    .unwrap()
+            let edits = snapshot.secondary_edits_for_stage_or_unstage(
+                stage,
+                [hunk_fields].into_iter(),
+                &working_copy,
+            );
+            index_text.update(cx, |index_text, cx| {
+                index_text.edit(edits, None, cx);
             });
 
             diff = uncommitted_diff(&working_copy, &index_text, head_text.clone(), cx);
@@ -1740,7 +1496,6 @@ mod tests {
                     .collect::<Vec<_>>()
             });
             assert_eq!(hunks.len(), found_hunks.len());
-
             for (expected_hunk, found_hunk) in hunks.iter().zip(&found_hunks) {
                 assert_eq!(
                     expected_hunk.buffer_range.to_point(&working_copy),
@@ -1751,6 +1506,10 @@ mod tests {
                     found_hunk.diff_base_byte_range
                 );
                 assert_eq!(expected_hunk.secondary_status, found_hunk.secondary_status);
+                assert_eq!(
+                    expected_hunk.secondary_diff_base_byte_range.is_some(),
+                    found_hunk.secondary_diff_base_byte_range.is_some()
+                )
             }
             hunks = found_hunks;
         }

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 going to spawn off the CLI of that version, with trailing args passed along.
+        // 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.
         use std::str::FromStr as _;
 
         if let Ok(channel) = release_channel::ReleaseChannel::from_str(&channel[2..]) {

crates/client/Cargo.toml

@@ -22,7 +22,6 @@ 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

crates/client/src/client.rs

@@ -15,7 +15,6 @@ 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,
@@ -58,6 +57,14 @@ 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()
@@ -186,7 +193,7 @@ pub struct Client {
     peer: Arc<Peer>,
     http: Arc<HttpClientWithUrl>,
     telemetry: Arc<Telemetry>,
-    credentials_provider: ClientCredentialsProvider,
+    credentials_provider: Arc<dyn CredentialsProvider + Send + Sync + 'static>,
     state: RwLock<ClientState>,
     handler_set: parking_lot::Mutex<ProtoMessageHandlerSet>,
 
@@ -297,46 +304,16 @@ impl Credentials {
     }
 }
 
-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())
-    }
-
+/// A provider for [`Credentials`].
+///
+/// Used to abstract over reading and writing credentials to some form of
+/// persistence (like the system keychain).
+trait CredentialsProvider {
     /// Reads the credentials from the provider.
     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 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()
-    }
+    ) -> Pin<Box<dyn Future<Output = Option<Credentials>> + 'a>>;
 
     /// Writes the credentials to the provider.
     fn write_credentials<'a>(
@@ -344,32 +321,13 @@ impl ClientCredentialsProvider {
         user_id: u64,
         access_token: String,
         cx: &'a AsyncApp,
-    ) -> 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()
-    }
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
 
     /// Deletes the credentials from the provider.
     fn delete_credentials<'a>(
         &'a self,
         cx: &'a AsyncApp,
-    ) -> 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()
-    }
+    ) -> Pin<Box<dyn Future<Output = Result<()>> + 'a>>;
 }
 
 impl Default for ClientState {
@@ -526,12 +484,27 @@ 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: ClientCredentialsProvider::new(cx),
+            credentials_provider,
             state: Default::default(),
             handler_set: Default::default(),
 
@@ -869,7 +842,8 @@ 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! {
@@ -1614,6 +1588,130 @@ 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";
 

crates/collab/Cargo.toml

@@ -89,11 +89,8 @@ channel.workspace = true
 client = { workspace = true, features = ["test-support"] }
 collab_ui = { workspace = true, features = ["test-support"] }
 collections = { workspace = true, features = ["test-support"] }
-command_palette_hooks.workspace = true
 context_server.workspace = true
 ctor.workspace = true
-dap = { workspace = true, features = ["test-support"] }
-debugger_ui = { workspace = true, features = ["test-support"] }
 editor = { workspace = true, features = ["test-support"] }
 env_logger.workspace = true
 extension.workspace = true

crates/collab/migrations.sqlite/20221109000000_test_schema.sql

@@ -469,14 +469,3 @@ CREATE TABLE IF NOT EXISTS processed_stripe_events (
 );
 
 CREATE INDEX "ix_processed_stripe_events_on_stripe_event_created_timestamp" ON processed_stripe_events (stripe_event_created_timestamp);
-
-CREATE TABLE IF NOT EXISTS "breakpoints" (
-    "id" INTEGER PRIMARY KEY AUTOINCREMENT,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "position" INTEGER NOT NULL,
-    "log_message" TEXT NULL,
-    "worktree_id" BIGINT NOT NULL,
-    "path" TEXT NOT NULL,
-    "kind" VARCHAR NOT NULL
-);
-CREATE INDEX "index_breakpoints_on_project_id" ON "breakpoints" ("project_id");

crates/collab/migrations/20241121185750_add_breakpoints.sql

@@ -1,11 +0,0 @@
-CREATE TABLE IF NOT EXISTS "breakpoints" (
-    "id" SERIAL PRIMARY KEY,
-    "project_id" INTEGER NOT NULL REFERENCES projects (id) ON DELETE CASCADE,
-    "position" INTEGER NOT NULL,
-    "log_message" TEXT NULL,
-    "worktree_id" BIGINT NOT NULL,
-    "path" TEXT NOT NULL,
-    "kind" VARCHAR NOT NULL
-);
-
-CREATE INDEX "index_breakpoints_on_project_id" ON "breakpoints" ("project_id");

crates/collab/src/db.rs

@@ -659,7 +659,6 @@ pub struct RejoinedProject {
     pub collaborators: Vec<ProjectCollaborator>,
     pub worktrees: Vec<RejoinedWorktree>,
     pub language_servers: Vec<proto::LanguageServer>,
-    pub breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>>,
 }
 
 impl RejoinedProject {
@@ -682,17 +681,6 @@ impl RejoinedProject {
                 .map(|collaborator| collaborator.to_proto())
                 .collect(),
             language_servers: self.language_servers.clone(),
-            breakpoints: self
-                .breakpoints
-                .iter()
-                .map(
-                    |(project_path, breakpoints)| proto::SynchronizeBreakpoints {
-                        project_id: self.id.to_proto(),
-                        breakpoints: breakpoints.iter().cloned().collect(),
-                        project_path: Some(project_path.clone()),
-                    },
-                )
-                .collect(),
         }
     }
 }
@@ -739,7 +727,6 @@ pub struct Project {
     pub collaborators: Vec<ProjectCollaborator>,
     pub worktrees: BTreeMap<u64, Worktree>,
     pub language_servers: Vec<proto::LanguageServer>,
-    pub breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>>,
 }
 
 pub struct ProjectCollaborator {

crates/collab/src/db/ids.rs

@@ -94,9 +94,6 @@ id_type!(RoomParticipantId);
 id_type!(ServerId);
 id_type!(SignupId);
 id_type!(UserId);
-id_type!(DebugClientId);
-id_type!(SessionId);
-id_type!(ThreadId);
 
 /// ChannelRole gives you permissions for both channels and calls.
 #[derive(

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

@@ -229,7 +229,6 @@ impl Database {
     }
 
     /// Creates a new channel message.
-    #[allow(clippy::too_many_arguments)]
     pub async fn create_channel_message(
         &self,
         channel_id: ChannelId,

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

@@ -1,5 +1,5 @@
 use anyhow::Context as _;
-use collections::{HashMap, HashSet};
+
 use util::ResultExt;
 
 use super::*;
@@ -571,60 +571,6 @@ impl Database {
         .await
     }
 
-    pub async fn update_breakpoints(
-        &self,
-        connection_id: ConnectionId,
-        update: &proto::SynchronizeBreakpoints,
-    ) -> Result<TransactionGuard<HashSet<ConnectionId>>> {
-        let project_id = ProjectId::from_proto(update.project_id);
-        self.project_transaction(project_id, |tx| async move {
-            let project_path = update
-                .project_path
-                .as_ref()
-                .ok_or_else(|| anyhow!("invalid project path"))?;
-
-            // Ensure the update comes from the host.
-            let project = project::Entity::find_by_id(project_id)
-                .one(&*tx)
-                .await?
-                .ok_or_else(|| anyhow!("no such project"))?;
-
-            // remove all existing breakpoints
-            breakpoints::Entity::delete_many()
-                .filter(breakpoints::Column::ProjectId.eq(project.id))
-                .exec(&*tx)
-                .await?;
-
-            if !update.breakpoints.is_empty() {
-                breakpoints::Entity::insert_many(update.breakpoints.iter().map(|breakpoint| {
-                    breakpoints::ActiveModel {
-                        id: ActiveValue::NotSet,
-                        project_id: ActiveValue::Set(project_id),
-                        worktree_id: ActiveValue::Set(project_path.worktree_id as i64),
-                        path: ActiveValue::Set(project_path.path.clone()),
-                        kind: match proto::BreakpointKind::from_i32(breakpoint.kind) {
-                            Some(proto::BreakpointKind::Log) => {
-                                ActiveValue::Set(breakpoints::BreakpointKind::Log)
-                            }
-                            Some(proto::BreakpointKind::Standard) => {
-                                ActiveValue::Set(breakpoints::BreakpointKind::Standard)
-                            }
-                            None => ActiveValue::Set(breakpoints::BreakpointKind::Standard),
-                        },
-                        log_message: ActiveValue::Set(breakpoint.message.clone()),
-                        position: ActiveValue::Set(breakpoint.cached_position as i32),
-                    }
-                }))
-                .exec_without_returning(&*tx)
-                .await?;
-            }
-
-            self.internal_project_connection_ids(project_id, connection_id, true, &tx)
-                .await
-        })
-        .await
-    }
-
     /// Updates the worktree settings for the given connection.
     pub async fn update_worktree_settings(
         &self,
@@ -906,33 +852,6 @@ impl Database {
             }
         }
 
-        let mut breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>> =
-            HashMap::default();
-
-        let db_breakpoints = project.find_related(breakpoints::Entity).all(tx).await?;
-
-        for breakpoint in db_breakpoints.iter() {
-            let project_path = proto::ProjectPath {
-                worktree_id: breakpoint.worktree_id as u64,
-                path: breakpoint.path.clone(),
-            };
-
-            breakpoints
-                .entry(project_path)
-                .or_default()
-                .insert(proto::Breakpoint {
-                    position: None,
-                    cached_position: breakpoint.position as u32,
-                    kind: match breakpoint.kind {
-                        breakpoints::BreakpointKind::Standard => {
-                            proto::BreakpointKind::Standard.into()
-                        }
-                        breakpoints::BreakpointKind::Log => proto::BreakpointKind::Log.into(),
-                    },
-                    message: breakpoint.log_message.clone(),
-                });
-        }
-
         // Populate language servers.
         let language_servers = project
             .find_related(language_server::Entity)
@@ -960,7 +879,6 @@ impl Database {
                     worktree_id: None,
                 })
                 .collect(),
-            breakpoints,
         };
         Ok((project, replica_id as ReplicaId))
     }
@@ -1188,52 +1106,41 @@ impl Database {
         exclude_dev_server: bool,
     ) -> Result<TransactionGuard<HashSet<ConnectionId>>> {
         self.project_transaction(project_id, |tx| async move {
-            self.internal_project_connection_ids(project_id, connection_id, exclude_dev_server, &tx)
-                .await
+            let project = project::Entity::find_by_id(project_id)
+                .one(&*tx)
+                .await?
+                .ok_or_else(|| anyhow!("no such project"))?;
+
+            let mut collaborators = project_collaborator::Entity::find()
+                .filter(project_collaborator::Column::ProjectId.eq(project_id))
+                .stream(&*tx)
+                .await?;
+
+            let mut connection_ids = HashSet::default();
+            if let Some(host_connection) = project.host_connection().log_err() {
+                if !exclude_dev_server {
+                    connection_ids.insert(host_connection);
+                }
+            }
+
+            while let Some(collaborator) = collaborators.next().await {
+                let collaborator = collaborator?;
+                connection_ids.insert(collaborator.connection());
+            }
+
+            if connection_ids.contains(&connection_id)
+                || Some(connection_id) == project.host_connection().ok()
+            {
+                Ok(connection_ids)
+            } else {
+                Err(anyhow!(
+                    "can only send project updates to a project you're in"
+                ))?
+            }
         })
         .await
     }
 
-    async fn internal_project_connection_ids(
-        &self,
-        project_id: ProjectId,
-        connection_id: ConnectionId,
-        exclude_dev_server: bool,
-        tx: &DatabaseTransaction,
-    ) -> Result<HashSet<ConnectionId>> {
-        let project = project::Entity::find_by_id(project_id)
-            .one(tx)
-            .await?
-            .ok_or_else(|| anyhow!("no such project"))?;
-
-        let mut collaborators = project_collaborator::Entity::find()
-            .filter(project_collaborator::Column::ProjectId.eq(project_id))
-            .stream(tx)
-            .await?;
-
-        let mut connection_ids = HashSet::default();
-        if let Some(host_connection) = project.host_connection().log_err() {
-            if !exclude_dev_server {
-                connection_ids.insert(host_connection);
-            }
-        }
-
-        while let Some(collaborator) = collaborators.next().await {
-            let collaborator = collaborator?;
-            connection_ids.insert(collaborator.connection());
-        }
-
-        if connection_ids.contains(&connection_id)
-            || Some(connection_id) == project.host_connection().ok()
-        {
-            Ok(connection_ids)
-        } else {
-            Err(anyhow!(
-                "can only send project updates to a project you're in"
-            ))?
-        }
-    }
-
     async fn project_guest_connection_ids(
         &self,
         project_id: ProjectId,

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

@@ -765,33 +765,6 @@ impl Database {
             worktrees.push(worktree);
         }
 
-        let mut breakpoints: HashMap<proto::ProjectPath, HashSet<proto::Breakpoint>> =
-            HashMap::default();
-
-        let db_breakpoints = project.find_related(breakpoints::Entity).all(tx).await?;
-
-        for breakpoint in db_breakpoints.iter() {
-            let project_path = proto::ProjectPath {
-                worktree_id: breakpoint.worktree_id as u64,
-                path: breakpoint.path.clone(),
-            };
-
-            breakpoints
-                .entry(project_path)
-                .or_default()
-                .insert(proto::Breakpoint {
-                    position: None,
-                    cached_position: breakpoint.position as u32,
-                    kind: match breakpoint.kind {
-                        breakpoints::BreakpointKind::Standard => {
-                            proto::BreakpointKind::Standard.into()
-                        }
-                        breakpoints::BreakpointKind::Log => proto::BreakpointKind::Log.into(),
-                    },
-                    message: breakpoint.log_message.clone(),
-                });
-        }
-
         let language_servers = project
             .find_related(language_server::Entity)
             .all(tx)
@@ -861,7 +834,6 @@ impl Database {
             collaborators,
             worktrees,
             language_servers,
-            breakpoints,
         }))
     }
 

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

@@ -122,7 +122,6 @@ impl Database {
         .await
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub async fn get_or_create_user_by_github_account_tx(
         &self,
         github_login: &str,

crates/collab/src/db/tables.rs

@@ -2,7 +2,6 @@ pub mod access_token;
 pub mod billing_customer;
 pub mod billing_preference;
 pub mod billing_subscription;
-pub mod breakpoints;
 pub mod buffer;
 pub mod buffer_operation;
 pub mod buffer_snapshot;

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

@@ -1,47 +0,0 @@
-use crate::db::ProjectId;
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
-#[sea_orm(table_name = "breakpoints")]
-pub struct Model {
-    #[sea_orm(primary_key)]
-    pub id: i32,
-    #[sea_orm(primary_key)]
-    pub project_id: ProjectId,
-    pub worktree_id: i64,
-    pub path: String,
-    pub kind: BreakpointKind,
-    pub log_message: Option<String>,
-    pub position: i32,
-}
-
-#[derive(
-    Copy, Clone, Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default, Hash, serde::Serialize,
-)]
-#[sea_orm(rs_type = "String", db_type = "String(StringLen::None)")]
-#[serde(rename_all = "snake_case")]
-pub enum BreakpointKind {
-    #[default]
-    #[sea_orm(string_value = "standard")]
-    Standard,
-    #[sea_orm(string_value = "log")]
-    Log,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::project::Entity",
-        from = "Column::ProjectId",
-        to = "super::project::Column::Id"
-    )]
-    Project,
-}
-
-impl Related<super::project::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Project.def()
-    }
-}
-
-impl ActiveModelBehavior for ActiveModel {}

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

@@ -49,8 +49,6 @@ pub enum Relation {
     Collaborators,
     #[sea_orm(has_many = "super::language_server::Entity")]
     LanguageServers,
-    #[sea_orm(has_many = "super::breakpoints::Entity")]
-    Breakpoints,
 }
 
 impl Related<super::user::Entity> for Entity {
@@ -83,10 +81,4 @@ impl Related<super::language_server::Entity> for Entity {
     }
 }
 
-impl Related<super::breakpoints::Entity> for Entity {
-    fn to() -> RelationDef {
-        Relation::Breakpoints.def()
-    }
-}
-
 impl ActiveModelBehavior for ActiveModel {}

crates/collab/src/llm.rs

@@ -256,7 +256,6 @@ async fn perform_completion(
             // so that users can use the new version, without having to update Zed.
             request.model = match model.as_str() {
                 "claude-3-5-sonnet" => anthropic::Model::Claude3_5Sonnet.id().to_string(),
-                "claude-3-7-sonnet" => anthropic::Model::Claude3_7Sonnet.id().to_string(),
                 "claude-3-opus" => anthropic::Model::Claude3Opus.id().to_string(),
                 "claude-3-haiku" => anthropic::Model::Claude3Haiku.id().to_string(),
                 "claude-3-sonnet" => anthropic::Model::Claude3Sonnet.id().to_string(),

crates/collab/src/llm/db/queries/usages.rs

@@ -289,7 +289,6 @@ impl LlmDatabase {
         .await
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub async fn record_usage(
         &self,
         user_id: UserId,
@@ -554,7 +553,6 @@ impl LlmDatabase {
         .await
     }
 
-    #[allow(clippy::too_many_arguments)]
     async fn update_usage_for_measure(
         &self,
         user_id: UserId,

crates/collab/src/llm/token.rs

@@ -33,7 +33,6 @@ pub struct LlmTokenClaims {
 const LLM_TOKEN_LIFETIME: Duration = Duration::from_secs(60 * 60);
 
 impl LlmTokenClaims {
-    #[allow(clippy::too_many_arguments)]
     pub fn create(
         user: &user::Model,
         is_staff: bool,

crates/collab/src/rpc.rs

@@ -392,13 +392,9 @@ impl Server {
             .add_request_handler(forward_mutating_project_request::<proto::OpenContext>)
             .add_request_handler(forward_mutating_project_request::<proto::CreateContext>)
             .add_request_handler(forward_mutating_project_request::<proto::SynchronizeContexts>)
-            .add_request_handler(forward_mutating_project_request::<proto::Push>)
-            .add_request_handler(forward_mutating_project_request::<proto::Pull>)
-            .add_request_handler(forward_mutating_project_request::<proto::Fetch>)
             .add_request_handler(forward_mutating_project_request::<proto::Stage>)
             .add_request_handler(forward_mutating_project_request::<proto::Unstage>)
             .add_request_handler(forward_mutating_project_request::<proto::Commit>)
-            .add_request_handler(forward_read_only_project_request::<proto::GetRemotes>)
             .add_request_handler(forward_read_only_project_request::<proto::GitShow>)
             .add_request_handler(forward_read_only_project_request::<proto::GitReset>)
             .add_request_handler(forward_read_only_project_request::<proto::GitCheckoutFiles>)
@@ -427,40 +423,7 @@ impl Server {
                         app_state.config.openai_api_key.clone(),
                     )
                 }
-            })
-            .add_message_handler(update_breakpoints)
-            .add_message_handler(broadcast_project_message_from_host::<proto::SetActiveDebugLine>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::RemoveActiveDebugLine>,
-            )
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateDebugAdapter>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::SetDebugClientCapabilities>,
-            )
-            .add_message_handler(broadcast_project_message_from_host::<proto::ShutdownDebugClient>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapNextRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepInRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepOutRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapStepBackRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapContinueRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapPauseRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapDisconnectRequest>)
-            .add_request_handler(
-                forward_mutating_project_request::<proto::DapTerminateThreadsRequest>,
-            )
-            .add_request_handler(forward_mutating_project_request::<proto::DapRestartRequest>)
-            .add_request_handler(forward_mutating_project_request::<proto::DapTerminateRequest>)
-            .add_message_handler(broadcast_project_message_from_host::<proto::UpdateThreadStatus>)
-            .add_request_handler(forward_mutating_project_request::<proto::VariablesRequest>)
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::DapRestartStackFrameRequest>,
-            )
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::ToggleIgnoreBreakpoints>,
-            )
-            .add_message_handler(
-                broadcast_project_message_from_host::<proto::IgnoreBreakpointState>,
-            );
+            });
 
         Arc::new(server)
     }
@@ -728,7 +691,6 @@ impl Server {
         })
     }
 
-    #[allow(clippy::too_many_arguments)]
     pub fn handle_connection(
         self: &Arc<Self>,
         connection: Connection,
@@ -1112,7 +1074,6 @@ pub fn routes(server: Arc<Server>) -> Router<(), Body> {
         .layer(Extension(server))
 }
 
-#[allow(clippy::too_many_arguments)]
 pub async fn handle_websocket_request(
     TypedHeader(ProtocolVersion(protocol_version)): TypedHeader<ProtocolVersion>,
     app_version_header: Option<TypedHeader<AppVersionHeader>>,
@@ -1900,18 +1861,6 @@ fn join_project_internal(
             .trace_err();
     }
 
-    let breakpoints = project
-        .breakpoints
-        .iter()
-        .map(
-            |(project_path, breakpoint_set)| proto::SynchronizeBreakpoints {
-                project_id: project.id.0 as u64,
-                breakpoints: breakpoint_set.iter().map(|bp| bp.clone()).collect(),
-                project_path: Some(project_path.clone()),
-            },
-        )
-        .collect();
-
     // First, we send the metadata associated with each worktree.
     response.send(proto::JoinProjectResponse {
         project_id: project.id.0 as u64,
@@ -1920,7 +1869,6 @@ fn join_project_internal(
         collaborators: collaborators.clone(),
         language_servers: project.language_servers.clone(),
         role: project.role.into(),
-        breakpoints,
     })?;
 
     for (worktree_id, worktree) in mem::take(&mut project.worktrees) {
@@ -2107,7 +2055,7 @@ async fn update_worktree_settings(
     Ok(())
 }
 
-/// Notify other participants that a language server has started.
+/// Notify other participants that a  language server has started.
 async fn start_language_server(
     request: proto::StartLanguageServer,
     session: Session,
@@ -2153,29 +2101,6 @@ async fn update_language_server(
     Ok(())
 }
 
-/// Notify other participants that breakpoints have changed.
-async fn update_breakpoints(
-    request: proto::SynchronizeBreakpoints,
-    session: Session,
-) -> Result<()> {
-    let guest_connection_ids = session
-        .db()
-        .await
-        .update_breakpoints(session.connection_id, &request)
-        .await?;
-
-    broadcast(
-        Some(session.connection_id),
-        guest_connection_ids.iter().copied(),
-        |connection_id| {
-            session
-                .peer
-                .forward_send(session.connection_id, connection_id, request.clone())
-        },
-    );
-    Ok(())
-}
-
 /// forward a project request to the host. These requests should be read only
 /// as guests are allowed to send them.
 async fn forward_read_only_project_request<T>(

crates/collab/src/tests.rs

@@ -11,7 +11,6 @@ mod channel_buffer_tests;
 mod channel_guest_tests;
 mod channel_message_tests;
 mod channel_tests;
-mod debug_panel_tests;
 mod editor_tests;
 mod following_tests;
 mod integration_tests;

crates/collab/src/tests/editor_tests.rs

@@ -22,7 +22,7 @@ use language::{
 };
 use project::{
     project_settings::{InlineBlameSettings, ProjectSettings},
-    ProjectPath, SERVER_PROGRESS_THROTTLE_TIMEOUT,
+    SERVER_PROGRESS_THROTTLE_TIMEOUT,
 };
 use recent_projects::disconnected_overlay::DisconnectedOverlay;
 use rpc::RECEIVE_TIMEOUT;
@@ -1591,8 +1591,6 @@ async fn test_mutual_editor_inlay_hint_cache_update(
         .await
         .unwrap();
 
-    executor.run_until_parked();
-
     // Client B joins the project
     let project_b = client_b.join_remote_project(project_id, cx_b).await;
     active_call_b
@@ -2396,202 +2394,6 @@ fn main() { let foo = other::foo(); }"};
     );
 }
 
-#[gpui::test]
-async fn test_add_breakpoints(cx_a: &mut TestAppContext, cx_b: &mut TestAppContext) {
-    let executor = cx_a.executor();
-    let mut server = TestServer::start(executor.clone()).await;
-    let client_a = server.create_client(cx_a, "user_a").await;
-    let client_b = server.create_client(cx_b, "user_b").await;
-    server
-        .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
-        .await;
-    let active_call_a = cx_a.read(ActiveCall::global);
-    let active_call_b = cx_b.read(ActiveCall::global);
-    cx_a.update(editor::init);
-    cx_b.update(editor::init);
-    client_a
-        .fs()
-        .insert_tree(
-            "/a",
-            json!({
-                "test.txt": "one\ntwo\nthree\nfour\nfive",
-            }),
-        )
-        .await;
-    let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
-    let project_path = ProjectPath {
-        worktree_id,
-        path: Arc::from(Path::new(&"test.txt")),
-    };
-    active_call_a
-        .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
-        .await
-        .unwrap();
-    let project_id = active_call_a
-        .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
-        .await
-        .unwrap();
-    let project_b = client_b.join_remote_project(project_id, cx_b).await;
-    active_call_b
-        .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
-        .await
-        .unwrap();
-    let (workspace_a, cx_a) = client_a.build_workspace(&project_a, cx_a);
-    let (workspace_b, cx_b) = client_b.build_workspace(&project_b, cx_b);
-
-    // Client A opens an editor.
-    let editor_a = workspace_a
-        .update_in(cx_a, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    // Client B opens same editor as A.
-    let editor_b = workspace_b
-        .update_in(cx_b, |workspace, window, cx| {
-            workspace.open_path(project_path.clone(), None, true, window, cx)
-        })
-        .await
-        .unwrap()
-        .downcast::<Editor>()
-        .unwrap();
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    // Client A adds breakpoint on line (1)
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(1, breakpoints_a.get(&project_path).unwrap().len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-
-    // Client B adds breakpoint on line(2)
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(2, breakpoints_a.get(&project_path).unwrap().len());
-
-    // Client A removes last added breakpoint from client B
-    editor_a.update_in(cx_a, |editor, window, cx| {
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.move_down(&editor::actions::MoveDown, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(1, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-    assert_eq!(1, breakpoints_a.get(&project_path).unwrap().len());
-
-    // Client B removes first added breakpoint by client A
-    editor_b.update_in(cx_b, |editor, window, cx| {
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.move_up(&editor::actions::MoveUp, window, cx);
-        editor.toggle_breakpoint(&editor::actions::ToggleBreakpoint, window, cx);
-    });
-
-    cx_a.run_until_parked();
-    cx_b.run_until_parked();
-
-    let breakpoints_a = editor_a.update(cx_a, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-    let breakpoints_b = editor_b.update(cx_b, |editor, cx| {
-        editor
-            .breakpoint_store()
-            .clone()
-            .unwrap()
-            .read(cx)
-            .breakpoints()
-            .clone()
-    });
-
-    assert_eq!(0, breakpoints_a.len());
-    assert_eq!(breakpoints_a, breakpoints_b);
-}
-
 #[track_caller]
 fn tab_undo_assert(
     cx_a: &mut EditorTestContext,

crates/collab/src/tests/integration_tests.rs

@@ -2618,7 +2618,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &diff.base_text_string().unwrap(),
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
+            &[(1..2, "", "two\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2646,7 +2646,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &diff.base_text_string().unwrap(),
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
+            &[(1..2, "", "two\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2672,7 +2672,7 @@ async fn test_git_diff_base_change(
                 1..2,
                 "TWO\n",
                 "two\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
+                DiffHunkStatus::Modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
             )],
         );
     });
@@ -2699,7 +2699,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &diff.base_text_string().unwrap(),
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
+            &[(2..3, "", "three\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2713,7 +2713,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &diff.base_text_string().unwrap(),
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
+            &[(2..3, "", "three\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2731,7 +2731,7 @@ async fn test_git_diff_base_change(
                 1..2,
                 "TWO_HUNDRED\n",
                 "two\n",
-                DiffHunkStatus::modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
+                DiffHunkStatus::Modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
             )],
         );
     });
@@ -2778,7 +2778,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &diff.base_text_string().unwrap(),
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
+            &[(1..2, "", "two\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2805,7 +2805,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &staged_text,
-            &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
+            &[(1..2, "", "two\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2827,7 +2827,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &new_staged_text,
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
+            &[(2..3, "", "three\n", DiffHunkStatus::added())],
         );
     });
 
@@ -2841,7 +2841,7 @@ async fn test_git_diff_base_change(
             diff.hunks_in_row_range(0..4, buffer, cx),
             buffer,
             &new_staged_text,
-            &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
+            &[(2..3, "", "three\n", DiffHunkStatus::added())],
         );
     });
 }

crates/collab/src/tests/randomized_test_helpers.rs

@@ -463,7 +463,6 @@ impl<T: RandomizedTest> TestPlan<T> {
         })
     }
 
-    #[allow(clippy::too_many_arguments)]
     async fn apply_server_operation(
         plan: Arc<Mutex<Self>>,
         deterministic: BackgroundExecutor,