diff --git a/.github/actionlint.yml b/.github/actionlint.yml
index d93ec5b15e..6bfbc27705 100644
--- a/.github/actionlint.yml
+++ b/.github/actionlint.yml
@@ -24,7 +24,6 @@ self-hosted-runner:
- buildjet-8vcpu-ubuntu-2204-arm
- buildjet-16vcpu-ubuntu-2204-arm
- buildjet-32vcpu-ubuntu-2204-arm
- - buildjet-64vcpu-ubuntu-2204-arm
# Self Hosted Runners
- self-mini-macos
- self-32vcpu-windows-2022
diff --git a/.github/actions/build_docs/action.yml b/.github/actions/build_docs/action.yml
index 9a2d7e1ec7..a7effad247 100644
--- a/.github/actions/build_docs/action.yml
+++ b/.github/actions/build_docs/action.yml
@@ -19,7 +19,7 @@ runs:
shell: bash -euxo pipefail {0}
run: ./script/linux
- - name: Check for broken links
+ - name: Check for broken links (in MD)
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
with:
args: --no-progress --exclude '^http' './docs/src/**/*'
@@ -30,3 +30,9 @@ runs:
run: |
mkdir -p target/deploy
mdbook build ./docs --dest-dir=../target/deploy/docs/
+
+ - name: Check for broken links (in HTML)
+ uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
+ with:
+ args: --no-progress --exclude '^http' 'target/deploy/docs/'
+ fail: true
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a4da5e99ba..43d305faae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,7 @@ env:
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 }}
+ ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
jobs:
job_spec:
@@ -269,6 +270,10 @@ jobs:
mkdir -p ./../.cargo
cp ./.cargo/ci-config.toml ./../.cargo/config.toml
+ - name: Check that Cargo.lock is up to date
+ run: |
+ cargo update --locked --workspace
+
- name: cargo clippy
run: ./script/clippy
@@ -645,7 +650,7 @@ jobs:
timeout-minutes: 60
name: Linux arm64 release bundle
runs-on:
- - buildjet-16vcpu-ubuntu-2204-arm
+ - buildjet-32vcpu-ubuntu-2204-arm
if: |
startsWith(github.ref, 'refs/tags/v')
|| contains(github.event.pull_request.labels.*.name, 'run-bundling')
@@ -767,7 +772,8 @@ jobs:
timeout-minutes: 120
name: Create a Windows installer
runs-on: [self-hosted, Windows, X64]
- if: false && (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))
+ if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
+ # if: (startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling'))
needs: [windows_tests]
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index beacd27774..6c3a97c163 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -29,6 +29,7 @@ jobs:
runs-on: ${{ matrix.system.runner }}
env:
ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+ ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on
steps:
diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml
index f799133ea7..c847149984 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -13,6 +13,7 @@ env:
CARGO_INCREMENTAL: 0
RUST_BACKTRACE: 1
ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
+ ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
@@ -111,6 +112,11 @@ jobs:
echo "Publishing version: ${version} on release channel nightly"
echo "nightly" > crates/zed/RELEASE_CHANNEL
+ - name: Setup Sentry CLI
+ uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
+ with:
+ token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
+
- name: Create macOS app bundle
run: script/bundle-mac
@@ -136,6 +142,11 @@ jobs:
- name: Install Linux dependencies
run: ./script/linux && ./script/install-mold 2.34.0
+ - name: Setup Sentry CLI
+ uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
+ with:
+ token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
+
- name: Limit target directory size
run: script/clear-target-dir-if-larger-than 100
@@ -157,7 +168,7 @@ jobs:
name: Create a Linux *.tar.gz bundle for ARM
if: github.repository_owner == 'zed-industries'
runs-on:
- - buildjet-16vcpu-ubuntu-2204-arm
+ - buildjet-32vcpu-ubuntu-2204-arm
needs: tests
steps:
- name: Checkout repo
@@ -168,6 +179,11 @@ jobs:
- name: Install Linux dependencies
run: ./script/linux
+ - name: Setup Sentry CLI
+ uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
+ with:
+ token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
+
- name: Limit target directory size
run: script/clear-target-dir-if-larger-than 100
@@ -262,6 +278,11 @@ jobs:
Write-Host "Publishing version: $version on release channel nightly"
"nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
+ - name: Setup Sentry CLI
+ uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
+ with:
+ token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
+
- name: Build Zed installer
working-directory: ${{ env.ZED_WORKSPACE }}
run: script/bundle-windows.ps1
diff --git a/Cargo.lock b/Cargo.lock
index 8f791d395a..1eb5669fa2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,10 +6,9 @@ version = 4
name = "acp_thread"
version = "0.1.0"
dependencies = [
- "agentic-coding-protocol",
+ "agent-client-protocol",
"anyhow",
"assistant_tool",
- "async-pipe",
"buffer_diff",
"editor",
"env_logger 0.11.8",
@@ -18,8 +17,11 @@ dependencies = [
"indoc",
"itertools 0.14.0",
"language",
+ "language_model",
"markdown",
+ "parking_lot",
"project",
+ "rand 0.8.5",
"serde",
"serde_json",
"settings",
@@ -89,6 +91,7 @@ dependencies = [
"assistant_tools",
"chrono",
"client",
+ "cloud_llm_client",
"collections",
"component",
"context_server",
@@ -112,7 +115,6 @@ dependencies = [
"pretty_assertions",
"project",
"prompt_store",
- "proto",
"rand 0.8.5",
"ref-cast",
"rope",
@@ -131,15 +133,68 @@ dependencies = [
"uuid",
"workspace",
"workspace-hack",
- "zed_llm_client",
"zstd",
]
+[[package]]
+name = "agent-client-protocol"
+version = "0.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12dbfec3d27680337ed9d3064eecafe97acf0b0f190148bb4e29d96707c9e403"
+dependencies = [
+ "anyhow",
+ "futures 0.3.31",
+ "log",
+ "parking_lot",
+ "schemars",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "agent2"
+version = "0.1.0"
+dependencies = [
+ "acp_thread",
+ "agent-client-protocol",
+ "agent_servers",
+ "anyhow",
+ "client",
+ "clock",
+ "cloud_llm_client",
+ "collections",
+ "ctor",
+ "env_logger 0.11.8",
+ "fs",
+ "futures 0.3.31",
+ "gpui",
+ "gpui_tokio",
+ "handlebars 4.5.0",
+ "indoc",
+ "language_model",
+ "language_models",
+ "log",
+ "project",
+ "reqwest_client",
+ "rust-embed",
+ "schemars",
+ "serde",
+ "serde_json",
+ "settings",
+ "smol",
+ "ui",
+ "util",
+ "uuid",
+ "workspace-hack",
+ "worktree",
+]
+
[[package]]
name = "agent_servers"
version = "0.1.0"
dependencies = [
"acp_thread",
+ "agent-client-protocol",
"agentic-coding-protocol",
"anyhow",
"collections",
@@ -155,6 +210,7 @@ dependencies = [
"nix 0.29.0",
"paths",
"project",
+ "rand 0.8.5",
"schemars",
"serde",
"serde_json",
@@ -162,6 +218,7 @@ dependencies = [
"smol",
"strum 0.27.1",
"tempfile",
+ "thiserror 2.0.12",
"ui",
"util",
"uuid",
@@ -175,6 +232,7 @@ name = "agent_settings"
version = "0.1.0"
dependencies = [
"anyhow",
+ "cloud_llm_client",
"collections",
"fs",
"gpui",
@@ -186,7 +244,6 @@ dependencies = [
"serde_json_lenient",
"settings",
"workspace-hack",
- "zed_llm_client",
]
[[package]]
@@ -195,9 +252,10 @@ version = "0.1.0"
dependencies = [
"acp_thread",
"agent",
+ "agent-client-protocol",
+ "agent2",
"agent_servers",
"agent_settings",
- "agentic-coding-protocol",
"ai_onboarding",
"anyhow",
"assistant_context",
@@ -209,6 +267,7 @@ dependencies = [
"buffer_diff",
"chrono",
"client",
+ "cloud_llm_client",
"collections",
"command_palette_hooks",
"component",
@@ -280,7 +339,6 @@ dependencies = [
"workspace",
"workspace-hack",
"zed_actions",
- "zed_llm_client",
]
[[package]]
@@ -341,10 +399,10 @@ name = "ai_onboarding"
version = "0.1.0"
dependencies = [
"client",
+ "cloud_llm_client",
"component",
"gpui",
"language_model",
- "proto",
"serde",
"smallvec",
"telemetry",
@@ -673,6 +731,7 @@ dependencies = [
"chrono",
"client",
"clock",
+ "cloud_llm_client",
"collections",
"context_server",
"fs",
@@ -706,7 +765,6 @@ dependencies = [
"uuid",
"workspace",
"workspace-hack",
- "zed_llm_client",
]
[[package]]
@@ -814,6 +872,7 @@ dependencies = [
"chrono",
"client",
"clock",
+ "cloud_llm_client",
"collections",
"component",
"derive_more 0.99.19",
@@ -867,7 +926,6 @@ dependencies = [
"which 6.0.3",
"workspace",
"workspace-hack",
- "zed_llm_client",
"zlog",
]
@@ -1061,17 +1119,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "async-recursion"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "async-recursion"
version = "1.1.1"
@@ -1165,7 +1212,7 @@ dependencies = [
"serde_json",
"serde_path_to_error",
"serde_qs 0.10.1",
- "smart-default",
+ "smart-default 0.6.0",
"smol_str 0.1.24",
"thiserror 1.0.69",
"tokio",
@@ -2957,11 +3004,12 @@ name = "client"
version = "0.1.0"
dependencies = [
"anyhow",
- "async-recursion 0.3.2",
"async-tungstenite",
"base64 0.22.1",
"chrono",
"clock",
+ "cloud_api_client",
+ "cloud_llm_client",
"cocoa 0.26.0",
"collections",
"credentials_provider",
@@ -3004,7 +3052,6 @@ dependencies = [
"windows 0.61.1",
"workspace-hack",
"worktree",
- "zed_llm_client",
]
[[package]]
@@ -3017,6 +3064,44 @@ dependencies = [
"workspace-hack",
]
+[[package]]
+name = "cloud_api_client"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "cloud_api_types",
+ "futures 0.3.31",
+ "http_client",
+ "parking_lot",
+ "serde_json",
+ "workspace-hack",
+]
+
+[[package]]
+name = "cloud_api_types"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "cloud_llm_client",
+ "pretty_assertions",
+ "serde",
+ "serde_json",
+ "workspace-hack",
+]
+
+[[package]]
+name = "cloud_llm_client"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "pretty_assertions",
+ "serde",
+ "serde_json",
+ "strum 0.27.1",
+ "uuid",
+ "workspace-hack",
+]
+
[[package]]
name = "clru"
version = "0.6.2"
@@ -3143,6 +3228,7 @@ dependencies = [
"chrono",
"client",
"clock",
+ "cloud_llm_client",
"collab_ui",
"collections",
"command_palette_hooks",
@@ -3229,7 +3315,6 @@ dependencies = [
"workspace",
"workspace-hack",
"worktree",
- "zed_llm_client",
"zlog",
]
@@ -3497,13 +3582,13 @@ dependencies = [
"command_palette_hooks",
"ctor",
"dirs 4.0.0",
+ "edit_prediction",
"editor",
"fs",
"futures 0.3.31",
"gpui",
"http_client",
"indoc",
- "inline_completion",
"itertools 0.14.0",
"language",
"log",
@@ -3517,6 +3602,7 @@ dependencies = [
"serde",
"serde_json",
"settings",
+ "sum_tree",
"task",
"theme",
"ui",
@@ -3670,17 +3756,6 @@ dependencies = [
"libm",
]
-[[package]]
-name = "coreaudio-rs"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
-]
-
[[package]]
name = "coreaudio-rs"
version = "0.12.1"
@@ -3738,29 +3813,6 @@ dependencies = [
"unicode-segmentation",
]
-[[package]]
-name = "cpal"
-version = "0.15.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
-dependencies = [
- "alsa",
- "core-foundation-sys",
- "coreaudio-rs 0.11.3",
- "dasp_sample",
- "jni",
- "js-sys",
- "libc",
- "mach2",
- "ndk 0.8.0",
- "ndk-context",
- "oboe",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows 0.54.0",
-]
-
[[package]]
name = "cpal"
version = "0.16.0"
@@ -3774,7 +3826,7 @@ dependencies = [
"js-sys",
"libc",
"mach2",
- "ndk 0.9.0",
+ "ndk",
"ndk-context",
"num-derive",
"num-traits",
@@ -3915,6 +3967,42 @@ dependencies = [
"target-lexicon 0.13.2",
]
+[[package]]
+name = "crash-context"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "031ed29858d90cfdf27fe49fae28028a1f20466db97962fa2f4ea34809aeebf3"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "mach2",
+]
+
+[[package]]
+name = "crash-handler"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2066907075af649bcb8bcb1b9b986329b243677e6918b2d920aa64b0aac5ace3"
+dependencies = [
+ "cfg-if",
+ "crash-context",
+ "libc",
+ "mach2",
+ "parking_lot",
+]
+
+[[package]]
+name = "crashes"
+version = "0.1.0"
+dependencies = [
+ "crash-handler",
+ "log",
+ "minidumper",
+ "paths",
+ "smol",
+ "workspace-hack",
+]
+
[[package]]
name = "crc"
version = "3.2.1"
@@ -4244,7 +4332,7 @@ dependencies = [
[[package]]
name = "dap-types"
version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=7f39295b441614ca9dbf44293e53c32f666897f9#7f39295b441614ca9dbf44293e53c32f666897f9"
+source = "git+https://github.com/zed-industries/dap-types?rev=1b461b310481d01e02b2603c16d7144b926339f8#1b461b310481d01e02b2603c16d7144b926339f8"
dependencies = [
"schemars",
"serde",
@@ -4276,41 +4364,6 @@ dependencies = [
"workspace-hack",
]
-[[package]]
-name = "darling"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
-dependencies = [
- "darling_core",
- "darling_macro",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 2.0.101",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.20.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
-dependencies = [
- "darling_core",
- "quote",
- "syn 2.0.101",
-]
-
[[package]]
name = "dashmap"
version = "5.5.3"
@@ -4476,6 +4529,15 @@ dependencies = [
"zlog",
]
+[[package]]
+name = "debugid"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+dependencies = [
+ "uuid",
+]
+
[[package]]
name = "deepseek"
version = "0.1.0"
@@ -4526,37 +4588,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "derive_builder"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
-dependencies = [
- "derive_builder_macro",
-]
-
-[[package]]
-name = "derive_builder_core"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
-dependencies = [
- "darling",
- "proc-macro2",
- "quote",
- "syn 2.0.101",
-]
-
-[[package]]
-name = "derive_builder_macro"
-version = "0.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
-dependencies = [
- "derive_builder_core",
- "syn 2.0.101",
-]
-
[[package]]
name = "derive_more"
version = "0.99.19"
@@ -4778,7 +4809,6 @@ name = "docs_preprocessor"
version = "0.1.0"
dependencies = [
"anyhow",
- "clap",
"command_palette",
"gpui",
"mdbook",
@@ -4789,6 +4819,7 @@ dependencies = [
"util",
"workspace-hack",
"zed",
+ "zlog",
]
[[package]]
@@ -4910,6 +4941,49 @@ dependencies = [
"signature 1.6.4",
]
+[[package]]
+name = "edit_prediction"
+version = "0.1.0"
+dependencies = [
+ "client",
+ "gpui",
+ "language",
+ "project",
+ "workspace-hack",
+]
+
+[[package]]
+name = "edit_prediction_button"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "client",
+ "cloud_llm_client",
+ "copilot",
+ "edit_prediction",
+ "editor",
+ "feature_flags",
+ "fs",
+ "futures 0.3.31",
+ "gpui",
+ "indoc",
+ "language",
+ "lsp",
+ "paths",
+ "project",
+ "regex",
+ "serde_json",
+ "settings",
+ "supermaven",
+ "telemetry",
+ "theme",
+ "ui",
+ "workspace",
+ "workspace-hack",
+ "zed_actions",
+ "zeta",
+]
+
[[package]]
name = "editor"
version = "0.1.0"
@@ -4925,6 +4999,7 @@ dependencies = [
"ctor",
"dap",
"db",
+ "edit_prediction",
"emojis",
"file_icons",
"fs",
@@ -4934,7 +5009,6 @@ dependencies = [
"gpui",
"http_client",
"indoc",
- "inline_completion",
"itertools 0.14.0",
"language",
"languages",
@@ -4966,6 +5040,8 @@ dependencies = [
"text",
"theme",
"time",
+ "tree-sitter-bash",
+ "tree-sitter-c",
"tree-sitter-html",
"tree-sitter-python",
"tree-sitter-rust",
@@ -5248,6 +5324,7 @@ dependencies = [
"chrono",
"clap",
"client",
+ "cloud_llm_client",
"collections",
"debug_adapter_extension",
"dirs 4.0.0",
@@ -5287,7 +5364,6 @@ dependencies = [
"uuid",
"watch",
"workspace-hack",
- "zed_llm_client",
]
[[package]]
@@ -5352,6 +5428,12 @@ dependencies = [
"zune-inflate",
]
+[[package]]
+name = "extended"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
+
[[package]]
name = "extension"
version = "0.1.0"
@@ -5371,11 +5453,13 @@ dependencies = [
"log",
"lsp",
"parking_lot",
+ "pretty_assertions",
"semantic_version",
"serde",
"serde_json",
"task",
"toml 0.8.20",
+ "url",
"util",
"wasm-encoder 0.221.3",
"wasmparser 0.221.3",
@@ -5926,7 +6010,7 @@ dependencies = [
"ignore",
"libc",
"log",
- "notify",
+ "notify 8.0.0",
"objc",
"parking_lot",
"paths",
@@ -6360,7 +6444,7 @@ dependencies = [
"buffer_diff",
"call",
"chrono",
- "client",
+ "cloud_llm_client",
"collections",
"command_palette_hooks",
"component",
@@ -6371,6 +6455,7 @@ dependencies = [
"fuzzy",
"git",
"gpui",
+ "indoc",
"itertools 0.14.0",
"language",
"language_model",
@@ -6403,7 +6488,6 @@ dependencies = [
"workspace",
"workspace-hack",
"zed_actions",
- "zed_llm_client",
"zlog",
]
@@ -7236,6 +7320,17 @@ dependencies = [
"workspace-hack",
]
+[[package]]
+name = "goblin"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47"
+dependencies = [
+ "log",
+ "plain",
+ "scroll",
+]
+
[[package]]
name = "google_ai"
version = "0.1.0"
@@ -7483,18 +7578,16 @@ dependencies = [
[[package]]
name = "handlebars"
-version = "6.3.2"
+version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759e2d5aea3287cb1190c8ec394f42866cb5bf74fcbf213f354e3c856ea26098"
+checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
dependencies = [
- "derive_builder",
"log",
- "num-order",
"pest",
"pest_derive",
"serde",
"serde_json",
- "thiserror 2.0.12",
+ "thiserror 1.0.69",
]
[[package]]
@@ -7719,12 +7812,6 @@ dependencies = [
"windows-sys 0.59.0",
]
-[[package]]
-name = "hound"
-version = "3.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
-
[[package]]
name = "html5ever"
version = "0.27.0"
@@ -7858,6 +7945,8 @@ dependencies = [
"http 1.3.1",
"http-body 1.0.1",
"log",
+ "parking_lot",
+ "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
"serde",
"serde_json",
"url",
@@ -8165,12 +8254,6 @@ version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
[[package]]
name = "idna"
version = "1.0.3"
@@ -8347,46 +8430,14 @@ dependencies = [
]
[[package]]
-name = "inline_completion"
-version = "0.1.0"
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
dependencies = [
- "client",
- "gpui",
- "language",
- "project",
- "workspace-hack",
-]
-
-[[package]]
-name = "inline_completion_button"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "client",
- "copilot",
- "editor",
- "feature_flags",
- "fs",
- "futures 0.3.31",
- "gpui",
- "indoc",
- "inline_completion",
- "language",
- "lsp",
- "paths",
- "project",
- "regex",
- "serde_json",
- "settings",
- "supermaven",
- "telemetry",
- "theme",
- "ui",
- "workspace",
- "workspace-hack",
- "zed_actions",
- "zed_llm_client",
- "zeta",
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
]
[[package]]
@@ -8542,7 +8593,7 @@ dependencies = [
"fnv",
"lazy_static",
"libc",
- "mio",
+ "mio 1.0.3",
"rand 0.8.5",
"serde",
"tempfile",
@@ -9067,6 +9118,7 @@ dependencies = [
"anyhow",
"base64 0.22.1",
"client",
+ "cloud_llm_client",
"collections",
"futures 0.3.31",
"gpui",
@@ -9084,7 +9136,6 @@ dependencies = [
"thiserror 2.0.12",
"util",
"workspace-hack",
- "zed_llm_client",
]
[[package]]
@@ -9100,6 +9151,7 @@ dependencies = [
"bedrock",
"chrono",
"client",
+ "cloud_llm_client",
"collections",
"component",
"convert_case 0.8.0",
@@ -9123,7 +9175,6 @@ dependencies = [
"open_router",
"partial-json-fixer",
"project",
- "proto",
"release_channel",
"schemars",
"serde",
@@ -9141,7 +9192,6 @@ dependencies = [
"vercel",
"workspace-hack",
"x_ai",
- "zed_llm_client",
]
[[package]]
@@ -9198,11 +9248,13 @@ version = "0.1.0"
dependencies = [
"anyhow",
"async-compression",
+ "async-fs",
"async-tar",
"async-trait",
"chrono",
"collections",
"dap",
+ "feature_flags",
"futures 0.3.31",
"gpui",
"http_client",
@@ -9228,9 +9280,11 @@ dependencies = [
"serde_json",
"serde_json_lenient",
"settings",
+ "sha2",
"smol",
"snippet_provider",
"task",
+ "tempfile",
"text",
"theme",
"toml 0.8.20",
@@ -9395,7 +9449,7 @@ dependencies = [
[[package]]
name = "libwebrtc"
version = "0.3.10"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"cxx",
"jni",
@@ -9475,7 +9529,7 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
[[package]]
name = "livekit"
version = "0.7.8"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"chrono",
"futures-util",
@@ -9498,7 +9552,7 @@ dependencies = [
[[package]]
name = "livekit-api"
version = "0.4.2"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"futures-util",
"http 0.2.12",
@@ -9522,7 +9576,7 @@ dependencies = [
[[package]]
name = "livekit-protocol"
version = "0.3.9"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"futures-util",
"livekit-runtime",
@@ -9539,7 +9593,7 @@ dependencies = [
[[package]]
name = "livekit-runtime"
version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"tokio",
"tokio-stream",
@@ -9571,7 +9625,7 @@ dependencies = [
"core-foundation 0.10.0",
"core-video",
"coreaudio-rs 0.12.1",
- "cpal 0.16.0",
+ "cpal",
"futures 0.3.31",
"gpui",
"gpui_tokio",
@@ -9622,9 +9676,9 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
dependencies = [
"autocfg",
"scopeguard",
@@ -9861,7 +9915,7 @@ name = "markdown_preview"
version = "0.1.0"
dependencies = [
"anyhow",
- "async-recursion 1.1.1",
+ "async-recursion",
"collections",
"editor",
"fs",
@@ -9981,9 +10035,9 @@ dependencies = [
[[package]]
name = "mdbook"
-version = "0.4.48"
+version = "0.4.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6fbb4ac2d9fd7aa987c3510309ea3c80004a968d063c42f0d34fea070817c1"
+checksum = "b45a38e19bd200220ef07c892b0157ad3d2365e5b5a267ca01ad12182491eea5"
dependencies = [
"ammonia",
"anyhow",
@@ -9993,12 +10047,11 @@ dependencies = [
"elasticlunr-rs",
"env_logger 0.11.8",
"futures-util",
- "handlebars 6.3.2",
- "hex",
+ "handlebars 5.1.2",
"ignore",
"log",
"memchr",
- "notify",
+ "notify 6.1.1",
"notify-debouncer-mini",
"once_cell",
"opener",
@@ -10007,7 +10060,6 @@ dependencies = [
"regex",
"serde",
"serde_json",
- "sha2",
"shlex",
"tempfile",
"tokio",
@@ -10128,6 +10180,63 @@ dependencies = [
"unicase",
]
+[[package]]
+name = "minidump-common"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c4d14bcca0fd3ed165a03000480aaa364c6860c34e900cb2dafdf3b95340e77"
+dependencies = [
+ "bitflags 2.9.0",
+ "debugid",
+ "num-derive",
+ "num-traits",
+ "range-map",
+ "scroll",
+ "smart-default 0.7.1",
+]
+
+[[package]]
+name = "minidump-writer"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abcd9c8a1e6e1e9d56ce3627851f39a17ea83e17c96bc510f29d7e43d78a7d"
+dependencies = [
+ "bitflags 2.9.0",
+ "byteorder",
+ "cfg-if",
+ "crash-context",
+ "goblin",
+ "libc",
+ "log",
+ "mach2",
+ "memmap2",
+ "memoffset",
+ "minidump-common",
+ "nix 0.28.0",
+ "procfs-core",
+ "scroll",
+ "tempfile",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "minidumper"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4ebc9d1f8847ec1d078f78b35ed598e0ebefa1f242d5f83cd8d7f03960a7d1"
+dependencies = [
+ "cfg-if",
+ "crash-context",
+ "libc",
+ "log",
+ "minidump-writer",
+ "parking_lot",
+ "polling",
+ "scroll",
+ "thiserror 1.0.69",
+ "uds",
+]
+
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -10150,6 +10259,18 @@ version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff"
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "mio"
version = "1.0.3"
@@ -10342,20 +10463,6 @@ dependencies = [
"workspace-hack",
]
-[[package]]
-name = "ndk"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
-dependencies = [
- "bitflags 2.9.0",
- "jni-sys",
- "log",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum",
- "thiserror 1.0.69",
-]
-
[[package]]
name = "ndk"
version = "0.9.0"
@@ -10365,7 +10472,7 @@ dependencies = [
"bitflags 2.9.0",
"jni-sys",
"log",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
"num_enum",
"thiserror 1.0.69",
]
@@ -10376,15 +10483,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
[[package]]
name = "ndk-sys"
version = "0.6.0+11769913"
@@ -10519,6 +10617,25 @@ dependencies = [
"zed_actions",
]
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.9.0",
+ "crossbeam-channel",
+ "filetime",
+ "fsevent-sys 4.1.0",
+ "inotify 0.9.6",
+ "kqueue",
+ "libc",
+ "log",
+ "mio 0.8.11",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "notify"
version = "8.0.0"
@@ -10527,11 +10644,11 @@ dependencies = [
"bitflags 2.9.0",
"filetime",
"fsevent-sys 4.1.0",
- "inotify",
+ "inotify 0.11.0",
"kqueue",
"libc",
"log",
- "mio",
+ "mio 1.0.3",
"notify-types",
"walkdir",
"windows-sys 0.59.0",
@@ -10539,14 +10656,13 @@ dependencies = [
[[package]]
name = "notify-debouncer-mini"
-version = "0.6.0"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a689eb4262184d9a1727f9087cd03883ea716682ab03ed24efec57d7716dccb8"
+checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43"
dependencies = [
+ "crossbeam-channel",
"log",
- "notify",
- "notify-types",
- "tempfile",
+ "notify 6.1.1",
]
[[package]]
@@ -10686,21 +10802,6 @@ dependencies = [
"num-traits",
]
-[[package]]
-name = "num-modular"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
-
-[[package]]
-name = "num-order"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6"
-dependencies = [
- "num-modular",
-]
-
[[package]]
name = "num-rational"
version = "0.4.2"
@@ -10954,29 +11055,6 @@ dependencies = [
"memchr",
]
-[[package]]
-name = "oboe"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
-dependencies = [
- "jni",
- "ndk 0.8.0",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
-]
-
-[[package]]
-name = "oboe-sys"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
-dependencies = [
- "cc",
-]
-
[[package]]
name = "ollama"
version = "0.1.0"
@@ -10994,17 +11072,36 @@ dependencies = [
name = "onboarding"
version = "0.1.0"
dependencies = [
+ "ai_onboarding",
"anyhow",
+ "client",
"command_palette_hooks",
+ "component",
"db",
+ "documented",
+ "editor",
"feature_flags",
"fs",
+ "fuzzy",
"gpui",
+ "itertools 0.14.0",
+ "language",
+ "language_model",
+ "menu",
+ "notifications",
+ "picker",
+ "project",
+ "schemars",
+ "serde",
"settings",
"theme",
"ui",
+ "util",
+ "vim_mode_setting",
"workspace",
"workspace-hack",
+ "zed_actions",
+ "zlog",
]
[[package]]
@@ -11355,9 +11452,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -11365,9 +11462,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
dependencies = [
"cfg-if",
"libc",
@@ -12131,6 +12228,12 @@ version = "0.3.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
[[package]]
name = "plist"
version = "1.7.1"
@@ -12391,6 +12494,16 @@ dependencies = [
"yansi",
]
+[[package]]
+name = "procfs-core"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29"
+dependencies = [
+ "bitflags 2.9.0",
+ "hex",
+]
+
[[package]]
name = "prodash"
version = "29.0.2"
@@ -13041,6 +13154,15 @@ dependencies = [
"rand_core 0.5.1",
]
+[[package]]
+name = "range-map"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12a5a2d6c7039059af621472a4389be1215a816df61aa4d531cfe85264aee95f"
+dependencies = [
+ "num-traits",
+]
+
[[package]]
name = "rangemap"
version = "1.5.1"
@@ -13383,6 +13505,8 @@ dependencies = [
"clap",
"client",
"clock",
+ "crash-handler",
+ "crashes",
"dap",
"dap_adapters",
"debug_adapter_extension",
@@ -13406,6 +13530,7 @@ dependencies = [
"libc",
"log",
"lsp",
+ "minidumper",
"node_runtime",
"paths",
"project",
@@ -13594,6 +13719,7 @@ dependencies = [
"js-sys",
"log",
"mime",
+ "mime_guess",
"once_cell",
"percent-encoding",
"pin-project-lite",
@@ -13755,12 +13881,15 @@ dependencies = [
[[package]]
name = "rodio"
-version = "0.20.1"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1"
+checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
dependencies = [
- "cpal 0.15.3",
- "hound",
+ "cpal",
+ "dasp_sample",
+ "num-rational",
+ "symphonia",
+ "tracing",
]
[[package]]
@@ -14319,6 +14448,26 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "scroll"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1783eabc414609e28a5ba76aee5ddd52199f7107a0b24c2e9746a1ecc34a683d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
[[package]]
name = "scrypt"
version = "0.11.0"
@@ -14765,6 +14914,27 @@ dependencies = [
"zlog",
]
+[[package]]
+name = "settings_profile_selector"
+version = "0.1.0"
+dependencies = [
+ "client",
+ "editor",
+ "fuzzy",
+ "gpui",
+ "language",
+ "menu",
+ "picker",
+ "project",
+ "serde_json",
+ "settings",
+ "theme",
+ "ui",
+ "workspace",
+ "workspace-hack",
+ "zed_actions",
+]
+
[[package]]
name = "settings_ui"
version = "0.1.0"
@@ -14787,7 +14957,6 @@ dependencies = [
"notifications",
"paths",
"project",
- "schemars",
"search",
"serde",
"serde_json",
@@ -15044,6 +15213,17 @@ dependencies = [
"syn 1.0.109",
]
+[[package]]
+name = "smart-default"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.101",
+]
+
[[package]]
name = "smol"
version = "2.0.2"
@@ -15626,12 +15806,12 @@ dependencies = [
"anyhow",
"client",
"collections",
+ "edit_prediction",
"editor",
"env_logger 0.11.8",
"futures 0.3.31",
"gpui",
"http_client",
- "inline_completion",
"language",
"log",
"postage",
@@ -15781,6 +15961,66 @@ dependencies = [
"zeno",
]
+[[package]]
+name = "symphonia"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
+dependencies = [
+ "lazy_static",
+ "symphonia-codec-pcm",
+ "symphonia-core",
+ "symphonia-format-riff",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-codec-pcm"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b"
+dependencies = [
+ "log",
+ "symphonia-core",
+]
+
+[[package]]
+name = "symphonia-core"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
+dependencies = [
+ "arrayvec",
+ "bitflags 1.3.2",
+ "bytemuck",
+ "lazy_static",
+ "log",
+]
+
+[[package]]
+name = "symphonia-format-riff"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50"
+dependencies = [
+ "extended",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
+[[package]]
+name = "symphonia-metadata"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
+dependencies = [
+ "encoding_rs",
+ "lazy_static",
+ "log",
+ "symphonia-core",
+]
+
[[package]]
name = "syn"
version = "1.0.109"
@@ -16164,7 +16404,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"assistant_slash_command",
- "async-recursion 1.1.1",
+ "async-recursion",
"breadcrumbs",
"client",
"collections",
@@ -16513,6 +16753,7 @@ dependencies = [
"call",
"chrono",
"client",
+ "cloud_llm_client",
"collections",
"db",
"gpui",
@@ -16548,7 +16789,7 @@ dependencies = [
"backtrace",
"bytes 1.10.1",
"libc",
- "mio",
+ "mio 1.0.3",
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
@@ -17266,6 +17507,15 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+[[package]]
+name = "uds"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "885c31f06fce836457fe3ef09a59f83fe8db95d270b11cd78f40a4666c4d1661"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "uds_windows"
version = "1.1.0"
@@ -18481,11 +18731,11 @@ name = "web_search"
version = "0.1.0"
dependencies = [
"anyhow",
+ "cloud_llm_client",
"collections",
"gpui",
"serde",
"workspace-hack",
- "zed_llm_client",
]
[[package]]
@@ -18494,6 +18744,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"client",
+ "cloud_llm_client",
"futures 0.3.31",
"gpui",
"http_client",
@@ -18502,7 +18753,6 @@ dependencies = [
"serde_json",
"web_search",
"workspace-hack",
- "zed_llm_client",
]
[[package]]
@@ -18526,7 +18776,7 @@ dependencies = [
[[package]]
name = "webrtc-sys"
version = "0.3.7"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"cc",
"cxx",
@@ -18539,7 +18789,7 @@ dependencies = [
[[package]]
name = "webrtc-sys-build"
version = "0.3.6"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
dependencies = [
"fs2",
"regex",
@@ -18574,7 +18824,6 @@ dependencies = [
"serde",
"settings",
"telemetry",
- "theme",
"ui",
"util",
"vim_mode_setting",
@@ -19589,7 +19838,7 @@ version = "0.1.0"
dependencies = [
"any_vec",
"anyhow",
- "async-recursion 1.1.1",
+ "async-recursion",
"bincode",
"call",
"client",
@@ -19666,14 +19915,12 @@ dependencies = [
"cc",
"chrono",
"cipher",
- "clang-sys",
"clap",
"clap_builder",
"codespan-reporting 0.12.0",
"concurrent-queue",
"core-foundation 0.9.4",
"core-foundation-sys",
- "coreaudio-sys",
"cranelift-codegen",
"crc32fast",
"crossbeam-epoch",
@@ -19724,9 +19971,11 @@ dependencies = [
"lyon_path",
"md-5",
"memchr",
+ "mime_guess",
"miniz_oxide",
- "mio",
+ "mio 1.0.3",
"naga",
+ "nix 0.28.0",
"nix 0.29.0",
"nom",
"num-bigint",
@@ -20116,7 +20365,7 @@ dependencies = [
"async-io",
"async-lock",
"async-process",
- "async-recursion 1.1.1",
+ "async-recursion",
"async-task",
"async-trait",
"blocking",
@@ -20169,7 +20418,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.198.0"
+version = "0.200.0"
dependencies = [
"activity_indicator",
"agent",
@@ -20198,6 +20447,7 @@ dependencies = [
"command_palette",
"component",
"copilot",
+ "crashes",
"dap",
"dap_adapters",
"db",
@@ -20205,6 +20455,7 @@ dependencies = [
"debugger_tools",
"debugger_ui",
"diagnostics",
+ "edit_prediction_button",
"editor",
"env_logger 0.11.8",
"extension",
@@ -20224,7 +20475,6 @@ dependencies = [
"http_client",
"image_viewer",
"indoc",
- "inline_completion_button",
"inspector_ui",
"install_cli",
"itertools 0.14.0",
@@ -20265,6 +20515,7 @@ dependencies = [
"release_channel",
"remote",
"repl",
+ "reqwest 0.12.15 (git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415)",
"reqwest_client",
"rope",
"search",
@@ -20272,6 +20523,7 @@ dependencies = [
"serde_json",
"session",
"settings",
+ "settings_profile_selector",
"settings_ui",
"shellexpand 2.1.2",
"smol",
@@ -20330,7 +20582,7 @@ dependencies = [
[[package]]
name = "zed_emmet"
-version = "0.0.3"
+version = "0.0.4"
dependencies = [
"zed_extension_api 0.1.0",
]
@@ -20369,19 +20621,6 @@ dependencies = [
"zed_extension_api 0.1.0",
]
-[[package]]
-name = "zed_llm_client"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6607f74dee2a18a9ce0f091844944a0e59881359ab62e0768fb0618f55d4c1dc"
-dependencies = [
- "anyhow",
- "serde",
- "serde_json",
- "strum 0.27.1",
- "uuid",
-]
-
[[package]]
name = "zed_proto"
version = "0.2.2"
@@ -20391,7 +20630,7 @@ dependencies = [
[[package]]
name = "zed_ruff"
-version = "0.1.0"
+version = "0.1.1"
dependencies = [
"zed_extension_api 0.1.0",
]
@@ -20561,11 +20800,14 @@ dependencies = [
"call",
"client",
"clock",
+ "cloud_api_types",
+ "cloud_llm_client",
"collections",
"command_palette_hooks",
"copilot",
"ctor",
"db",
+ "edit_prediction",
"editor",
"feature_flags",
"fs",
@@ -20573,14 +20815,12 @@ dependencies = [
"gpui",
"http_client",
"indoc",
- "inline_completion",
"language",
"language_model",
"log",
"menu",
"postage",
"project",
- "proto",
"regex",
"release_channel",
"reqwest_client",
@@ -20602,10 +20842,45 @@ dependencies = [
"workspace-hack",
"worktree",
"zed_actions",
- "zed_llm_client",
"zlog",
]
+[[package]]
+name = "zeta_cli"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "client",
+ "debug_adapter_extension",
+ "extension",
+ "fs",
+ "futures 0.3.31",
+ "gpui",
+ "gpui_tokio",
+ "language",
+ "language_extension",
+ "language_model",
+ "language_models",
+ "languages",
+ "node_runtime",
+ "paths",
+ "project",
+ "prompt_store",
+ "release_channel",
+ "reqwest_client",
+ "serde",
+ "serde_json",
+ "settings",
+ "shellexpand 2.1.2",
+ "smol",
+ "terminal_view",
+ "util",
+ "watch",
+ "workspace-hack",
+ "zeta",
+]
+
[[package]]
name = "zip"
version = "0.6.6"
diff --git a/Cargo.toml b/Cargo.toml
index ec793a7429..7b82fd1910 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,14 @@
[workspace]
resolver = "2"
members = [
- "crates/activity_indicator",
"crates/acp_thread",
- "crates/agent_ui",
+ "crates/activity_indicator",
"crates/agent",
- "crates/agent_settings",
- "crates/ai_onboarding",
+ "crates/agent2",
"crates/agent_servers",
+ "crates/agent_settings",
+ "crates/agent_ui",
+ "crates/ai_onboarding",
"crates/anthropic",
"crates/askpass",
"crates/assets",
@@ -29,6 +30,9 @@ members = [
"crates/cli",
"crates/client",
"crates/clock",
+ "crates/cloud_api_client",
+ "crates/cloud_api_types",
+ "crates/cloud_llm_client",
"crates/collab",
"crates/collab_ui",
"crates/collections",
@@ -37,6 +41,7 @@ members = [
"crates/component",
"crates/context_server",
"crates/copilot",
+ "crates/crashes",
"crates/credentials_provider",
"crates/dap",
"crates/dap_adapters",
@@ -48,8 +53,8 @@ members = [
"crates/diagnostics",
"crates/docs_preprocessor",
"crates/editor",
- "crates/explorer_command_injector",
"crates/eval",
+ "crates/explorer_command_injector",
"crates/extension",
"crates/extension_api",
"crates/extension_cli",
@@ -70,15 +75,14 @@ members = [
"crates/gpui",
"crates/gpui_macros",
"crates/gpui_tokio",
-
"crates/html_to_markdown",
"crates/http_client",
"crates/http_client_tls",
"crates/icons",
"crates/image_viewer",
"crates/indexed_docs",
- "crates/inline_completion",
- "crates/inline_completion_button",
+ "crates/edit_prediction",
+ "crates/edit_prediction_button",
"crates/inspector_ui",
"crates/install_cli",
"crates/jj",
@@ -99,7 +103,6 @@ members = [
"crates/markdown_preview",
"crates/media",
"crates/menu",
- "crates/svg_preview",
"crates/migrator",
"crates/mistral",
"crates/multi_buffer",
@@ -140,6 +143,7 @@ members = [
"crates/semantic_version",
"crates/session",
"crates/settings",
+ "crates/settings_profile_selector",
"crates/settings_ui",
"crates/snippet",
"crates/snippet_provider",
@@ -152,6 +156,7 @@ members = [
"crates/sum_tree",
"crates/supermaven",
"crates/supermaven_api",
+ "crates/svg_preview",
"crates/tab_switcher",
"crates/task",
"crates/tasks_ui",
@@ -186,6 +191,7 @@ members = [
"crates/zed",
"crates/zed_actions",
"crates/zeta",
+ "crates/zeta_cli",
"crates/zlog",
"crates/zlog_settings",
@@ -224,6 +230,7 @@ edition = "2024"
acp_thread = { path = "crates/acp_thread" }
agent = { path = "crates/agent" }
+agent2 = { path = "crates/agent2" }
activity_indicator = { path = "crates/activity_indicator" }
agent_ui = { path = "crates/agent_ui" }
agent_settings = { path = "crates/agent_settings" }
@@ -251,6 +258,9 @@ channel = { path = "crates/channel" }
cli = { path = "crates/cli" }
client = { path = "crates/client" }
clock = { path = "crates/clock" }
+cloud_api_client = { path = "crates/cloud_api_client" }
+cloud_api_types = { path = "crates/cloud_api_types" }
+cloud_llm_client = { path = "crates/cloud_llm_client" }
collab = { path = "crates/collab" }
collab_ui = { path = "crates/collab_ui" }
collections = { path = "crates/collections" }
@@ -259,6 +269,7 @@ command_palette_hooks = { path = "crates/command_palette_hooks" }
component = { path = "crates/component" }
context_server = { path = "crates/context_server" }
copilot = { path = "crates/copilot" }
+crashes = { path = "crates/crashes" }
credentials_provider = { path = "crates/credentials_provider" }
dap = { path = "crates/dap" }
dap_adapters = { path = "crates/dap_adapters" }
@@ -295,8 +306,8 @@ http_client_tls = { path = "crates/http_client_tls" }
icons = { path = "crates/icons" }
image_viewer = { path = "crates/image_viewer" }
indexed_docs = { path = "crates/indexed_docs" }
-inline_completion = { path = "crates/inline_completion" }
-inline_completion_button = { path = "crates/inline_completion_button" }
+edit_prediction = { path = "crates/edit_prediction" }
+edit_prediction_button = { path = "crates/edit_prediction_button" }
inspector_ui = { path = "crates/inspector_ui" }
install_cli = { path = "crates/install_cli" }
jj = { path = "crates/jj" }
@@ -337,6 +348,7 @@ picker = { path = "crates/picker" }
plugin = { path = "crates/plugin" }
plugin_macros = { path = "crates/plugin_macros" }
prettier = { path = "crates/prettier" }
+settings_profile_selector = { path = "crates/settings_profile_selector" }
project = { path = "crates/project" }
project_panel = { path = "crates/project_panel" }
project_symbols = { path = "crates/project_symbols" }
@@ -413,6 +425,7 @@ zlog_settings = { path = "crates/zlog_settings" }
#
agentic-coding-protocol = "0.0.10"
+agent-client-protocol = "0.0.20"
aho-corasick = "1.1"
alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
any_vec = "0.14"
@@ -457,9 +470,10 @@ core-foundation = "0.10.0"
core-foundation-sys = "0.8.6"
core-video = { version = "0.4.3", features = ["metal"] }
cpal = "0.16"
+crash-handler = "0.6"
criterion = { version = "0.5", features = ["html_reports"] }
ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "7f39295b441614ca9dbf44293e53c32f666897f9" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "1b461b310481d01e02b2603c16d7144b926339f8" }
dashmap = "6.0"
derive_more = "0.99.17"
dirs = "4.0"
@@ -504,6 +518,7 @@ log = { version = "0.4.16", features = ["kv_unstable_serde", "serde"] }
lsp-types = { git = "https://github.com/zed-industries/lsp-types", rev = "39f629bdd03d59abd786ed9fc27e8bca02c0c0ec" }
markup5ever_rcdom = "0.3.0"
metal = "0.29"
+minidumper = "0.8"
moka = { version = "0.12.10", features = ["sync"] }
naga = { version = "25.0", features = ["wgsl-in"] }
nanoid = "0.4"
@@ -543,6 +558,7 @@ reqwest = { git = "https://github.com/zed-industries/reqwest.git", rev = "951c77
"charset",
"http2",
"macos-system-configuration",
+ "multipart",
"rustls-tls-native-roots",
"socks",
"stream",
@@ -644,7 +660,6 @@ which = "6.0.0"
windows-core = "0.61"
wit-component = "0.221"
workspace-hack = "0.1.0"
-zed_llm_client = "= 0.8.6"
zstd = "0.11"
[workspace.dependencies.async-stripe]
@@ -671,14 +686,16 @@ features = [
"UI_ViewManagement",
"Wdk_System_SystemServices",
"Win32_Globalization",
- "Win32_Graphics_Direct2D",
- "Win32_Graphics_Direct2D_Common",
+ "Win32_Graphics_Direct3D",
+ "Win32_Graphics_Direct3D11",
+ "Win32_Graphics_Direct3D_Fxc",
+ "Win32_Graphics_DirectComposition",
"Win32_Graphics_DirectWrite",
"Win32_Graphics_Dwm",
+ "Win32_Graphics_Dxgi",
"Win32_Graphics_Dxgi_Common",
"Win32_Graphics_Gdi",
"Win32_Graphics_Imaging",
- "Win32_Graphics_Imaging_D2D",
"Win32_Networking_WinSock",
"Win32_Security",
"Win32_Security_Credentials",
@@ -719,6 +736,11 @@ workspace-hack = { path = "tooling/workspace-hack" }
split-debuginfo = "unpacked"
codegen-units = 16
+# mirror configuration for crates compiled for the build platform
+# (without this cargo will compile ~400 crates twice)
+[profile.dev.build-override]
+codegen-units = 16
+
[profile.dev.package]
taffy = { opt-level = 3 }
cranelift-codegen = { opt-level = 3 }
@@ -741,7 +763,7 @@ feature_flags = { codegen-units = 1 }
file_icons = { codegen-units = 1 }
fsevent = { codegen-units = 1 }
image_viewer = { codegen-units = 1 }
-inline_completion_button = { codegen-units = 1 }
+edit_prediction_button = { codegen-units = 1 }
install_cli = { codegen-units = 1 }
journal = { codegen-units = 1 }
lmstudio = { codegen-units = 1 }
diff --git a/Procfile b/Procfile
index 5f1231b90a..b3f13f66a6 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,4 @@
collab: RUST_LOG=${RUST_LOG:-info} cargo run --package=collab serve all
+cloud: cd ../cloud; cargo make dev
livekit: livekit-server --dev
blob_store: ./script/run-local-minio
diff --git a/README.md b/README.md
index 4c794efc3d..38547c1ca4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
# Zed
+[](https://zed.dev)
[](https://github.com/zed-industries/zed/actions/workflows/ci.yml)
Welcome to Zed, a high-performance, multiplayer code editor from the creators of [Atom](https://github.com/atom/atom) and [Tree-sitter](https://github.com/tree-sitter/tree-sitter).
diff --git a/assets/badge/v0.json b/assets/badge/v0.json
new file mode 100644
index 0000000000..c7d18bb42b
--- /dev/null
+++ b/assets/badge/v0.json
@@ -0,0 +1,8 @@
+{
+ "label": "",
+ "message": "Zed",
+ "logoSvg": "",
+ "logoWidth": 16,
+ "labelColor": "black",
+ "color": "white"
+}
diff --git a/assets/icons/ai_bedrock.svg b/assets/icons/ai_bedrock.svg
index 2b672c364e..c9bbcc82e1 100644
--- a/assets/icons/ai_bedrock.svg
+++ b/assets/icons/ai_bedrock.svg
@@ -1,4 +1,8 @@
-
-