diff --git a/.github/actions/build_docs/action.yml b/.github/actions/build_docs/action.yml
index a7effad247..9a2d7e1ec7 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 (in MD)
+ - name: Check for broken links
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2.4.1
with:
args: --no-progress --exclude '^http' './docs/src/**/*'
@@ -30,9 +30,3 @@ 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 7dfc33e0d2..a4da5e99ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -269,10 +269,6 @@ 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
@@ -771,8 +767,7 @@ jobs:
timeout-minutes: 120
name: Create a Windows installer
runs-on: [self-hosted, Windows, X64]
- 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'))
+ if: false && (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/release_nightly.yml b/.github/workflows/release_nightly.yml
index 4f7506967b..f799133ea7 100644
--- a/.github/workflows/release_nightly.yml
+++ b/.github/workflows/release_nightly.yml
@@ -111,11 +111,6 @@ 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
@@ -141,11 +136,6 @@ 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
@@ -178,11 +168,6 @@ 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
@@ -277,11 +262,6 @@ 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 56210557d2..c5ab86ceb9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,9 +6,10 @@ version = 4
name = "acp_thread"
version = "0.1.0"
dependencies = [
- "agent-client-protocol",
+ "agentic-coding-protocol",
"anyhow",
"assistant_tool",
+ "async-pipe",
"buffer_diff",
"editor",
"env_logger 0.11.8",
@@ -18,9 +19,7 @@ dependencies = [
"itertools 0.14.0",
"language",
"markdown",
- "parking_lot",
"project",
- "rand 0.8.5",
"serde",
"serde_json",
"settings",
@@ -90,7 +89,6 @@ dependencies = [
"assistant_tools",
"chrono",
"client",
- "cloud_llm_client",
"collections",
"component",
"context_server",
@@ -114,6 +112,7 @@ dependencies = [
"pretty_assertions",
"project",
"prompt_store",
+ "proto",
"rand 0.8.5",
"ref-cast",
"rope",
@@ -132,30 +131,15 @@ dependencies = [
"uuid",
"workspace",
"workspace-hack",
+ "zed_llm_client",
"zstd",
]
-[[package]]
-name = "agent-client-protocol"
-version = "0.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22c5180e40d31a9998ffa5f8eb067667f0870908a4aeed65a6a299e2d1d95443"
-dependencies = [
- "anyhow",
- "futures 0.3.31",
- "log",
- "parking_lot",
- "schemars",
- "serde",
- "serde_json",
-]
-
[[package]]
name = "agent_servers"
version = "0.1.0"
dependencies = [
"acp_thread",
- "agent-client-protocol",
"agentic-coding-protocol",
"anyhow",
"collections",
@@ -171,7 +155,6 @@ dependencies = [
"nix 0.29.0",
"paths",
"project",
- "rand 0.8.5",
"schemars",
"serde",
"serde_json",
@@ -179,7 +162,6 @@ dependencies = [
"smol",
"strum 0.27.1",
"tempfile",
- "thiserror 2.0.12",
"ui",
"util",
"uuid",
@@ -193,7 +175,6 @@ name = "agent_settings"
version = "0.1.0"
dependencies = [
"anyhow",
- "cloud_llm_client",
"collections",
"fs",
"gpui",
@@ -205,6 +186,7 @@ dependencies = [
"serde_json_lenient",
"settings",
"workspace-hack",
+ "zed_llm_client",
]
[[package]]
@@ -213,9 +195,9 @@ version = "0.1.0"
dependencies = [
"acp_thread",
"agent",
- "agent-client-protocol",
"agent_servers",
"agent_settings",
+ "agentic-coding-protocol",
"ai_onboarding",
"anyhow",
"assistant_context",
@@ -227,7 +209,6 @@ dependencies = [
"buffer_diff",
"chrono",
"client",
- "cloud_llm_client",
"collections",
"command_palette_hooks",
"component",
@@ -299,6 +280,7 @@ dependencies = [
"workspace",
"workspace-hack",
"zed_actions",
+ "zed_llm_client",
]
[[package]]
@@ -359,10 +341,10 @@ name = "ai_onboarding"
version = "0.1.0"
dependencies = [
"client",
- "cloud_llm_client",
"component",
"gpui",
"language_model",
+ "proto",
"serde",
"smallvec",
"telemetry",
@@ -691,7 +673,6 @@ dependencies = [
"chrono",
"client",
"clock",
- "cloud_llm_client",
"collections",
"context_server",
"fs",
@@ -725,6 +706,7 @@ dependencies = [
"uuid",
"workspace",
"workspace-hack",
+ "zed_llm_client",
]
[[package]]
@@ -832,7 +814,6 @@ dependencies = [
"chrono",
"client",
"clock",
- "cloud_llm_client",
"collections",
"component",
"derive_more 0.99.19",
@@ -886,6 +867,7 @@ dependencies = [
"which 6.0.3",
"workspace",
"workspace-hack",
+ "zed_llm_client",
"zlog",
]
@@ -1079,6 +1061,17 @@ 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"
@@ -2964,12 +2957,11 @@ 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",
@@ -3012,6 +3004,7 @@ dependencies = [
"windows 0.61.1",
"workspace-hack",
"worktree",
+ "zed_llm_client",
]
[[package]]
@@ -3024,44 +3017,6 @@ 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"
@@ -3188,7 +3143,6 @@ dependencies = [
"chrono",
"client",
"clock",
- "cloud_llm_client",
"collab_ui",
"collections",
"command_palette_hooks",
@@ -3275,6 +3229,7 @@ dependencies = [
"workspace",
"workspace-hack",
"worktree",
+ "zed_llm_client",
"zlog",
]
@@ -3715,6 +3670,17 @@ 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"
@@ -3772,6 +3738,29 @@ 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"
@@ -3785,7 +3774,7 @@ dependencies = [
"js-sys",
"libc",
"mach2",
- "ndk",
+ "ndk 0.9.0",
"ndk-context",
"num-derive",
"num-traits",
@@ -4255,7 +4244,7 @@ dependencies = [
[[package]]
name = "dap-types"
version = "0.0.1"
-source = "git+https://github.com/zed-industries/dap-types?rev=1b461b310481d01e02b2603c16d7144b926339f8#1b461b310481d01e02b2603c16d7144b926339f8"
+source = "git+https://github.com/zed-industries/dap-types?rev=7f39295b441614ca9dbf44293e53c32f666897f9#7f39295b441614ca9dbf44293e53c32f666897f9"
dependencies = [
"schemars",
"serde",
@@ -4723,6 +4712,7 @@ name = "docs_preprocessor"
version = "0.1.0"
dependencies = [
"anyhow",
+ "clap",
"command_palette",
"gpui",
"mdbook",
@@ -4733,7 +4723,6 @@ dependencies = [
"util",
"workspace-hack",
"zed",
- "zlog",
]
[[package]]
@@ -4911,7 +4900,6 @@ dependencies = [
"text",
"theme",
"time",
- "tree-sitter-bash",
"tree-sitter-c",
"tree-sitter-html",
"tree-sitter-python",
@@ -5195,7 +5183,6 @@ dependencies = [
"chrono",
"clap",
"client",
- "cloud_llm_client",
"collections",
"debug_adapter_extension",
"dirs 4.0.0",
@@ -5235,6 +5222,7 @@ dependencies = [
"uuid",
"watch",
"workspace-hack",
+ "zed_llm_client",
]
[[package]]
@@ -5299,12 +5287,6 @@ 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"
@@ -5324,13 +5306,11 @@ 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",
@@ -6316,7 +6296,6 @@ dependencies = [
"call",
"chrono",
"client",
- "cloud_llm_client",
"collections",
"command_palette_hooks",
"component",
@@ -6359,6 +6338,7 @@ dependencies = [
"workspace",
"workspace-hack",
"zed_actions",
+ "zed_llm_client",
"zlog",
]
@@ -7357,9 +7337,9 @@ dependencies = [
[[package]]
name = "grid"
-version = "0.17.0"
+version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71b01d27060ad58be4663b9e4ac9e2d4806918e8876af8912afbddd1a91d5eaa"
+checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
[[package]]
name = "group"
@@ -7672,6 +7652,12 @@ 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"
@@ -7805,7 +7791,6 @@ dependencies = [
"http 1.3.1",
"http-body 1.0.1",
"log",
- "parking_lot",
"serde",
"serde_json",
"url",
@@ -8305,7 +8290,6 @@ version = "0.1.0"
dependencies = [
"anyhow",
"client",
- "cloud_llm_client",
"copilot",
"editor",
"feature_flags",
@@ -8328,6 +8312,7 @@ dependencies = [
"workspace",
"workspace-hack",
"zed_actions",
+ "zed_llm_client",
"zeta",
]
@@ -9020,7 +9005,6 @@ dependencies = [
"anyhow",
"base64 0.22.1",
"client",
- "cloud_llm_client",
"collections",
"futures 0.3.31",
"gpui",
@@ -9038,6 +9022,7 @@ dependencies = [
"thiserror 2.0.12",
"util",
"workspace-hack",
+ "zed_llm_client",
]
[[package]]
@@ -9053,7 +9038,6 @@ dependencies = [
"bedrock",
"chrono",
"client",
- "cloud_llm_client",
"collections",
"component",
"convert_case 0.8.0",
@@ -9077,6 +9061,7 @@ dependencies = [
"open_router",
"partial-json-fixer",
"project",
+ "proto",
"release_channel",
"schemars",
"serde",
@@ -9094,6 +9079,7 @@ dependencies = [
"vercel",
"workspace-hack",
"x_ai",
+ "zed_llm_client",
]
[[package]]
@@ -9155,7 +9141,6 @@ dependencies = [
"chrono",
"collections",
"dap",
- "feature_flags",
"futures 0.3.31",
"gpui",
"http_client",
@@ -9348,7 +9333,7 @@ dependencies = [
[[package]]
name = "libwebrtc"
version = "0.3.10"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"cxx",
"jni",
@@ -9428,7 +9413,7 @@ checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
[[package]]
name = "livekit"
version = "0.7.8"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"chrono",
"futures-util",
@@ -9451,7 +9436,7 @@ dependencies = [
[[package]]
name = "livekit-api"
version = "0.4.2"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"futures-util",
"http 0.2.12",
@@ -9475,7 +9460,7 @@ dependencies = [
[[package]]
name = "livekit-protocol"
version = "0.3.9"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"futures-util",
"livekit-runtime",
@@ -9492,7 +9477,7 @@ dependencies = [
[[package]]
name = "livekit-runtime"
version = "0.4.0"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"tokio",
"tokio-stream",
@@ -9524,7 +9509,7 @@ dependencies = [
"core-foundation 0.10.0",
"core-video",
"coreaudio-rs 0.12.1",
- "cpal",
+ "cpal 0.16.0",
"futures 0.3.31",
"gpui",
"gpui_tokio",
@@ -9575,9 +9560,9 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.13"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
dependencies = [
"autocfg",
"scopeguard",
@@ -9814,7 +9799,7 @@ name = "markdown_preview"
version = "0.1.0"
dependencies = [
"anyhow",
- "async-recursion",
+ "async-recursion 1.1.1",
"collections",
"editor",
"fs",
@@ -10305,6 +10290,20 @@ 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"
@@ -10314,7 +10313,7 @@ dependencies = [
"bitflags 2.9.0",
"jni-sys",
"log",
- "ndk-sys",
+ "ndk-sys 0.6.0+11769913",
"num_enum",
"thiserror 1.0.69",
]
@@ -10325,6 +10324,15 @@ 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"
@@ -10897,6 +10905,29 @@ 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"
@@ -10914,33 +10945,17 @@ dependencies = [
name = "onboarding"
version = "0.1.0"
dependencies = [
- "ai_onboarding",
"anyhow",
- "client",
"command_palette_hooks",
- "component",
"db",
- "documented",
- "editor",
"feature_flags",
"fs",
"gpui",
- "itertools 0.14.0",
- "language",
- "language_model",
- "menu",
- "project",
- "schemars",
- "serde",
"settings",
"theme",
"ui",
- "util",
- "vim_mode_setting",
"workspace",
"workspace-hack",
- "zed_actions",
- "zlog",
]
[[package]]
@@ -11291,9 +11306,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
[[package]]
name = "parking_lot"
-version = "0.12.4"
+version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
dependencies = [
"lock_api",
"parking_lot_core",
@@ -11301,9 +11316,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
dependencies = [
"cfg-if",
"libc",
@@ -13691,15 +13706,12 @@ dependencies = [
[[package]]
name = "rodio"
-version = "0.21.1"
+version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e40ecf59e742e03336be6a3d53755e789fd05a059fa22dfa0ed624722319e183"
+checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1"
dependencies = [
- "cpal",
- "dasp_sample",
- "num-rational",
- "symphonia",
- "tracing",
+ "cpal 0.15.3",
+ "hound",
]
[[package]]
@@ -14704,27 +14716,6 @@ 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"
@@ -14747,6 +14738,7 @@ dependencies = [
"notifications",
"paths",
"project",
+ "schemars",
"search",
"serde",
"serde_json",
@@ -15740,66 +15732,6 @@ 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"
@@ -15980,12 +15912,13 @@ dependencies = [
[[package]]
name = "taffy"
-version = "0.8.3"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aaef0ac998e6527d6d0d5582f7e43953bb17221ac75bb8eb2fcc2db3396db1c"
+checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e"
dependencies = [
"arrayvec",
"grid",
+ "num-traits",
"serde",
"slotmap",
]
@@ -16183,7 +16116,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"assistant_slash_command",
- "async-recursion",
+ "async-recursion 1.1.1",
"breadcrumbs",
"client",
"collections",
@@ -16532,7 +16465,6 @@ dependencies = [
"call",
"chrono",
"client",
- "cloud_llm_client",
"collections",
"db",
"gpui",
@@ -18501,11 +18433,11 @@ name = "web_search"
version = "0.1.0"
dependencies = [
"anyhow",
- "cloud_llm_client",
"collections",
"gpui",
"serde",
"workspace-hack",
+ "zed_llm_client",
]
[[package]]
@@ -18514,7 +18446,6 @@ version = "0.1.0"
dependencies = [
"anyhow",
"client",
- "cloud_llm_client",
"futures 0.3.31",
"gpui",
"http_client",
@@ -18523,6 +18454,7 @@ dependencies = [
"serde_json",
"web_search",
"workspace-hack",
+ "zed_llm_client",
]
[[package]]
@@ -18546,7 +18478,7 @@ dependencies = [
[[package]]
name = "webrtc-sys"
version = "0.3.7"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"cc",
"cxx",
@@ -18559,7 +18491,7 @@ dependencies = [
[[package]]
name = "webrtc-sys-build"
version = "0.3.6"
-source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=5f04705ac3f356350ae31534ffbc476abc9ea83d#5f04705ac3f356350ae31534ffbc476abc9ea83d"
+source = "git+https://github.com/zed-industries/livekit-rust-sdks?rev=d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4#d2eade7a6b15d6dbdb38ba12a1ff7bf07fcebba4"
dependencies = [
"fs2",
"regex",
@@ -18594,6 +18526,7 @@ dependencies = [
"serde",
"settings",
"telemetry",
+ "theme",
"ui",
"util",
"vim_mode_setting",
@@ -19608,7 +19541,7 @@ version = "0.1.0"
dependencies = [
"any_vec",
"anyhow",
- "async-recursion",
+ "async-recursion 1.1.1",
"bincode",
"call",
"client",
@@ -19685,12 +19618,14 @@ 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",
@@ -20133,7 +20068,7 @@ dependencies = [
"async-io",
"async-lock",
"async-process",
- "async-recursion",
+ "async-recursion 1.1.1",
"async-task",
"async-trait",
"blocking",
@@ -20186,7 +20121,7 @@ dependencies = [
[[package]]
name = "zed"
-version = "0.199.0"
+version = "0.197.5"
dependencies = [
"activity_indicator",
"agent",
@@ -20227,7 +20162,6 @@ dependencies = [
"extension",
"extension_host",
"extensions_ui",
- "feature_flags",
"feedback",
"file_finder",
"fs",
@@ -20289,7 +20223,6 @@ dependencies = [
"serde_json",
"session",
"settings",
- "settings_profile_selector",
"settings_ui",
"shellexpand 2.1.2",
"smol",
@@ -20348,7 +20281,7 @@ dependencies = [
[[package]]
name = "zed_emmet"
-version = "0.0.4"
+version = "0.0.3"
dependencies = [
"zed_extension_api 0.1.0",
]
@@ -20387,6 +20320,19 @@ 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"
@@ -20566,8 +20512,6 @@ dependencies = [
"call",
"client",
"clock",
- "cloud_api_types",
- "cloud_llm_client",
"collections",
"command_palette_hooks",
"copilot",
@@ -20587,6 +20531,7 @@ dependencies = [
"menu",
"postage",
"project",
+ "proto",
"regex",
"release_channel",
"reqwest_client",
@@ -20608,45 +20553,10 @@ 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 5d852f8842..ec793a7429 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,13 @@
[workspace]
resolver = "2"
members = [
- "crates/acp_thread",
"crates/activity_indicator",
- "crates/agent",
- "crates/agent_servers",
- "crates/agent_settings",
+ "crates/acp_thread",
"crates/agent_ui",
+ "crates/agent",
+ "crates/agent_settings",
"crates/ai_onboarding",
+ "crates/agent_servers",
"crates/anthropic",
"crates/askpass",
"crates/assets",
@@ -29,9 +29,6 @@ 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",
@@ -51,8 +48,8 @@ members = [
"crates/diagnostics",
"crates/docs_preprocessor",
"crates/editor",
- "crates/eval",
"crates/explorer_command_injector",
+ "crates/eval",
"crates/extension",
"crates/extension_api",
"crates/extension_cli",
@@ -73,6 +70,7 @@ members = [
"crates/gpui",
"crates/gpui_macros",
"crates/gpui_tokio",
+
"crates/html_to_markdown",
"crates/http_client",
"crates/http_client_tls",
@@ -101,6 +99,7 @@ members = [
"crates/markdown_preview",
"crates/media",
"crates/menu",
+ "crates/svg_preview",
"crates/migrator",
"crates/mistral",
"crates/multi_buffer",
@@ -141,7 +140,6 @@ members = [
"crates/semantic_version",
"crates/session",
"crates/settings",
- "crates/settings_profile_selector",
"crates/settings_ui",
"crates/snippet",
"crates/snippet_provider",
@@ -154,7 +152,6 @@ members = [
"crates/sum_tree",
"crates/supermaven",
"crates/supermaven_api",
- "crates/svg_preview",
"crates/tab_switcher",
"crates/task",
"crates/tasks_ui",
@@ -189,7 +186,6 @@ members = [
"crates/zed",
"crates/zed_actions",
"crates/zeta",
- "crates/zeta_cli",
"crates/zlog",
"crates/zlog_settings",
@@ -255,9 +251,6 @@ 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" }
@@ -344,7 +337,6 @@ 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" }
@@ -421,7 +413,6 @@ zlog_settings = { path = "crates/zlog_settings" }
#
agentic-coding-protocol = "0.0.10"
-agent-client-protocol = "0.0.17"
aho-corasick = "1.1"
alacritty_terminal = { git = "https://github.com/zed-industries/alacritty.git", branch = "add-hush-login-flag" }
any_vec = "0.14"
@@ -468,7 +459,7 @@ core-video = { version = "0.4.3", features = ["metal"] }
cpal = "0.16"
criterion = { version = "0.5", features = ["html_reports"] }
ctor = "0.4.0"
-dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "1b461b310481d01e02b2603c16d7144b926339f8" }
+dap-types = { git = "https://github.com/zed-industries/dap-types", rev = "7f39295b441614ca9dbf44293e53c32f666897f9" }
dashmap = "6.0"
derive_more = "0.99.17"
dirs = "4.0"
@@ -653,6 +644,7 @@ 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]
@@ -679,16 +671,14 @@ features = [
"UI_ViewManagement",
"Wdk_System_SystemServices",
"Win32_Globalization",
- "Win32_Graphics_Direct3D",
- "Win32_Graphics_Direct3D11",
- "Win32_Graphics_Direct3D_Fxc",
- "Win32_Graphics_DirectComposition",
+ "Win32_Graphics_Direct2D",
+ "Win32_Graphics_Direct2D_Common",
"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",
@@ -729,11 +719,6 @@ 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 }
diff --git a/README.md b/README.md
index 38547c1ca4..4c794efc3d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
# 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
deleted file mode 100644
index c7d18bb42b..0000000000
--- a/assets/badge/v0.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "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 c9bbcc82e1..2b672c364e 100644
--- a/assets/icons/ai_bedrock.svg
+++ b/assets/icons/ai_bedrock.svg
@@ -1,8 +1,4 @@
-